diff options
Diffstat (limited to 'deps/v8/src/scanner.cc')
| -rw-r--r-- | deps/v8/src/scanner.cc | 45 |
1 files changed, 7 insertions, 38 deletions
diff --git a/deps/v8/src/scanner.cc b/deps/v8/src/scanner.cc index 48bfd3326..2e039ca40 100644 --- a/deps/v8/src/scanner.cc +++ b/deps/v8/src/scanner.cc @@ -1,29 +1,6 @@ // Copyright 2011 the V8 project authors. All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. // Features shared by parsing and pre-parsing scanners. @@ -1120,10 +1097,10 @@ Handle<String> Scanner::AllocateNextLiteralString(Isolate* isolate, PretenureFlag tenured) { if (is_next_literal_one_byte()) { return isolate->factory()->NewStringFromOneByte( - Vector<const uint8_t>::cast(next_literal_one_byte_string()), tenured); + next_literal_one_byte_string(), tenured).ToHandleChecked(); } else { return isolate->factory()->NewStringFromTwoByte( - next_literal_two_byte_string(), tenured); + next_literal_two_byte_string(), tenured).ToHandleChecked(); } } @@ -1142,7 +1119,8 @@ Handle<String> Scanner::AllocateInternalizedString(Isolate* isolate) { double Scanner::DoubleValue() { ASSERT(is_literal_one_byte()); return StringToDouble( - unicode_cache_, Vector<const char>::cast(literal_one_byte_string()), + unicode_cache_, + literal_one_byte_string(), ALLOW_HEX | ALLOW_OCTAL | ALLOW_IMPLICIT_OCTAL | ALLOW_BINARY); } @@ -1160,15 +1138,6 @@ int Scanner::FindSymbol(DuplicateFinder* finder, int value) { } -void Scanner::LogSymbol(ParserRecorder* log, int position) { - if (is_literal_one_byte()) { - log->LogOneByteSymbol(position, literal_one_byte_string()); - } else { - log->LogTwoByteSymbol(position, literal_two_byte_string()); - } -} - - int DuplicateFinder::AddOneByteSymbol(Vector<const uint8_t> key, int value) { return AddSymbol(key, true, value); } @@ -1201,7 +1170,7 @@ int DuplicateFinder::AddNumber(Vector<const uint8_t> key, int value) { int flags = ALLOW_HEX | ALLOW_OCTAL | ALLOW_IMPLICIT_OCTAL | ALLOW_BINARY; double double_value = StringToDouble( - unicode_constants_, Vector<const char>::cast(key), flags, 0.0); + unicode_constants_, key, flags, 0.0); int length; const char* string; if (!std::isfinite(double_value)) { |