CHANGE: renamed remove/part argument from length to range and allowed remove/part on bitset when the argument is string, binary, block or char

related to: Oldes/Rebol-issues#933

Author: Oldes

src/boot/actions.reb

@@ -316,7 +316,7 @@ remove: action [
 	{Removes element(s); returns same position.}
 	series [series! gob! port! bitset! none! map!] {At position (modified)}
 	/part {Removes multiple elements or to a given position}
-	length [number! series! pair! char!]
+	range [number! series! pair! char!]
 	/key {Removes a key from map.}
 	key-arg [any-type!]
 ]

src/core/t-bitset.c

@@ -700,9 +700,18 @@
 		Trap_Arg(arg);
 
 	case A_REMOVE:	// #"a" "abc"  remove/key bs "abcd"
-		if (D_REF(ARG_REMOVE_PART)) Trap0(RE_BAD_REFINES);
-		if (!D_REF(ARG_REMOVE_KEY)) Trap0(RE_MISSING_ARG); // /key required
-		if (Set_Bits(VAL_SERIES(value), D_ARG(ARG_REMOVE_KEY_ARG), FALSE)) break;
+		if (D_REF(ARG_REMOVE_KEY)) {
+			if (D_REF(ARG_REMOVE_PART))
+				Trap0(RE_BAD_REFINES);
+			arg = D_ARG(ARG_REMOVE_KEY_ARG);
+		} else if (D_REF(ARG_REMOVE_PART)) {
+			arg = D_ARG(ARG_REMOVE_RANGE);
+			// remove/part is allowed only with block, string, binary and char
+			if (!(IS_BLOCK(arg) || IS_STRING(arg) || IS_BINARY(arg) || IS_CHAR(arg)))
+				Trap_Arg(arg);
+		}
+		else Trap0(RE_MISSING_ARG); // /key or /part is required
+		if (Set_Bits(VAL_SERIES(value), arg, FALSE)) break;
 		Trap_Arg(D_ARG(3));
 
 	case A_COPY:

src/tests/units/bitset-test.r3

@@ -211,26 +211,34 @@
 		clear bs
 		--assert "make bitset! #{}" = mold bs
 
-	--test-- "remove-1"
+	--test-- "remove/key"
 		;@@ https://github.com/Oldes/Rebol-wishes/issues/20
 		bs: charset "012345789"
 		--assert 64 = length? bs
 		--assert "make bitset! #{000000000000FDC0}" = mold bs
 		--assert "make bitset! #{0000000000007DC0}" = mold remove/key bs #"0"
 		--assert "make bitset! #{0000000000003DC0}" = mold remove/key bs 49
 		--assert "make bitset! #{0000000000000000}" = mold remove/key bs [#"2" - #"7" "8" #"9"]
-	--test-- "remove/part invalid"
-		--assert all [
-			error? e: try [remove/part bs "01"]
-			e/id = 'bad-refines
-		]
+	--test-- "remove/part"
+		;@@ https://github.com/Oldes/Rebol-issues/issues/933
+		bs: charset "012345789"
+		--assert "make bitset! #{0000000000007DC0}" = mold remove/part bs  #"0"
+		--assert "make bitset! #{0000000000003DC0}" = mold remove/part bs   "1"
+		--assert "make bitset! #{0000000000000000}" = mold remove/part bs [#"2" - #"7" "8" #"9"]
+		--assert all [ error? e: try [remove/part bs 1] e/id = 'invalid-arg]
+		--assert all [ error? e: try [remove/part/key bs "01" ""] e/id = 'bad-refines]
+
 	--test-- "issue-1355"
 		;@@ https://github.com/Oldes/Rebol-issues/issues/1355
 		--assert pick charset [not "a"] #"b"
 		--assert not pick charset [not "a"] #"a"
 		--assert "make bitset! #{00000000000000000000000060}" = mold poke charset "a" #"b" true
 		--assert {make bitset! [not bits #{00000000000000000000000040}]} = mold poke charset [not "a"] #"b" true
 
+	--test-- "issue-933"
+		;@@ https://github.com/Oldes/Rebol-issues/issues/933
+		--assert all [error? e: try [remove make bitset! #{FF}]  e/id = 'missing-arg]
+
 ===end-group===