Extend storage spec support so a REPR can describe the things it can/canny box.

Author: jnthn

src/6model/reprs/HashAttrStore.c

@@ -174,6 +174,7 @@ static storage_spec get_storage_spec(PARROT_INTERP, STable *st) {
     storage_spec spec;
     spec.inlineable = STORAGE_SPEC_REFERENCE;
     spec.boxed_primitive = STORAGE_SPEC_BP_NONE;
+    spec.can_box = 0;
     return spec;
 }
 

src/6model/reprs/KnowHOWREPR.c

@@ -165,6 +165,7 @@ static storage_spec get_storage_spec(PARROT_INTERP, STable *st) {
     storage_spec spec;
     spec.inlineable = STORAGE_SPEC_REFERENCE;
     spec.boxed_primitive = STORAGE_SPEC_BP_NONE;
+    spec.can_box = 0;
     return spec;
 }
 

src/6model/reprs/P6int.c

@@ -156,6 +156,7 @@ static storage_spec get_storage_spec(PARROT_INTERP, STable *st) {
     spec.inlineable = STORAGE_SPEC_INLINED;
     spec.bits = sizeof(INTVAL) * 8;
     spec.boxed_primitive = STORAGE_SPEC_BP_INT;
+    spec.can_box = STORAGE_SPEC_CAN_BOX_INT;
     return spec;
 }
 

src/6model/reprs/P6num.c

@@ -156,6 +156,7 @@ static storage_spec get_storage_spec(PARROT_INTERP, STable *st) {
     spec.inlineable = STORAGE_SPEC_INLINED;
     spec.bits = sizeof(FLOATVAL) * 8;
     spec.boxed_primitive = STORAGE_SPEC_BP_NUM;
+    spec.can_box = STORAGE_SPEC_CAN_BOX_NUM;
     return spec;
 }
 

src/6model/reprs/P6opaque.c

@@ -800,9 +800,17 @@ static void gc_free_repr(PARROT_INTERP, STable *st) {
 
 /* Gets the storage specification for this representation. */
 static storage_spec get_storage_spec(PARROT_INTERP, STable *st) {
+    P6opaqueREPRData *repr_data = (P6opaqueREPRData *)st->REPR_data;
     storage_spec spec;
     spec.inlineable = STORAGE_SPEC_REFERENCE;
     spec.boxed_primitive = STORAGE_SPEC_BP_NONE;
+    spec.can_box = 0;
+    if (repr_data->unbox_int_offset)
+        spec.can_box += STORAGE_SPEC_CAN_BOX_INT;
+    if (repr_data->unbox_num_offset)
+        spec.can_box += STORAGE_SPEC_CAN_BOX_NUM;
+    if (repr_data->unbox_str_offset)
+        spec.can_box += STORAGE_SPEC_CAN_BOX_STR;
     return spec;
 }
 

src/6model/reprs/P6str.c

@@ -158,6 +158,7 @@ static storage_spec get_storage_spec(PARROT_INTERP, STable *st) {
     spec.inlineable = STORAGE_SPEC_INLINED;
     spec.bits = sizeof(STRING *) * 8;
     spec.boxed_primitive = STORAGE_SPEC_BP_STR;
+    spec.can_box = STORAGE_SPEC_CAN_BOX_STR;
     return spec;
 }
 

src/6model/reprs/Uninstantiable.c

@@ -154,6 +154,7 @@ static storage_spec get_storage_spec(PARROT_INTERP, STable *st) {
     storage_spec spec;
     spec.inlineable = STORAGE_SPEC_REFERENCE;
     spec.boxed_primitive = STORAGE_SPEC_BP_NONE;
+    spec.can_box = 0;
     return spec;
 }
 

src/6model/storage_spec.h

@@ -19,6 +19,9 @@ typedef struct {
      * primitive type and can unbox, this says what primitive type
      * that they unbox to. */
     INTVAL boxed_primitive;
+    
+    /* The types that this one can box/unbox to. */
+    INTVAL can_box;
 } storage_spec;
 
 /* Inlined or not. */
@@ -31,4 +34,9 @@ typedef struct {
 #define STORAGE_SPEC_BP_NUM     2
 #define STORAGE_SPEC_BP_STR     3
 
+/* can_box bit field values. */
+#define STORAGE_SPEC_CAN_BOX_INT     1
+#define STORAGE_SPEC_CAN_BOX_NUM     2
+#define STORAGE_SPEC_CAN_BOX_STR     4
+
 #endif