[modules] AST and parser rework.

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 5872 matching lines @@
   isolate->stack_guard()->SetStackLimit(i::GetCurrentStackPosition() -
                                         128 * 1024);
 
   static const char kSource[] =
       "let x = 5;"
       "export { x as y };"
       "import { q as z } from 'm.js';"
       "import n from 'n.js';"
       "export { a as b } from 'm.js';"
       "export * from 'p.js';"
+      "export var foo;"
+      "export function goo() {};"
+      "export let hoo;"
+      "export const joo = 42;"
+      "export default (function koo() {});"

[adamk, 2016/07/13 18:38:22]

Can you also add an anonymous case? That'll be coverable once you've changed the
parser to set the default name at parse time.

[neis, 2016/07/14 10:28:24]

Not sure what you mean. This module already has a default export, so adding
another one will cause an error. Also, I'm not checking the .name property here
anywhere.

       "import 'q.js'";
   i::Handle<i::String> source = factory->NewStringFromAsciiChecked(kSource);
   i::Handle<i::Script> script = factory->NewScript(source);
   i::Zone zone(CcTest::i_isolate()->allocator());
   i::ParseInfo info(&zone, script);
   i::Parser parser(&info);
   info.set_module();
   CHECK(parser.Parse(&info));
   CHECK(i::Compiler::Analyze(&info));
   i::FunctionLiteral* func = info.literal();
   i::Scope* module_scope = func->scope();
   i::Scope* outer_scope = module_scope->outer_scope();
   CHECK(outer_scope->is_script_scope());
   CHECK_NULL(outer_scope->outer_scope());
   CHECK(module_scope->is_module_scope());
   i::ModuleDescriptor* descriptor = module_scope->module();
   CHECK_NOT_NULL(descriptor);
-  CHECK_EQ(1, descriptor->Length());
-  const i::AstRawString* export_name =
-      info.ast_value_factory()->GetOneByteString("y");
-  const i::AstRawString* local_name =
-      descriptor->LookupLocalExport(export_name, &zone);
-  CHECK_NOT_NULL(local_name);
-  CHECK(local_name->IsOneByteEqualTo("x"));
   i::ZoneList<i::Declaration*>* declarations = module_scope->declarations();
-  CHECK_EQ(3, declarations->length());
+  CHECK_EQ(8, 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"));
+  CHECK(declarations->at(1)->proxy()->raw_name()->IsOneByteEqualTo("z"));
+  CHECK(declarations->at(2)->proxy()->raw_name()->IsOneByteEqualTo("n"));
+  CHECK(declarations->at(3)->proxy()->raw_name()->IsOneByteEqualTo("foo"));
+  CHECK(declarations->at(4)->proxy()->raw_name()->IsOneByteEqualTo("goo"));
+  CHECK(declarations->at(5)->proxy()->raw_name()->IsOneByteEqualTo("hoo"));
+  CHECK(declarations->at(6)->proxy()->raw_name()->IsOneByteEqualTo("joo"));
+  CHECK(
+      declarations->at(7)->proxy()->raw_name()->IsOneByteEqualTo("*default*"));
+  // CHECK_EQ(1, descriptor->Length());

[adamk, 2016/07/13 18:38:22]

Is this stuff dead now?

[neis, 2016/07/14 10:28:24]

Yes, removed. Will most likely re-add such tests later when we have a way of
inspecting the exports/imports.

+  // const i::AstRawString* export_name =
+  //    info.ast_value_factory()->GetOneByteString("y");
+  // const i::AstRawString* local_name =
+  //    descriptor->LookupExport(export_name, &zone);
+  // CHECK_NOT_NULL(local_name);
+  // CHECK(local_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"));
   // TODO(adamk): Add test for indirect exports once they're fully implemented.
   // TODO(adamk): Add test for star exports once they're fully implemented.
-  const i::ZoneList<const i::AstRawString*>& requested_modules =
-      descriptor->requested_modules();
-  CHECK_EQ(4, requested_modules.length());
-  CHECK(requested_modules[0]->IsOneByteEqualTo("m.js"));
-  CHECK(requested_modules[1]->IsOneByteEqualTo("n.js"));
-  CHECK(requested_modules[2]->IsOneByteEqualTo("p.js"));
-  CHECK(requested_modules[3]->IsOneByteEqualTo("q.js"));
+  // const i::ZoneList<const i::AstRawString*>& requested_modules =
+  //    descriptor->requested_modules();
+  // CHECK_EQ(4, requested_modules.length());
+  // CHECK(requested_modules[0]->IsOneByteEqualTo("m.js"));
+  // CHECK(requested_modules[1]->IsOneByteEqualTo("n.js"));
+  // CHECK(requested_modules[2]->IsOneByteEqualTo("p.js"));
+  // CHECK(requested_modules[3]->IsOneByteEqualTo("q.js"));
 }
 
 
 TEST(DuplicateProtoError) {
   const char* context_data[][2] = {
     {"({", "});"},
     {"'use strict'; ({", "});"},
     {NULL, NULL}
   };
   const char* error_data[] = {
@@ skipping 2016 matching lines @@
     "(a,);",
     "(a,b,c,);",
     NULL
   };
   // clang-format on
 
   static const ParserFlag always_flags[] = {kAllowHarmonyTrailingCommas};
   RunParserSyncTest(context_data, data, kError, NULL, 0, always_flags,
                     arraysize(always_flags));
 }