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

Side by Side Diff: runtime/lib/string.cc

Issue 54663002: Change int.fromEnvironment in VM to use same code as int.parse. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Change order for String/bool too. Add canonicalization. Created 7 years, 1 month 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
OLDNEW
1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2011, 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 "vm/bootstrap_natives.h" 5 #include "vm/bootstrap_natives.h"
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 #include "vm/exceptions.h" 8 #include "vm/exceptions.h"
9 #include "vm/dart_api_impl.h" 9 #include "vm/dart_api_impl.h"
10 #include "vm/isolate.h" 10 #include "vm/isolate.h"
11 #include "vm/native_entry.h" 11 #include "vm/native_entry.h"
12 #include "vm/object.h" 12 #include "vm/object.h"
13 #include "vm/symbols.h" 13 #include "vm/symbols.h"
14 #include "vm/unicode.h" 14 #include "vm/unicode.h"
15 15
16 namespace dart { 16 namespace dart {
17 17
18 DEFINE_NATIVE_ENTRY(String_fromEnvironment, 3) { 18 DEFINE_NATIVE_ENTRY(String_fromEnvironment, 3) {
19 GET_NON_NULL_NATIVE_ARGUMENT(String, name, arguments->NativeArgAt(1)); 19 GET_NON_NULL_NATIVE_ARGUMENT(String, name, arguments->NativeArgAt(1));
20 GET_NATIVE_ARGUMENT(String, default_value, arguments->NativeArgAt(2)); 20 GET_NATIVE_ARGUMENT(String, default_value, arguments->NativeArgAt(2));
21 // Call the embedder to supply us with the environment. 21 // Call the embedder to supply us with the environment.
22 Dart_EnvironmentCallback callback = isolate->environment_callback(); 22 Dart_EnvironmentCallback callback = isolate->environment_callback();
23 if (callback != NULL) { 23 if (callback != NULL) {
24 Dart_Handle result = callback(Api::NewHandle(isolate, name.raw())); 24 Dart_Handle result = callback(Api::NewHandle(isolate, name.raw()));
25 if (Dart_IsError(result)) { 25 if (Dart_IsString(result)) {
26 const Object& value =
27 Object::Handle(isolate, Api::UnwrapHandle(result));
28 return Symbols::New(String::Cast(value));
29 } else if (Dart_IsError(result)) {
26 const Object& error = 30 const Object& error =
27 Object::Handle(isolate, Api::UnwrapHandle(result)); 31 Object::Handle(isolate, Api::UnwrapHandle(result));
28 Exceptions::ThrowArgumentError( 32 Exceptions::ThrowArgumentError(
29 String::Handle( 33 String::Handle(
30 String::New(Error::Cast(error).ToErrorCString()))); 34 String::New(Error::Cast(error).ToErrorCString())));
31 } else if (Dart_IsString(result)) {
32 const Object& value =
33 Object::Handle(isolate, Api::UnwrapHandle(result));
34 return Symbols::New(String::Cast(value));
35 } else if (!Dart_IsNull(result)) { 35 } else if (!Dart_IsNull(result)) {
36 Exceptions::ThrowArgumentError( 36 Exceptions::ThrowArgumentError(
37 String::Handle(String::New("Illegal environment value"))); 37 String::Handle(String::New("Illegal environment value")));
38 } 38 }
39 } 39 }
40 return default_value.raw(); 40 return default_value.raw();
41 } 41 }
42 42
43 43
44 DEFINE_NATIVE_ENTRY(StringBase_createFromCodePoints, 1) { 44 DEFINE_NATIVE_ENTRY(StringBase_createFromCodePoints, 1) {
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 ? String::Handle(OneByteString::New(length_value, Heap::kNew)) 295 ? String::Handle(OneByteString::New(length_value, Heap::kNew))
296 : String::Handle(TwoByteString::New(length_value, Heap::kNew)); 296 : String::Handle(TwoByteString::New(length_value, Heap::kNew));
297 NoGCScope no_gc; 297 NoGCScope no_gc;
298 298
299 uint16_t* data_position = reinterpret_cast<uint16_t*>(codeUnits.DataAddr(0)); 299 uint16_t* data_position = reinterpret_cast<uint16_t*>(codeUnits.DataAddr(0));
300 String::Copy(result, 0, data_position, length_value); 300 String::Copy(result, 0, data_position, length_value);
301 return result.raw(); 301 return result.raw();
302 } 302 }
303 303
304 } // namespace dart 304 } // namespace dart
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698