[parser] Correctly handle invalid escapes in adjacent template tokens.

src/parsing/scanner.h

Index: src/parsing/scanner.h
diff --git a/src/parsing/scanner.h b/src/parsing/scanner.h
index 9885b8ed0a5b5c3988a79332527e1e327539c0a8..150c8e9f714bd36f0728759a15ad43fa91fb4a7c 100644
--- a/src/parsing/scanner.h
+++ b/src/parsing/scanner.h
@@ -215,19 +215,15 @@ class Scanner {
   Location error_location() const { return scanner_error_location_; }
 
   bool has_invalid_template_escape() const {
-    return invalid_template_escape_message_ != MessageTemplate::kNone;
+    return current_.invalid_template_escape_message_ != MessageTemplate::kNone;
   }
   MessageTemplate::Template invalid_template_escape_message() const {
-    return invalid_template_escape_message_;
+    DCHECK(has_invalid_template_escape());
+    return current_.invalid_template_escape_message_;
   }
   Location invalid_template_escape_location() const {
-    return invalid_template_escape_location_;
-  }
-
-  void clear_invalid_template_escape() {
     DCHECK(has_invalid_template_escape());
-    invalid_template_escape_message_ = MessageTemplate::kNone;
-    invalid_template_escape_location_ = Location::invalid();
+    return current_.invalid_template_escape_location_;
   }
 
   // Similar functions for the upcoming token.
@@ -457,6 +453,8 @@ class Scanner {
     LiteralBuffer* raw_literal_chars;
     uint32_t smi_value_;
     Token::Value token;
+    MessageTemplate::Template invalid_template_escape_message_;
+    Location invalid_template_escape_location_;

[vogelheim, 2017/03/03 10:40:08]

style nitpick: The style guide wants struct members to be named without an
underscore.


Ref: https://google.github.io/styleguide/cppguide.html#Variable_Names
  - section "Struct Data Members"
  - referenced from V8 C++ style guide 
    (https://github.com/v8/v8/wiki/Cpp-Style-Guide)
    via Chromium C++ style guide
   
(https://chromium.googlesource.com/chromium/src/+/master/styleguide/c++/c++.md)


(Yeah, "smi_value_" should be "smi_value". Whatever.)

[bakkot1, 2017/03/03 20:50:17]

Done.

   };
 
   static const int kCharacterLookaheadBufferSize = 1;
@@ -475,15 +473,17 @@ class Scanner {
     current_.token = Token::UNINITIALIZED;
     current_.literal_chars = NULL;
     current_.raw_literal_chars = NULL;
+    current_.invalid_template_escape_message_ = MessageTemplate::kNone;
     next_.token = Token::UNINITIALIZED;
     next_.literal_chars = NULL;
     next_.raw_literal_chars = NULL;
+    next_.invalid_template_escape_message_ = MessageTemplate::kNone;
     next_next_.token = Token::UNINITIALIZED;
     next_next_.literal_chars = NULL;
     next_next_.raw_literal_chars = NULL;
+    next_next_.invalid_template_escape_message_ = MessageTemplate::kNone;
     found_html_comment_ = false;
     scanner_error_ = MessageTemplate::kNone;
-    invalid_template_escape_message_ = MessageTemplate::kNone;
   }
 
   void ReportScannerError(const Location& location,
@@ -774,9 +774,6 @@ class Scanner {
 
   MessageTemplate::Template scanner_error_;
   Location scanner_error_location_;
-
-  MessageTemplate::Template invalid_template_escape_message_;
-  Location invalid_template_escape_location_;
 };
 
 }  // namespace internal