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

Side by Side Diff: src/json-parser.h

Issue 291153005: Consistently say 'own' property (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Add new files Created 6 years, 7 months 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 | « src/isolate.cc ('k') | src/json-stringifier.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 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef V8_JSON_PARSER_H_ 5 #ifndef V8_JSON_PARSER_H_
6 #define V8_JSON_PARSER_H_ 6 #define V8_JSON_PARSER_H_
7 7
8 #include "v8.h" 8 #include "v8.h"
9 9
10 #include "char-predicates-inl.h" 10 #include "char-predicates-inl.h"
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 } 418 }
419 } else { 419 } else {
420 key = ParseJsonInternalizedString(); 420 key = ParseJsonInternalizedString();
421 if (key.is_null() || c0_ != ':') return ReportUnexpectedCharacter(); 421 if (key.is_null() || c0_ != ':') return ReportUnexpectedCharacter();
422 422
423 AdvanceSkipWhitespace(); 423 AdvanceSkipWhitespace();
424 value = ParseJsonValue(); 424 value = ParseJsonValue();
425 if (value.is_null()) return ReportUnexpectedCharacter(); 425 if (value.is_null()) return ReportUnexpectedCharacter();
426 } 426 }
427 427
428 JSObject::SetLocalPropertyIgnoreAttributes( 428 JSObject::SetOwnPropertyIgnoreAttributes(
429 json_object, key, value, NONE).Assert(); 429 json_object, key, value, NONE).Assert();
430 } while (MatchSkipWhiteSpace(',')); 430 } while (MatchSkipWhiteSpace(','));
431 if (c0_ != '}') { 431 if (c0_ != '}') {
432 return ReportUnexpectedCharacter(); 432 return ReportUnexpectedCharacter();
433 } 433 }
434 434
435 // If we transitioned until the very end, transition the map now. 435 // If we transitioned until the very end, transition the map now.
436 if (transitioning) { 436 if (transitioning) {
437 JSObject::AllocateStorageForMap(json_object, map); 437 JSObject::AllocateStorageForMap(json_object, map);
438 int length = properties.length(); 438 int length = properties.length();
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 781
782 ASSERT_EQ('"', c0_); 782 ASSERT_EQ('"', c0_);
783 // Advance past the last '"'. 783 // Advance past the last '"'.
784 AdvanceSkipWhitespace(); 784 AdvanceSkipWhitespace();
785 return result; 785 return result;
786 } 786 }
787 787
788 } } // namespace v8::internal 788 } } // namespace v8::internal
789 789
790 #endif // V8_JSON_PARSER_H_ 790 #endif // V8_JSON_PARSER_H_
OLDNEW
« no previous file with comments | « src/isolate.cc ('k') | src/json-stringifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698