FEAT: support map! in remove-each

Oldes · Jan 20, 2021 · 355df84 · 355df84
1 parent b7118b7
commit 355df84
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/boot/natives.reb b/src/boot/natives.reb
@@ -272,7 +272,7 @@ repeat: native [
 remove-each: native [
 	{Removes values for each block that returns true; returns removal count.}
 	'word [word! block!] {Word or block of words to set each time (local)}
-	data [series!] {The series to traverse (modified)}
+	data [series! map!] {The series to traverse (modified)}
 	body [block!] {Block to evaluate (return TRUE to remove)}
 ]
 

diff --git a/src/core/n-loop.c b/src/core/n-loop.c
@@ -477,6 +477,7 @@ skip_hidden: ;
 		// Remove hole (updates tail):
 		if (windex < index) Remove_Series(series, windex, index - windex);
 		SET_INTEGER(DS_RETURN, index - windex);
+		if (IS_MAP(value)) return R_ARG2;
 		return R_RET;
 	}
 

diff --git a/src/tests/units/map-test.r3 b/src/tests/units/map-test.r3
@@ -307,4 +307,13 @@ Rebol [
 
 ===end-group===
 
+===start-group=== "remove-each with map!"
+	;@@ https://github.com/red/REP/issues/93
+	--test-- "remove-each with map"
+		m: #(a 1 "b" 2 c #[none] d: 3)
+		--assert m = remove-each [k v] m [any [string? k none? v]]
+		--assert [a d] = words-of m
+
+===end-group===
+
 ~~~end-file~~~