Re-introduce ImportDeclaration to the parser

test/cctest/test-parsing.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 5200 matching lines @@
 
 TEST(ModuleParsingInternals) {
   i::Isolate* isolate = CcTest::i_isolate();
   i::Factory* factory = isolate->factory();
   v8::HandleScope handles(CcTest::isolate());
   v8::Handle<v8::Context> context = v8::Context::New(CcTest::isolate());
   v8::Context::Scope context_scope(context);
   isolate->stack_guard()->SetStackLimit(i::GetCurrentStackPosition() -
                                         128 * 1024);
 
-  static const char kSource[] = "let x = 5; export { x as y };";
+  static const char kSource[] =
+      "let x = 5; export { x as y }; import { q as z } from 'm.js';";
   i::Handle<i::String> source = factory->NewStringFromAsciiChecked(kSource);
   i::Handle<i::Script> script = factory->NewScript(source);
   i::CompilationInfoWithZone info(script);
-  i::AstValueFactory avf(info.zone(), isolate->heap()->HashSeed());
   i::Parser parser(&info, isolate->stack_guard()->real_climit(),
                    isolate->heap()->HashSeed(), isolate->unicode_cache());
   parser.set_allow_harmony_modules(true);
   parser.set_allow_harmony_scoping(true);
   info.MarkAsModule();
   CHECK(parser.Parse(&info));
   i::FunctionLiteral* func = info.function();
   CHECK_EQ(i::MODULE_SCOPE, func->scope()->scope_type());
   i::ModuleDescriptor* descriptor = func->scope()->module();
   CHECK_NOT_NULL(descriptor);
-  const i::AstRawString* name_x = avf.GetOneByteString("x");
-  const i::AstRawString* name_y = avf.GetOneByteString("y");
   int num_exports = 0;
   for (auto it = descriptor->iterator(); !it.done(); it.Advance()) {
     ++num_exports;
-    CHECK(*name_x == *it.local_name());
-    CHECK(*name_y == *it.export_name());
+    CHECK(it.local_name()->IsOneByteEqualTo("x"));
+    CHECK(it.export_name()->IsOneByteEqualTo("y"));
   }
   CHECK_EQ(1, num_exports);
+  i::ZoneList<i::Declaration*>* declarations = func->scope()->declarations();
+  CHECK_EQ(2, declarations->length());
+  for (int i = 0; i < declarations->length(); ++i) {
+    i::ImportDeclaration* decl = declarations->at(i)->AsImportDeclaration();

[arv (Not doing code reviews), 2015/02/25 16:07:25]

Maybe remove the loop and check x and z separately?

[adamk, 2015/02/25 21:43:12]

Done.

+    if (decl != NULL) {
+      CHECK(decl->import_name()->IsOneByteEqualTo("q"));
+      CHECK(decl->proxy()->raw_name()->IsOneByteEqualTo("z"));
+      CHECK(decl->module_specifier()->IsOneByteEqualTo("m.js"));
+    }
+  }
 }
 
 
 TEST(DuplicateProtoError) {
   const char* context_data[][2] = {
     {"({", "});"},
     {"'use strict'; ({", "});"},
     {NULL, NULL}
   };
   const char* error_data[] = {
@@ skipping 277 matching lines @@
   static const ParserFlag always_flags[] = {
       kAllowStrongMode, kAllowHarmonyScoping
   };
   RunParserSyncTest(sloppy_context_data, data, kSuccess, NULL, 0, always_flags,
                     arraysize(always_flags));
   RunParserSyncTest(strict_context_data, data, kSuccess, NULL, 0, always_flags,
                     arraysize(always_flags));
   RunParserSyncTest(strong_context_data, data, kError, NULL, 0, always_flags,
                     arraysize(always_flags));
 }