[parser] Refactor parser and preparser traits

src/parsing/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_PARSING_PREPARSER_H
 #define V8_PARSING_PREPARSER_H
 
 #include "src/ast/scopes.h"
 #include "src/bailout-reason.h"
 #include "src/base/hashmap.h"
@@ skipping 727 matching lines @@
                                           PreParserIdentifier arg, int pos) {
     return PreParserExpression::Default();
   }
 
   PreParserExpression NewThrowTypeError(MessageTemplate::Template message,
                                         PreParserIdentifier arg, int pos) {
     return PreParserExpression::Default();
   }
 
   // Reporting errors.
-  void ReportMessageAt(Scanner::Location location,
+  void ReportMessageAt(Scanner::Location source_location,
                        MessageTemplate::Template message,
                        const char* arg = NULL,
                        ParseErrorType error_type = kSyntaxError);
-  void ReportMessageAt(Scanner::Location location,
+  void ReportMessageAt(Scanner::Location source_location,
                        MessageTemplate::Template message,
                        const AstRawString* arg,
                        ParseErrorType error_type = kSyntaxError);
 
   // A dummy function, just useful as an argument to CHECK_OK_CUSTOM.
   static void Void() {}
 
   // "null" return type creators.
   static PreParserIdentifier EmptyIdentifier() {
     return PreParserIdentifier::Default();
   }
   static PreParserExpression EmptyExpression() {
     return PreParserExpression::Default();
   }
   static PreParserExpression EmptyLiteral() {
     return PreParserExpression::Default();
   }
   static PreParserExpression EmptyObjectLiteralProperty() {
     return PreParserExpression::Default();
   }
   static PreParserExpression EmptyFunctionLiteral() {
     return PreParserExpression::Default();
   }
 
   static PreParserExpressionList NullExpressionList() {
     return PreParserExpressionList();
   }
-  static PreParserIdentifier EmptyIdentifierString() {
+  PreParserIdentifier EmptyIdentifierString() const {
     return PreParserIdentifier::Default();
   }
 
   // Odd-ball literal creators.
   PreParserExpression GetLiteralTheHole(int position,
                                         PreParserFactory* factory) const {
     return PreParserExpression::Default();
   }
 
   // Producing data during the recursive descent.
-  PreParserIdentifier GetSymbol(Scanner* scanner);
+  PreParserIdentifier GetSymbol(Scanner* scanner) const;
 
   PreParserIdentifier GetNextSymbol(Scanner* scanner) const {
     return PreParserIdentifier::Default();
   }
 
-  PreParserIdentifier GetNumberAsSymbol(Scanner* scanner) {
+  PreParserIdentifier GetNumberAsSymbol(Scanner* scanner) const {
     return PreParserIdentifier::Default();
   }
 
   PreParserExpression ThisExpression(int pos = kNoSourcePosition) const {
     return PreParserExpression::This();
   }
 
   PreParserExpression NewSuperPropertyReference(PreParserFactory* factory,
                                                 int pos) const {
     return PreParserExpression::Default();
@@ skipping 19 matching lines @@
     return PreParserExpression::Default();
   }
 
   PreParserExpression ExpressionFromIdentifier(
       PreParserIdentifier name, int start_position, int end_position,
       InferName = InferName::kYes) const {
     return PreParserExpression::FromIdentifier(name);
   }
 
   PreParserExpression ExpressionFromString(int pos, Scanner* scanner,
-                                           PreParserFactory* factory);
+                                           PreParserFactory* factory) const;
 
   PreParserExpression GetIterator(PreParserExpression iterable,
                                   PreParserFactory* factory, int pos) {
     return PreParserExpression::Default();
   }
 
   PreParserExpressionList NewExpressionList(int size, Zone* zone) const {
     return PreParserExpressionList();
   }
 
   PreParserExpressionList NewPropertyList(int size, Zone* zone) const {
     return PreParserExpressionList();
   }
 
   PreParserStatementList NewStatementList(int size, Zone* zone) const {
     return PreParserStatementList();
   }
 
   void AddParameterInitializationBlock(
-      const PreParserFormalParameters& parameters, PreParserStatementList list,
+      const PreParserFormalParameters& parameters, PreParserStatementList body,
       bool is_async, bool* ok) const {}
 
   void ParseAsyncArrowSingleExpressionBody(
       PreParserStatementList body, bool accept_IN,
       Type::ExpressionClassifier* classifier, int pos, bool* ok);
 
 
   void AddFormalParameter(PreParserFormalParameters* parameters,
                           PreParserExpression pattern,
                           PreParserExpression initializer,
                           int initializer_end_position, bool is_rest) {
     ++parameters->arity;
   }
 
   void DeclareFormalParameter(DeclarationScope* scope,
                               PreParserIdentifier parameter,
                               Type::ExpressionClassifier* classifier) {
     if (!classifier->is_simple_parameter_list()) {
       scope->SetHasNonSimpleParameters();
     }
   }
 
   V8_INLINE void ParseArrowFunctionFormalParameterList(
-      PreParserFormalParameters* parameters, PreParserExpression expression,
+      PreParserFormalParameters* parameters, PreParserExpression params,
       const Scanner::Location& params_loc, Scanner::Location* duplicate_loc,
       const Scope::Snapshot& scope_snapshot, bool* ok);
 
   V8_INLINE PreParserExpression ParseAsyncFunctionExpression(bool* ok);
 
   V8_INLINE PreParserExpression ParseDoExpression(bool* ok);
 
   void ReindexLiterals(const PreParserFormalParameters& parameters) {}
 
   // Temporary glue; these functions will move to ParserBase.
@@ skipping 365 matching lines @@
     pre_parser_->function_state_->NextMaterializedLiteralIndex();
     pre_parser_->function_state_->NextMaterializedLiteralIndex();
   }
   return EmptyExpression();
 }
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_PARSING_PREPARSER_H