| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stdio.h> | 5 #include <stdio.h> |
| 6 | 6 |
| 7 #include "include/dart_api.h" | 7 #include "include/dart_api.h" |
| 8 | 8 |
| 9 #include "bin/builtin.h" | 9 #include "bin/builtin.h" |
| 10 #include "bin/dartutils.h" | 10 #include "bin/dartutils.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 Dart_Handle Builtin::LoadLibrary(BuiltinLibraryId id) { | 48 Dart_Handle Builtin::LoadLibrary(BuiltinLibraryId id) { |
| 49 Dart_Handle url; | 49 Dart_Handle url; |
| 50 if (id == kBuiltinLibrary) { | 50 if (id == kBuiltinLibrary) { |
| 51 url = Dart_NewString(DartUtils::kBuiltinLibURL); | 51 url = Dart_NewString(DartUtils::kBuiltinLibURL); |
| 52 } else { | 52 } else { |
| 53 ASSERT(id == kIOLibrary); | 53 ASSERT(id == kIOLibrary); |
| 54 url = Dart_NewString(DartUtils::kIOLibURL); | 54 url = Dart_NewString(DartUtils::kIOLibURL); |
| 55 } | 55 } |
| 56 Dart_Handle library = Dart_LookupLibrary(url); | 56 Dart_Handle library = Dart_LookupLibrary(url); |
| 57 if (Dart_IsError(library)) { | 57 if (Dart_IsError(library)) { |
| 58 library = Dart_LoadLibrary(url, Source(id)); | 58 Dart_Handle import_map = Dart_NewList(0); |
| 59 library = Dart_LoadLibrary(url, Source(id), import_map); |
| 59 if (!Dart_IsError(library)) { | 60 if (!Dart_IsError(library)) { |
| 60 SetupLibrary(library, id); | 61 SetupLibrary(library, id); |
| 61 } | 62 } |
| 62 } | 63 } |
| 63 DART_CHECK_VALID(library); | 64 DART_CHECK_VALID(library); |
| 64 return library; | 65 return library; |
| 65 } | 66 } |
| 66 | 67 |
| 67 | 68 |
| 68 void Builtin::ImportLibrary(Dart_Handle library, BuiltinLibraryId id) { | 69 void Builtin::ImportLibrary(Dart_Handle library, BuiltinLibraryId id) { |
| 69 Dart_Handle imported_library = LoadLibrary(id); | 70 Dart_Handle imported_library = LoadLibrary(id); |
| 70 // Import the library into current library. | 71 // Import the library into current library. |
| 71 DART_CHECK_VALID(Dart_LibraryImportLibrary(library, imported_library)); | 72 DART_CHECK_VALID(Dart_LibraryImportLibrary(library, imported_library)); |
| 72 } | 73 } |
| OLD | NEW |