FEAT: struct reflection code reduction

related to: Oldes/Rebol-issues#2577

Author: Oldes

src/core/t-struct.c

@@ -242,79 +242,37 @@ 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 void Get_Struct_Body(REBVAL* ret, REBSTU* stu) {
+static void Get_Struct_Reflect(REBVAL* ret, REBSTU* stu, REBCNT type) {
 	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*2);
+	out = Make_Block(cnt * (type==SYM_BODY?2:1));
 	Set_Block(ret, out);
 
 	for (i = 0; i < cnt; i++, field++) {
-		val = Append_Value(out);
-		Init_Word(val, field->sym);
-		SET_TYPE(val, REB_SET_WORD);
-
-		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);
-			}
+		if (type != SYM_VALUES) {
+			val = Append_Value(out);
+			Init_Word(val, field->sym);
+			SET_TYPE(val, (type==SYM_WORDS?REB_WORD:REB_SET_WORD));
 		}
-		else {
-			get_scalar(stu, field, 0, val);
+		if (type != SYM_WORDS) {
+			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);
+			}
 		}
 	}
 }
@@ -1163,18 +1121,13 @@ 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)));
-						Get_Struct_Values(ret, &VAL_STRUCT(val));
+					case SYM_BODY:
+						Get_Struct_Reflect(ret, &VAL_STRUCT(val), n);
 						break;
 					case SYM_SPEC:
 						Set_Block(ret, Clone_Block(VAL_STRUCT_SPEC(val)));
 						break;
-					case SYM_BODY:
-						Get_Struct_Body(ret, &VAL_STRUCT(val));
-						break;
 					case SYM_ADDR:
 						SET_INTEGER(ret, (REBUPT)SERIES_SKIP(VAL_STRUCT_DATA_BIN(val), VAL_STRUCT_OFFSET(val)));
 						break;