[modules] Split exports into regular and special, store regular ones in a multimap.

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 5834 matching lines @@
   RunModuleParserSyncTest(context_data, kErrorSources, kError);
 }
 
 static void CheckModuleEntry(const i::ModuleDescriptor::ModuleEntry* entry,
     const char* export_name, const char* local_name, const char* import_name,
     const char* module_request) {
   CHECK_NOT_NULL(entry);
   if (export_name == nullptr) {
     CHECK_NULL(entry->export_name);
   } else {
-    entry->export_name->IsOneByteEqualTo(export_name);
+    CHECK(entry->export_name->IsOneByteEqualTo(export_name));

[neis, 2016/08/24 14:46:04]

!!!

[adamk, 2016/08/24 18:06:09]

Ha!

   }
   if (local_name == nullptr) {
     CHECK_NULL(entry->local_name);
   } else {
-    entry->local_name->IsOneByteEqualTo(local_name);
+    CHECK(entry->local_name->IsOneByteEqualTo(local_name));
   }
   if (import_name == nullptr) {
     CHECK_NULL(entry->import_name);
   } else {
-    entry->import_name->IsOneByteEqualTo(import_name);
+    CHECK(entry->import_name->IsOneByteEqualTo(import_name));
   }
   if (module_request == nullptr) {
     CHECK_NULL(entry->module_request);
   } else {
-    entry->module_request->IsOneByteEqualTo(module_request);
+    CHECK(entry->module_request->IsOneByteEqualTo(module_request));
   }
 }
 
 TEST(ModuleParsingInternals) {
   i::Isolate* isolate = CcTest::i_isolate();
   i::Factory* factory = isolate->factory();
   v8::HandleScope handles(CcTest::isolate());
   v8::Local<v8::Context> context = v8::Context::New(CcTest::isolate());
   v8::Context::Scope context_scope(context);
   isolate->stack_guard()->SetStackLimit(i::GetCurrentStackPosition() -
@@ skipping 26 matching lines @@
   i::Parser parser(&info);
   info.set_module();
   CHECK(parser.Parse(&info));
   CHECK(i::Compiler::Analyze(&info));
   i::FunctionLiteral* func = info.literal();
   i::ModuleScope* module_scope = func->scope()->AsModuleScope();
   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());
+  const i::ModuleDescriptor::ModuleEntry* entry;
   i::ZoneList<i::Declaration*>* declarations = module_scope->declarations();
   CHECK_EQ(13, declarations->length());
 
   CHECK(declarations->at(0)->proxy()->raw_name()->IsOneByteEqualTo("x"));
   CHECK(declarations->at(0)->proxy()->var()->mode() == i::LET);
   CHECK(declarations->at(0)->proxy()->var()->binding_needs_init());
   CHECK(declarations->at(0)->proxy()->var()->location() ==
         i::VariableLocation::MODULE);
 
   CHECK(declarations->at(1)->proxy()->raw_name()->IsOneByteEqualTo("z"));
@@ skipping 65 matching lines @@
 
   CHECK(declarations->at(12)->proxy()->raw_name()->IsOneByteEqualTo("foob"));
   CHECK(declarations->at(12)->proxy()->var()->mode() == i::CONST);
   CHECK(!declarations->at(12)->proxy()->var()->binding_needs_init());
   CHECK(declarations->at(12)->proxy()->var()->location() ==
         i::VariableLocation::MODULE);
 
   i::ModuleDescriptor* descriptor = module_scope->module();
   CHECK_NOT_NULL(descriptor);
 
-  CHECK_EQ(11, descriptor->exports().length());
+  CHECK_EQ(3, descriptor->special_exports().length());
   CheckModuleEntry(
-      descriptor->exports().at(0), "y", "x", nullptr, nullptr);
+     descriptor->special_exports().at(0), "b", nullptr, "a", "m.js");
   CheckModuleEntry(
-      descriptor->exports().at(1), "b", nullptr, "a", "m.js");
+     descriptor->special_exports().at(1), nullptr, nullptr, nullptr, "p.js");
   CheckModuleEntry(
-      descriptor->exports().at(2), nullptr, nullptr, nullptr, "p.js");
-  CheckModuleEntry(
-      descriptor->exports().at(3), "foo", "foo", nullptr, nullptr);
-  CheckModuleEntry(
-      descriptor->exports().at(4), "goo", "goo", nullptr, nullptr);
-  CheckModuleEntry(
-      descriptor->exports().at(5), "hoo", "hoo", nullptr, nullptr);
-  CheckModuleEntry(
-      descriptor->exports().at(6), "joo", "joo", nullptr, nullptr);
-  CheckModuleEntry(
-      descriptor->exports().at(7), "default", "*default*", nullptr, nullptr);
-  CheckModuleEntry(
-      descriptor->exports().at(8), "bb", nullptr, "aa", "m.js");  // !!!
-  CheckModuleEntry(
-      descriptor->exports().at(9), "x", "x", nullptr, nullptr);
-  CheckModuleEntry(
-      descriptor->exports().at(10), "foob", "foob", nullptr, nullptr);
+     descriptor->special_exports().at(2), "bb", nullptr, "aa", "m.js");  // !!!
+
+  CHECK_EQ(8, descriptor->regular_exports().size());
+  entry = descriptor->regular_exports().find(
+      declarations->at(3)->proxy()->raw_name())->second;
+  CheckModuleEntry(entry, "foo", "foo", nullptr, nullptr);
+  entry = descriptor->regular_exports().find(
+      declarations->at(4)->proxy()->raw_name())->second;
+  CheckModuleEntry(entry, "goo", "goo", nullptr, nullptr);
+  entry = descriptor->regular_exports().find(
+      declarations->at(5)->proxy()->raw_name())->second;
+  CheckModuleEntry(entry, "hoo", "hoo", nullptr, nullptr);
+  entry = descriptor->regular_exports().find(
+      declarations->at(6)->proxy()->raw_name())->second;
+  CheckModuleEntry(entry, "joo", "joo", nullptr, nullptr);
+  entry = descriptor->regular_exports().find(
+      declarations->at(7)->proxy()->raw_name())->second;
+  CheckModuleEntry(entry, "default", "*default*", nullptr, nullptr);
+  entry = descriptor->regular_exports().find(
+      declarations->at(12)->proxy()->raw_name())->second;
+  CheckModuleEntry(entry, "foob", "foob", nullptr, nullptr);
+  // TODO(neis): The next lines are terrible. Find a better way.
+  auto name_x = declarations->at(0)->proxy()->raw_name();
+  CHECK_EQ(2, descriptor->regular_exports().count(name_x));
+  auto it = descriptor->regular_exports().equal_range(name_x).first;
+  entry = it->second;
+  if (entry->export_name->IsOneByteEqualTo("y")) {
+    CheckModuleEntry(entry, "y", "x", nullptr, nullptr);
+    entry = (++it)->second;
+    CheckModuleEntry(entry, "x", "x", nullptr, nullptr);
+  } else {
+    CheckModuleEntry(entry, "x", "x", nullptr, nullptr);
+    entry = (++it)->second;
+    CheckModuleEntry(entry, "y", "x", nullptr, nullptr);
+  }
 
   CHECK_EQ(3, descriptor->special_imports().length());
   CheckModuleEntry(
       descriptor->special_imports().at(0), nullptr, nullptr, nullptr, "q.js");
   CheckModuleEntry(
       descriptor->special_imports().at(1), nullptr, "loo", nullptr, "bar.js");
   CheckModuleEntry(
       descriptor->special_imports().at(2), nullptr, "foob", nullptr, "bar.js");
 
   CHECK_EQ(4, descriptor->regular_imports().size());
-  const i::ModuleDescriptor::ModuleEntry* entry;
   entry = descriptor->regular_imports().find(
       declarations->at(1)->proxy()->raw_name())->second;
   CheckModuleEntry(entry, nullptr, "z", "q", "m.js");
   entry = descriptor->regular_imports().find(
       declarations->at(2)->proxy()->raw_name())->second;
   CheckModuleEntry(entry, nullptr, "n", "default", "n.js");
   entry = descriptor->regular_imports().find(
       declarations->at(9)->proxy()->raw_name())->second;
   CheckModuleEntry(entry, nullptr, "mm", "m", "m.js");
   entry = descriptor->regular_imports().find(
@@ skipping 2105 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));
 }