| Index: src/scanner-base.cc
|
| diff --git a/src/scanner-base.cc b/src/scanner-base.cc
|
| index b26fee01a72351c1c93fc42bc2522ed53f221a60..1babaebb17f189620579f599abfcf641fdcc0488 100644
|
| --- a/src/scanner-base.cc
|
| +++ b/src/scanner-base.cc
|
| @@ -35,28 +35,6 @@ namespace v8 {
|
| namespace internal {
|
|
|
| // ----------------------------------------------------------------------------
|
| -// LiteralCollector
|
| -
|
| -LiteralCollector::LiteralCollector()
|
| - : buffer_(kInitialCapacity), recording_(false) { }
|
| -
|
| -
|
| -LiteralCollector::~LiteralCollector() {}
|
| -
|
| -
|
| -void LiteralCollector::AddCharSlow(uc32 c) {
|
| - ASSERT(static_cast<unsigned>(c) > unibrow::Utf8::kMaxOneByteChar);
|
| - int length = unibrow::Utf8::Length(c);
|
| - Vector<char> block = buffer_.AddBlock(length, '\0');
|
| -#ifdef DEBUG
|
| - int written_length = unibrow::Utf8::Encode(block.start(), c);
|
| - CHECK_EQ(length, written_length);
|
| -#else
|
| - unibrow::Utf8::Encode(block.start(), c);
|
| -#endif
|
| -}
|
| -
|
| -// ----------------------------------------------------------------------------
|
| // Character predicates
|
|
|
| unibrow::Predicate<IdentifierStart, 128> ScannerConstants::kIsIdentifierStart;
|
| @@ -256,7 +234,7 @@ Token::Value JavaScriptScanner::ScanHtmlComment() {
|
|
|
|
|
| void JavaScriptScanner::Scan() {
|
| - next_.literal_chars = Vector<const char>();
|
| + next_.literal_chars = NULL;
|
| Token::Value token;
|
| do {
|
| // Remember the position of the next token
|
| @@ -561,7 +539,7 @@ Token::Value JavaScriptScanner::ScanString() {
|
| uc32 quote = c0_;
|
| Advance(); // consume quote
|
|
|
| - LiteralScope literal(this, kLiteralString);
|
| + LiteralScope literal(this);
|
| while (c0_ != quote && c0_ >= 0
|
| && !ScannerConstants::kIsLineTerminator.get(c0_)) {
|
| uc32 c = c0_;
|
| @@ -592,7 +570,7 @@ Token::Value JavaScriptScanner::ScanNumber(bool seen_period) {
|
|
|
| enum { DECIMAL, HEX, OCTAL } kind = DECIMAL;
|
|
|
| - LiteralScope literal(this, kLiteralNumber);
|
| + LiteralScope literal(this);
|
| if (seen_period) {
|
| // we have already seen a decimal point of the float
|
| AddLiteralChar('.');
|
| @@ -681,7 +659,7 @@ uc32 JavaScriptScanner::ScanIdentifierUnicodeEscape() {
|
|
|
| Token::Value JavaScriptScanner::ScanIdentifierOrKeyword() {
|
| ASSERT(ScannerConstants::kIsIdentifierStart.get(c0_));
|
| - LiteralScope literal(this, kLiteralIdentifier);
|
| + LiteralScope literal(this);
|
| KeywordMatcher keyword_match;
|
| // Scan identifier start character.
|
| if (c0_ == '\\') {
|
| @@ -747,7 +725,7 @@ bool JavaScriptScanner::ScanRegExpPattern(bool seen_equal) {
|
| // Scan regular expression body: According to ECMA-262, 3rd, 7.8.5,
|
| // the scanner should pass uninterpreted bodies to the RegExp
|
| // constructor.
|
| - LiteralScope literal(this, kLiteralRegExp);
|
| + LiteralScope literal(this);
|
| if (seen_equal)
|
| AddLiteralChar('=');
|
|
|
| @@ -773,7 +751,7 @@ bool JavaScriptScanner::ScanRegExpPattern(bool seen_equal) {
|
|
|
| bool JavaScriptScanner::ScanRegExpFlags() {
|
| // Scan regular expression flags.
|
| - LiteralScope literal(this, kLiteralRegExpFlags);
|
| + LiteralScope literal(this);
|
| while (ScannerConstants::kIsIdentifierPart.get(c0_)) {
|
| if (c0_ == '\\') {
|
| uc32 c = ScanIdentifierUnicodeEscape();
|
|
|