Eliminte defined from the REPR API; now it's all done through the IS_CONCRETE macro.

jnthn · jnthn · commit 065622fffedf · 2011-10-30T15:52:23.000+01:00
diff --git a/src/6model/multi_dispatch.c b/src/6model/multi_dispatch.c
@@ -314,7 +314,7 @@ PMC *nqp_multi_dispatch(PARROT_INTERP, PMC *dispatcher, PMC *capture) {
             if (definedness) {
                 /* Have a constraint on the definedness. */
                 INTVAL defined = param->vtable->base_type == smo_id ?
-                        REPR(param)->defined(interp, param) :
+                        IS_CONCRETE(param) :
                         VTABLE_defined(interp, param);
                 if ((!defined && definedness == DEFINED_ONLY) || (defined && definedness == UNDEFINED_ONLY)) {
                     type_mismatch = 1;
diff --git a/src/6model/reprs/HashAttrStore.c b/src/6model/reprs/HashAttrStore.c
@@ -46,13 +46,6 @@ static void initialize(PARROT_INTERP, STable *st, void *data) {
     ((HashAttrStoreBody *)data)->store = pmc_new(interp, enum_class_Hash);
 }
 
-/* Checks if a given object is defined (from the point of view of the
- * representation). */
-static INTVAL defined(PARROT_INTERP, PMC *obj) {
-    HashAttrStoreInstance *instance = (HashAttrStoreInstance *)PMC_data(obj);
-    return instance->body.store != NULL;
-}
-
 /* Gets the current value for an attribute. */
 static PMC * get_attribute(PARROT_INTERP, PMC *obj, PMC *class_handle, STRING *name, INTVAL hint) {
     HashAttrStoreInstance *instance = (HashAttrStoreInstance *)PMC_data(obj);
@@ -198,7 +191,6 @@ REPROps * HashAttrStore_initialize(PARROT_INTERP) {
     this_repr->type_object_for = type_object_for;
     this_repr->allocate = allocate;
     this_repr->initialize = initialize;
-    this_repr->defined = defined;
     this_repr->get_attribute = get_attribute;
     this_repr->get_attribute_int = get_attribute_int;
     this_repr->get_attribute_num = get_attribute_num;
diff --git a/src/6model/reprs/KnowHOWREPR.c b/src/6model/reprs/KnowHOWREPR.c
@@ -46,12 +46,6 @@ static void initialize(PARROT_INTERP, STable *st, void *data) {
     body->attributes     = pmc_new(interp, enum_class_ResizablePMCArray);
 }
 
-/* Checks if a given object is defined (from the point of view of the
- * representation). */
-static INTVAL defined(PARROT_INTERP, PMC *obj) {
-    return !PMC_IS_NULL(((KnowHOWREPRInstance *)PMC_data(obj))->body.methods);
-}
-
 /* Helper to die because this type doesn't support attributes. */
 PARROT_DOES_NOT_RETURN
 static void die_no_attrs(PARROT_INTERP) {
@@ -189,7 +183,6 @@ REPROps * KnowHOWREPR_initialize(PARROT_INTERP) {
     this_repr->type_object_for = type_object_for;
     this_repr->allocate = allocate;
     this_repr->initialize = initialize;
-    this_repr->defined = defined;
     this_repr->get_attribute = get_attribute;
     this_repr->get_attribute_int = get_attribute_int;
     this_repr->get_attribute_num = get_attribute_num;
diff --git a/src/6model/reprs/P6int.c b/src/6model/reprs/P6int.c
@@ -43,13 +43,6 @@ static void initialize(PARROT_INTERP, STable *st, void *data) {
     ((P6intBody *)data)->value = 0;
 }
 
-/* Checks if a given object is defined (from the point of view of the
- * representation). */
-static INTVAL defined(PARROT_INTERP, PMC *obj) {
-    /* Native types only ever exist as the type object, which is undefined. */
-    return 0;
-}
-
 /* Helper to die because this type doesn't support attributes. */
 PARROT_DOES_NOT_RETURN
 static void die_no_attrs(PARROT_INTERP) {
@@ -179,7 +172,6 @@ REPROps * P6int_initialize(PARROT_INTERP) {
     this_repr->type_object_for = type_object_for;
     this_repr->allocate = allocate;
     this_repr->initialize = initialize;
-    this_repr->defined = defined;
     this_repr->get_attribute = get_attribute;
     this_repr->get_attribute_int = get_attribute_int;
     this_repr->get_attribute_num = get_attribute_num;
diff --git a/src/6model/reprs/P6num.c b/src/6model/reprs/P6num.c
@@ -44,13 +44,6 @@ static void initialize(PARROT_INTERP, STable *st, void *data) {
     ((P6numBody *)data)->value = 0.0/x;
 }
 
-/* Checks if a given object is defined (from the point of view of the
- * representation). */
-static INTVAL defined(PARROT_INTERP, PMC *obj) {
-    /* Native types only ever exist as the type object, which is undefined. */
-    return 0;
-}
-
 /* Helper to die because this type doesn't support attributes. */
 PARROT_DOES_NOT_RETURN
 static void die_no_attrs(PARROT_INTERP) {
@@ -180,7 +173,6 @@ REPROps * P6num_initialize(PARROT_INTERP) {
     this_repr->type_object_for = type_object_for;
     this_repr->allocate = allocate;
     this_repr->initialize = initialize;
-    this_repr->defined = defined;
     this_repr->get_attribute = get_attribute;
     this_repr->get_attribute_int = get_attribute_int;
     this_repr->get_attribute_num = get_attribute_num;
diff --git a/src/6model/reprs/P6opaque.c b/src/6model/reprs/P6opaque.c
@@ -388,12 +388,6 @@ static void initialize(PARROT_INTERP, STable *st, void *data) {
     /* XXX Fill this out when we may have nested things to initialize. */
 }
 
-/* Checks if a given object is defined (from the point of view of the
- * representation). */
-static INTVAL defined(PARROT_INTERP, PMC *obj) {
-    return !PObj_flag_TEST(private0, obj);
-}
-
 /* Helper for complaining about attribute access errors. */
 PARROT_DOES_NOT_RETURN
 static void no_such_attribute(PARROT_INTERP, const char *action, PMC *class_handle, STRING *name) {
@@ -604,7 +598,7 @@ static PMC * repr_clone(PARROT_INTERP, PMC *to_clone) {
     P6opaqueInstance *obj;
     P6opaqueREPRData *repr_data = (P6opaqueREPRData *)STABLE(to_clone)->REPR_data;
     
-    if (defined(interp, to_clone)) {
+    if (IS_CONCRETE(to_clone)) {
         obj = (P6opaqueInstance *)Parrot_gc_allocate_fixed_size_storage(interp, repr_data->allocation_size);
         memcpy(obj, PMC_data(to_clone), repr_data->allocation_size);
         return wrap_object(interp, obj);
@@ -890,7 +884,6 @@ REPROps * P6opaque_initialize(PARROT_INTERP) {
     this_repr->type_object_for = type_object_for;
     this_repr->allocate = allocate;
     this_repr->initialize = initialize;
-    this_repr->defined = defined;
     this_repr->get_attribute = get_attribute;
     this_repr->get_attribute_int = get_attribute_int;
     this_repr->get_attribute_num = get_attribute_num;
diff --git a/src/6model/reprs/P6str.c b/src/6model/reprs/P6str.c
@@ -43,13 +43,6 @@ static void initialize(PARROT_INTERP, STable *st, void *data) {
     ((P6strBody *)data)->value = STRINGNULL;
 }
 
-/* Checks if a given object is defined (from the point of view of the
- * representation). */
-static INTVAL defined(PARROT_INTERP, PMC *obj) {
-    /* Native types only ever exist as the type object, which is undefined. */
-    return 0;
-}
-
 /* Helper to die because this type doesn't support attributes. */
 PARROT_DOES_NOT_RETURN
 static void die_no_attrs(PARROT_INTERP) {
@@ -181,7 +174,6 @@ REPROps * P6str_initialize(PARROT_INTERP) {
     this_repr->type_object_for = type_object_for;
     this_repr->allocate = allocate;
     this_repr->initialize = initialize;
-    this_repr->defined = defined;
     this_repr->get_attribute = get_attribute;
     this_repr->get_attribute_int = get_attribute_int;
     this_repr->get_attribute_num = get_attribute_num;
diff --git a/src/6model/reprs/Uninstantiable.c b/src/6model/reprs/Uninstantiable.c
@@ -42,13 +42,6 @@ static void initialize(PARROT_INTERP, STable *st, void *data) {
     /* Nothing to do. */
 }
 
-/* Checks if a given object is defined (from the point of view of the
- * representation). */
-static INTVAL defined(PARROT_INTERP, PMC *obj) {
-    /* Non-instantiable; always undefined. */
-    return 0;
-}
-
 /* Helper to die because this type doesn't support attributes. */
 PARROT_DOES_NOT_RETURN
 static void die_no_attrs(PARROT_INTERP) {
@@ -178,7 +171,6 @@ REPROps * Uninstantiable_initialize(PARROT_INTERP) {
     this_repr->type_object_for = type_object_for;
     this_repr->allocate = allocate;
     this_repr->initialize = initialize;
-    this_repr->defined = defined;
     this_repr->get_attribute = get_attribute;
     this_repr->get_attribute_int = get_attribute_int;
     this_repr->get_attribute_num = get_attribute_num;
diff --git a/src/6model/sixmodelobject.c b/src/6model/sixmodelobject.c
@@ -171,7 +171,7 @@ PMC * create_stable(PARROT_INTERP, REPROps *REPR, PMC *HOW) {
 PMC * decontainerize(PARROT_INTERP, PMC *var) {
     if (var->vtable->base_type == smo_id) {
         ContainerSpec *spec = STABLE(var)->container_spec;
-        if (spec && REPR(var)->defined(interp, var)) {
+        if (spec && IS_CONCRETE(var)) {
             if (!PMC_IS_NULL(spec->value_slot.class_handle)) {
                 /* Just get slot. */
                 return VTABLE_get_attr_keyed(interp, var, spec->value_slot.class_handle,
diff --git a/src/6model/sixmodelobject.h b/src/6model/sixmodelobject.h
@@ -159,10 +159,6 @@ struct SixModel_REPROps {
      * may recursively call initialize for any flattened objects. */
     void (*initialize) (PARROT_INTERP, STable *st, void *data);
 
-    /* Checks if a given object is defined (from the point of
-     * view of the representation). */
-    INTVAL (*defined) (PARROT_INTERP, PMC *Obj);
-
     /* Gets the current value for an object attribute. */
     PMC * (*get_attribute) (PARROT_INTERP, PMC *Object, PMC *ClassHandle, STRING *Name, INTVAL Hint);
 
diff --git a/src/ops/nqp.ops b/src/ops/nqp.ops
@@ -237,7 +237,7 @@ Checks the REPRs idea of definedness.
 inline op repr_defined(out INT, in PMC) :base_core {
     PMC *var = decontainerize(interp, $2);
     if (var->vtable->base_type == smo_id)
-        $1 = REPR(var)->defined(interp, var);
+        $1 = IS_CONCRETE(var);
     else
         Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
             "Can only use repr_defined on a SixModelObject");
diff --git a/src/pmc/sixmodelobject.pmc b/src/pmc/sixmodelobject.pmc
@@ -26,7 +26,7 @@
 
 PMC * decontainerize(PARROT_INTERP, PMC *var) {
     ContainerSpec *spec = STABLE(var)->container_spec;
-    if (spec && REPR(var)->defined(interp, var)) {
+    if (spec && IS_CONCRETE(var)) {
         if (!PMC_IS_NULL(spec->value_slot.class_handle)) {
             /* Just get slot. */
             return VTABLE_get_attr_keyed(interp, var, spec->value_slot.class_handle,
@@ -209,28 +209,28 @@ pmclass SixModelObject manual_attrs dynpmc group nqp {
                     Parrot_pcc_set_signature(interp, CURRENT_CONTEXT(interp), old_ctx);
                     return VTABLE_get_bool(interp, VTABLE_get_pmc_keyed_int(interp, cappy, 0));
                 case BOOL_MODE_UNBOX_INT:
-                    return REPR(decont)->defined(interp, decont) &&
+                    return IS_CONCRETE(decont) &&
                         REPR(decont)->get_int(interp, STABLE(decont), OBJECT_BODY(decont));
                 case BOOL_MODE_UNBOX_NUM:
-                    if (!REPR(decont)->defined(interp, decont))
+                    if (!IS_CONCRETE(decont))
                         return 0;
                     unnum = REPR(decont)->get_num(interp, STABLE(decont), OBJECT_BODY(decont));
                     return unnum != 0.0;
                 case BOOL_MODE_UNBOX_STR_NOT_EMPTY:
-                    if (!REPR(decont)->defined(interp, decont))
+                    if (!IS_CONCRETE(decont))
                         return 0;
                     unstr = REPR(decont)->get_str(interp, STABLE(decont), OBJECT_BODY(decont));
                     return !STRING_IS_NULL(unstr) &&
                         !Parrot_str_equal(interp, unstr, CONST_STRING(interp, ""));
                 case BOOL_MODE_UNBOX_STR_NOT_EMPTY_OR_ZERO:
-                    if (!REPR(decont)->defined(interp, decont))
+                    if (!IS_CONCRETE(decont))
                         return 0;
                     unstr = REPR(decont)->get_str(interp, STABLE(decont), OBJECT_BODY(decont));
                     return !STRING_IS_NULL(unstr) &&
                         !Parrot_str_equal(interp, unstr, CONST_STRING(interp, "")) &&
                         !Parrot_str_equal(interp, unstr, CONST_STRING(interp, "0"));
                 case BOOL_MODE_NOT_TYPE_OBJECT:
-                    return REPR(decont)->defined(interp, decont);
+                    return IS_CONCRETE(decont);
                 default:
                     return SUPER();
             }
