| 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 url = Dart_NewString(DartUtils::kUriLibURL); | 83 url = Dart_NewString(DartUtils::kUriLibURL); |
| 84 break; | 84 break; |
| 85 case kUtfLibrary: | 85 case kUtfLibrary: |
| 86 url = Dart_NewString(DartUtils::kUtfLibURL); | 86 url = Dart_NewString(DartUtils::kUtfLibURL); |
| 87 break; | 87 break; |
| 88 default: | 88 default: |
| 89 return Dart_Error("Unknown builtin library requested."); | 89 return Dart_Error("Unknown builtin library requested."); |
| 90 } | 90 } |
| 91 Dart_Handle library = Dart_LookupLibrary(url); | 91 Dart_Handle library = Dart_LookupLibrary(url); |
| 92 if (Dart_IsError(library)) { | 92 if (Dart_IsError(library)) { |
| 93 library = Dart_LoadLibrary(url, Source(id)); | 93 Dart_Handle import_map = Dart_NewList(0); |
| 94 library = Dart_LoadLibrary(url, Source(id), import_map); |
| 94 if (!Dart_IsError(library)) { | 95 if (!Dart_IsError(library)) { |
| 95 SetupLibrary(library, id); | 96 SetupLibrary(library, id); |
| 96 } | 97 } |
| 97 } | 98 } |
| 98 DART_CHECK_VALID(library); | 99 DART_CHECK_VALID(library); |
| 99 return library; | 100 return library; |
| 100 } | 101 } |
| 101 | 102 |
| 102 | 103 |
| 103 void Builtin::ImportLibrary(Dart_Handle library, BuiltinLibraryId id) { | 104 void Builtin::ImportLibrary(Dart_Handle library, BuiltinLibraryId id) { |
| 104 Dart_Handle imported_library = LoadLibrary(id); | 105 Dart_Handle imported_library = LoadLibrary(id); |
| 105 // Import the library into current library. | 106 // Import the library into current library. |
| 106 DART_CHECK_VALID(Dart_LibraryImportLibrary(library, imported_library)); | 107 DART_CHECK_VALID(Dart_LibraryImportLibrary(library, imported_library)); |
| 107 } | 108 } |
| OLD | NEW |