Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: runtime/bin/builtin_nolib.cc

Issue 10905102: Rename Builtin::LoadLibrary to Builtin::LoadAndCheckLibrary as the name (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « runtime/bin/builtin.cc ('k') | runtime/bin/dartutils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 23 matching lines...) Expand all
34 ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) == 34 ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) ==
35 kInvalidLibrary); 35 kInvalidLibrary);
36 ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary); 36 ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary);
37 if (builtin_libraries_[id].has_natives_) { 37 if (builtin_libraries_[id].has_natives_) {
38 // Setup the native resolver for built in library functions. 38 // Setup the native resolver for built in library functions.
39 DART_CHECK_VALID(Dart_SetNativeResolver(library, NativeLookup)); 39 DART_CHECK_VALID(Dart_SetNativeResolver(library, NativeLookup));
40 } 40 }
41 } 41 }
42 42
43 43
44 Dart_Handle Builtin::LoadLibrary(BuiltinLibraryId id) { 44 Dart_Handle Builtin::LoadAndCheckLibrary(BuiltinLibraryId id) {
45 ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) == 45 ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) ==
46 kInvalidLibrary); 46 kInvalidLibrary);
47 ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary); 47 ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary);
48 Dart_Handle url = Dart_NewString(builtin_libraries_[id].url_); 48 Dart_Handle url = Dart_NewString(builtin_libraries_[id].url_);
49 Dart_Handle library = Dart_LookupLibrary(url); 49 Dart_Handle library = Dart_LookupLibrary(url);
50 if (Dart_IsError(library)) { 50 if (Dart_IsError(library)) {
51 ASSERT(id >= kCryptoLibrary && id < kInvalidLibrary); 51 ASSERT(id >= kCryptoLibrary && id < kInvalidLibrary);
52 library = Dart_LoadLibrary(url, Source(id)); 52 library = Dart_LoadLibrary(url, Source(id));
53 if (!Dart_IsError(library)) { 53 if (!Dart_IsError(library)) {
54 SetupLibrary(library, id); 54 SetupLibrary(library, id);
55 } 55 }
56 } 56 }
57 DART_CHECK_VALID(library); 57 DART_CHECK_VALID(library);
58 return library; 58 return library;
59 } 59 }
60 60
61 61
62 void Builtin::ImportLibrary(Dart_Handle library, BuiltinLibraryId id) { 62 void Builtin::ImportLibrary(Dart_Handle library, BuiltinLibraryId id) {
63 Dart_Handle imported_library = LoadLibrary(id); 63 Dart_Handle imported_library = LoadAndCheckLibrary(id);
64 // Import the library into current library. 64 // Import the library into current library.
65 DART_CHECK_VALID(Dart_LibraryImportLibrary(library, 65 DART_CHECK_VALID(Dart_LibraryImportLibrary(library,
66 imported_library, 66 imported_library,
67 Dart_Null())); 67 Dart_Null()));
68 } 68 }
OLDNEW
« no previous file with comments | « runtime/bin/builtin.cc ('k') | runtime/bin/dartutils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698