Address Regis' comments, replace AbstractType with Type where possible.

runtime/vm/parser.cc

 // 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.
 
 #include "vm/parser.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/compiler_stats.h"
@@ skipping 855 matching lines @@
       if (signature_class.IsNull()) {
         signature_class = Class::NewSignatureClass(signature,
                                                    signature_function,
                                                    script_);
         // Record the function signature class in the current library.
         library_.AddClass(signature_class);
       } else {
         signature_function.set_signature_class(signature_class);
       }
       ASSERT(signature_function.signature_class() == signature_class.raw());
-      AbstractType& signature_type =
-          AbstractType::ZoneHandle(signature_class.SignatureType());
+      Type& signature_type = Type::ZoneHandle(signature_class.SignatureType());
       if (!is_top_level_ && !signature_type.IsFinalized()) {
         String& errmsg = String::Handle();
-        signature_type =
+        signature_type ^=

[regis, 2011/12/01 19:20:43]

^= not necessary if you change ClassFinalizer::FinalizeAndCanonicalizeType to
return a type

[srdjan, 2011/12/01 20:04:09]

Done.

             ClassFinalizer::FinalizeAndCanonicalizeType(signature_type,
                                                         &errmsg);
         if (!errmsg.IsNull()) {
           ErrorMsg(errmsg.ToCString());
         }
       }
       // The type of the parameter is now the signature type.
       parameter.type = &signature_type;
     }
   }
@@ skipping 1576 matching lines @@
                class_name.ToCString());
     } else if (cls.functions() != Array::Empty()) {
       ErrorMsg(classname_pos, "class '%s' is already defined",
                class_name.ToCString());
     }
   }
   ASSERT(!cls.IsNull());
   ASSERT(cls.functions() == Array::Empty());
   set_current_class(cls);
   ParseTypeParameters(cls);
-  AbstractType& super_type = AbstractType::Handle();
+  Type& super_type = Type::Handle();
   if (CurrentToken() == Token::kEXTENDS) {
     ConsumeToken();
-    super_type = ParseType(kCanResolve);
+    super_type ^= ParseType(kCanResolve);
     if (super_type.IsInterfaceType()) {
       ErrorMsg("class '%s' may implement, but cannot extend interface '%s'",
                class_name.ToCString(),
                String::Handle(super_type.Name()).ToCString());
     }
   } else {
     // No extends clause: Implicitly extend Object.
     super_type = Type::ObjectType();
   }
   ASSERT(!super_type.IsNull());
@@ skipping 1231 matching lines @@
   // Make sure that the instantiator is captured.
   if ((signature_class.NumTypeParameters() > 0) &&
       (current_block_->scope->function_level() > 0)) {
     CaptureReceiver();
   }
 
   if (variable_name != NULL) {
     // Patch the function type now that the signature is known.
     // We need to create a new type for proper finalization, since the existing
     // type is already marked as finalized.
-    AbstractType& signature_type =
-        AbstractType::Handle(signature_class.SignatureType());
+    Type& signature_type = Type::Handle(signature_class.SignatureType());
     const TypeArguments& signature_type_arguments = TypeArguments::Handle(
         signature_type.arguments());
 
     // Since the signature type is cached by the signature class, it may have
     // been finalized already.
     if (!signature_type.IsFinalized()) {
       String& errmsg = String::Handle();
-      signature_type =
+      signature_type ^=

[regis, 2011/12/01 19:20:43]

ditto

[srdjan, 2011/12/01 20:04:09]

Done.

           ClassFinalizer::FinalizeAndCanonicalizeType(signature_type, &errmsg);
       if (!errmsg.IsNull()) {
         ErrorMsg(errmsg.ToCString());
       }
       // The call to ClassFinalizer::FinalizeAndCanonicalizeType may have
       // extended the vector of type arguments.
       ASSERT(signature_type_arguments.IsNull() ||
              (signature_type_arguments.Length() ==
               signature_class.NumTypeArguments()));
       // The signature_class should not have changed.
@@ skipping 2815 matching lines @@
           }
           return type_parameter.raw();
         }
       }
     }
     // Try to resolve the type class.
     type_class = LookupTypeClass(type_name, type_resolution);
   }
   TypeArguments& type_arguments =
       TypeArguments::Handle(ParseTypeArguments(type_resolution));
-  AbstractType& type = AbstractType::Handle(
+  Type& type = Type::Handle(
       Type::NewParameterizedType(type_class, type_arguments));
   if (type_resolution == kMustResolve) {
     ASSERT(type_class.IsClass());  // Must be resolved.
     String& errmsg = String::Handle();
-    type = ClassFinalizer::FinalizeAndCanonicalizeType(type, &errmsg);
+    type ^= ClassFinalizer::FinalizeAndCanonicalizeType(type, &errmsg);

[regis, 2011/12/01 19:20:43]

ditto

[srdjan, 2011/12/01 20:04:09]

Done.

     if (!errmsg.IsNull()) {
       ErrorMsg(errmsg.ToCString());
     }
   }
   return type.raw();
 }
 
 
 void Parser::CheckConstructorCallTypeArguments(
     intptr_t pos, Function& constructor, const TypeArguments& type_arguments) {
@@ skipping 518 matching lines @@
   // argument vector to be passed.
   {
     Class& signature_class = Class::Handle();
     if (constructor.IsFactory()) {
       signature_class = constructor.signature_class();
     } else {
       signature_class = constructor.owner();
       ASSERT(signature_class.raw() == type_class.raw());
     }
     // TODO(regis): Temporary type should be allocated in new gen heap.
-    AbstractType& type = Type::Handle(
+    Type& type = Type::Handle(
         Type::NewParameterizedType(signature_class, type_arguments));
     String& errmsg = String::Handle();
-    type = ClassFinalizer::FinalizeAndCanonicalizeType(type, &errmsg);
+    type ^= ClassFinalizer::FinalizeAndCanonicalizeType(type, &errmsg);

[regis, 2011/12/01 19:20:43]

ditto

[srdjan, 2011/12/01 20:04:09]

Done.

     if (!errmsg.IsNull()) {
       ErrorMsg(errmsg.ToCString());
     }
     // The type argument vector may have been expanded with the type arguments
     // of the super type when finalizing the type.
     type_arguments = type.arguments();
   }
 
   // Make the constructor call.
   AstNode* new_object = NULL;
@@ skipping 458 matching lines @@
 }
 
 
 void Parser::SkipNestedExpr() {
   const bool saved_mode = SetAllowFunctionLiterals(true);
   SkipExpr();
   SetAllowFunctionLiterals(saved_mode);
 }
 
 }  // namespace dart