Prohibit use of dynamic when extending or implementing classes (was crashing).

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 "lib/invocation_mirror.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
@@ skipping 3053 matching lines @@
     member.name_pos = TokenPos();
     member.name = CurrentLiteral();  // Unqualified identifier.
     ConsumeToken();
     if (member.has_factory) {
       // The factory name may be qualified, but the first identifier must match
       // the name of the immediately enclosing class.
       if (!member.name->Equals(members->class_name())) {
         ErrorMsg(member.name_pos, "factory name must be '%s'",
                  members->class_name().ToCString());
       }
+      // Do not bypass class resolution by using current_class() directly, since
+      // it may be a patch class.
       const Object& result_type_class = Object::Handle(
           UnresolvedClass::New(LibraryPrefix::Handle(),
                                *member.name,
                                member.name_pos));
-      // The type arguments of the result type are set during finalization.
-      member.type = &Type::ZoneHandle(Type::New(result_type_class,
-                                                TypeArguments::Handle(),
-                                                member.name_pos));
+      // The type arguments of the result type are the type parameters of the
+      // current class. Note that in the case of a patch class, they are copied
+      // from the class being patched.
+      member.type = &Type::ZoneHandle(Type::New(
+          result_type_class,
+          TypeArguments::Handle(current_class().type_parameters()),
+          member.name_pos));
     } else if (member.has_static) {
       ErrorMsg(member.name_pos, "constructor cannot be static");
     }
     // We must be dealing with a constructor or named constructor.
     member.kind = RawFunction::kConstructor;
     *member.name = String::Concat(*member.name, Symbols::Dot());
     if (CurrentToken() == Token::kPERIOD) {
       // Named constructor.
       ConsumeToken();
       member.constructor_name = ExpectIdentifier("identifier expected");
@@ skipping 202 matching lines @@
   if (CurrentToken() == Token::kEXTENDS) {
     ConsumeToken();
     const intptr_t type_pos = TokenPos();
     super_type = ParseType(ClassFinalizer::kTryResolve);
     if (super_type.IsTypeParameter()) {
       ErrorMsg(type_pos,
                "class '%s' may not extend type parameter '%s'",
                class_name.ToCString(),
                String::Handle(super_type.UserVisibleName()).ToCString());
     }
+    if (super_type.IsDynamicType()) {
+      ErrorMsg(type_pos,
+               "class '%s' may not extend dynamic",

[hausner, 2013/04/10 14:53:53]

may not extend 'dynamic'? I'm fine either way.

[regis, 2013/04/10 16:31:33]

Done.

+               class_name.ToCString());
+    }
     if (CurrentToken() == Token::kWITH) {
       super_type = ParseMixins(super_type);
     }
   } else {
     // No extends clause: implicitly extend Object.
     super_type = Type::ObjectType();
   }
   ASSERT(!super_type.IsNull());
   cls.set_super_type(super_type);
 
@@ skipping 521 matching lines @@
   // Now parse and add the new interfaces.
   do {
     ConsumeToken();
     intptr_t interface_pos = TokenPos();
     interface = ParseType(ClassFinalizer::kTryResolve);
     if (interface.IsTypeParameter()) {
       ErrorMsg(interface_pos,
                "type parameter '%s' may not be used in interface list",
                String::Handle(interface.UserVisibleName()).ToCString());
     }
+    if (interface.IsDynamicType()) {
+      ErrorMsg(interface_pos, "dynamic may not be used in interface list");

[hausner, 2013/04/10 14:53:53]

ditto

[regis, 2013/04/10 16:31:33]

Done.

+    }
     all_interfaces.Add(interface);
   } while (CurrentToken() == Token::kCOMMA);
   cls_interfaces = Array::MakeArray(all_interfaces);
   cls.set_interfaces(cls_interfaces);
 }
 
 
 RawAbstractType* Parser::ParseMixins(const AbstractType& super_type) {
   TRACE_PARSER("ParseMixins");
   ASSERT(CurrentToken() == Token::kWITH);
@@ skipping 6049 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart