[parser] Refactor parser and preparser traits

src/parsing/preparser.cc

 // Copyright 2011 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.
 
 #include <cmath>
 
 #include "src/allocation.h"
 #include "src/base/logging.h"
 #include "src/conversions-inl.h"
 #include "src/conversions.h"
@@ skipping 23 matching lines @@
 #define DUMMY )  // to make indentation work
 #undef DUMMY
 
 // Used in functions where the return type is not ExpressionT.
 #define CHECK_OK_CUSTOM(x) ok); \
   if (!*ok) return this->x();   \
   ((void)0
 #define DUMMY )  // to make indentation work
 #undef DUMMY
 
-void PreParserTraits::ReportMessageAt(Scanner::Location location,
+void PreParserTraits::ReportMessageAt(Scanner::Location source_location,
                                       MessageTemplate::Template message,
                                       const char* arg,
                                       ParseErrorType error_type) {
-  pre_parser_->log_->LogMessage(location.beg_pos, location.end_pos, message,
-                                arg, error_type);
+  pre_parser_->log_->LogMessage(source_location.beg_pos,
+                                source_location.end_pos, message, arg,
+                                error_type);
 }
 
-void PreParserTraits::ReportMessageAt(Scanner::Location location,
+void PreParserTraits::ReportMessageAt(Scanner::Location source_location,
                                       MessageTemplate::Template message,
                                       const AstRawString* arg,
                                       ParseErrorType error_type) {
   UNREACHABLE();
 }
 
 
-PreParserIdentifier PreParserTraits::GetSymbol(Scanner* scanner) {
+PreParserIdentifier PreParserTraits::GetSymbol(Scanner* scanner) const {
   switch (scanner->current_token()) {
     case Token::ENUM:
       return PreParserIdentifier::Enum();
     case Token::AWAIT:
       return PreParserIdentifier::Await();
     case Token::FUTURE_STRICT_RESERVED_WORD:
       return PreParserIdentifier::FutureStrictReserved();
     case Token::LET:
       return PreParserIdentifier::Let();
     case Token::STATIC:
@@ skipping 12 matching lines @@
       if (scanner->LiteralMatches("prototype", 9))
         return PreParserIdentifier::Prototype();
       if (scanner->LiteralMatches("constructor", 11))
         return PreParserIdentifier::Constructor();
       return PreParserIdentifier::Default();
   }
 }
 
 
 PreParserExpression PreParserTraits::ExpressionFromString(
-    int pos, Scanner* scanner, PreParserFactory* factory) {
+    int pos, Scanner* scanner, PreParserFactory* factory) const {
   if (scanner->UnescapedLiteralMatches("use strict", 10)) {
     return PreParserExpression::UseStrictStringLiteral();
   }
   return PreParserExpression::StringLiteral();
 }
 
 
 PreParserExpression PreParserTraits::ParseV8Intrinsic(bool* ok) {
   return pre_parser_->ParseV8Intrinsic(ok);
 }
@@ skipping 1198 matching lines @@
 
   body->Add(PreParserStatement::ExpressionStatement(return_value), zone());
 }
 
 #undef CHECK_OK
 #undef CHECK_OK_CUSTOM
 
 
 }  // namespace internal
 }  // namespace v8