Update get_attribute_ref prototype to return bit width of attribute.

Author: arnsholt

src/6model/repr_registry.c

@@ -33,7 +33,7 @@ static void die_no_attrs(PARROT_INTERP, STRING *repr_name) {
 static PMC * default_get_attribute_boxed(PARROT_INTERP, STable *st, void *data, PMC *class_handle, STRING *name, INTVAL hint) {
     die_no_attrs(interp, st->REPR->name);
 }
-static void * default_get_attribute_ref(PARROT_INTERP, STable *st, void *data, PMC *class_handle, STRING *name, INTVAL hint) {
+static void * default_get_attribute_ref(PARROT_INTERP, STable *st, void *data, PMC *class_handle, STRING *name, INTVAL *bits, INTVAL hint) {
     die_no_attrs(interp, st->REPR->name);
 }
 static void default_bind_attribute_boxed(PARROT_INTERP, STable *st, void *data, PMC *class_handle, STRING *name, INTVAL hint, PMC *value) {

src/6model/reprs/CStruct.c

@@ -474,7 +474,7 @@ static PMC * get_attribute_boxed(PARROT_INTERP, STable *st, void *data, PMC *cla
     /* Otherwise, complain that the attribute doesn't exist. */
     no_such_attribute(interp, "get", class_handle, name);
 }
-static void * get_attribute_ref(PARROT_INTERP, STable *st, void *data, PMC *class_handle, STRING *name, INTVAL hint) {
+static void * get_attribute_ref(PARROT_INTERP, STable *st, void *data, PMC *class_handle, STRING *name, INTVAL *bits, INTVAL hint) {
     CStructREPRData *repr_data = (CStructREPRData *)st->REPR_data;
     CStructBody     *body      = (CStructBody *)data;
     INTVAL           slot;

src/6model/reprs/HashAttrStore.c

@@ -58,7 +58,7 @@ static PMC * get_attribute_boxed(PARROT_INTERP, STable *st, void *data, PMC *cla
     HashAttrStoreBody *body = (HashAttrStoreBody *)data;
     return VTABLE_get_pmc_keyed_str(interp, body->store, name);
 }
-static void * get_attribute_ref(PARROT_INTERP, STable *st, void *data, PMC *class_handle, STRING *name, INTVAL hint) {
+static void * get_attribute_ref(PARROT_INTERP, STable *st, void *data, PMC *class_handle, STRING *name, INTVAL *bits, INTVAL hint) {
     Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
             "HashAttrStore representation does not support value type attributes");
 }

src/6model/reprs/P6opaque.c

@@ -520,7 +520,7 @@ static PMC * get_attribute_boxed(PARROT_INTERP, STable *st, void *data, PMC *cla
     no_such_attribute(interp, "get", class_handle, name);
 }
 
-static void * get_attribute_ref(PARROT_INTERP, STable *st, void *data, PMC *class_handle, STRING *name, INTVAL hint) {
+static void * get_attribute_ref(PARROT_INTERP, STable *st, void *data, PMC *class_handle, STRING *name, INTVAL *bits, INTVAL hint) {
     P6opaqueREPRData *repr_data = (P6opaqueREPRData *)st->REPR_data;
     INTVAL            slot;
 

src/6model/sixmodelobject.h

@@ -158,9 +158,11 @@ typedef struct SixModel_REPROps_Attribute {
         PMC *class_handle, STRING *name, INTVAL hint);
 
     /* Gets a reference to the memory location of an attribute. Note
-     * that this is only valid so long as the object itself is alive. */
+     * that this is only valid so long as the object itself is alive. If
+     * bits is a non-NULL pointer, the pointed-to INTVAL will contain the
+     * bit-width of the attribute. */
     void * (*get_attribute_ref) (PARROT_INTERP, STable *st, void *data,
-        PMC *class_handle, STRING *name, INTVAL hint);
+        PMC *class_handle, STRING *name, INTVAL *bits, INTVAL hint);
 
     /* Binds the given object value to the specified attribute. If it's
      * a reference type attribute, this just simply sets the value in 
@@ -215,7 +217,10 @@ typedef struct SixModel_REPROps_Boxing {
 } REPROps_Boxing;
 typedef struct SixModel_REPROps_Indexing {
     /* Get the address of the element at the specified position. May return null if
-     * nothing is there, or throw to indicate out of bounds, or vivify. */
+     * nothing is there, or throw to indicate out of bounds, or vivify. If
+     * bits is a non-NULL pointer, the pointed-to INTVAL will contain the
+     * bit-width of the attribute. */
+    /*void * (*at_pos_ref) (PARROT_INTERP, STable *st, void *data, INTVAL index, INTVAL *bits);*/
     void * (*at_pos_ref) (PARROT_INTERP, STable *st, void *data, INTVAL index);
 
     /* Get a boxed object representing the element at the specified position. If the

src/ops/nqp.ops

@@ -551,7 +551,7 @@ inline op repr_get_attr_int(out INT, invar PMC, invar PMC, in STR) :base_core {
     PMC *ch = decontainerize(interp, $3);
     if ($2->vtable->base_type == smo_id) {
         if (IS_CONCRETE($2))
-            $1 = *((INTVAL *)REPR($2)->attr_funcs->get_attribute_ref(interp, STABLE($2), OBJECT_BODY($2), ch, $4, NO_HINT));
+            $1 = *((INTVAL *)REPR($2)->attr_funcs->get_attribute_ref(interp, STABLE($2), OBJECT_BODY($2), ch, $4, NULL, NO_HINT));
         else
             Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
                 "Cannot look up attributes in a type object");
@@ -575,7 +575,7 @@ inline op repr_get_attr_num(out NUM, invar PMC, invar PMC, in STR) :base_core {
     PMC *ch = decontainerize(interp, $3);
     if ($2->vtable->base_type == smo_id) {
         if (IS_CONCRETE($2))
-            $1 = *((FLOATVAL *)REPR($2)->attr_funcs->get_attribute_ref(interp, STABLE($2), OBJECT_BODY($2), ch, $4, NO_HINT));
+            $1 = *((FLOATVAL *)REPR($2)->attr_funcs->get_attribute_ref(interp, STABLE($2), OBJECT_BODY($2), ch, $4, NULL, NO_HINT));
         else
             Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
                 "Cannot look up attributes in a type object");
@@ -600,7 +600,7 @@ inline op repr_get_attr_str(out STR, invar PMC, invar PMC, in STR) :base_core {
     PMC *ch = decontainerize(interp, $3);
     if ($2->vtable->base_type == smo_id) {
         if (IS_CONCRETE($2))
-            $1 = *((STRING **)REPR($2)->attr_funcs->get_attribute_ref(interp, STABLE($2), OBJECT_BODY($2), ch, $4, NO_HINT));
+            $1 = *((STRING **)REPR($2)->attr_funcs->get_attribute_ref(interp, STABLE($2), OBJECT_BODY($2), ch, $4, NULL, NO_HINT));
         else
             Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
                 "Cannot look up attributes in a type object");
@@ -757,7 +757,7 @@ inline op repr_get_attr_int(out INT, invar PMC, invar PMC, in STR, in INT) :base
     PMC *ch = decontainerize(interp, $3);
     if ($2->vtable->base_type == smo_id) {
         if (IS_CONCRETE($2))
-            $1 = *((INTVAL *)REPR($2)->attr_funcs->get_attribute_ref(interp, STABLE($2), OBJECT_BODY($2), ch, $4, $5));
+            $1 = *((INTVAL *)REPR($2)->attr_funcs->get_attribute_ref(interp, STABLE($2), OBJECT_BODY($2), ch, $4, NULL, $5));
         else
             Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
                 "Cannot look up attributes in a type object");
@@ -782,7 +782,7 @@ inline op repr_get_attr_num(out NUM, invar PMC, invar PMC, in STR, in INT) :base
     PMC *ch = decontainerize(interp, $3);
     if ($2->vtable->base_type == smo_id) {
         if (IS_CONCRETE($2))
-            $1 = *((FLOATVAL *)REPR($2)->attr_funcs->get_attribute_ref(interp, STABLE($2), OBJECT_BODY($2), ch, $4, $5));
+            $1 = *((FLOATVAL *)REPR($2)->attr_funcs->get_attribute_ref(interp, STABLE($2), OBJECT_BODY($2), ch, $4, NULL, $5));
         else
             Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
                 "Cannot look up attributes in a type object");
@@ -807,7 +807,7 @@ inline op repr_get_attr_str(out STR, invar PMC, invar PMC, in STR, in INT) :base
     PMC *ch = decontainerize(interp, $3);
     if ($2->vtable->base_type == smo_id) {
         if (IS_CONCRETE($2))
-            $1 = *((STRING **)REPR($2)->attr_funcs->get_attribute_ref(interp, STABLE($2), OBJECT_BODY($2), ch, $4, $5));
+            $1 = *((STRING **)REPR($2)->attr_funcs->get_attribute_ref(interp, STABLE($2), OBJECT_BODY($2), ch, $4, NULL, $5));
         else
             Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
                 "Cannot look up attributes in a type object");