Changeset 188417 in webkit for trunk/Source/JavaScriptCore/parser/NodesAnalyzeModule.cpp

Timestamp:

Aug 13, 2015, 4:55:35 PM (10 years ago)

Author:

Yusuke Suzuki

Message:

Unify JSParserCodeType, FunctionParseMode and ModuleParseMode into SourceParseMode
​https://bugs.webkit.org/show_bug.cgi?id=147353

Reviewed by Saam Barati.

This is the follow-up patch after r188355.
It includes the following changes.

• Unify JSParserCodeType, FunctionParseMode and ModuleParseMode into SourceParseMode
• Make SourceParseMode to C++ strongly-typed enum.
• Fix the comments.
• Rename ModuleSpecifier to ModuleName.
• Add the type name ImportEntry before the C++11 uniform initialization.
• Fix the thrown message for duplicate 'default' names.
• Assert the all statements in the top-level source elements are the module declarations under the module analyzer phase.

• API/JSScriptRef.cpp:

(parseScript):

• builtins/BuiltinExecutables.cpp:

(JSC::BuiltinExecutables::createExecutableInternal):

• bytecode/UnlinkedFunctionExecutable.cpp:

(JSC::generateFunctionCodeBlock):

• bytecode/UnlinkedFunctionExecutable.h:
• bytecompiler/BytecodeGenerator.h:

(JSC::BytecodeGenerator::makeFunction):

• parser/ASTBuilder.h:

(JSC::ASTBuilder::createFunctionMetadata):
(JSC::ASTBuilder::createModuleName):
(JSC::ASTBuilder::createImportDeclaration):
(JSC::ASTBuilder::createExportAllDeclaration):
(JSC::ASTBuilder::createExportNamedDeclaration):
(JSC::ASTBuilder::createModuleSpecifier): Deleted.

• parser/ModuleAnalyzer.cpp:

(JSC::ModuleAnalyzer::analyze):

• parser/NodeConstructors.h:

(JSC::ModuleNameNode::ModuleNameNode):
(JSC::ImportDeclarationNode::ImportDeclarationNode):
(JSC::ExportAllDeclarationNode::ExportAllDeclarationNode):
(JSC::ExportNamedDeclarationNode::ExportNamedDeclarationNode):
(JSC::ModuleSpecifierNode::ModuleSpecifierNode): Deleted.

• parser/Nodes.cpp:

(JSC::FunctionMetadataNode::FunctionMetadataNode):

• parser/Nodes.h:

(JSC::StatementNode::isModuleDeclarationNode):
(JSC::ModuleDeclarationNode::isModuleDeclarationNode):
(JSC::ImportDeclarationNode::moduleName):
(JSC::ExportAllDeclarationNode::moduleName):
(JSC::ExportNamedDeclarationNode::moduleName):
(JSC::ImportDeclarationNode::moduleSpecifier): Deleted.
(JSC::ExportAllDeclarationNode::moduleSpecifier): Deleted.
(JSC::ExportNamedDeclarationNode::moduleSpecifier): Deleted.

• parser/NodesAnalyzeModule.cpp:

(JSC::SourceElements::analyzeModule):
(JSC::ImportDeclarationNode::analyzeModule):
(JSC::ExportAllDeclarationNode::analyzeModule):
(JSC::ExportNamedDeclarationNode::analyzeModule):

• parser/Parser.cpp:

(JSC::Parser<LexerType>::Parser):
(JSC::Parser<LexerType>::parseInner):
(JSC::Parser<LexerType>::parseModuleSourceElements):
(JSC::Parser<LexerType>::parseFunctionBody):
(JSC::stringForFunctionMode):
(JSC::Parser<LexerType>::parseFunctionParameters):
(JSC::Parser<LexerType>::parseFunctionInfo):
(JSC::Parser<LexerType>::parseFunctionDeclaration):
(JSC::Parser<LexerType>::parseClass):
(JSC::Parser<LexerType>::parseModuleName):
(JSC::Parser<LexerType>::parseImportDeclaration):
(JSC::Parser<LexerType>::parseExportDeclaration):
(JSC::Parser<LexerType>::parsePropertyMethod):
(JSC::Parser<LexerType>::parseGetterSetter):
(JSC::Parser<LexerType>::parsePrimaryExpression):
(JSC::Parser<LexerType>::parseArrowFunctionExpression):
(JSC::Parser<LexerType>::parseModuleSpecifier): Deleted.

• parser/Parser.h:

(JSC::Parser<LexerType>::parse):
(JSC::parse):

• parser/ParserModes.h:

(JSC::isFunctionParseMode):
(JSC::isModuleParseMode):
(JSC::isProgramParseMode):

• parser/SyntaxChecker.h:

(JSC::SyntaxChecker::createFunctionMetadata):
(JSC::SyntaxChecker::createModuleName):
(JSC::SyntaxChecker::createImportDeclaration):
(JSC::SyntaxChecker::createExportAllDeclaration):
(JSC::SyntaxChecker::createExportNamedDeclaration):
(JSC::SyntaxChecker::createModuleSpecifier): Deleted.

• runtime/CodeCache.cpp:

(JSC::CodeCache::getGlobalCodeBlock):
(JSC::CodeCache::getFunctionExecutableFromGlobalCode):

• runtime/Completion.cpp:

(JSC::checkSyntax):
(JSC::checkModuleSyntax):

• runtime/Executable.cpp:

(JSC::ProgramExecutable::checkSyntax):

• tests/stress/modules-syntax-error-with-names.js:

File:

• trunk/Source/JavaScriptCore/parser/NodesAnalyzeModule.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/parser/NodesAnalyzeModule.cpp

@@ -41 +41 @@
 {
     // In the module analyzer phase, only module declarations are included in the top-level SourceElements.
-    for (StatementNode* statement = m_head; statement; statement = statement->next())
+    for (StatementNode* statement = m_head; statement; statement = statement->next()) {
+        ASSERT(statement->isModuleDeclarationNode());
         static_cast<ModuleDeclarationNode*>(statement)->analyzeModule(analyzer);
+    }
 }
 
 void ImportDeclarationNode::analyzeModule(ModuleAnalyzer& analyzer)
 {
-    analyzer.moduleRecord().appendRequestedModule(m_moduleSpecifier->moduleName());
+    analyzer.moduleRecord().appendRequestedModule(m_moduleName->moduleName());
     for (auto* specifier : m_specifierList->specifiers()) {
-        analyzer.moduleRecord().addImportEntry({
-            m_moduleSpecifier->moduleName(),
+        analyzer.moduleRecord().addImportEntry(ModuleRecord::ImportEntry {
+            m_moduleName->moduleName(),
             specifier->importedName(),
             specifier->localName()
@@ -59 +61 @@
 void ExportAllDeclarationNode::analyzeModule(ModuleAnalyzer& analyzer)
 {
-    analyzer.moduleRecord().appendRequestedModule(m_moduleSpecifier->moduleName());
-    analyzer.moduleRecord().addStarExportEntry(m_moduleSpecifier->moduleName());
+    analyzer.moduleRecord().appendRequestedModule(m_moduleName->moduleName());
+    analyzer.moduleRecord().addStarExportEntry(m_moduleName->moduleName());
 }
 
@@ -74 +76 @@
 void ExportNamedDeclarationNode::analyzeModule(ModuleAnalyzer& analyzer)
 {
-    if (m_moduleSpecifier)
-        analyzer.moduleRecord().appendRequestedModule(m_moduleSpecifier->moduleName());
+    if (m_moduleName)
+        analyzer.moduleRecord().appendRequestedModule(m_moduleName->moduleName());
 
     for (auto* specifier : m_specifierList->specifiers()) {
-        if (m_moduleSpecifier) {
+        if (m_moduleName) {
             // export { v } from "mod"
             //
             // In this case, no local variable names are imported into the current module.
             // "v" indirectly points the binding in "mod".
-            analyzer.moduleRecord().addExportEntry(ModuleRecord::ExportEntry::createIndirect(specifier->exportedName(), specifier->localName(), m_moduleSpecifier->moduleName()));
+            analyzer.moduleRecord().addExportEntry(ModuleRecord::ExportEntry::createIndirect(specifier->exportedName(), specifier->localName(), m_moduleName->moduleName()));
             continue;
         }