Changeset 187760 in webkit

Timestamp:

Aug 3, 2015 1:47:54 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Clean up the naming for AST expression generation.
​https://bugs.webkit.org/show_bug.cgi?id=147581

Patch by Keith Miller <​keith_miller@apple.com> on 2015-08-03
Reviewed by Yusuke Suzuki.

• parser/ASTBuilder.h:

(JSC::ASTBuilder::createThisExpr):
(JSC::ASTBuilder::createSuperExpr):
(JSC::ASTBuilder::createNewTargetExpr):
(JSC::ASTBuilder::thisExpr): Deleted.
(JSC::ASTBuilder::superExpr): Deleted.
(JSC::ASTBuilder::newTargetExpr): Deleted.

• parser/Parser.cpp:

(JSC::Parser<LexerType>::parsePrimaryExpression):
(JSC::Parser<LexerType>::parseMemberExpression):

• parser/SyntaxChecker.h:

(JSC::SyntaxChecker::createThisExpr):
(JSC::SyntaxChecker::createSuperExpr):
(JSC::SyntaxChecker::createNewTargetExpr):
(JSC::SyntaxChecker::thisExpr): Deleted.
(JSC::SyntaxChecker::superExpr): Deleted.
(JSC::SyntaxChecker::newTargetExpr): Deleted.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• parser/ASTBuilder.h (modified) (1 diff)
• parser/Parser.cpp (modified) (3 diffs)
• parser/SyntaxChecker.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-08-03  Keith Miller  <keith_miller@apple.com>
+
+        Clean up the naming for AST expression generation.
+        https://bugs.webkit.org/show_bug.cgi?id=147581
+
+        Reviewed by Yusuke Suzuki.
+
+        * parser/ASTBuilder.h:
+        (JSC::ASTBuilder::createThisExpr):
+        (JSC::ASTBuilder::createSuperExpr):
+        (JSC::ASTBuilder::createNewTargetExpr):
+        (JSC::ASTBuilder::thisExpr): Deleted.
+        (JSC::ASTBuilder::superExpr): Deleted.
+        (JSC::ASTBuilder::newTargetExpr): Deleted.
+        * parser/Parser.cpp:
+        (JSC::Parser<LexerType>::parsePrimaryExpression):
+        (JSC::Parser<LexerType>::parseMemberExpression):
+        * parser/SyntaxChecker.h:
+        (JSC::SyntaxChecker::createThisExpr):
+        (JSC::SyntaxChecker::createSuperExpr):
+        (JSC::SyntaxChecker::createNewTargetExpr):
+        (JSC::SyntaxChecker::thisExpr): Deleted.
+        (JSC::SyntaxChecker::superExpr): Deleted.
+        (JSC::SyntaxChecker::newTargetExpr): Deleted.
+
 2015-08-03  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/JavaScriptCore/parser/ASTBuilder.h

@@ -169 +169 @@
         return new (m_parserArena) VoidNode(location, expr);
     }
-    ExpressionNode* thisExpr(const JSTokenLocation& location, ThisTDZMode thisTDZMode)
+    ExpressionNode* createThisExpr(const JSTokenLocation& location, ThisTDZMode thisTDZMode)
     {
         usesThis();
         return new (m_parserArena) ThisNode(location, thisTDZMode);
     }
-    ExpressionNode* superExpr(const JSTokenLocation& location)
+    ExpressionNode* createSuperExpr(const JSTokenLocation& location)
     {
         return new (m_parserArena) SuperNode(location);
     }
-    ExpressionNode* newTargetExpr(const JSTokenLocation location)
+    ExpressionNode* createNewTargetExpr(const JSTokenLocation location)
     {
         return new (m_parserArena) NewTargetNode(location);

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -2767 +2767 @@
         JSTokenLocation location(tokenLocation());
         next();
-        return context.thisExpr(location, m_thisTDZMode);
+        return context.createThisExpr(location, m_thisTDZMode);
     }
     case IDENT: {
@@ -2917 +2917 @@
                 semanticFailIfFalse(currentScope()->isFunction(), "new.target is only valid inside functions");
                 baseIsNewTarget = true;
-                base = context.newTargetExpr(location);
+                base = context.createNewTargetExpr(location);
                 newCount--;
                 next();
@@ -2927 +2927 @@
 
     if (baseIsSuper) {
-        base = context.superExpr(location);
+        base = context.createSuperExpr(location);
         next();
         currentScope()->setNeedsSuperBinding();

trunk/Source/JavaScriptCore/parser/SyntaxChecker.h

@@ -153 +153 @@
     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 newTargetExpr(const JSTokenLocation&) { return NewTargetExpr; }
+    ExpressionType createThisExpr(const JSTokenLocation&, ThisTDZMode) { return ThisExpr; }
+    ExpressionType createSuperExpr(const JSTokenLocation&) { return SuperExpr; }
+    ExpressionType createNewTargetExpr(const JSTokenLocation&) { return NewTargetExpr; }
     ExpressionType createResolve(const JSTokenLocation&, const Identifier*, int) { return ResolveExpr; }
     ExpressionType createObjectLiteral(const JSTokenLocation&) { return ObjectLiteralExpr; }