More parser stuff to handle pseudo keywords as identifiers

runtime/vm/parser.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/parser.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/compiler_stats.h"
@@ skipping 2384 matching lines @@
       // The type can only be already set in the factory case.
       if (!member.has_factory) {
         ErrorMsg(member.name_pos, "constructor must not specify return type");
       }
     }
     if (CurrentToken() != Token::kLPAREN) {
       ErrorMsg("left parenthesis expected");
     }
   } else if ((CurrentToken() == Token::kGET) &&
              (LookaheadToken(1) != Token::kLPAREN) &&
-             !member.has_var && !member.has_final) {
+             (LookaheadToken(1) != Token::kASSIGN) &&
+             (LookaheadToken(1) != Token::kCOMMA)  &&
+             (LookaheadToken(1) != Token::kSEMICOLON)) {
     ConsumeToken();
     member.kind = RawFunction::kGetterFunction;
     member.name_pos = this->token_index_;
     member.name = ExpectIdentifier("identifier expected");
     // If the result type was not specified, it will be set to DynamicType.
   } else if ((CurrentToken() == Token::kSET) &&
              (LookaheadToken(1) != Token::kLPAREN) &&
-             !member.has_var && !member.has_final)  {
+             (LookaheadToken(1) != Token::kASSIGN) &&
+             (LookaheadToken(1) != Token::kCOMMA)  &&
+             (LookaheadToken(1) != Token::kSEMICOLON))  {
     ConsumeToken();
     member.kind = RawFunction::kSetterFunction;
     member.name_pos = this->token_index_;
     member.name = ExpectIdentifier("identifier expected");
     // The grammar allows a return type, so member.type is not always NULL here.
     // If no return type is specified, the return type of the setter is Dynamic.
     if (member.type == NULL) {
       member.type = &Type::ZoneHandle(Type::DynamicType());
     }
   } else if ((CurrentToken() == Token::kOPERATOR) &&
              (LookaheadToken(1) != Token::kLPAREN) &&
-             !member.has_var && !member.has_final) {
+             (LookaheadToken(1) != Token::kASSIGN) &&
+             (LookaheadToken(1) != Token::kCOMMA)  &&
+             (LookaheadToken(1) != Token::kSEMICOLON)) {
     ConsumeToken();
     if (!Token::CanBeOverloaded(CurrentToken())) {
       ErrorMsg("invalid operator overloading");
     }
     if (member.has_static) {
       ErrorMsg("operator overloading functions cannot be static");
     }
     member.kind = RawFunction::kFunction;
     member.name_pos = this->token_index_;
     member.name =
@@ skipping 5297 matching lines @@
 }
 
 
 void Parser::SkipNestedExpr() {
   const bool saved_mode = SetAllowFunctionLiterals(true);
   SkipExpr();
   SetAllowFunctionLiterals(saved_mode);
 }
 
 }  // namespace dart