Revision: 8148
Author: [email protected]
Date: Wed Jun 1 07:55:55 2011
Log: Untank compilation and fix JSON parse bug introduced in r8147.
Review URL: http://codereview.chromium.org/7020028
http://code.google.com/p/v8/source/detail?r=8148
Modified:
/branches/bleeding_edge/src/json-parser.cc
/branches/bleeding_edge/src/json-parser.h
=======================================
--- /branches/bleeding_edge/src/json-parser.cc Wed Jun 1 07:06:30 2011
+++ /branches/bleeding_edge/src/json-parser.cc Wed Jun 1 07:55:55 2011
@@ -167,6 +167,7 @@
AdvanceSkipWhitespace();
if (c0_ != '}') {
do {
+ if (c0_ != '"') return ReportUnexpectedCharacter();
Handle<String> key = ParseJsonSymbol();
if (key.is_null() || c0_ != ':') return ReportUnexpectedCharacter();
AdvanceSkipWhitespace();
@@ -283,7 +284,7 @@
return isolate()->factory()->NewNumber(number_);
}
-Handle<Object> JsonParser::SlowScanJsonString() {
+Handle<String> JsonParser::SlowScanJsonString() {
// The currently scanned ascii characters.
Handle<String> ascii(isolate()->factory()->NewSubString(source_,
beg_pos_,
@@ -312,7 +313,7 @@
}
// Check for control character (0x00-0x1f) or unterminated string (<0).
- if (c0_ < 0x20) return ReportUnexpectedCharacter();
+ if (c0_ < 0x20) return Handle<String>::null();
if (c0_ != '\\') {
seq_two_byte->SeqTwoByteStringSet(count++, c0_);
Advance();
@@ -345,7 +346,7 @@
Advance();
int digit = HexValue(c0_);
if (digit < 0) {
- return ReportUnexpectedCharacter();
+ return Handle<String>::null();
}
value = value * 16 + digit;
}
@@ -353,7 +354,7 @@
break;
}
default:
- return ReportUnexpectedCharacter();
+ return Handle<String>::null();
}
Advance();
}
@@ -381,14 +382,14 @@
template <bool is_symbol>
-Handle<Object> JsonParser::ScanJsonString() {
+Handle<String> JsonParser::ScanJsonString() {
ASSERT_EQ('"', c0_);
Advance();
beg_pos_ = position_;
// Fast case for ascii only without escape characters.
while (c0_ != '"') {
// Check for control character (0x00-0x1f) or unterminated string (<0).
- if (c0_ < 0x20) return ReportUnexpectedCharacter();
+ if (c0_ < 0x20) return Handle<String>::null();
if (c0_ != '\\' && c0_ < kMaxAsciiCharCode) {
Advance();
} else {
=======================================
--- /branches/bleeding_edge/src/json-parser.h Wed Jun 1 07:06:30 2011
+++ /branches/bleeding_edge/src/json-parser.h Wed Jun 1 07:55:55 2011
@@ -92,17 +92,17 @@
// literals. The string must only be double-quoted (not single-quoted),
and
// the only allowed backslash-escapes are ", /, \, b, f, n, r, t and
// four-digit hex escapes (uXXXX). Any other use of backslashes is
invalid.
- Handle<Object> ParseJsonString() {
+ Handle<String> ParseJsonString() {
return ScanJsonString<false>();
}
- Handle<Object> ParseJsonSymbol() {
+ Handle<String> ParseJsonSymbol() {
return ScanJsonString<true>();
}
template <bool is_symbol>
- Handle<Object> ScanJsonString();
+ Handle<String> ScanJsonString();
// Slow version for unicode support, uses the first ascii_count
characters,
// as first part of a ConsString
- Handle<Object> SlowScanJsonString();
+ Handle<String> SlowScanJsonString();
// A JSON number (production JSONNumber) is a subset of the valid
JavaScript
// decimal number literals.
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
