X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/14957cd040308e3eeec43d26bae5d76da13fcd85..12899fa232562c774004a3a9d7d3149944dec712:/parser/SyntaxChecker.h diff --git a/parser/SyntaxChecker.h b/parser/SyntaxChecker.h index 2392244..7f902c0 100644 --- a/parser/SyntaxChecker.h +++ b/parser/SyntaxChecker.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Apple Inc. All rights reserved. + * Copyright (C) 2010, 2013 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,6 +30,7 @@ #include namespace JSC { + class SyntaxChecker { public: struct BinaryExprContext { @@ -63,7 +64,7 @@ public: SyntaxChecker* m_context; }; - SyntaxChecker(JSGlobalData* , Lexer*) + SyntaxChecker(VM* , void*) { } @@ -114,46 +115,47 @@ public: static const bool CreatesAST = false; static const bool NeedsFreeVariableInfo = false; static const bool CanUseFunctionCache = true; - static const unsigned DontBuildKeywords = Lexer::DontBuildKeywords; - static const unsigned DontBuildStrings = Lexer::DontBuildStrings; + static const unsigned DontBuildKeywords = LexexFlagsDontBuildKeywords; + static const unsigned DontBuildStrings = LexerFlagsDontBuildStrings; int createSourceElements() { return 1; } - ExpressionType makeFunctionCallNode(int, int, int, int, int) { return CallExpr; } + ExpressionType makeFunctionCallNode(const JSTokenLocation&, int, int, int, int, int, int, int) { return CallExpr; } void appendToComma(ExpressionType& base, ExpressionType right) { base = right; } - ExpressionType createCommaExpr(ExpressionType, ExpressionType right) { return right; } - ExpressionType makeAssignNode(ExpressionType, Operator, ExpressionType, bool, bool, int, int, int) { return AssignmentExpr; } - ExpressionType makePrefixNode(ExpressionType, Operator, int, int, int) { return PreExpr; } - ExpressionType makePostfixNode(ExpressionType, Operator, int, int, int) { return PostExpr; } - ExpressionType makeTypeOfNode(ExpressionType) { return TypeofExpr; } - ExpressionType makeDeleteNode(ExpressionType, int, int, int) { return DeleteExpr; } - ExpressionType makeNegateNode(ExpressionType) { return UnaryExpr; } - ExpressionType makeBitwiseNotNode(ExpressionType) { return UnaryExpr; } - ExpressionType createLogicalNot(ExpressionType) { return UnaryExpr; } - ExpressionType createUnaryPlus(ExpressionType) { return UnaryExpr; } - ExpressionType createVoid(ExpressionType) { return UnaryExpr; } - ExpressionType thisExpr() { return ThisExpr; } - ExpressionType createResolve(const Identifier*, int) { return ResolveExpr; } - ExpressionType createObjectLiteral() { return ObjectLiteralExpr; } - ExpressionType createObjectLiteral(int) { return ObjectLiteralExpr; } - ExpressionType createArray(int) { return ArrayLiteralExpr; } - ExpressionType createArray(int, int) { return ArrayLiteralExpr; } - ExpressionType createNumberExpr(double) { return NumberExpr; } - ExpressionType createString(const Identifier*) { return StringExpr; } - ExpressionType createBoolean(bool) { return BoolExpr; } - ExpressionType createNull() { return NullExpr; } - ExpressionType createBracketAccess(ExpressionType, ExpressionType, bool, int, int, int) { return BracketExpr; } - ExpressionType createDotAccess(ExpressionType, const Identifier*, int, int, int) { return DotExpr; } - ExpressionType createRegExp(const Identifier& pattern, const Identifier&, int) { return Yarr::checkSyntax(pattern.ustring()) ? 0 : RegExpExpr; } - ExpressionType createNewExpr(ExpressionType, int, int, int, int) { return NewExpr; } - ExpressionType createNewExpr(ExpressionType, int, int) { return NewExpr; } - ExpressionType createConditionalExpr(ExpressionType, ExpressionType, ExpressionType) { return ConditionalExpr; } - ExpressionType createAssignResolve(const Identifier&, ExpressionType, bool, int, int, int) { return AssignmentExpr; } - ExpressionType createFunctionExpr(const Identifier*, int, int, int, int, int, int) { return FunctionExpr; } - int createFunctionBody(bool) { return 1; } + ExpressionType createCommaExpr(const JSTokenLocation&, ExpressionType, ExpressionType right) { return right; } + ExpressionType makeAssignNode(const JSTokenLocation&, ExpressionType, Operator, ExpressionType, bool, bool, int, int, int, int, int) { return AssignmentExpr; } + ExpressionType makePrefixNode(const JSTokenLocation&, ExpressionType, Operator, int, int, int, int, int) { return PreExpr; } + ExpressionType makePostfixNode(const JSTokenLocation&, ExpressionType, Operator, int, int, int, int, int) { return PostExpr; } + ExpressionType makeTypeOfNode(const JSTokenLocation&, ExpressionType) { return TypeofExpr; } + ExpressionType makeDeleteNode(const JSTokenLocation&, ExpressionType, int, int, int, int, int) { return DeleteExpr; } + ExpressionType makeNegateNode(const JSTokenLocation&, ExpressionType) { return UnaryExpr; } + ExpressionType makeBitwiseNotNode(const JSTokenLocation&, ExpressionType) { return UnaryExpr; } + ExpressionType createLogicalNot(const JSTokenLocation&, ExpressionType) { return UnaryExpr; } + ExpressionType createUnaryPlus(const JSTokenLocation&, ExpressionType) { return UnaryExpr; } + ExpressionType createVoid(const JSTokenLocation&, ExpressionType) { return UnaryExpr; } + ExpressionType thisExpr(const JSTokenLocation&) { return ThisExpr; } + ExpressionType createResolve(const JSTokenLocation&, const Identifier*, int, int, int) { return ResolveExpr; } + ExpressionType createObjectLiteral(const JSTokenLocation&) { return ObjectLiteralExpr; } + ExpressionType createObjectLiteral(const JSTokenLocation&, int) { return ObjectLiteralExpr; } + ExpressionType createArray(const JSTokenLocation&, int) { return ArrayLiteralExpr; } + ExpressionType createArray(const JSTokenLocation&, int, int) { return ArrayLiteralExpr; } + ExpressionType createNumberExpr(const JSTokenLocation&, double) { return NumberExpr; } + ExpressionType createString(const JSTokenLocation&, const Identifier*) { return StringExpr; } + ExpressionType createBoolean(const JSTokenLocation&, bool) { return BoolExpr; } + ExpressionType createNull(const JSTokenLocation&) { return NullExpr; } + ExpressionType createBracketAccess(const JSTokenLocation&, ExpressionType, ExpressionType, bool, int, int, int, int, int) { return BracketExpr; } + ExpressionType createDotAccess(const JSTokenLocation&, ExpressionType, const Identifier*, int, int, int, int, int) { return DotExpr; } + ExpressionType createRegExp(const JSTokenLocation&, const Identifier& pattern, const Identifier&, int, int, int) { return Yarr::checkSyntax(pattern.string()) ? 0 : RegExpExpr; } + ExpressionType createNewExpr(const JSTokenLocation&, ExpressionType, int, int, int, int, int, int) { return NewExpr; } + ExpressionType createNewExpr(const JSTokenLocation&, ExpressionType, int, int, int, int) { return NewExpr; } + ExpressionType createConditionalExpr(const JSTokenLocation&, ExpressionType, ExpressionType, ExpressionType) { return ConditionalExpr; } + ExpressionType createAssignResolve(const JSTokenLocation&, const Identifier&, ExpressionType, int, int, int, int, int) { return AssignmentExpr; } + ExpressionType createFunctionExpr(const JSTokenLocation&, const Identifier*, int, int, int, int, int, int, int) { return FunctionExpr; } + int createFunctionBody(const JSTokenLocation&, const JSTokenLocation&, int, bool) { return 1; } + void setFunctionStart(int, int) { } int createArguments() { return 1; } int createArguments(int) { return 1; } - int createArgumentsList(int) { return 1; } - int createArgumentsList(int, int) { return 1; } + int createArgumentsList(const JSTokenLocation&, int) { return 1; } + int createArgumentsList(const JSTokenLocation&, int, int) { return 1; } template Property createProperty(const Identifier* name, int, PropertyNode::Type type) { if (!complete) @@ -161,14 +163,14 @@ public: ASSERT(name); return Property(name, type); } - template Property createProperty(JSGlobalData* globalData, double name, int, PropertyNode::Type type) + template Property createProperty(VM* vm, double name, int, PropertyNode::Type type) { if (!complete) return Property(type); - return Property(&globalData->parser->arena().identifierArena().makeNumericIdentifier(globalData, name), type); + return Property(&vm->parserArena->identifierArena().makeNumericIdentifier(vm, name), type); } - int createPropertyList(Property) { return 1; } - int createPropertyList(Property, int) { return 1; } + int createPropertyList(const JSTokenLocation&, Property) { return 1; } + int createPropertyList(const JSTokenLocation&, Property, int) { return 1; } int createElementList(int, int) { return 1; } int createElementList(int, int, int) { return 1; } int createFormalParameterList(const Identifier&) { return 1; } @@ -177,44 +179,50 @@ public: int createClauseList(int) { return 1; } int createClauseList(int, int) { return 1; } void setUsesArguments(int) { } - int createFuncDeclStatement(const Identifier*, int, int, int, int, int, int) { return 1; } - int createBlockStatement(int, int, int) { return 1; } - int createExprStatement(int, int, int) { return 1; } - int createIfStatement(int, int, int, int) { return 1; } - int createIfStatement(int, int, int, int, int) { return 1; } - int createForLoop(int, int, int, int, bool, int, int) { return 1; } - int createForInLoop(const Identifier*, int, int, int, int, int, int, int, int, int, int) { return 1; } - int createForInLoop(int, int, int, int, int, int, int, int) { return 1; } - int createEmptyStatement() { return 1; } - int createVarStatement(int, int, int) { return 1; } - int createReturnStatement(int, int, int, int, int) { return 1; } - int createBreakStatement(int, int, int, int) { return 1; } - int createBreakStatement(const Identifier*, int, int, int, int) { return 1; } - int createContinueStatement(int, int, int, int) { return 1; } - int createContinueStatement(const Identifier*, int, int, int, int) { return 1; } - int createTryStatement(int, const Identifier*, bool, int, int, int, int) { return 1; } - int createSwitchStatement(int, int, int, int, int, int) { return 1; } - int createWhileStatement(int, int, int, int) { return 1; } - int createWithStatement(int, int, int, int, int, int) { return 1; } - int createDoWhileStatement(int, int, int, int) { return 1; } - int createLabelStatement(const Identifier*, int, int, int) { return 1; } - int createThrowStatement(int, int, int, int, int) { return 1; } - int createDebugger(int, int) { return 1; } - int createConstStatement(int, int, int) { return 1; } - int appendConstDecl(int, const Identifier*, int) { return 1; } - template Property createGetterOrSetterProperty(PropertyNode::Type type, const Identifier* name, int, int, int, int, int, int) + int createFuncDeclStatement(const JSTokenLocation&, const Identifier*, int, int, int, int, int, int, int) { return 1; } + int createBlockStatement(const JSTokenLocation&, int, int, int) { return 1; } + int createExprStatement(const JSTokenLocation&, int, int, int) { return 1; } + int createIfStatement(const JSTokenLocation&, int, int, int, int) { return 1; } + int createIfStatement(const JSTokenLocation&, int, int, int, int, int) { return 1; } + int createForLoop(const JSTokenLocation&, int, int, int, int, int, int) { return 1; } + int createForInLoop(const JSTokenLocation&, const Identifier*, int, int, int, int, int, int, int, int, int, int, int, int) { return 1; } + int createForInLoop(const JSTokenLocation&, int, int, int, int, int, int, int, int, int, int) { return 1; } + int createEmptyStatement(const JSTokenLocation&) { return 1; } + int createVarStatement(const JSTokenLocation&, int, int, int) { return 1; } + int createReturnStatement(const JSTokenLocation&, int, int, int, int, int, int, int) { return 1; } + int createBreakStatement(const JSTokenLocation&, int, int, int, int, int) { return 1; } + int createBreakStatement(const JSTokenLocation&, const Identifier*, int, int, int, int, int) { return 1; } + int createContinueStatement(const JSTokenLocation&, int, int, int, int, int) { return 1; } + int createContinueStatement(const JSTokenLocation&, const Identifier*, int, int, int, int, int) { return 1; } + int createTryStatement(const JSTokenLocation&, int, const Identifier*, int, int, int, int) { return 1; } + int createSwitchStatement(const JSTokenLocation&, int, int, int, int, int, int) { return 1; } + int createWhileStatement(const JSTokenLocation&, int, int, int, int) { return 1; } + int createWithStatement(const JSTokenLocation&, int, int, int, int, int, int, int, int) { return 1; } + int createDoWhileStatement(const JSTokenLocation&, int, int, int, int) { return 1; } + int createLabelStatement(const JSTokenLocation&, const Identifier*, int, int, int, int, int) { return 1; } + int createThrowStatement(const JSTokenLocation&, int, int, int, int, int, int, int) { return 1; } + int createDebugger(const JSTokenLocation&, int, int) { return 1; } + int createConstStatement(const JSTokenLocation&, int, int, int) { return 1; } + int appendConstDecl(const JSTokenLocation&, int, const Identifier*, int) { return 1; } + template Property createGetterOrSetterProperty(const JSTokenLocation&, PropertyNode::Type type, const Identifier* name, int, int, int, int, int, int, int) { ASSERT(name); if (!strict) return Property(type); return Property(name, type); } + template Property createGetterOrSetterProperty(VM* vm, const JSTokenLocation&, PropertyNode::Type type, double name, int, int, int, int, int, int, int) + { + if (!strict) + return Property(type); + return Property(&vm->parserArena->identifierArena().makeNumericIdentifier(vm, name), type); + } void appendStatement(int, int) { } void addVar(const Identifier*, bool) { } - int combineCommaNodes(int, int) { return 1; } + int combineCommaNodes(const JSTokenLocation&, int, int) { return 1; } int evalCount() const { return 0; } - void appendBinaryExpressionInfo(int& operandStackDepth, int expr, int, int, int, bool) + void appendBinaryExpressionInfo(int& operandStackDepth, int expr, int, int, int, int, int, bool) { if (!m_topBinaryExpr) m_topBinaryExpr = expr; @@ -228,17 +236,18 @@ public: bool operatorStackHasHigherPrecedence(int&, int) { return true; } BinaryOperand getFromOperandStack(int) { return m_topBinaryExpr; } void shrinkOperandStackBy(int& operandStackDepth, int amount) { operandStackDepth -= amount; } - void appendBinaryOperation(int& operandStackDepth, int&, BinaryOperand, BinaryOperand) { operandStackDepth++; } + void appendBinaryOperation(const JSTokenLocation&, int& operandStackDepth, int&, BinaryOperand, BinaryOperand) { operandStackDepth++; } void operatorStackAppend(int& operatorStackDepth, int, int) { operatorStackDepth++; } int popOperandStack(int&) { int res = m_topBinaryExpr; m_topBinaryExpr = 0; return res; } - void appendUnaryToken(int& stackDepth, int tok, int) { stackDepth = 1; m_topUnaryToken = tok; } + void appendUnaryToken(int& stackDepth, int tok, int, int, int) { stackDepth = 1; m_topUnaryToken = tok; } int unaryTokenStackLastType(int&) { return m_topUnaryToken; } - int unaryTokenStackLastStart(int&) { return 0; } + unsigned unaryTokenStackLastStart(int&) { return 0; } + unsigned unaryTokenStackLastLineStartPosition(int&) { return 0; } void unaryTokenStackRemoveLast(int& stackDepth) { stackDepth = 0; } - void assignmentStackAppend(int, int, int, int, int, Operator) { } - int createAssignment(int, int, int, int, int) { ASSERT_NOT_REACHED(); return 1; } + void assignmentStackAppend(int, int, int, int, int, int, int, Operator) { } + int createAssignment(const JSTokenLocation&, int, int, int, int, int) { RELEASE_ASSERT_NOT_REACHED(); return 1; } const Identifier& getName(const Property& property) const { ASSERT(property.name); return *property.name; } PropertyNode::Type getType(const Property& property) const { return property.type; } bool isResolve(ExpressionType expr) const { return expr == ResolveExpr || expr == ResolveEvalExpr; }