Title: [250548] trunk/Source/_javascript_Core
- Revision
- 250548
- Author
- achristen...@apple.com
- Date
- 2019-09-30 23:14:40 -0700 (Mon, 30 Sep 2019)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (250547 => 250548)
--- trunk/Source/_javascript_Core/ChangeLog 2019-10-01 05:34:15 UTC (rev 250547)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-10-01 06:14:40 UTC (rev 250548)
@@ -1,3 +1,14 @@
+2019-09-30 Alex Christensen <achristen...@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 <tzaga...@apple.com>
Make assertion in JSObject::putOwnDataProperty more precise
Modified: trunk/Source/_javascript_Core/parser/Keywords.table (250547 => 250548)
--- trunk/Source/_javascript_Core/parser/Keywords.table 2019-10-01 05:34:15 UTC (rev 250547)
+++ trunk/Source/_javascript_Core/parser/Keywords.table 2019-10-01 06:14:40 UTC (rev 250548)
@@ -43,7 +43,7 @@
# Reserved for future use.
enum RESERVED
-export EXPORT
+export EXPORT_
import IMPORT
# Reserved for future use in strict code.
Modified: trunk/Source/_javascript_Core/parser/Parser.cpp (250547 => 250548)
--- trunk/Source/_javascript_Core/parser/Parser.cpp 2019-10-01 05:34:15 UTC (rev 250547)
+++ trunk/Source/_javascript_Core/parser/Parser.cpp 2019-10-01 06:14:40 UTC (rev 250548)
@@ -427,7 +427,7 @@
while (true) {
TreeStatement statement = 0;
switch (m_token.m_type) {
- case EXPORT:
+ case EXPORT_:
statement = parseExportDeclaration(context);
if (statement)
recordPauseLocation(context.breakpointLocation(statement));
@@ -3380,7 +3380,7 @@
template <class TreeBuilder> TreeStatement Parser<LexerType>::parseExportDeclaration(TreeBuilder& context)
{
// http://www.ecma-international.org/ecma-262/6.0/#sec-exports
- ASSERT(match(EXPORT));
+ ASSERT(match(EXPORT_));
JSTokenLocation exportLocation(tokenLocation());
next();
Modified: trunk/Source/_javascript_Core/parser/ParserTokens.h (250547 => 250548)
--- trunk/Source/_javascript_Core/parser/ParserTokens.h 2019-10-01 05:34:15 UTC (rev 250547)
+++ trunk/Source/_javascript_Core/parser/ParserTokens.h 2019-10-01 06:14:40 UTC (rev 250548)
@@ -85,7 +85,7 @@
DEBUGGER,
ELSE,
IMPORT,
- EXPORT,
+ EXPORT_,
CLASSTOKEN,
EXTENDS,
SUPER,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
