- Split functionality of adding implicit constructors and checking

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
@@ skipping 1482 matching lines @@
   // Prefinalized classes have a VM internal representation and no Dart fields.
   // Their instance size  is precomputed and field offsets are known.
   if (!is_prefinalized()) {
     // Compute offsets of instance fields and instance size.
     CalculateFieldOffsets();
   }
   set_is_finalized();
 }
 
 
-void Class::ApplyPatch(const Class& with) const {
+// Apply the members from the patch class to the original class.
+void Class::ApplyPatch(const Class& patch) const {
   ASSERT(!is_finalized());
-  const Script& patch_script = Script::Handle(with.script());
-  const PatchClass& patch = PatchClass::Handle(
+  const Script& patch_script = Script::Handle(patch.script());
+  const PatchClass& patch_class = PatchClass::Handle(
       PatchClass::New(*this, patch_script));
 
   const Array& orig_functions = Array::Handle(functions());
   intptr_t orig_len = orig_functions.Length();
 
-  const Array& patch_functions = Array::Handle(with.functions());
+  const Array& patch_functions = Array::Handle(patch.functions());
   intptr_t patch_len = patch_functions.Length();
 
   // TODO(iposva): Verify that only patching existing methods and adding only
-  // new private methods.
+  // new private methods. Currently we prepend all patch class members to the
+  // members lists which makes them override the orignals.
   Function& func = Function::Handle();
   const Array& new_functions = Array::Handle(Array::New(patch_len + orig_len));
   for (intptr_t i = 0; i < patch_len; i++) {
     func ^= patch_functions.At(i);
-    func.set_owner(patch);
+    func.set_owner(patch_class);
     new_functions.SetAt(i, func);
   }
   for (intptr_t i = 0; i < orig_len; i++) {
     func ^= orig_functions.At(i);
     new_functions.SetAt(patch_len + i, func);
   }
   SetFunctions(new_functions);
 
   const Array& orig_fields = Array::Handle(fields());
   orig_len = orig_fields.Length();
 
-  const Array& patch_fields = Array::Handle(with.fields());
+  const Array& patch_fields = Array::Handle(patch.fields());
   patch_len = patch_fields.Length();
 
-  // TODO(iposva): Verify that no duplicate fields are entered.
+  // TODO(iposva): Verify that no duplicate fields are entered. Currently we
+  // prepend all patch class members to the members lists which makes them
+  // override the orignals.
   Field& field = Field::Handle();
   const Array& new_fields = Array::Handle(Array::New(patch_len + orig_len));
   for (intptr_t i = 0; i < patch_len; i++) {
     field ^= patch_fields.At(i);
     field.set_owner(*this);
     new_fields.SetAt(i, field);
   }
   for (intptr_t i = 0; i < orig_len; i++) {
     field ^= orig_fields.At(i);
     new_fields.SetAt(patch_len + i, field);
@@ skipping 2576 matching lines @@
   return reinterpret_cast<RawFunction*>(raw);
 }
 
 
 RawFunction* Function::New(const String& name,
                            RawFunction::Kind kind,
                            bool is_static,
                            bool is_const,
                            bool is_abstract,
                            bool is_external,
-                           const Class& owner,
+                           const Object& owner,
                            intptr_t token_pos) {
   ASSERT(name.IsOneByteString());
   ASSERT(!owner.IsNull());
   const Function& result = Function::Handle(Function::New());
   const Array& empty_array = Array::Handle(Object::empty_array());
   result.set_parameter_types(empty_array);
   result.set_parameter_names(empty_array);
   result.set_name(name);
   result.set_kind(kind);
   result.set_is_static(is_static);
@@ skipping 12 matching lines @@
   result.set_is_native(false);
   return result.raw();
 }
 
 
 RawFunction* Function::NewClosureFunction(const String& name,
                                           const Function& parent,
                                           intptr_t token_pos) {
   ASSERT(name.IsOneByteString());
   ASSERT(!parent.IsNull());
-  const Class& parent_class = Class::Handle(parent.Owner());
-  ASSERT(!parent_class.IsNull());
+  const Object& parent_owner = Object::Handle(parent.raw_ptr()->owner_);
+  ASSERT(!parent_owner.IsNull());
   const Function& result = Function::Handle(
       Function::New(name,
                     RawFunction::kClosureFunction,
                     /* is_static = */ parent.is_static(),
                     /* is_const = */ false,
                     /* is_abstract = */ false,
                     /* is_external = */ false,
-                    parent_class,
+                    parent_owner,
                     token_pos));
   result.set_parent_function(parent);
   return result.raw();
 }
 
 
 RawFunction* Function::ImplicitClosureFunction() const {
   // Return the existing implicit closure function if any.
   if (raw_ptr()->implicit_closure_function_ != Function::null()) {
     return raw_ptr()->implicit_closure_function_;
@@ skipping 7033 matching lines @@
 const char* JSRegExp::ToCString() const {
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len + 1);
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart