X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/14957cd040308e3eeec43d26bae5d76da13fcd85..HEAD:/parser/SyntaxChecker.h diff --git a/parser/SyntaxChecker.h b/parser/SyntaxChecker.h index 2392244..a3306d2 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 @@ -27,9 +27,11 @@ #define SyntaxChecker_h #include "Lexer.h" -#include +#include "ParserFunctionInfo.h" +#include "YarrSyntaxChecker.h" namespace JSC { + class SyntaxChecker { public: struct BinaryExprContext { @@ -63,18 +65,27 @@ public: SyntaxChecker* m_context; }; - SyntaxChecker(JSGlobalData* , Lexer*) + SyntaxChecker(VM* , void*) { } typedef SyntaxChecker FunctionBodyBuilder; enum { NoneExpr = 0, - ResolveEvalExpr, ResolveExpr, NumberExpr, StringExpr, + ResolveEvalExpr, ResolveExpr, IntegerExpr, DoubleExpr, StringExpr, ThisExpr, NullExpr, BoolExpr, RegExpExpr, ObjectLiteralExpr, - FunctionExpr, BracketExpr, DotExpr, CallExpr, + FunctionExpr, ClassExpr, SuperExpr, BracketExpr, DotExpr, CallExpr, NewExpr, PreExpr, PostExpr, UnaryExpr, BinaryExpr, ConditionalExpr, AssignmentExpr, TypeofExpr, - DeleteExpr, ArrayLiteralExpr }; + DeleteExpr, ArrayLiteralExpr, BindingDestructuring, + ArrayDestructuring, ObjectDestructuring, SourceElementsResult, + FunctionBodyResult, SpreadExpr, ArgumentsResult, + PropertyListResult, ArgumentsListResult, ElementsListResult, + StatementResult, FormalParameterListResult, ClauseResult, + ClauseListResult, CommaExpr, DestructuringAssignment, + TemplateStringResult, TemplateStringListResult, + TemplateExpressionListResult, TemplateExpr, + TaggedTemplateExpr + }; typedef int ExpressionType; typedef ExpressionType Expression; @@ -87,8 +98,8 @@ public: { } ALWAYS_INLINE Property(const Identifier* ident, PropertyNode::Type ty) - : name(ident) - , type(ty) + : name(ident) + , type(ty) { } ALWAYS_INLINE Property(PropertyNode::Type ty) @@ -103,116 +114,163 @@ public: typedef int PropertyList; typedef int ElementList; typedef int ArgumentsList; +#if ENABLE(ES6_TEMPLATE_LITERAL_SYNTAX) + typedef int TemplateExpressionList; + typedef int TemplateString; + typedef int TemplateStringList; + typedef int TemplateLiteral; +#endif typedef int FormalParameterList; typedef int FunctionBody; +#if ENABLE(ES6_CLASS_SYNTAX) + typedef int ClassExpression; +#endif typedef int Statement; typedef int ClauseList; typedef int Clause; typedef int ConstDeclList; typedef int BinaryOperand; - + typedef int DestructuringPattern; + typedef DestructuringPattern ArrayPattern; + typedef DestructuringPattern ObjectPattern; + 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; } - 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; } - int createArguments() { return 1; } - int createArguments(int) { return 1; } - int createArgumentsList(int) { return 1; } - int createArgumentsList(int, int) { return 1; } - template Property createProperty(const Identifier* name, int, PropertyNode::Type type) + int createSourceElements() { return SourceElementsResult; } + ExpressionType makeFunctionCallNode(const JSTokenLocation&, int, int, int, int, int) { return CallExpr; } + ExpressionType createCommaExpr(const JSTokenLocation&, ExpressionType expr) { return expr; } + ExpressionType appendToCommaExpr(const JSTokenLocation&, ExpressionType& head, ExpressionType, ExpressionType next) { head = next; return next; } + ExpressionType makeAssignNode(const JSTokenLocation&, ExpressionType, Operator, ExpressionType, bool, bool, int, int, int) { return AssignmentExpr; } + ExpressionType makePrefixNode(const JSTokenLocation&, ExpressionType, Operator, int, int, int) { return PreExpr; } + ExpressionType makePostfixNode(const JSTokenLocation&, ExpressionType, Operator, int, int, int) { return PostExpr; } + ExpressionType makeTypeOfNode(const JSTokenLocation&, ExpressionType) { return TypeofExpr; } + ExpressionType makeDeleteNode(const JSTokenLocation&, ExpressionType, 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&, ThisTDZMode) { return ThisExpr; } + ExpressionType superExpr(const JSTokenLocation&) { return SuperExpr; } + ExpressionType createResolve(const JSTokenLocation&, const Identifier*, 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 createDoubleExpr(const JSTokenLocation&, double) { return DoubleExpr; } + ExpressionType createIntegerExpr(const JSTokenLocation&, double) { return IntegerExpr; } + 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) { return BracketExpr; } + ExpressionType createDotAccess(const JSTokenLocation&, ExpressionType, const Identifier*, int, int, int) { return DotExpr; } + ExpressionType createRegExp(const JSTokenLocation&, const Identifier& pattern, const Identifier&, int) { return Yarr::checkSyntax(pattern.string()) ? 0 : RegExpExpr; } + ExpressionType createNewExpr(const JSTokenLocation&, ExpressionType, int, int, int, int) { return NewExpr; } + ExpressionType createNewExpr(const JSTokenLocation&, ExpressionType, int, int) { return NewExpr; } + ExpressionType createConditionalExpr(const JSTokenLocation&, ExpressionType, ExpressionType, ExpressionType) { return ConditionalExpr; } + ExpressionType createAssignResolve(const JSTokenLocation&, const Identifier&, ExpressionType, int, int, int) { return AssignmentExpr; } + ExpressionType createEmptyVarExpression(const JSTokenLocation&, const Identifier&) { return AssignmentExpr; } +#if ENABLE(ES6_CLASS_SYNTAX) + ClassExpression createClassExpr(const JSTokenLocation&, const Identifier&, ExpressionType, ExpressionType, PropertyList, PropertyList) { return ClassExpr; } +#endif + ExpressionType createFunctionExpr(const JSTokenLocation&, const ParserFunctionInfo&) { return FunctionExpr; } + int createFunctionBody(const JSTokenLocation&, const JSTokenLocation&, int, int, bool, int, int, int, ConstructorKind) { return FunctionBodyResult; } +#if ENABLE(ES6_ARROWFUNCTION_SYNTAX) + ExpressionType createArrowFunctionExpr(const JSTokenLocation&, const ParserFunctionInfo&) { return FunctionExpr; } +#endif + void setFunctionNameStart(int, int) { } + int createArguments() { return ArgumentsResult; } + int createArguments(int) { return ArgumentsResult; } + ExpressionType createSpreadExpression(const JSTokenLocation&, ExpressionType, int, int, int) { return SpreadExpr; } +#if ENABLE(ES6_TEMPLATE_LITERAL_SYNTAX) + TemplateString createTemplateString(const JSTokenLocation&, const Identifier&, const Identifier&) { return TemplateStringResult; } + TemplateStringList createTemplateStringList(TemplateString) { return TemplateStringListResult; } + TemplateStringList createTemplateStringList(TemplateStringList, TemplateString) { return TemplateStringListResult; } + TemplateExpressionList createTemplateExpressionList(Expression) { return TemplateExpressionListResult; } + TemplateExpressionList createTemplateExpressionList(TemplateExpressionList, Expression) { return TemplateExpressionListResult; } + TemplateLiteral createTemplateLiteral(const JSTokenLocation&, TemplateStringList) { return TemplateExpr; } + TemplateLiteral createTemplateLiteral(const JSTokenLocation&, TemplateStringList, TemplateExpressionList) { return TemplateExpr; } + ExpressionType createTaggedTemplate(const JSTokenLocation&, ExpressionType, TemplateLiteral, int, int, int) { return TaggedTemplateExpr; } +#endif + + int createArgumentsList(const JSTokenLocation&, int) { return ArgumentsListResult; } + int createArgumentsList(const JSTokenLocation&, int, int) { return ArgumentsListResult; } + Property createProperty(const Identifier* name, int, PropertyNode::Type type, PropertyNode::PutType, bool complete, SuperBinding = SuperBinding::NotNeeded) { if (!complete) return Property(type); ASSERT(name); return Property(name, type); } - template Property createProperty(JSGlobalData* globalData, double name, int, PropertyNode::Type type) + Property createProperty(VM* vm, ParserArena& parserArena, double name, int, PropertyNode::Type type, PropertyNode::PutType, bool complete) { if (!complete) return Property(type); - return Property(&globalData->parser->arena().identifierArena().makeNumericIdentifier(globalData, name), type); - } - int createPropertyList(Property) { return 1; } - int createPropertyList(Property, int) { return 1; } - int createElementList(int, int) { return 1; } - int createElementList(int, int, int) { return 1; } - int createFormalParameterList(const Identifier&) { return 1; } - int createFormalParameterList(int, const Identifier&) { return 1; } - int createClause(int, int) { return 1; } - 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) + return Property(&parserArena.identifierArena().makeNumericIdentifier(vm, name), type); + } + Property createProperty(int, int, PropertyNode::Type type, PropertyNode::PutType, bool) + { + return Property(type); + } + int createPropertyList(const JSTokenLocation&, Property) { return PropertyListResult; } + int createPropertyList(const JSTokenLocation&, Property, int) { return PropertyListResult; } + int createElementList(int, int) { return ElementsListResult; } + int createElementList(int, int, int) { return ElementsListResult; } + int createFormalParameterList(DestructuringPattern) { return FormalParameterListResult; } + int createFormalParameterList(int, DestructuringPattern) { return FormalParameterListResult; } + int createClause(int, int) { return ClauseResult; } + int createClauseList(int) { return ClauseListResult; } + int createClauseList(int, int) { return ClauseListResult; } + int createFuncDeclStatement(const JSTokenLocation&, const ParserFunctionInfo&) { return StatementResult; } +#if ENABLE(ES6_CLASS_SYNTAX) + int createClassDeclStatement(const JSTokenLocation&, ClassExpression, + const JSTextPosition&, const JSTextPosition&, int, int) { return StatementResult; } +#endif + int createBlockStatement(const JSTokenLocation&, int, int, int) { return StatementResult; } + int createExprStatement(const JSTokenLocation&, int, int, int) { return StatementResult; } + int createIfStatement(const JSTokenLocation&, int, int, int, int) { return StatementResult; } + int createIfStatement(const JSTokenLocation&, int, int, int, int, int) { return StatementResult; } + int createForLoop(const JSTokenLocation&, int, int, int, int, int, int) { return StatementResult; } + int createForInLoop(const JSTokenLocation&, int, int, int, int, int, int, int, int) { return StatementResult; } + int createForOfLoop(const JSTokenLocation&, int, int, int, int, int, int, int, int) { return StatementResult; } + int createEmptyStatement(const JSTokenLocation&) { return StatementResult; } + int createVarStatement(const JSTokenLocation&, int, int, int) { return StatementResult; } + int createReturnStatement(const JSTokenLocation&, int, int, int) { return StatementResult; } + int createBreakStatement(const JSTokenLocation&, int, int) { return StatementResult; } + int createBreakStatement(const JSTokenLocation&, const Identifier*, int, int) { return StatementResult; } + int createContinueStatement(const JSTokenLocation&, int, int) { return StatementResult; } + int createContinueStatement(const JSTokenLocation&, const Identifier*, int, int) { return StatementResult; } + int createTryStatement(const JSTokenLocation&, int, const Identifier*, int, int, int, int) { return StatementResult; } + int createSwitchStatement(const JSTokenLocation&, int, int, int, int, int, int) { return StatementResult; } + int createWhileStatement(const JSTokenLocation&, int, int, int, int) { return StatementResult; } + int createWithStatement(const JSTokenLocation&, int, int, int, int, int, int) { return StatementResult; } + int createDoWhileStatement(const JSTokenLocation&, int, int, int, int) { return StatementResult; } + int createLabelStatement(const JSTokenLocation&, const Identifier*, int, int, int) { return StatementResult; } + int createThrowStatement(const JSTokenLocation&, int, int, int) { return StatementResult; } + int createDebugger(const JSTokenLocation&, int, int) { return StatementResult; } + int createConstStatement(const JSTokenLocation&, int, int, int) { return StatementResult; } + int appendConstDecl(const JSTokenLocation&, int, const Identifier*, int) { return StatementResult; } + Property createGetterOrSetterProperty(const JSTokenLocation&, PropertyNode::Type type, bool strict, const Identifier* name, const ParserFunctionInfo&, SuperBinding) { ASSERT(name); if (!strict) return Property(type); return Property(name, type); } + Property createGetterOrSetterProperty(VM* vm, ParserArena& parserArena, const JSTokenLocation&, PropertyNode::Type type, bool strict, double name, const ParserFunctionInfo&, SuperBinding) + { + if (!strict) + return Property(type); + return Property(&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 CommaExpr; } int evalCount() const { return 0; } void appendBinaryExpressionInfo(int& operandStackDepth, int expr, int, int, int, bool) { @@ -228,21 +286,62 @@ 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; } int unaryTokenStackLastType(int&) { return m_topUnaryToken; } - int unaryTokenStackLastStart(int&) { return 0; } + JSTextPosition unaryTokenStackLastStart(int&) { return JSTextPosition(0, 0, 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; } - const Identifier& getName(const Property& property) const { ASSERT(property.name); return *property.name; } + int createAssignment(const JSTokenLocation&, int, int, int, int, int) { RELEASE_ASSERT_NOT_REACHED(); return AssignmentExpr; } + const Identifier* getName(const Property& property) const { return property.name; } PropertyNode::Type getType(const Property& property) const { return property.type; } bool isResolve(ExpressionType expr) const { return expr == ResolveExpr || expr == ResolveEvalExpr; } + ExpressionType createDestructuringAssignment(const JSTokenLocation&, int, ExpressionType) + { + return DestructuringAssignment; + } + ArrayPattern createArrayPattern(const JSTokenLocation&) + { + return ArrayDestructuring; + } + void appendArrayPatternSkipEntry(ArrayPattern, const JSTokenLocation&) + { + } + void appendArrayPatternEntry(ArrayPattern, const JSTokenLocation&, DestructuringPattern, int) + { + } + void appendArrayPatternRestEntry(ArrayPattern, const JSTokenLocation&, DestructuringPattern) + { + } + void finishArrayPattern(ArrayPattern, const JSTextPosition&, const JSTextPosition&, const JSTextPosition&) + { + } + ObjectPattern createObjectPattern(const JSTokenLocation&) + { + return ObjectDestructuring; + } + void appendObjectPatternEntry(ArrayPattern, const JSTokenLocation&, bool, const Identifier&, DestructuringPattern, int) + { + } + DestructuringPattern createBindingLocation(const JSTokenLocation&, const Identifier&, const JSTextPosition&, const JSTextPosition&) + { + return BindingDestructuring; + } + + bool isBindingNode(DestructuringPattern pattern) + { + return pattern == BindingDestructuring; + } + + void setEndOffset(int, int) { } + int endOffset(int) { return 0; } + void setStartOffset(int, int) { } + private: int m_topBinaryExpr; int m_topUnaryToken;