Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 573 0, | 573 0, |
| 574 count); | 574 count); |
| 575 } | 575 } |
| 576 } | 576 } |
| 577 default: | 577 default: |
| 578 return Handle<String>::null(); | 578 return Handle<String>::null(); |
| 579 } | 579 } |
| 580 Advance(); | 580 Advance(); |
| 581 } | 581 } |
| 582 } | 582 } |
| 583 // Shrink seq_string length to count. | 583 |
| 584 if (isolate()->heap()->InNewSpace(*seq_str)) { | |
| 585 isolate()->heap()->new_space()-> | |
| 586 template ShrinkStringAtAllocationBoundary<StringType>( | |
| 587 *seq_str, count); | |
| 588 } else { | |
| 589 int string_size = StringType::SizeFor(count); | |
| 590 int allocated_string_size = StringType::SizeFor(length); | |
| 591 int delta = allocated_string_size - string_size; | |
| 592 Address start_filler_object = seq_str->address() + string_size; | |
| 593 seq_str->set_length(count); | |
| 594 isolate()->heap()->CreateFillerObjectAt(start_filler_object, delta); | |
| 595 } | |
| 596 ASSERT_EQ('"', c0_); | 584 ASSERT_EQ('"', c0_); |
| 597 // Advance past the last '"'. | 585 // Advance past the last '"'. |
| 598 AdvanceSkipWhitespace(); | 586 AdvanceSkipWhitespace(); |
| 599 return seq_str; | 587 |
| 588 // Shrink seq_string length to count and return. | |
| 589 return SeqString::Truncate(seq_str, count); | |
|
Hannes Payer (out of office)
2013/03/22 08:12:48
Either change the variable name to seq_string or c
| |
| 600 } | 590 } |
| 601 | 591 |
| 602 | 592 |
| 603 template <bool seq_ascii> | 593 template <bool seq_ascii> |
| 604 template <bool is_internalized> | 594 template <bool is_internalized> |
| 605 Handle<String> JsonParser<seq_ascii>::ScanJsonString() { | 595 Handle<String> JsonParser<seq_ascii>::ScanJsonString() { |
| 606 ASSERT_EQ('"', c0_); | 596 ASSERT_EQ('"', c0_); |
| 607 Advance(); | 597 Advance(); |
| 608 if (c0_ == '"') { | 598 if (c0_ == '"') { |
| 609 AdvanceSkipWhitespace(); | 599 AdvanceSkipWhitespace(); |
| 610 return factory()->empty_string(); | 600 return factory()->empty_string(); |
| 611 } | 601 } |
| 612 | 602 |
| 613 if (seq_ascii && is_internalized) { | 603 if (seq_ascii && is_internalized) { |
| 614 // Fast path for existing internalized strings. If the the string being | 604 // Fast path for existing internalized strings. If the the string being |
| 615 // parsed is not a known internalized string, contains backslashes or | 605 // parsed is not a known internalized string, contains backslashes or |
| 616 // unexpectedly reaches the end of string, return with an empty handle. | 606 // unexpectedly reaches the end of string, return with an empty handle. |
| 617 uint32_t running_hash = isolate()->heap()->HashSeed(); | 607 uint32_t running_hash = isolate()->heap()->HashSeed(); |
| 618 int position = position_; | 608 int position = position_; |
| 619 uc32 c0 = c0_; | 609 uc32 c0 = c0_; |
| 620 do { | 610 do { |
| 621 if (c0 == '\\') { | 611 if (c0 == '\\') { |
| 622 c0_ = c0; | 612 c0_ = c0; |
| 623 int beg_pos = position_; | 613 int beg_pos = position_; |
| 624 position_ = position; | 614 position_ = position; |
| 625 return SlowScanJsonString<SeqOneByteString, uint8_t>(source_, | 615 return SlowScanJsonString<SeqOneByteString, uint8_t>(source_, |
| 626 beg_pos, | 616 beg_pos, |
| 627 position_); | 617 position_); |
| 628 } | 618 } |
| 629 if (c0 < 0x20) return Handle<String>::null(); | 619 if (c0 < 0x20) return Handle<String>::null(); |
| 630 if (static_cast<uint32_t>(c0) > | 620 if (static_cast<uint32_t>(c0) > |
| 631 unibrow::Utf16::kMaxNonSurrogateCharCode) { | 621 unibrow::Utf16::kMaxNonSurrogateCharCode) { |
| 632 running_hash = | 622 running_hash = |
| 633 StringHasher::AddCharacterCore(running_hash, | 623 StringHasher::AddCharacterCore(running_hash, |
| 634 unibrow::Utf16::LeadSurrogate(c0)); | 624 unibrow::Utf16::LeadSurrogate(c0)); |
| 635 running_hash = | 625 running_hash = |
| 636 StringHasher::AddCharacterCore(running_hash, | 626 StringHasher::AddCharacterCore(running_hash, |
| 637 unibrow::Utf16::TrailSurrogate(c0)); | 627 unibrow::Utf16::TrailSurrogate(c0)); |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 699 } | 689 } |
| 700 ASSERT_EQ('"', c0_); | 690 ASSERT_EQ('"', c0_); |
| 701 // Advance past the last '"'. | 691 // Advance past the last '"'. |
| 702 AdvanceSkipWhitespace(); | 692 AdvanceSkipWhitespace(); |
| 703 return result; | 693 return result; |
| 704 } | 694 } |
| 705 | 695 |
| 706 } } // namespace v8::internal | 696 } } // namespace v8::internal |
| 707 | 697 |
| 708 #endif // V8_JSON_PARSER_H_ | 698 #endif // V8_JSON_PARSER_H_ |
| OLD | NEW |