Changeset 192147 in webkit for trunk/Source/JavaScriptCore/parser/SyntaxChecker.h

Timestamp:

Nov 8, 2015, 5:34:09 PM (10 years ago)

Author:

Yusuke Suzuki

Message:

[ES6] Minimize ES6_CLASS_SYNTAX ifdefs
​https://bugs.webkit.org/show_bug.cgi?id=151006

Reviewed by Darin Adler.

This patch minimizes ENABLE_ES6_CLASS_SYNTAX ifdefs.
It keeps several ENABLE_ES6_CLASS_SYNTAX ifdefs in Parser.cpp.

• super meta property
• class declaration parsing
• class expression parsing
• class with import declaration

This change makes difference minimal between the enabled and disabled configurations;
reducing accidental build breaks of the disabled configuration.

• bytecompiler/BytecodeGenerator.h:

(JSC::BytecodeGenerator::constructorKind): Deleted.

• bytecompiler/NodesCodegen.cpp:
• parser/ASTBuilder.h:
• parser/NodeConstructors.h:
• parser/Nodes.h:
• parser/Parser.cpp:
• parser/Parser.h:

(JSC::Scope::hasDirectSuper): Deleted.
(JSC::Scope::needsSuperBinding): Deleted.

• parser/ParserFunctionInfo.h:
• parser/ParserTokens.h:
• parser/SyntaxChecker.h:

File:

• trunk/Source/JavaScriptCore/parser/SyntaxChecker.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/parser/SyntaxChecker.h

@@ -123 +123 @@
     typedef int FormalParameterList;
     typedef int FunctionBody;
-#if ENABLE(ES6_CLASS_SYNTAX)
     typedef int ClassExpression;
-#endif
     typedef int ModuleName;
     typedef int ImportSpecifier;
@@ -183 +181 @@
     ExpressionType createYield(const JSTokenLocation&) { return YieldExpr; }
     ExpressionType createYield(const JSTokenLocation&, ExpressionType, bool) { return YieldExpr; }
-#if ENABLE(ES6_CLASS_SYNTAX)
     ClassExpression createClassExpr(const JSTokenLocation&, const Identifier&, VariableEnvironment&, ExpressionType, ExpressionType, PropertyList, PropertyList) { return ClassExpr; }
-#endif
     ExpressionType createFunctionExpr(const JSTokenLocation&, const ParserFunctionInfo<SyntaxChecker>&) { return FunctionExpr; }
     int createFunctionMetadata(const JSTokenLocation&, const JSTokenLocation&, int, int, bool, int, int, int, ConstructorKind, unsigned, SourceParseMode, bool, bool) { return FunctionBodyResult; }
@@ -231 +227 @@
     int createClauseList(int, int) { return ClauseListResult; }
     int createFuncDeclStatement(const JSTokenLocation&, const ParserFunctionInfo<SyntaxChecker>&) { 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, VariableEnvironment&) { return StatementResult; }
     int createExprStatement(const JSTokenLocation&, int, int, int) { return StatementResult; }