Resubmit change 7506.

vm/dart_api_impl_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
@@ skipping 3579 matching lines @@
   const char* kScriptChars =
       "main() {"
       "  return 12345;"
       "}";
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   Dart_Handle error = Dart_Error("incoming error");
   Dart_Handle result;
   Dart_Handle import_map = Dart_NewList(0);
 
-  result = Dart_LoadScript(Dart_Null(), source, library_handler, import_map);
+  result = Dart_SetLibraryTagHandler(library_handler);
+  EXPECT_VALID(result);
+
+  result = Dart_LoadScript(Dart_Null(), source, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_LoadScript expects argument 'url' to be non-null.",
                Dart_GetError(result));
 
-  result = Dart_LoadScript(Dart_True(), source, library_handler, import_map);
+  result = Dart_LoadScript(Dart_True(), source, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_LoadScript expects argument 'url' to be of type String.",
                Dart_GetError(result));
 
-  result = Dart_LoadScript(error, source, library_handler, import_map);
+  result = Dart_LoadScript(error, source, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("incoming error", Dart_GetError(result));
 
-  result = Dart_LoadScript(url, Dart_Null(), library_handler, import_map);
+  result = Dart_LoadScript(url, Dart_Null(), import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_LoadScript expects argument 'source' to be non-null.",
                Dart_GetError(result));
 
-  result = Dart_LoadScript(url, Dart_True(), library_handler, import_map);
+  result = Dart_LoadScript(url, Dart_True(), import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ(
       "Dart_LoadScript expects argument 'source' to be of type String.",
       Dart_GetError(result));
 
-  result = Dart_LoadScript(url, error, library_handler, import_map);
+  result = Dart_LoadScript(url, error, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("incoming error", Dart_GetError(result));
 
   // Load a script successfully.
-  result = Dart_LoadScript(url, source, library_handler, import_map);
+  result = Dart_LoadScript(url, source, import_map);
   EXPECT_VALID(result);
 
   result = Dart_Invoke(result, Dart_NewString("main"), 0, NULL);
   EXPECT_VALID(result);
   EXPECT(Dart_IsInteger(result));
   int64_t value = 0;
   EXPECT_VALID(Dart_IntegerToInt64(result, &value));
   EXPECT_EQ(12345, value);
 
   // Further calls to LoadScript are errors.
-  result = Dart_LoadScript(url, source, library_handler, import_map);
+  result = Dart_LoadScript(url, source, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_LoadScript: "
                "A script has already been loaded from 'dart:test-lib'.",
                Dart_GetError(result));
 }
 
 
 static const char* var_mapping[] = {
   "GOOGLE3", ".",
   "ABC", "lala",
@@ skipping 48 matching lines @@
       "main() {"
       "  return 12345;"
       "}";
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   intptr_t length = (sizeof(var_mapping) / sizeof(var_mapping[0]));
   Dart_Handle import_map = Dart_NewList(length);
   for (intptr_t i = 0; i < length; i++) {
     Dart_ListSetAt(import_map, i, Dart_NewString(var_mapping[i]));
   }
-  Dart_Handle result = Dart_LoadScript(url,
-                                       source,
-                                       import_library_handler,
-                                       import_map);
+  Dart_Handle result = Dart_SetLibraryTagHandler(import_library_handler);
+  EXPECT_VALID(result);
+  result = Dart_LoadScript(url, source, import_map);
   EXPECT(!Dart_IsError(result));
 }
 
 
 TEST_CASE(LoadImportScriptError1) {
   const char* kScriptChars =
       "#import('abc${DEF}def/extra_weird.dart');"
       "main() {"
       "  return 12345;"
       "}";
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   Dart_Handle import_map = Dart_NewList(0);
-  Dart_Handle result = Dart_LoadScript(url,
-                                       source,
-                                       import_library_handler,
-                                       import_map);
+  Dart_Handle result = Dart_SetLibraryTagHandler(import_library_handler);
+  EXPECT_VALID(result);
+  result = Dart_LoadScript(url, source, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT(strstr(Dart_GetError(result),
                 "import variable 'DEF' has not been defined"));
 }
 
 
 TEST_CASE(LoadImportScriptError2) {
   const char* kScriptChars =
       "#import('abc${ABC/extra_weird.dart');"
       "main() {"
       "  return 12345;"
       "}";
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   intptr_t length = (sizeof(var_mapping) / sizeof(var_mapping[0]));
   Dart_Handle import_map = Dart_NewList(length);
   for (intptr_t i = 0; i < length; i++) {
     Dart_ListSetAt(import_map, i, Dart_NewString(var_mapping[i]));
   }
-  Dart_Handle result = Dart_LoadScript(url,
-                                       source,
-                                       import_library_handler,
-                                       import_map);
+  Dart_Handle result = Dart_SetLibraryTagHandler(import_library_handler);
+  EXPECT_VALID(result);
+  result = Dart_LoadScript(url, source, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT(strstr(Dart_GetError(result), "'}' expected"));
 }
 
 
 TEST_CASE(LoadScript_CompileError) {
   const char* kScriptChars =
       ")";
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   Dart_Handle import_map = Dart_NewList(0);
-  Dart_Handle result = Dart_LoadScript(url,
-                                       source,
-                                       library_handler,
-                                       import_map);
+  Dart_Handle result = Dart_SetLibraryTagHandler(import_library_handler);
+  EXPECT_VALID(result);
+  result = Dart_LoadScript(url, source, import_map);
   EXPECT(Dart_IsError(result));
   EXPECT(strstr(Dart_GetError(result), "unexpected token ')'"));
 }
 
 
 TEST_CASE(LookupLibrary) {
   const char* kScriptChars =
       "#import('library1.dart');"
       "main() {}";
   const char* kLibrary1Chars =
       "#library('library1.dart');"
       "#import('library2.dart');";
 
   // Create a test library and Load up a test script in it.
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   Dart_Handle import_map = Dart_NewList(0);
-  Dart_Handle result = Dart_LoadScript(url,
-                                       source,
-                                       library_handler,
-                                       import_map);
+  Dart_Handle result = Dart_SetLibraryTagHandler(library_handler);
+  EXPECT_VALID(result);
+  result = Dart_LoadScript(url, source, import_map);
   EXPECT_VALID(result);
 
   url = Dart_NewString("library1.dart");
   source = Dart_NewString(kLibrary1Chars);
   result = Dart_LoadLibrary(url, source, import_map);
   EXPECT_VALID(result);
 
   result = Dart_LookupLibrary(url);
   EXPECT_VALID(result);
 
@@ skipping 297 matching lines @@
       "  static bar() native \"SomeNativeFunction2\";"
       "  static baz() native \"SomeNativeFunction3\";"
       "}";
   Dart_Handle error = Dart_Error("incoming error");
   Dart_Handle result;
 
   // Load a test script.
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   Dart_Handle import_map = Dart_NewList(0);
-  Dart_Handle lib = Dart_LoadScript(url, source, library_handler, import_map);
+  result = Dart_SetLibraryTagHandler(library_handler);
+  EXPECT_VALID(result);
+  Dart_Handle lib = Dart_LoadScript(url, source, import_map);
   EXPECT_VALID(lib);
   EXPECT(Dart_IsLibrary(lib));
   Dart_Handle cls = Dart_GetClass(lib, Dart_NewString("Test"));
   EXPECT_VALID(cls);
 
   result = Dart_SetNativeResolver(Dart_Null(), &MyNativeResolver1);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ(
       "Dart_SetNativeResolver expects argument 'library' to be non-null.",
       Dart_GetError(result));
@@ skipping 58 matching lines @@
       "#library('library1.dart');"
       "#import('library2.dart');"
       "var foo1;";
   const char* kLibrary2Chars =
       "#library('library2.dart');"
       "var foo;";
   Dart_Handle result;
   // Create a test library and Load up a test script in it.
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
-  result = Dart_LoadScript(url, source, library_handler, Dart_Null());
+  result = Dart_SetLibraryTagHandler(library_handler);
+  EXPECT_VALID(result);
+  result = Dart_LoadScript(url, source, Dart_Null());
 
   url = Dart_NewString("library1.dart");
   source = Dart_NewString(kLibrary1Chars);
   Dart_LoadLibrary(url, source, Dart_Null());
 
   url = Dart_NewString("library2.dart");
   source = Dart_NewString(kLibrary2Chars);
   Dart_LoadLibrary(url, source, Dart_Null());
 
   result = Dart_Invoke(result, Dart_NewString("main"), 0, NULL);
@@ skipping 15 matching lines @@
       "var foo1;";
   const char* kLibrary2Chars =
       "#library('library2.dart');"
       "#import('library1.dart');"
       "var foo;";
   Dart_Handle result;
   // Create a test library and Load up a test script in it.
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   Dart_Handle import_map = Dart_NewList(0);
-  result = Dart_LoadScript(url, source, library_handler, import_map);
+  result = Dart_SetLibraryTagHandler(library_handler);
+  EXPECT_VALID(result);
+  result = Dart_LoadScript(url, source, import_map);
 
   url = Dart_NewString("library1.dart");
   source = Dart_NewString(kLibrary1Chars);
   Dart_LoadLibrary(url, source, import_map);
 
   url = Dart_NewString("library2.dart");
   source = Dart_NewString(kLibrary2Chars);
   Dart_LoadLibrary(url, source, import_map);
 
   result = Dart_Invoke(result, Dart_NewString("main"), 0, NULL);
@@ skipping 12 matching lines @@
       "var foo;";
   const char* kLibrary2Chars =
       "#library('library2.dart');"
       "var foo;";
   Dart_Handle result;
 
   // Create a test library and Load up a test script in it.
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   Dart_Handle import_map = Dart_NewList(0);
-  result = Dart_LoadScript(url, source, library_handler, import_map);
+  result = Dart_SetLibraryTagHandler(library_handler);
+  EXPECT_VALID(result);
+  result = Dart_LoadScript(url, source, import_map);
 
   url = Dart_NewString("library2.dart");
   source = Dart_NewString(kLibrary2Chars);
   Dart_LoadLibrary(url, source, import_map);
 
   url = Dart_NewString("library1.dart");
   source = Dart_NewString(kLibrary1Chars);
   Dart_LoadLibrary(url, source, import_map);
 
   result = Dart_Invoke(result, Dart_NewString("main"), 0, NULL);
@@ skipping 34 matching lines @@
       "var fooE = 10;  //fooC has duplicate def. so should be an error.";
   const char* kLibraryFChars =
       "#library('libraryF.dart');"
       "var fooC;";
   Dart_Handle result;
 
   // Create a test library and Load up a test script in it.
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   Dart_Handle import_map = Dart_NewList(0);
-  result = Dart_LoadScript(url, source, library_handler, import_map);
+  result = Dart_SetLibraryTagHandler(library_handler);
+  EXPECT_VALID(result);
+  result = Dart_LoadScript(url, source, import_map);
 
   url = Dart_NewString("libraryA.dart");
   source = Dart_NewString(kLibraryAChars);
   Dart_LoadLibrary(url, source, import_map);
 
   url = Dart_NewString("libraryC.dart");
   source = Dart_NewString(kLibraryCChars);
   Dart_LoadLibrary(url, source, import_map);
 
   url = Dart_NewString("libraryB.dart");
@@ skipping 31 matching lines @@
       "#library('lib.dart');"
       "interface X {"
       "  void set handler(void callback(List<int> x));"
       "}";
   Dart_Handle result;
 
   // Create a test library and Load up a test script in it.
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   Dart_Handle import_map = Dart_NewList(0);
-  result = Dart_LoadScript(url, source, library_handler, import_map);
+  result = Dart_SetLibraryTagHandler(library_handler);
+  EXPECT_VALID(result);
+  result = Dart_LoadScript(url, source, import_map);
 
   url = Dart_NewString("lib.dart");
   source = Dart_NewString(kLibraryChars);
   Dart_LoadLibrary(url, source, import_map);
 
   result = Dart_Invoke(result, Dart_NewString("main"), 0, NULL);
   EXPECT_VALID(result);
 }
 
 
@@ skipping 116 matching lines @@
 
   if (Dart_CurrentIsolate() != NULL) {
     Dart_ExitIsolate();
   }
   Dart_Isolate isolate = TestCase::CreateTestIsolate();
   ASSERT(isolate != NULL);
   Dart_EnterScope();
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   Dart_Handle import_map = Dart_NewList(0);
-  Dart_Handle lib = Dart_LoadScript(url,
-                                    source,
-                                    TestCase::library_handler,
-                                    import_map);
+  Dart_Handle result = Dart_SetLibraryTagHandler(TestCase::library_handler);
+  EXPECT_VALID(result);
+  Dart_Handle lib = Dart_LoadScript(url, source, import_map);
   EXPECT_VALID(lib);
   Dart_ExitScope();
   return true;
 }
 
 
 // Common code for RunLoop_Success/RunLoop_Failure.
 static void RunLoopTest(bool throw_exception_child,
                         bool throw_exception_parent) {
   Dart_IsolateCreateCallback saved = Isolate::CreateCallback();
@@ skipping 81 matching lines @@
   Dart_Handle lib;
   {
     sync->Enter();
     char* error = NULL;
     shared_isolate = Dart_CreateIsolate(NULL, NULL, NULL, &error);
     EXPECT(shared_isolate != NULL);
     Dart_EnterScope();
     Dart_Handle url = Dart_NewString(TestCase::url());
     Dart_Handle source = Dart_NewString(kScriptChars);
     Dart_Handle import_map = Dart_NewList(0);
-    lib = Dart_LoadScript(url, source, TestCase::library_handler, import_map);
+    Dart_Handle result = Dart_SetLibraryTagHandler(TestCase::library_handler);
+    EXPECT_VALID(result);
+    lib = Dart_LoadScript(url, source, import_map);
     EXPECT_VALID(lib);
-    Dart_Handle result = Dart_SetNativeResolver(
-        lib, &IsolateInterruptTestNativeLookup);
+    result = Dart_SetNativeResolver(lib, &IsolateInterruptTestNativeLookup);
     DART_CHECK_VALID(result);
 
     sync->Notify();
     sync->Exit();
   }
 
   Dart_Handle result = Dart_Invoke(lib, Dart_NewString("main"), 0, NULL);
   EXPECT(Dart_IsError(result));
   EXPECT(Dart_ErrorHasException(result));
   EXPECT_SUBSTRING("Unhandled exception:\nfoo\n",
@@ skipping 83 matching lines @@
   // We should have received the expected number of interrupts.
   EXPECT_EQ(kInterruptCount, interrupt_count);
 
   // Give the spawned thread enough time to properly exit.
   Isolate::SetInterruptCallback(saved);
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart