Renaming type classes as discussed:

runtime/vm/parser.h

 // Copyright (c) 2011, 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 184 matching lines @@
 
   // Support for parsing libraries.
   Dart_Handle CallLibraryTagHandler(Dart_LibraryTag tag,
                                     intptr_t token_pos,
                                     const String& url);
   void ParseLibraryDefinition();
   void ParseLibraryName();
   void ParseLibraryImport();
   void ParseLibraryInclude();
 
-  void TryResolveTypeFromClass(intptr_t type_pos, const Class& cls, Type* type);
+  void TryResolveTypeFromClass(intptr_t type_pos,
+                               const Class& cls,
+                               AbstractType* type);
   enum TypeResolution {
     kDoNotResolve,  // Type resolution is postponed.
     kCanResolve,  // Type resolution is optional.
     kMustResolve  // Type resolution is required.
   };
-  RawType* ParseType(TypeResolution type_resolution);
+  RawAbstractType* ParseType(TypeResolution type_resolution);
   void ParseTypeParameters(const Class& cls);
   RawTypeArguments* ParseTypeArguments(TypeResolution type_resolution);
-  RawType* ParseInterface();
+  RawAbstractType* ParseInterface();

[regis, 2011/12/01 04:24:07]

This should always be a Type. Later cl.

[srdjan, 2011/12/01 17:48:42]

This method does not exist, deleted. Maybe have ParseInterfaceList return
TypeArguments?

[regis, 2011/12/01 17:53:38]

Yes.

   void ParseQualIdent(QualIdent* qual_ident);
   void ParseMethodOrConstructor(ClassDesc* members, MemberDesc* method);
   void ParseFieldDefinition(ClassDesc* members, MemberDesc* field);
   void ParseClassMemberDefinition(ClassDesc* members);
   void ParseFormalParameter(bool allow_explicit_default_value,
                             ParamList* params);
   void ParseFormalParameters(bool allow_explicit_default_values,
                              ParamList* params);
   void ParseFormalParameterList(bool allow_explicit_default_values,
                                 ParamList* params);
@@ skipping 77 matching lines @@
   // inlined finally code if needed.
   void AddNodeForFinallyInlining(AstNode* node);
   // Add the inlined finally block to the specified node.
   void AddFinallyBlockToNode(AstNode* node, InlinedFinallyNode* finally_node);
   AstNode* ParseTryStatement(String* label_name);
 
   enum TypeSpecification {
     kIsOptional,  // Type specification is optional.
     kIsMandatory  // Type specification is mandatory.
   };
-  RawType* ParseFinalVarOrType(TypeSpecification type_specification,
+  RawAbstractType* ParseFinalVarOrType(TypeSpecification type_specification,
                                TypeResolution type_resolution);
-  const Type& ParseConstVarOrType(TypeSpecification type_specification);
-  AstNode* ParseVariableDeclaration(const Type& type, bool is_const);
+  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 IsFunctionTypeAliasName();
   bool IsTypeParameter();
   bool IsOptionalType();
   bool IsReturnType();
@@ skipping 118 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_