diff options
| author | Ben Murdoch <benm@google.com> | 2012-04-12 10:51:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2012-04-16 16:41:38 +0100 |
| commit | 3ef787dbeca8a5fb1086949cda830dccee07bfbd (patch) | |
| tree | 0a22edd97aa148abffdd405c585b22213fccbc82 /src/json-parser.h | |
| parent | 85b71799222b55eb5dd74ea26efe0c64ab655c8c (diff) | |
| download | android_external_v8-3ef787dbeca8a5fb1086949cda830dccee07bfbd.tar.gz android_external_v8-3ef787dbeca8a5fb1086949cda830dccee07bfbd.tar.bz2 android_external_v8-3ef787dbeca8a5fb1086949cda830dccee07bfbd.zip | |
Merge V8 at 3.9.24.13
Bug: 5688872
Change-Id: Id0aa8d23375030494d3189c31774059c0f5398fc
Diffstat (limited to 'src/json-parser.h')
| -rw-r--r-- | src/json-parser.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/json-parser.h b/src/json-parser.h index 68eab65f..d22cd0da 100644 --- a/src/json-parser.h +++ b/src/json-parser.h @@ -130,7 +130,7 @@ class JsonParser BASE_EMBEDDED { // An object literal is a squiggly-braced and comma separated sequence // (possibly empty) of key/value pairs, where the key is a JSON string // literal, the value is a JSON value, and the two are separated by a colon. - // A JSON array dosn't allow numbers and identifiers as keys, like a + // A JSON array doesn't allow numbers and identifiers as keys, like a // JavaScript array. Handle<Object> ParseJsonObject(); @@ -165,7 +165,7 @@ class JsonParser BASE_EMBEDDED { template <bool seq_ascii> Handle<Object> JsonParser<seq_ascii>::ParseJson(Handle<String> source) { - isolate_ = source->map()->isolate(); + isolate_ = source->map()->GetHeap()->isolate(); FlattenString(source); source_ = source; source_length_ = source_->length(); @@ -177,7 +177,7 @@ Handle<Object> JsonParser<seq_ascii>::ParseJson(Handle<String> source) { // Set initial position right before the string. position_ = -1; - // Advance to the first character (posibly EOS) + // Advance to the first character (possibly EOS) AdvanceSkipWhitespace(); Handle<Object> result = ParseJsonValue(); if (result.is_null() || c0_ != kEndOfString) { @@ -303,11 +303,12 @@ Handle<Object> JsonParser<seq_ascii>::ParseJsonObject() { uint32_t index; if (key->AsArrayIndex(&index)) { - SetOwnElement(json_object, index, value, kNonStrictMode); + JSObject::SetOwnElement(json_object, index, value, kNonStrictMode); } else if (key->Equals(isolate()->heap()->Proto_symbol())) { SetPrototype(json_object, value); } else { - SetLocalPropertyIgnoreAttributes(json_object, key, value, NONE); + JSObject::SetLocalPropertyIgnoreAttributes( + json_object, key, value, NONE); } } while (MatchSkipWhiteSpace(',')); if (c0_ != '}') { |