Begin modernization of --harmony-modules

test/cctest/test-parsing.cc

Index: test/cctest/test-parsing.cc
diff --git a/test/cctest/test-parsing.cc b/test/cctest/test-parsing.cc
index f2b82ccf9811107ef798d3666b9c897a515f8aff..1a9c36ce906d1e55a3903c53bd17bd42958f5e6e 100644
--- a/test/cctest/test-parsing.cc
+++ b/test/cctest/test-parsing.cc
@@ -4668,3 +4668,57 @@ TEST(ComputedPropertyNameShorthandError) {
   RunParserSyncTest(context_data, error_data, kError, NULL, 0,
                     always_flags, arraysize(always_flags));
 }
+
+
+TEST(BasicImportExportParsing) {
+  const char kSource[] =
+      "export let x = 0;"
+      "import y from 'http://module.com/foo.js';"
+      "function f() {};"
+      "f();";
+
+  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);
+
+  int kProgramByteSize = i::StrLength(kSource);
+  i::ScopedVector<char> program(kProgramByteSize + 1);
+  i::SNPrintF(program, "%s", kSource);
+  i::Handle<i::String> source =
+      factory->NewStringFromUtf8(i::CStrVector(program.start()))
+          .ToHandleChecked();
+
+  // Show that parsing as a module works
+  {
+    i::Handle<i::Script> script = factory->NewScript(source);
+    i::CompilationInfoWithZone info(script);
+    i::Parser::ParseInfo parse_info = {isolate->stack_guard()->real_climit(),
+                                       isolate->heap()->HashSeed(),
+                                       isolate->unicode_cache()};
+    i::Parser parser(&info, &parse_info);
+    parser.set_allow_harmony_modules(true);
+    parser.set_allow_harmony_scoping(true);
+    info.MarkAsModule();
+    CHECK(parser.Parse());
+  }
+
+  // And that parsing a script does not.
+  {
+    i::Handle<i::Script> script = factory->NewScript(source);
+    i::CompilationInfoWithZone info(script);
+    i::Parser::ParseInfo parse_info = {isolate->stack_guard()->real_climit(),
+                                       isolate->heap()->HashSeed(),
+                                       isolate->unicode_cache()};
+    i::Parser parser(&info, &parse_info);
+    parser.set_allow_harmony_modules(true);
+    parser.set_allow_harmony_scoping(true);
+    info.MarkAsGlobal();
+    CHECK(!parser.Parse());

[arv (Not doing code reviews), 2015/01/27 01:17:17]

Would it not be cleaner if we added ParseScript and ParseModule?

[adamk, 2015/01/27 01:58:37]

This was extracted from a branch where I had the whole compilation pipeline
parameterized. The trouble is there's lots of code to be shared between the two
paths (even in the parser, as you see, it's mostly shared), so adding a bit to
CompilationInfo seems more readable than passing a bool "is_module" to a bunch
of helper methods. And definitely more clear than duplicating the code around
the edges.

Put another way: what code would ParseModule and ParseScript methods on the
parser contain?

[rossberg, 2015/01/27 20:00:56]

I don't think we have a separate ParseEval either, so the current CL is at least
consistent.

+  }
+}