Simplify scanner and generate better error message for legacy octals in templates

src/preparser.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_PREPARSER_H
 #define V8_PREPARSER_H
 
 #include "src/v8.h"
 
 #include "src/bailout-reason.h"
@@ skipping 2828 matching lines @@
   // When parsing a TemplateLiteral, we must have scanned either an initial
   // TEMPLATE_SPAN, or a TEMPLATE_TAIL.
   CHECK(peek() == Token::TEMPLATE_SPAN || peek() == Token::TEMPLATE_TAIL);
 
   // If we reach a TEMPLATE_TAIL first, we are parsing a NoSubstitutionTemplate.
   // In this case we may simply consume the token and build a template with a
   // single TEMPLATE_SPAN and no expressions.
   if (peek() == Token::TEMPLATE_TAIL) {
     Consume(Token::TEMPLATE_TAIL);
     int pos = position();
+    CheckOctalLiteral(pos, peek_position(), CHECK_OK);

[arv (Not doing code reviews), 2014/12/18 20:38:51]

CheckOctalLiteral needs to be updated to use a different error message.

[caitp (gmail), 2014/12/18 20:44:18]

Yeah --- I was undecided whether it should be something generic like "Octal
escape sequences are deprecated", or let callers pass in their own message ID
and make a template-specific error message.

What do you think?

[arv (Not doing code reviews), 2014/12/18 20:46:58]

I think a new error message would be best.

[caitp (gmail), 2014/12/18 21:09:50]

Done and done

     typename Traits::TemplateLiteralState ts = Traits::OpenTemplateLiteral(pos);
     Traits::AddTemplateSpan(&ts, true);
     return Traits::CloseTemplateLiteral(&ts, start, tag);
   }
 
   Consume(Token::TEMPLATE_SPAN);
   int pos = position();
   typename Traits::TemplateLiteralState ts = Traits::OpenTemplateLiteral(pos);
   Traits::AddTemplateSpan(&ts, false);
   Token::Value next;
@@ skipping 31 matching lines @@
       ReportMessageAt(Scanner::Location(start, position()),
                       "unterminated_template");
       *ok = false;
       return Traits::EmptyExpression();
     }
 
     Traits::AddTemplateSpan(&ts, next == Token::TEMPLATE_TAIL);
   } while (next == Token::TEMPLATE_SPAN);
 
   DCHECK_EQ(next, Token::TEMPLATE_TAIL);
+  CheckOctalLiteral(pos, peek_position(), CHECK_OK);
   // Once we've reached a TEMPLATE_TAIL, we can close the TemplateLiteral.
   return Traits::CloseTemplateLiteral(&ts, start, tag);
 }
 
 
 template <typename Traits>
 typename ParserBase<Traits>::ExpressionT ParserBase<
     Traits>::CheckAndRewriteReferenceExpression(ExpressionT expression,
                                                 Scanner::Location location,
                                                 const char* message, bool* ok) {
@@ skipping 44 matching lines @@
       DCHECK(IsAccessorAccessorConflict(old_type, type));
       // Both accessors of the same type.
       parser()->ReportMessage("accessor_get_set");
     }
     *ok = false;
   }
 }
 } }  // v8::internal
 
 #endif  // V8_PREPARSER_H