Reviewers: rossberg,
Description:
Create ImportDeclarations for default imports.
BUG=v8:1569
LOG=n
Please review this at https://codereview.chromium.org/958213006/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+18, -8 lines):
M src/parser.cc
M test/cctest/test-parsing.cc
Index: src/parser.cc
diff --git a/src/parser.cc b/src/parser.cc
index
f4828a0d5ca5f9a1e13c1ee934f8f4b043a62e1a..aa6ee8ccb6c67a3d210a39b18e97a31f9808ea32
100644
--- a/src/parser.cc
+++ b/src/parser.cc
@@ -1422,16 +1422,19 @@ Statement* Parser::ParseImportDeclaration(bool* ok)
{
}
// Parse ImportedDefaultBinding if present.
- const AstRawString* imported_default_binding = NULL;
+ ImportDeclaration* import_default_declaration = NULL;
if (tok != Token::MUL && tok != Token::LBRACE) {
- imported_default_binding =
+ const AstRawString* local_name =
ParseIdentifier(kDontAllowEvalOrArguments, CHECK_OK);
- // TODO(ES6): Add an appropriate declaration.
+ VariableProxy* proxy = NewUnresolved(local_name, IMPORT);
+ import_default_declaration = factory()->NewImportDeclaration(
+ proxy, ast_value_factory()->default_string(), NULL, scope_, pos);
+ Declare(import_default_declaration, true, CHECK_OK);
}
const AstRawString* module_instance_binding = NULL;
ZoneList<ImportDeclaration*>* named_declarations = NULL;
- if (imported_default_binding == NULL || Check(Token::COMMA)) {
+ if (import_default_declaration == NULL || Check(Token::COMMA)) {
switch (peek()) {
case Token::MUL: {
Consume(Token::MUL);
@@ -1461,8 +1464,8 @@ Statement* Parser::ParseImportDeclaration(bool* ok) {
// TODO(ES6): Set the module specifier for the module namespace
binding.
}
- if (imported_default_binding != NULL) {
- // TODO(ES6): Set the module specifier for the default binding.
+ if (import_default_declaration != NULL) {
+ import_default_declaration->set_module_specifier(module_specifier);
}
if (named_declarations != NULL) {
Index: test/cctest/test-parsing.cc
diff --git a/test/cctest/test-parsing.cc b/test/cctest/test-parsing.cc
index
02f8869c419fc4c70504c2ac87fa1cf8fe3e7ee3..7318448497b9ea28598205ff40e5cbc591de9d10
100644
--- a/test/cctest/test-parsing.cc
+++ b/test/cctest/test-parsing.cc
@@ -5219,7 +5219,10 @@ TEST(ModuleParsingInternals) {
128 * 1024);
static const char kSource[] =
- "let x = 5; export { x as y }; import { q as z } from 'm.js';";
+ "let x = 5;"
+ "export { x as y };"
+ "import { q as z } from 'm.js';"
+ "import n from 'n.js'";
i::Handle<i::String> source =
factory->NewStringFromAsciiChecked(kSource);
i::Handle<i::Script> script = factory->NewScript(source);
i::CompilationInfoWithZone info(script);
@@ -5241,13 +5244,17 @@ TEST(ModuleParsingInternals) {
}
CHECK_EQ(1, num_exports);
i::ZoneList<i::Declaration*>* declarations =
func->scope()->declarations();
- CHECK_EQ(2, declarations->length());
+ CHECK_EQ(3, declarations->length());
CHECK(declarations->at(0)->proxy()->raw_name()->IsOneByteEqualTo("x"));
i::ImportDeclaration* import_decl =
declarations->at(1)->AsImportDeclaration();
CHECK(import_decl->import_name()->IsOneByteEqualTo("q"));
CHECK(import_decl->proxy()->raw_name()->IsOneByteEqualTo("z"));
CHECK(import_decl->module_specifier()->IsOneByteEqualTo("m.js"));
+ import_decl = declarations->at(2)->AsImportDeclaration();
+ CHECK(import_decl->import_name()->IsOneByteEqualTo("default"));
+ CHECK(import_decl->proxy()->raw_name()->IsOneByteEqualTo("n"));
+ CHECK(import_decl->module_specifier()->IsOneByteEqualTo("n.js"));
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
