FIX: TAKE/DEEP does not copies series values within the block

fixes: Oldes/Rebol-issues#171

Author: Oldes

src/core/t-block.c

@@ -703,8 +703,8 @@ static struct {
 
 	case A_TAKE:
 		// take/part:
-		if (D_REF(2)) {
-			len = Partial1(value, D_ARG(3));
+		if (D_REF(ARG_TAKE_PART)) {
+			len = Partial1(value, D_ARG(ARG_TAKE_LENGTH));
 			if (len == 0) {
 zero_blk:
 				Set_Block(D_RET, Make_Block(0));
@@ -715,22 +715,35 @@ static struct {
 
 		index = VAL_INDEX(value); // /part can change index
 		// take/last:
-		if (D_REF(5)) index = tail - len;
+		if (D_REF(ARG_TAKE_LAST)) index = tail - len;
 		if (index < 0 || index >= tail) {
-			if (!D_REF(2)) goto is_none;
+			if (!D_REF(ARG_TAKE_PART)) goto is_none;
 			goto zero_blk;
 		}
 
 		// if no /part, just return value, else return block:
-		if (!D_REF(2)) *D_RET = BLK_HEAD(ser)[index];
-		else Set_Series(VAL_TYPE(value), D_RET, Copy_Block_Len(ser, index, len)); // no more /DEEP
-//		else Set_Block(D_RET, Copy_Block_Deep(ser, index, len, D_REF(4) ? COPY_DEEP: 0));
+		if (!D_REF(ARG_TAKE_PART)) {
+			*D_RET = BLK_HEAD(ser)[index];
+			if (D_REF(ARG_TAKE_DEEP) && ANY_SERIES(D_RET)) {
+				VAL_SERIES(D_RET) = ANY_BLOCK(D_RET)
+					? Clone_Block(VAL_SERIES(D_RET))
+					: Copy_Series(VAL_SERIES(D_RET));
+			}
+		}
+		else {
+			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_Len(ser, index, len)
+			);
+		}
 		Remove_Series(ser, index, len);
 		return R_RET;
 
 	case A_PUT:
-		arg2 = D_ARG(3);
-		args = D_REF(4) ? AM_FIND_CASE : 0;
+		arg2 = D_ARG(ARG_PUT_VALUE);
+		args = D_REF(ARG_PUT_CASE) ? AM_FIND_CASE : 0;
 		ret = Find_Block(ser, index, tail, arg, len, args, 1);
 		if(ret != NOT_FOUND) {
 			ret++;

src/tests/units/series-test.r3

@@ -195,6 +195,52 @@ Rebol [
 	--assert 3    = take/last blk: [1 2 3]
 	--assert [1 2] = blk
 
+	;@@ https://github.com/Oldes/Rebol-issues/issues/171
+	--test-- "take/deep block!"
+		a: [1 [2] "3"] b: reduce [a] c: take b
+		--assert same? a c
+		a: [1 [2] "3"] b: reduce [a] c: take/deep b
+		--assert not same? a c
+		--assert not same? a/2 c/2
+		--assert not same? a/3 c/3
+		--assert [2 3] = append c/2 3
+		--assert [2] = a/2
+	--test-- "take/deep block with string!"
+		a: "1" b: reduce [a 2] c: take b
+		--assert same? a c
+		a: "1" b: reduce [a 2] c: take/deep b
+		--assert "1" = a
+		--assert "1" = c
+		--assert not same? a c
+		--assert "12" = append c 2
+		--assert "1"  = a
+	--test-- "take/deep block with object!"
+		a: object [] b: reduce [a 2] c: take b
+		--assert same? a c
+		a: object [] b: reduce [a 2] c: take/deep b
+		--assert same? a c ; object are not copied
+	--test-- "take/deep/part block!"
+		a: [1 [2] "3"] b: reduce [a] c: take/part b 1
+		--assert same? a c/1
+		--assert [] = b
+		a: [1 [2] "3"] b: reduce [a] c: take/deep/part b 1
+		--assert not same? a c/1
+		--assert not same? a/2 c/1/2
+		--assert not same? a/3 c/1/3
+		--assert [2 3] = append c/1/2 3
+		--assert "34"  = append c/1/3 4
+		--assert "3"   = a/3
+	--test-- "take/deep/part block with string!"
+		a: "1" b: reduce [a 2] c: take/part b 1
+		--assert same? a c/1
+		--assert [2] = b
+		a: "1" b: reduce [a 2] c: take/deep/part b 1
+		--assert [2] = b
+		--assert "1" = a
+		--assert "1" = c/1
+		--assert not same? a c/1
+		--assert "12" = append c/1 2
+		--assert "1"  = a
 
 	--test-- "take block!"
 	s: [1]

src/tools/make-headers.r

@@ -339,6 +339,7 @@ foreach word [
 	read
 	write
 	query
+	take
 ] [make-arg-enums word]
 
 acts: load %../boot/natives.r