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