First sketch of implementation of is_attribute_initialized for all re…

…prs.
Raku · Jul 5, 2011 · 0ae9745 · 0ae9745
1 parent b003b38
commit 0ae9745
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 1 deletion.
diff --git a/src/6model/reprs/HashAttrStore.c b/src/6model/reprs/HashAttrStore.c
@@ -177,6 +177,15 @@ static storage_spec get_storage_spec(PARROT_INTERP, STable *st) {
     return spec;
 }
 
+/* Checks if an attribute has been initialized. */
+static INTVAL is_attribute_initialized(PARROT_INTERP, PMC *obj, PMC *class_handle, STRING *name, INTVAL hint) {
+    HashAttrStoreInstance *instance = (HashAttrStoreInstance *)PMC_data(obj);
+    if (!instance->store)
+        Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
+                "Cannot access attributes in a type object");
+    return VTABLE_exists_keyed_str(interp, instance->store, name);
+}
+
 /* Initializes the HashAttrStore representation. */
 PMC * HashAttrStore_initialize(PARROT_INTERP) {
     /* Allocate and populate the representation function table. */
@@ -203,6 +212,7 @@ PMC * HashAttrStore_initialize(PARROT_INTERP) {
     repr->gc_mark = gc_mark;
     repr->gc_free = gc_free;
     repr->get_storage_spec = get_storage_spec;
+    repr->is_attribute_initialized = is_attribute_initialized;
 
     /* Wrap it in a PMC. */
     return (this_repr = wrap_repr(interp, repr));

diff --git a/src/6model/reprs/KnowHOWREPR.c b/src/6model/reprs/KnowHOWREPR.c
@@ -47,7 +47,7 @@ static INTVAL defined(PARROT_INTERP, PMC *obj) {
 /* Helper to die because this type doesn't support attributes. */
 static void die_no_attrs(PARROT_INTERP) {
     Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
-            "P6str representation does not support attribute storage");
+            "KnowHOWREPR representation does not support attribute storage");
 }
 
 /* Gets the current value for an attribute. */
@@ -167,6 +167,11 @@ static storage_spec get_storage_spec(PARROT_INTERP, STable *st) {
     return spec;
 }
 
+/* Checks if an attribute has been initialized. */
+static INTVAL is_attribute_initialized(PARROT_INTERP, PMC *Object, PMC *ClassHandle, STRING *Name, INTVAL Hint) {
+    die_no_attrs(interp);
+}
+
 /* Initializes the KnowHOWREPR representation. */
 PMC * KnowHOWREPR_initialize(PARROT_INTERP) {
     /* Allocate and populate the representation function table. */
@@ -195,6 +200,7 @@ PMC * KnowHOWREPR_initialize(PARROT_INTERP) {
     repr->gc_mark_repr = NULL;
     repr->gc_free_repr = NULL;
     repr->get_storage_spec = get_storage_spec;
+    repr->is_attribute_initialized = is_attribute_initialized;
 
     /* Wrap it in a PMC. */
     return (this_repr = wrap_repr(interp, repr));

diff --git a/src/6model/reprs/P6int.c b/src/6model/reprs/P6int.c
@@ -158,6 +158,11 @@ static storage_spec get_storage_spec(PARROT_INTERP, STable *st) {
     return spec;
 }
 
+/* Checks if an attribute has been initialized. */
+static INTVAL is_attribute_initialized(PARROT_INTERP, PMC *Object, PMC *ClassHandle, STRING *Name, INTVAL Hint) {
+    die_no_attrs(interp);
+}
+
 /* Initializes the P6int representation. */
 PMC * P6int_initialize(PARROT_INTERP) {
     /* Allocate and populate the representation function table. */
@@ -186,6 +191,7 @@ PMC * P6int_initialize(PARROT_INTERP) {
     repr->gc_mark_repr = NULL;
     repr->gc_free_repr = NULL;
     repr->get_storage_spec = get_storage_spec;
+    repr->is_attribute_initialized = is_attribute_initialized;
 
     /* Wrap it in a PMC. */
     return (this_repr = wrap_repr(interp, repr));

diff --git a/src/6model/reprs/P6num.c b/src/6model/reprs/P6num.c
@@ -158,6 +158,11 @@ static storage_spec get_storage_spec(PARROT_INTERP, STable *st) {
     return spec;
 }
 
+/* Checks if an attribute has been initialized. */
+static INTVAL is_attribute_initialized(PARROT_INTERP, PMC *Object, PMC *ClassHandle, STRING *Name, INTVAL Hint) {
+    die_no_attrs(interp);
+}
+
 /* Initializes the P6num representation. */
 PMC * P6num_initialize(PARROT_INTERP) {
     /* Allocate and populate the representation function table. */
@@ -186,6 +191,7 @@ PMC * P6num_initialize(PARROT_INTERP) {
     repr->gc_mark_repr = NULL;
     repr->gc_free_repr = NULL;
     repr->get_storage_spec = get_storage_spec;
+    repr->is_attribute_initialized = is_attribute_initialized;
 
     /* Wrap it in a PMC. */
     return (this_repr = wrap_repr(interp, repr));

diff --git a/src/6model/reprs/P6opaque.c b/src/6model/reprs/P6opaque.c
@@ -775,6 +775,23 @@ static storage_spec get_storage_spec(PARROT_INTERP, STable *st) {
     return spec;
 }
 
+/* Checks if an attribute has been initialized. */
+static INTVAL is_attribute_initialized(PARROT_INTERP, PMC *obj, PMC *class_handle, STRING *name, INTVAL hint) {
+    P6opaqueInstance *instance  = (P6opaqueInstance *)PMC_data(obj);
+    P6opaqueREPRData *repr_data = (P6opaqueREPRData *)STABLE(obj)->REPR_data;
+    INTVAL            slot;
+
+    if (!instance->spill)
+        Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
+                "Cannot access attributes in a type object");
+
+    slot = try_get_slot(interp, repr_data, class_handle, name);
+    if (slot >= 0)
+        return NULL != get_pmc_at_offset(instance, repr_data->attribute_offsets[slot]);
+    else
+        no_such_attribute(interp, "initializedness check", class_handle, name);
+}
+
 /* Initializes the P6opaque representation. */
 PMC * P6opaque_initialize(PARROT_INTERP) {
     /* Allocate and populate the representation function table. */
@@ -803,6 +820,7 @@ PMC * P6opaque_initialize(PARROT_INTERP) {
     repr->gc_mark_repr = gc_mark_repr;
     repr->gc_free_repr = gc_free_repr;
     repr->get_storage_spec = get_storage_spec;
+    repr->is_attribute_initialized = is_attribute_initialized;
 
     /* Wrap it in a PMC. */
     return (this_repr = wrap_repr(interp, repr));

diff --git a/src/6model/reprs/P6str.c b/src/6model/reprs/P6str.c
@@ -160,6 +160,11 @@ static storage_spec get_storage_spec(PARROT_INTERP, STable *st) {
     return spec;
 }
 
+/* Checks if an attribute has been initialized. */
+static INTVAL is_attribute_initialized(PARROT_INTERP, PMC *Object, PMC *ClassHandle, STRING *Name, INTVAL Hint) {
+    die_no_attrs(interp);
+}
+
 /* Initializes the P6str representation. */
 PMC * P6str_initialize(PARROT_INTERP) {
     /* Allocate and populate the representation function table. */
@@ -188,6 +193,7 @@ PMC * P6str_initialize(PARROT_INTERP) {
     repr->gc_mark_repr = NULL;
     repr->gc_free_repr = NULL;
     repr->get_storage_spec = get_storage_spec;
+    repr->is_attribute_initialized = is_attribute_initialized;
 
     /* Wrap it in a PMC. */
     return (this_repr = wrap_repr(interp, repr));

diff --git a/src/6model/reprs/Uninstantiable.c b/src/6model/reprs/Uninstantiable.c
@@ -156,6 +156,11 @@ static storage_spec get_storage_spec(PARROT_INTERP, STable *st) {
     return spec;
 }
 
+/* Checks if an attribute has been initialized. */
+static INTVAL is_attribute_initialized(PARROT_INTERP, PMC *Object, PMC *ClassHandle, STRING *Name, INTVAL Hint) {
+    die_no_attrs(interp);
+}
+
 /* Initializes the Uninstantiable representation. */
 PMC * Uninstantiable_initialize(PARROT_INTERP) {
     /* Allocate and populate the representation function table. */
@@ -184,6 +189,7 @@ PMC * Uninstantiable_initialize(PARROT_INTERP) {
     repr->gc_mark_repr = NULL;
     repr->gc_free_repr = NULL;
     repr->get_storage_spec = get_storage_spec;
+    repr->is_attribute_initialized = is_attribute_initialized;
 
     /* Wrap it in a PMC. */
     return (this_repr = wrap_repr(interp, repr));