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 "vm/symbols.h" | 5 #include "vm/symbols.h" |
6 | 6 |
7 #include "vm/isolate.h" | 7 #include "vm/isolate.h" |
8 #include "vm/object.h" | 8 #include "vm/object.h" |
9 #include "vm/object_store.h" | 9 #include "vm/object_store.h" |
10 #include "vm/raw_object.h" | 10 #include "vm/raw_object.h" |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 RawString* Symbols::New(const char* str) { | 96 RawString* Symbols::New(const char* str) { |
97 ASSERT(str != NULL); | 97 ASSERT(str != NULL); |
98 Utf8::Type type; | 98 Utf8::Type type; |
99 intptr_t str_len = strlen(str); | 99 intptr_t str_len = strlen(str); |
100 const uint8_t* utf8_array = reinterpret_cast<const uint8_t*>(str); | 100 const uint8_t* utf8_array = reinterpret_cast<const uint8_t*>(str); |
101 intptr_t len = Utf8::CodePointCount(utf8_array, str_len, &type); | 101 intptr_t len = Utf8::CodePointCount(utf8_array, str_len, &type); |
102 Zone* zone = Isolate::Current()->current_zone(); | 102 Zone* zone = Isolate::Current()->current_zone(); |
103 if (len == 0) { | 103 if (len == 0) { |
104 return Symbols::New(reinterpret_cast<uint8_t*>(NULL), 0); | 104 return Symbols::New(reinterpret_cast<uint8_t*>(NULL), 0); |
105 } | 105 } |
106 if (type == Utf8::kAscii) { | 106 if (type == Utf8::kLatin1) { |
107 uint8_t* characters = zone->Alloc<uint8_t>(len); | 107 uint8_t* characters = zone->Alloc<uint8_t>(len); |
108 Utf8::DecodeToAscii(utf8_array, str_len, characters, len); | 108 Utf8::DecodeToLatin1(utf8_array, str_len, characters, len); |
109 return New(characters, len); | 109 return New(characters, len); |
110 } | 110 } |
111 ASSERT((type == Utf8::kBMP) || (type == Utf8::kSMP)); | 111 ASSERT((type == Utf8::kBMP) || (type == Utf8::kSMP)); |
112 uint16_t* characters = zone->Alloc<uint16_t>(len); | 112 uint16_t* characters = zone->Alloc<uint16_t>(len); |
113 Utf8::DecodeToUTF16(utf8_array, str_len, characters, len); | 113 Utf8::DecodeToUTF16(utf8_array, str_len, characters, len); |
114 return New(characters, len); | 114 return New(characters, len); |
115 } | 115 } |
116 | 116 |
117 | 117 |
118 template<typename T> | 118 template<typename T> |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 } | 312 } |
313 | 313 |
314 | 314 |
315 RawObject* Symbols::GetVMSymbol(intptr_t object_id) { | 315 RawObject* Symbols::GetVMSymbol(intptr_t object_id) { |
316 ASSERT(IsVMSymbolId(object_id)); | 316 ASSERT(IsVMSymbolId(object_id)); |
317 intptr_t i = (object_id - kMaxPredefinedObjectIds); | 317 intptr_t i = (object_id - kMaxPredefinedObjectIds); |
318 return (i > 0 && i < Symbols::kMaxId) ? predefined_[i] : Object::null(); | 318 return (i > 0 && i < Symbols::kMaxId) ? predefined_[i] : Object::null(); |
319 } | 319 } |
320 | 320 |
321 } // namespace dart | 321 } // namespace dart |
OLD | NEW |