Changeset 250548 in webkit

Timestamp:

Sep 30, 2019 11:14:40 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Rename JSTokenType::EXPORT to EXPORT_ to avoid naming conflict with internal header
​https://bugs.webkit.org/show_bug.cgi?id=202385

• parser/Keywords.table:
• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseModuleSourceElements):
(JSC::Parser<LexerType>::parseExportDeclaration):

• parser/ParserTokens.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• parser/Keywords.table (modified) (1 diff)
• parser/Parser.cpp (modified) (2 diffs)
• parser/ParserTokens.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-09-30  Alex Christensen  <achristensen@webkit.org>
+
+        Rename JSTokenType::EXPORT to EXPORT_ to avoid naming conflict with internal header
+        https://bugs.webkit.org/show_bug.cgi?id=202385
+
+        * parser/Keywords.table:
+        * parser/Parser.cpp:
+        (JSC::Parser<LexerType>::parseModuleSourceElements):
+        (JSC::Parser<LexerType>::parseExportDeclaration):
+        * parser/ParserTokens.h:
+
 2019-09-30  Tadeu Zagallo  <tzagallo@apple.com>
 

trunk/Source/JavaScriptCore/parser/Keywords.table

@@ -44 +44 @@
 # Reserved for future use.
 enum            RESERVED
-export          EXPORT
+export          EXPORT_
 import          IMPORT
 

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -428 +428 @@
         TreeStatement statement = 0;
         switch (m_token.m_type) {
-        case EXPORT:
+        case EXPORT_:
             statement = parseExportDeclaration(context);
             if (statement)
@@ -3381 +3381 @@
 {
     // http://www.ecma-international.org/ecma-262/6.0/#sec-exports
-    ASSERT(match(EXPORT));
+    ASSERT(match(EXPORT_));
     JSTokenLocation exportLocation(tokenLocation());
     next();

trunk/Source/JavaScriptCore/parser/ParserTokens.h

@@ -86 +86 @@
     ELSE,
     IMPORT,
-    EXPORT,
+    EXPORT_,
     CLASSTOKEN,
     EXTENDS,