Proper handling of built-in identifiers

runtime/vm/parser.h

-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// 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.
 
 #ifndef VM_PARSER_H_
 #define VM_PARSER_H_
 
 #include "include/dart_api.h"
 
 #include "vm/ast.h"
 #include "vm/compiler_stats.h"
@@ skipping 123 matching lines @@
   void ConsumeToken() {
     // Reset cache and advance the token.
     token_kind_ = Token::kILLEGAL;
     token_index_++;
     CompilerStats::num_tokens_consumed++;
   }
   void ConsumeRightAngleBracket();
   void ExpectToken(Token::Kind token_expected);
   void ExpectSemicolon();
   void UnexpectedToken();
+  String* ExpectTypeIdentifier(const char* msg);
   String* ExpectIdentifier(const char* msg);
   bool IsLiteral(const char* literal);
 
   void SkipIf(Token::Kind);
   void SkipBlock();
   void SkipToMatchingParenthesis();
   void SkipTypeArguments();
   void SkipType(bool allow_void);
   void SkipInitializers();
   void SkipExpr();
@@ skipping 162 matching lines @@
   RawAbstractType* ParseFinalVarOrType(TypeSpecification type_specification,
                                TypeResolution type_resolution);
   const AbstractType& ParseConstVarOrType(TypeSpecification type_specification);
   AstNode* ParseVariableDeclaration(const AbstractType& type, bool is_const);
   AstNode* ParseVariableDeclarationList();
   AstNode* ParseFunctionStatement(bool is_literal);
   AstNode* ParseStatement();
   SequenceNode* ParseNestedStatement(bool parsing_loop_body,
                                      SourceLabel* label);
   void ParseStatementSequence();
+  bool IsIdentifier();
   bool IsFunctionTypeAliasName();
   bool IsTypeParameter();
   bool IsOptionalType();
   bool IsReturnType();
   bool IsVariableDeclaration();
   bool IsFunctionDeclaration();
   bool IsFunctionLiteral();
   bool IsForInStatement();
   bool IsTopLevelAccessor();
   bool IsTopLevelFunction();
@@ skipping 34 matching lines @@
                                   const String& field_name,
                                   intptr_t ident_pos);
 
   RawClass*  LookupClass(const String& class_name);
   RawObject* LookupTypeClass(const QualIdent& type_name,
                              TypeResolution type_resolution);
   LocalVariable* LookupLocalScope(const String& ident);
   void CheckInstanceFieldAccess(intptr_t field_pos, const String& field_name);
   RawClass* TypeParametersScopeClass();
   bool IsInstantiatorRequired() const;
+  bool IsDefinedInLexicalScope(const String& ident);
   bool ResolveIdentInLocalScope(intptr_t ident_pos,
                                 const String &ident,
                                 AstNode** node);
   static const bool kResolveLocally = true;
   static const bool kResolveIncludingImports = false;
   AstNode* ResolveIdentInLibraryScope(const Library& lib,
                                       const QualIdent& qual_ident,
                                       bool resolve_locally);
   AstNode* ResolveVarOrField(intptr_t ident_pos, const String &ident);
   AstNode* OptimizeBinaryOpNode(intptr_t op_pos,
@@ skipping 58 matching lines @@
   // code at all points in the try block where an exit from the block is
   // done using 'return', 'break' or 'continue' statements.
   TryBlocks* try_blocks_list_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_