Make Dart_LoadLibrary and Dart_LoadSource take line and column offsets like Dart_LoadScript.

runtime/bin/dartutils.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 "bin/dartutils.h"
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
@@ skipping 486 matching lines @@
     if (tag == Dart_kSourceTag) {
       // Prepend the library URI to form a unique script URI for the part.
       intptr_t len = snprintf(NULL, 0, "%s/%s", library_url_string, url_string);
       char* part_uri = reinterpret_cast<char*>(malloc(len + 1));
       snprintf(part_uri, len + 1, "%s/%s", library_url_string, url_string);
       Dart_Handle part_uri_obj = DartUtils::NewString(part_uri);
       free(part_uri);
       return Dart_LoadSource(
           library,
           part_uri_obj,
-          Builtin::PartSource(Builtin::kIOLibrary, url_string));
+          Builtin::PartSource(Builtin::kIOLibrary, url_string), 0, 0);
     } else {
       ASSERT(tag == Dart_kImportTag);
       return NewError("Unable to import '%s' ", url_string);
     }
   }
 
   Dart_Handle builtin_lib =
       Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
   if (DartUtils::IsDartExtensionSchemeURL(url_string)) {
     // Load a native code shared library to use in a native extension
@@ skipping 219 matching lines @@
 void FUNCTION_NAME(Builtin_LoadLibrarySource)(Dart_NativeArguments args) {
   Dart_Handle tag_in = Dart_GetNativeArgument(args, 0);
   Dart_Handle resolved_script_uri = Dart_GetNativeArgument(args, 1);
   Dart_Handle library_uri = Dart_GetNativeArgument(args, 2);
   Dart_Handle sourceText = Dart_GetNativeArgument(args, 3);
 
   int64_t tag = DartUtils::GetIntegerValue(tag_in);
 
   Dart_Handle result;
   if (tag == Dart_kImportTag) {
-    result = Dart_LoadLibrary(resolved_script_uri, sourceText);
+    result = Dart_LoadLibrary(resolved_script_uri, sourceText, 0, 0);
   } else {
     ASSERT(tag == Dart_kSourceTag);
     Dart_Handle library = Dart_LookupLibrary(library_uri);
     DART_CHECK_VALID(library);
-    result = Dart_LoadSource(library, resolved_script_uri, sourceText);
+    result = Dart_LoadSource(library, resolved_script_uri, sourceText, 0, 0);
   }
   if (Dart_IsError(result)) {
     // TODO(hausner): If compilation/loading errors are supposed to
     // be observable by the program, we need to mark the bad library
     // with the error instead of propagating it.
     Dart_PropagateError(result);
   }
 }
 
 
@@ skipping 23 matching lines @@
     // Read the file.
     source = DartUtils::ReadStringFromFile(url_string);
   }
   if (Dart_IsError(source)) {
     return source;  // source contains the error string.
   }
   // The tag is either an import or a source tag.
   // Load it according to the specified tag.
   if (tag == Dart_kImportTag) {
     // Return library object or an error string.
-    return Dart_LoadLibrary(url, source);
+    return Dart_LoadLibrary(url, source, 0, 0);
   } else if (tag == Dart_kSourceTag) {
-    return Dart_LoadSource(library, url, source);
+    return Dart_LoadSource(library, url, source, 0, 0);
   }
   return Dart_NewApiError("wrong tag");
 }
 
 
 Dart_Handle DartUtils::PrepareForScriptLoading(const char* package_root,
                                                Dart_Handle builtin_lib) {
   // First ensure all required libraries are available.
   Dart_Handle url = NewString(kAsyncLibURL);
   DART_CHECK_VALID(url);
@@ skipping 373 matching lines @@
       new CObjectString(CObject::NewString(os_error->message()));
   CObjectArray* result = new CObjectArray(CObject::NewArray(3));
   result->SetAt(0, new CObjectInt32(CObject::NewInt32(kOSError)));
   result->SetAt(1, new CObjectInt32(CObject::NewInt32(os_error->code())));
   result->SetAt(2, error_message);
   return result;
 }
 
 }  // namespace bin
 }  // namespace dart