Implement import scope

runtime/vm/parser.h

 // 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"
@@ skipping 188 matching lines @@
   void ConsumeToken() {
     // Reset cache and advance the token.
     token_kind_ = Token::kILLEGAL;
     tokens_iterator_.Advance();
     CompilerStats::num_tokens_consumed++;
   }
   void ConsumeRightAngleBracket();
   void ExpectToken(Token::Kind token_expected);
   void ExpectSemicolon();
   void UnexpectedToken();
-  String* ExpectTypeIdentifier(const char* msg);
+  String* ExpectClassIdentifier(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 255 matching lines @@
   void CheckInstanceFieldAccess(intptr_t field_pos, const String& field_name);
   RawClass* TypeParametersScopeClass() const;
   const Type* ReceiverType(intptr_t type_pos) const;
   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* ResolveIdentInLibraryPrefixScope(const LibraryPrefix& lib_prefix,
-                                            const QualIdent& qual_ident);
+
+  // Resolve a primary identifier in the libary or prefix scope and
+  // generate the corresponding AstNode.
+  AstNode* ResolveIdentInPrefixScope(intptr_t ident_pos,
+                                     const LibraryPrefix& prefix,
+                                     const String& ident);
+  AstNode* ResolveIdentInCurrentLibraryScope(intptr_t ident_pos,
+                                             const String& ident);
+
+  // Find class with the given name in the library or prefix scope.
+  RawClass* ResolveClassInCurrentLibraryScope(intptr_t ident_pos,
+                                              const String& name);
+  RawClass* ResolveClassInPrefixScope(intptr_t ident_pos,
+                                      const LibraryPrefix& prefix,
+                                      const String& name);
+
+  // Find name in the library or prefix scope and return the corresponding
+  // object (field, class, function etc).
+  RawObject* ResolveNameInCurrentLibraryScope(intptr_t ident_pos,
+                                              const String& ident);
+  RawObject* ResolveNameInPrefixScope(intptr_t ident_pos,
+                                      const LibraryPrefix& prefix,
+                                      const String& name);
+
   AstNode* ResolveIdent(intptr_t ident_pos,
                         const String& ident,
                         bool allow_closure_names);
   RawString* ResolveImportVar(intptr_t ident_pos, const String& ident);
   AstNode* OptimizeBinaryOpNode(intptr_t op_pos,
                                 Token::Kind binary_op,
                                 AstNode* lhs,
                                 AstNode* rhs);
   AstNode* ExpandAssignableOp(intptr_t op_pos,
                               Token::Kind assignment_op,
@@ skipping 71 matching lines @@
 
   // Allocate temporary only once per function.
   LocalVariable* expression_temp_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_