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

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

Issue 27694005: Fix issue 13942 - Dart_Error function invokes OS::VSNPrint with the "format" string containing data… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 2 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 | « no previous file | runtime/bin/dartutils.h » ('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"
11 #include "bin/io_natives.h" 11 #include "bin/io_natives.h"
12 12
13 13
14 namespace dart { 14 namespace dart {
15 namespace bin { 15 namespace bin {
16 16
17 Builtin::builtin_lib_props Builtin::builtin_libraries_[] = { 17 Builtin::builtin_lib_props Builtin::builtin_libraries_[] = {
18 /* { url_, source_, patch_url_, patch_source_, has_natives_ } */ 18 /* { url_, source_, patch_url_, patch_source_, has_natives_ } */
19 { DartUtils::kBuiltinLibURL, NULL, NULL, NULL, true }, 19 { DartUtils::kBuiltinLibURL, NULL, NULL, NULL, true },
20 { DartUtils::kIOLibURL, NULL, NULL, NULL, true }, 20 { DartUtils::kIOLibURL, NULL, NULL, NULL, true },
21 }; 21 };
22 22
23 23
24 Dart_Handle Builtin::Source(BuiltinLibraryId id) { 24 Dart_Handle Builtin::Source(BuiltinLibraryId id) {
25 return Dart_NewApiError("Unreachable code in Builtin::Source (%d).", id); 25 return DartUtils::NewError("Unreachable code in Builtin::Source (%d).", id);
26 } 26 }
27 27
28 28
29 Dart_Handle Builtin::PartSource(BuiltinLibraryId id, const char* uri) { 29 Dart_Handle Builtin::PartSource(BuiltinLibraryId id, const char* uri) {
30 return Dart_NewApiError("Unreachable code in Builtin::PartSource (%d).", id); 30 return DartUtils::NewError(
31 "Unreachable code in Builtin::PartSource (%d).", id);
31 } 32 }
32 33
33 34
34 Dart_Handle Builtin::GetSource(const char** source_paths, const char* uri) { 35 Dart_Handle Builtin::GetSource(const char** source_paths, const char* uri) {
35 return Dart_NewApiError("Unreachable code in Builtin::GetSource (%s).", uri); 36 return DartUtils::NewError(
37 "Unreachable code in Builtin::GetSource (%s).", uri);
36 } 38 }
37 39
38 40
39 void Builtin::SetNativeResolver(BuiltinLibraryId id) { 41 void Builtin::SetNativeResolver(BuiltinLibraryId id) {
40 ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) == 42 ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) ==
41 kInvalidLibrary); 43 kInvalidLibrary);
42 ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary); 44 ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary);
43 if (builtin_libraries_[id].has_natives_) { 45 if (builtin_libraries_[id].has_natives_) {
44 Dart_Handle url = DartUtils::NewString(builtin_libraries_[id].url_); 46 Dart_Handle url = DartUtils::NewString(builtin_libraries_[id].url_);
45 Dart_Handle library = Dart_LookupLibrary(url); 47 Dart_Handle library = Dart_LookupLibrary(url);
46 ASSERT(!Dart_IsError(library)); 48 ASSERT(!Dart_IsError(library));
47 // Setup the native resolver for built in library functions. 49 // Setup the native resolver for built in library functions.
48 DART_CHECK_VALID(Dart_SetNativeResolver(library, NativeLookup)); 50 DART_CHECK_VALID(Dart_SetNativeResolver(library, NativeLookup));
49 } 51 }
50 } 52 }
51 53
52 54
53 Dart_Handle Builtin::LoadAndCheckLibrary(BuiltinLibraryId id) { 55 Dart_Handle Builtin::LoadAndCheckLibrary(BuiltinLibraryId id) {
54 ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) == 56 ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) ==
55 kInvalidLibrary); 57 kInvalidLibrary);
56 ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary); 58 ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary);
57 Dart_Handle url = DartUtils::NewString(builtin_libraries_[id].url_); 59 Dart_Handle url = DartUtils::NewString(builtin_libraries_[id].url_);
58 Dart_Handle library = Dart_LookupLibrary(url); 60 Dart_Handle library = Dart_LookupLibrary(url);
59 DART_CHECK_VALID(library); 61 DART_CHECK_VALID(library);
60 return library; 62 return library;
61 } 63 }
62 64
63 } // namespace bin 65 } // namespace bin
64 } // namespace dart 66 } // namespace dart
OLDNEW
« no previous file with comments | « no previous file | runtime/bin/dartutils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698