dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Address comments on double-parse implementation from earlier CL.

Browse Source 
Comments at https://codereview.chromium.org/368483004/#msg7

R=fschneider@google.com, iposva@google.com

Review URL: https://codereview.chromium.org//381603002

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@38224 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
lrn@google.com
2014-07-15 08:25:12 +00:00
parent e41bf80fbb
commit f48e9cb218
2 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/lib/string_patch.dart
+23 -23
View File
@@ -133,12 +133,12 @@ class _StringBase {
int otherLength = other.length;
int len = (thisLength < otherLength) ? thisLength : otherLength;
for (int i = 0; i < len; i++) {
int thisCodePoint = this.codeUnitAt(i);
int otherCodePoint = other.codeUnitAt(i);
if (thisCodePoint < otherCodePoint) {
int thisCodeUnit = this.codeUnitAt(i);
int otherCodeUnit = other.codeUnitAt(i);
if (thisCodeUnit < otherCodeUnit) {
return -1;
}
if (thisCodePoint > otherCodePoint) {
if (thisCodeUnit > otherCodeUnit) {
return 1;
}
}
@@ -280,17 +280,17 @@ class _StringBase {
// 3000 ; White_Space # Zs IDEOGRAPHIC SPACE
//
// BOM: 0xFEFF
static bool _isTwoByteWhitespace(int codePoint) {
if (codePoint < 256) return _isOneByteWhitespace(codePoint);
return (codePoint == 0x1680) ||
(codePoint == 0x180E) ||
((0x2000 <= codePoint) && (codePoint <= 0x200A)) ||
(codePoint == 0x2028) ||
(codePoint == 0x2029) ||
(codePoint == 0x202F) ||
(codePoint == 0x205F) ||
(codePoint == 0x3000) ||
(codePoint == 0xFEFF);
static bool _isTwoByteWhitespace(int codeUnit) {
if (codeUnit < 256) return _isOneByteWhitespace(codeUnit);
return (codeUnit == 0x1680) ||
(codeUnit == 0x180E) ||
((0x2000 <= codeUnit) && (codeUnit <= 0x200A)) ||
(codeUnit == 0x2028) ||
(codeUnit == 0x2029) ||
(codeUnit == 0x202F) ||
(codeUnit == 0x205F) ||
(codeUnit == 0x3000) ||
(codeUnit == 0xFEFF);
}
int _firstNonWhitespace() {
@@ -643,8 +643,8 @@ class _OneByteString extends _StringBase implements String {
int get hashCode native "String_getHashCode";
bool _isWhitespace(int codePoint) {
return _StringBase._isOneByteWhitespace(codePoint);
bool _isWhitespace(int codeUnit) {
return _StringBase._isOneByteWhitespace(codeUnit);
}
bool operator ==(Object other) {
@@ -921,8 +921,8 @@ class _TwoByteString extends _StringBase implements String {
"_TwoByteString can only be allocated by the VM");
}
bool _isWhitespace(int codePoint) {
return _StringBase._isTwoByteWhitespace(codePoint);
bool _isWhitespace(int codeUnit) {
return _StringBase._isTwoByteWhitespace(codeUnit);
}
bool operator ==(Object other) {
@@ -937,8 +937,8 @@ class _ExternalOneByteString extends _StringBase implements String {
"_ExternalOneByteString can only be allocated by the VM");
}
bool _isWhitespace(int codePoint) {
return _StringBase._isOneByteWhitespace(codePoint);
bool _isWhitespace(int codeUnit) {
return _StringBase._isOneByteWhitespace(codeUnit);
}
bool operator ==(Object other) {
@@ -955,8 +955,8 @@ class _ExternalTwoByteString extends _StringBase implements String {
"_ExternalTwoByteString can only be allocated by the VM");
}
bool _isWhitespace(int codePoint) {
return _StringBase._isTwoByteWhitespace(codePoint);
bool _isWhitespace(int codeUnit) {
return _StringBase._isTwoByteWhitespace(codeUnit);
}
bool operator ==(Object other) {
runtime/vm/object.cc
+4 -3
View File
@@ -16972,7 +16972,7 @@ bool String::ParseDouble(const String& str,
ASSERT(0 <= start);
ASSERT(start <= end);
ASSERT(end <= str.Length());
int length = end - start;
intptr_t length = end - start;
NoGCScope no_gc;
const uint8_t* startChar;
if (str.IsOneByteString()) {
@@ -16981,8 +16981,9 @@ bool String::ParseDouble(const String& str,
startChar = ExternalOneByteString::CharAddr(str, start);
} else {
uint8_t* chars = Isolate::Current()->current_zone()->Alloc<uint8_t>(length);
for (int i = 0; i < length; i++) {
int ch = str.CharAt(start + i);
const Scanner::CharAtFunc char_at = str.CharAtFunc();
for (intptr_t i = 0; i < length; i++) {
int32_t ch = char_at(str, start + i);
if (ch < 128) {
chars[i] = ch;
} else {