Rename IsConstructor to IsGenerativeConstructor.

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/cpu.h"
@@ skipping 2703 matching lines @@
           Script::Handle(patch.script()),
           func.token_pos(),
           Report::kError,
           Heap::kNew,
           "signature mismatch: '%s'", member_name.ToCString());
       return false;
     }
   }
   for (intptr_t i = 0; i < patch_len; i++) {
     func ^= patch_list.At(i);
-    if (func.IsConstructor() || func.IsFactory()) {
+    if (func.IsGenerativeConstructor() || func.IsFactory()) {
       // Do not preserve the original implicit constructor, if any.
       orig_implicit_ctor = Function::null();
     }
     func.set_owner(patch_class);
     new_functions.Add(func);
   }
   if (!orig_implicit_ctor.IsNull()) {
     // Preserve the original implicit constructor.
     new_functions.Add(orig_implicit_ctor);
   }
@@ skipping 1098 matching lines @@
 RawFunction* Class::CheckFunctionType(const Function& func, MemberKind kind) {
   if (kind == kInstance) {
     if (func.IsDynamicFunction()) {
       return func.raw();
     }
   } else if (kind == kStatic) {
     if (func.IsStaticFunction()) {
       return func.raw();
     }
   } else if (kind == kConstructor) {
-    if (func.IsConstructor()) {
+    if (func.IsGenerativeConstructor()) {
       ASSERT(!func.is_static());
       return func.raw();
     }
   } else if (kind == kFactory) {
     if (func.IsFactory()) {
       ASSERT(func.is_static());
       return func.raw();
     }
   } else if (kind == kAny) {
     return func.raw();
@@ skipping 1740 matching lines @@
   return num_fixed_parameters() + NumOptionalParameters();
 }
 
 
 intptr_t Function::NumImplicitParameters() const {
   if (kind() == RawFunction::kConstructor) {
     if (is_static()) {
       ASSERT(IsFactory());
       return 1;  // Type arguments.
     } else {
-      ASSERT(IsConstructor());
+      ASSERT(IsGenerativeConstructor());
       return 2;  // Instance, phase.
     }
   }
   if ((kind() == RawFunction::kClosureFunction) ||
       (kind() == RawFunction::kSignatureFunction)) {
     return 1;  // Closure object.
   }
   if (!is_static()) {
     // Closure functions defined inside instance (i.e. non-static) functions are
     // marked as non-static, but they do not have a receiver.
@@ skipping 441 matching lines @@
     }
   }
   return true;
 }
 
 
 // The compiler generates an implicit constructor if a class definition
 // does not contain an explicit constructor or factory. The implicit
 // constructor has the same token position as the owner class.
 bool Function::IsImplicitConstructor() const {
-  return IsConstructor() && (token_pos() == end_token_pos());
+  return IsGenerativeConstructor() && (token_pos() == end_token_pos());
 }
 
 
 bool Function::IsImplicitClosureFunction() const {
   if (!IsClosureFunction()) {
     return false;
   }
   const Function& parent = Function::Handle(parent_function());
   return (parent.implicit_closure_function() == raw());
 }
@@ skipping 55 matching lines @@
   result.SetInstructions(Code::Handle(stub_code->LazyCompile_entry()->code()));
   if (kind == RawFunction::kClosureFunction) {
     const ClosureData& data = ClosureData::Handle(ClosureData::New());
     result.set_data(data);
   }
   return result.raw();
 }
 
 
 RawFunction* Function::Clone(const Class& new_owner) const {
-  ASSERT(!IsConstructor());
+  ASSERT(!IsGenerativeConstructor());
   Function& clone = Function::Handle();
   clone ^= Object::Clone(*this, Heap::kOld);
   const Class& origin = Class::Handle(this->origin());
   const PatchClass& clone_owner =
       PatchClass::Handle(PatchClass::New(new_owner, origin));
   clone.set_owner(clone_owner);
   clone.ClearCode();
   clone.set_usage_counter(0);
   clone.set_deoptimization_counter(0);
   clone.set_regexp_cid(kIllegalCid);
@@ skipping 14463 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart