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

Side by Side Diff: runtime/vm/symbols.cc

Issue 11365243: Revert OneByteString back to ISO Latin-1 instead of ASCII (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 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
« no previous file with comments | « runtime/vm/object_test.cc ('k') | runtime/vm/unicode.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 "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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 RawString* Symbols::New(const char* str) { 95 RawString* Symbols::New(const char* str) {
96 ASSERT(str != NULL); 96 ASSERT(str != NULL);
97 Utf8::Type type; 97 Utf8::Type type;
98 intptr_t str_len = strlen(str); 98 intptr_t str_len = strlen(str);
99 const uint8_t* utf8_array = reinterpret_cast<const uint8_t*>(str); 99 const uint8_t* utf8_array = reinterpret_cast<const uint8_t*>(str);
100 intptr_t len = Utf8::CodePointCount(utf8_array, str_len, &type); 100 intptr_t len = Utf8::CodePointCount(utf8_array, str_len, &type);
101 Zone* zone = Isolate::Current()->current_zone(); 101 Zone* zone = Isolate::Current()->current_zone();
102 if (len == 0) { 102 if (len == 0) {
103 return Symbols::New(reinterpret_cast<uint8_t*>(NULL), 0); 103 return Symbols::New(reinterpret_cast<uint8_t*>(NULL), 0);
104 } 104 }
105 if (type == Utf8::kAscii) { 105 if (type == Utf8::kLatin1) {
106 uint8_t* characters = zone->Alloc<uint8_t>(len); 106 uint8_t* characters = zone->Alloc<uint8_t>(len);
107 Utf8::DecodeToAscii(utf8_array, str_len, characters, len); 107 Utf8::DecodeToLatin1(utf8_array, str_len, characters, len);
108 return New(characters, len); 108 return New(characters, len);
109 } 109 }
110 ASSERT((type == Utf8::kBMP) || (type == Utf8::kSMP)); 110 ASSERT((type == Utf8::kBMP) || (type == Utf8::kSMP));
111 uint16_t* characters = zone->Alloc<uint16_t>(len); 111 uint16_t* characters = zone->Alloc<uint16_t>(len);
112 Utf8::DecodeToUTF16(utf8_array, str_len, characters, len); 112 Utf8::DecodeToUTF16(utf8_array, str_len, characters, len);
113 return New(characters, len); 113 return New(characters, len);
114 } 114 }
115 115
116 116
117 template<typename T> 117 template<typename T>
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 } 311 }
312 312
313 313
314 RawObject* Symbols::GetVMSymbol(intptr_t object_id) { 314 RawObject* Symbols::GetVMSymbol(intptr_t object_id) {
315 ASSERT(IsVMSymbolId(object_id)); 315 ASSERT(IsVMSymbolId(object_id));
316 intptr_t i = (object_id - kMaxPredefinedObjectIds); 316 intptr_t i = (object_id - kMaxPredefinedObjectIds);
317 return (i > 0 && i < Symbols::kMaxId) ? predefined_[i] : Object::null(); 317 return (i > 0 && i < Symbols::kMaxId) ? predefined_[i] : Object::null();
318 } 318 }
319 319
320 } // namespace dart 320 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/vm/object_test.cc ('k') | runtime/vm/unicode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698