FEAT: implemented values-of and words-of struct reflections

Author: Oldes

src/boot/sysobj.reb

@@ -81,8 +81,8 @@ catalog: object [
 	; Reflectors are used on boot to create *-of functions
 	reflectors: [
 		spec   [any-function! any-object! vector! datatype! struct!]
-		body   [any-function! any-object! map!]
-		words  [any-function! any-object! map! date! handle!]
+		body   [any-function! any-object! map! struct!]
+		words  [any-function! any-object! map! date! handle! struct!]
 		values [any-object! map! struct!]
 		types  [any-function!]
 		title  [any-function! datatype! module!]

src/core/t-struct.c

@@ -224,18 +224,17 @@ static REBFLG get_scalar(REBSTU *stu,
 		}
 
 		/* optional initialization */
+		val = Append_Value(ser);
 		if (field->dimension > 1) {
 			REBSER *dim = Make_Block(1);
 			REBCNT n = 0;
-			val = Append_Value(ser);
 			SET_TYPE(val, REB_BLOCK);
 			VAL_SERIES(val) = dim;
 			for (n = 0; n < field->dimension; n ++) {
 				REBVAL *dv = Append_Value(dim);
 				get_scalar(stu, field, n, dv);
 			}
 		} else {
-			val = Append_Value(ser);
 			get_scalar(stu, field, 0, val);
 #ifdef ALLOW_CODE_EVALUATION_INSIDE_STRUCT_CONSTRUCTION_SPEC 
 			if (IS_WORD(val)) SET_TYPE(val, REB_LIT_WORD);
@@ -245,6 +244,51 @@ static REBFLG get_scalar(REBSTU *stu,
 	return ser;
 }
 
+static void Get_Struct_Words(REBVAL* ret, REBSTU* stu) {
+	REBVAL* val = NULL;
+	REBSER* out;
+	struct Struct_Field* field = (struct Struct_Field*)SERIES_DATA(stu->fields);
+	REBCNT i, cnt;
+
+	cnt = SERIES_TAIL(stu->fields);
+	out = Make_Block(cnt);
+	Set_Block(ret, out);
+
+	for (i = 0; i < cnt; i++, field++) {
+		val = Append_Value(out);
+		Init_Word(val, field->sym);
+		SET_TYPE(val, REB_WORD);
+	}
+}
+
+static void Get_Struct_Values(REBVAL* ret, REBSTU* stu) {
+	REBVAL *val = NULL;
+	REBVAL *type_blk = NULL;
+	REBSER *out, *dim;
+	struct Struct_Field* field = (struct Struct_Field*)SERIES_DATA(stu->fields);
+	REBCNT i, n, cnt;
+
+	cnt = SERIES_TAIL(stu->fields);
+	out = Make_Block(cnt);
+	Set_Block(ret, out);
+
+	for (i = 0; i < cnt; i++, field++) {
+		val = Append_Value(out);
+		if (field->dimension > 1) {
+			dim = Make_Block(field->dimension);
+			SET_TYPE(val, REB_BLOCK);
+			VAL_SERIES(val) = dim;
+			for (n = 0; n < field->dimension; n++) {
+				REBVAL* dv = Append_Value(dim);
+				get_scalar(stu, field, n, dv);
+			}
+		}
+		else {
+			get_scalar(stu, field, 0, val);
+		}
+	}
+}
+
 static REBOOL same_fields(REBSER *tgt, REBSER *src)
 {
 	struct Struct_Field *tgt_fields = (struct Struct_Field *) SERIES_DATA(tgt);
@@ -1088,12 +1132,17 @@ static void init_fields(REBVAL *ret, REBVAL *spec)
 			{
 				REBINT n = VAL_WORD_CANON(arg); // zero on error
 				switch (n) {
+					case SYM_WORDS:
+						Get_Struct_Words(ret, &VAL_STRUCT(val));
+						break;
 					case SYM_VALUES:
-						SET_BINARY(ret, Copy_Series_Part(VAL_STRUCT_DATA_BIN(val), VAL_STRUCT_OFFSET(val), VAL_STRUCT_LEN(val)));
+						//SET_BINARY(ret, Copy_Series_Part(VAL_STRUCT_DATA_BIN(val), VAL_STRUCT_OFFSET(val), VAL_STRUCT_LEN(val)));
+						Get_Struct_Values(ret, &VAL_STRUCT(val));
 						break;
 					case SYM_SPEC:
+					case SYM_BODY:
 						Set_Block(ret, Clone_Block(VAL_STRUCT_SPEC(val)));
-						Unbind_Block(VAL_BLK(val), TRUE);
+						//Unbind_Block(VAL_BLK(val), TRUE); //???
 						break;
 					case SYM_ADDR:
 						SET_INTEGER(ret, (REBUPT)SERIES_SKIP(VAL_STRUCT_DATA_BIN(val), VAL_STRUCT_OFFSET(val)));

src/tests/units/struct-test.r3

@@ -134,6 +134,21 @@ Rebol [
 ===end-group===
 
 
+===start-group=== "Struct reflection"
+;@@ https://github.com/Oldes/Rebol-issues/issues/2577
+s: make struct! blk: [a: [uint16!] 1 b: [int32!] -1 c: [word!] foo d [uint8! [2]]]
+--test-- "body-of struct"
+	--assert blk = body-of s
+--test-- "spec-of struct"
+	--assert blk = spec-of s
+--test-- "words-of struct"
+	--assert [a b c d] = words-of s
+	--assert [a b c d] = keys-of s
+--test-- "values-of struct"
+	--assert [1 -1 foo [0 0]] = values-of s
+===end-group===
+
+
 ===start-group=== "Struct conversion"
 --test-- "to binary! struct!"
 	s: make struct! [a: [uint16!] 1 b: [int32!] -1]