- Merge function lists when patching classes (no more duplicates).

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 "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/compiler_stats.h"
@@ skipping 2927 matching lines @@
   } else {
     if (!obj.IsClass()) {
       ErrorMsg(classname_pos, "'%s' is already defined",
                class_name.ToCString());
     }
     cls ^= obj.raw();
     if (cls.is_interface()) {
       ErrorMsg(classname_pos, "'%s' %s",
                class_name.ToCString(),
                is_patch ?
-                   "is already defined as interface" :
-                   "interface cannot be patched");
+                   "interface cannot be patched" :
+                   "is already defined as interface");
     } else if (is_patch) {
       String& patch = String::Handle(Symbols::New("patch "));
       patch = String::Concat(patch, class_name);
       patch = Symbols::New(patch);
       cls = Class::New(patch, script_, classname_pos);
     } else {
       // Not patching a class, but it has been found. This must be one of the
       // pre-registered classes from object.cc or a duplicate definition.
       if (cls.functions() != Object::empty_array()) {
         ErrorMsg(classname_pos, "class '%s' is already defined",
@@ skipping 60 matching lines @@
 
   // Creating a new array for functions marks the class as parsed.
   array = Array::MakeArray(members.functions());
   cls.SetFunctions(array);
 
   if (!is_patch) {
     pending_classes.Add(cls, Heap::kOld);
   } else {
     // Lookup the patched class and apply the changes.
     obj = library_.LookupObject(class_name);
-    Class::Cast(obj).ApplyPatch(cls);
+    const char* err_msg = Class::Cast(obj).ApplyPatch(cls);
+    if (err_msg != NULL) {
+      ErrorMsg(classname_pos, "applying patch failed with '%s'", err_msg);
+    }
   }
 }
 
 
 // Add an implicit constructor if no explicit constructor is present.
 void Parser::AddImplicitConstructor(ClassDesc* class_desc) {
   // The implicit constructor is unnamed, has no explicit parameter,
   // and contains a supercall in the initializer list.
   String& ctor_name = String::ZoneHandle(
     String::Concat(class_desc->class_name(), String::Handle(Symbols::Dot())));
@@ skipping 6038 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart