FEAT: implemented copy of nested maps

related to:
Oldes/Rebol-issues#1864 Oldes/Rebol-issues#2293

Author: Oldes

src/core/f-blocks.c

@@ -120,12 +120,14 @@
 ***********************************************************************/
 {
 	REBVAL *val;
+	REBSER *ser;
+	REBU64 ts;
 
 	for (; index < tail; index++) {
 
 		val = BLK_SKIP(block, index);
-
-		if ((types & TYPESET(VAL_TYPE(val)) & TS_SERIES_OBJ) != 0) {
+		ts = types & TYPESET(VAL_TYPE(val));
+		if ((ts & TS_SERIES_OBJ) != 0) {
 			// Replace just the series field of the value
 			// Note that this should work for objects too (the frame).
 			VAL_SERIES(val) = Copy_Series(VAL_SERIES(val));
@@ -135,8 +137,13 @@
 				if ((types & CP_DEEP) != 0)
 					Copy_Deep_Values(VAL_SERIES(val), 0, VAL_TAIL(val), types);
 			}
-		} else if (types & TYPESET(VAL_TYPE(val)) & TS_FUNCLOS)
+		}
+		else if (ts & TS_FUNCLOS) {
 			Clone_Function(val, val);
+		}
+		else if (ts & TYPESET(REB_MAP)) {
+			Set_Series(REB_MAP, val, Copy_Map(val, types));
+		}
 	}
 }
 

src/core/t-block.c

@@ -754,7 +754,7 @@ static struct {
 			Set_Series(
 				VAL_TYPE(value), D_RET,
 				D_REF(ARG_TAKE_DEEP)
-					? Copy_Block_Values(ser, 0, len, CP_DEEP | TS_STD_SERIES)
+					? Copy_Block_Values(ser, 0, len, CP_DEEP | TS_DEEP_COPIED)
 					: Copy_Block_Len(ser, index, len)
 			);
 		}
@@ -847,7 +847,7 @@ static struct {
 	{
 		REBU64 types = 0;
 		if (D_REF(ARG_COPY_DEEP)) {
-			types |= CP_DEEP | (D_REF(ARG_COPY_TYPES) ? 0 : TS_STD_SERIES);
+			types |= CP_DEEP | (D_REF(ARG_COPY_TYPES) ? 0 : TS_DEEP_COPIED);
 		}
 		if D_REF(ARG_COPY_TYPES) {
 			arg = D_ARG(ARG_COPY_KINDS);

src/core/t-map.c

@@ -343,7 +343,24 @@
 
 /***********************************************************************
 **
-*/	REBFLG MT_Map(REBVAL *out, REBVAL *data, REBCNT type)
+*/	REBSER *Copy_Map(REBVAL *val, REBU64 types)
+/*
+**		Copy given map.
+**
+***********************************************************************/
+{
+	REBSER *series;
+	series = Make_Map(VAL_BLK_LEN(val) / 2);
+	//COPY_BLK_PART(series, VAL_BLK_DATA(data), n);
+	Append_Map(series, val, UNKNOWN);
+	if (types != 0) Copy_Deep_Values(series, 0, SERIES_TAIL(series), types);
+	Rehash_Hash(series);
+	return series;
+}
+
+/***********************************************************************
+**
+*/	REBFLG MT_Map(REBVAL *out, REBVAL *data, REBU64 type)
 /*
 ***********************************************************************/
 {
@@ -355,16 +372,7 @@
 	n = VAL_BLK_LEN(data);
 	if (n & 1) return FALSE;
 
-	series = Make_Map(n/2);
-
-	//COPY_BLK_PART(series, VAL_BLK_DATA(data), n);
-	Append_Map(series, data, UNKNOWN);
-
-	if (type != 0) Copy_Deep_Values(series, 0, SERIES_TAIL(series), type);
-
-	Rehash_Hash(series);
-
-	Set_Series(REB_MAP, out, series);
+	Set_Series(REB_MAP, out, Copy_Map(data, type));
 
 	return TRUE;
 }
@@ -561,15 +569,15 @@
 
 	case A_COPY: {
 		REBU64 types = 0;
-		if (D_REF(ARG_COPY_DEEP)) {
-			//puts("deep copy wanted");
-			types |= CP_DEEP | (D_REF(ARG_COPY_TYPES) ? 0 : TS_STD_SERIES);
-		}
 		if D_REF(ARG_COPY_TYPES) {
 			arg = D_ARG(ARG_COPY_KINDS);
 			if (IS_DATATYPE(arg)) types |= TYPESET(VAL_DATATYPE(arg));
 			else types |= VAL_TYPESET(arg);
 		}
+		if (D_REF(ARG_COPY_DEEP)) {
+			//puts("deep copy wanted");
+			types |= CP_DEEP | (D_REF(ARG_COPY_TYPES) ? types : TS_DEEP_COPIED);
+		}
 		if (MT_Map(D_RET, val, types)) return R_RET;
 		Trap_Arg(val);
 	}

src/core/t-object.c

@@ -453,7 +453,7 @@ static REBSER *Trim_Object(REBSER *obj)
 		REBU64 types = 0;
 		if (D_REF(ARG_COPY_PART)) Trap0(RE_BAD_REFINES);
 		if (D_REF(ARG_COPY_DEEP)) {
-			types |= CP_DEEP | (D_REF(ARG_COPY_TYPES) ? 0 : TS_STD_SERIES);
+			types |= CP_DEEP | (D_REF(ARG_COPY_TYPES) ? 0 : TS_DEEP_COPIED);
 		}
 		if D_REF(ARG_COPY_TYPES) {
 			arg = D_ARG(ARG_COPY_KINDS);

src/include/sys-core.h

@@ -163,6 +163,7 @@ enum {
 #define TS_STD_SERIES (TS_SERIES & ~TS_NOT_COPIED)
 #define TS_SERIES_OBJ ((TS_SERIES | TS_OBJECT) & ~TS_NOT_COPIED)
 #define TS_BLOCKS_OBJ ((TS_BLOCK | TS_OBJECT) & ~TS_NOT_COPIED)
+#define TS_DEEP_COPIED ((TS_SERIES | TYPESET(REB_MAP)) & ~TS_NOT_COPIED)
 
 #define TS_CODE ((CP_DEEP | TS_SERIES) & ~TS_NOT_COPIED)