FIX: trim on binary! should deal with NULL char instead of white-spaces like on string!

resolves: Oldes/Rebol-issues#1482

Author: Oldes

src/boot/actions.reb

@@ -345,7 +345,7 @@ clear: action [
 ]
 
 trim: action [
-	{Removes spaces from strings or nones from blocks or objects.}
+	{Removes spaces from strings, nulls from binary, nones from blocks or objects.}
 	series [series! object! error! module!] {Series (modified) or object (made)}
 	/head {Removes only from the head}
 	/tail {Removes only from the tail}

src/core/s-trim.c

@@ -293,3 +293,41 @@ static REBFLG find_in_uni(REBUNI *up, REBINT len, REBUNI c)
 		trim_head_tail(ser, index, tail, flags & AM_TRIM_HEAD, flags & AM_TRIM_TAIL);
 	}
 }
+
+/***********************************************************************
+**
+*/	void Trim_Binary(REBSER *ser, REBCNT index, REBCNT len, REBCNT flags, REBVAL *with)
+/*
+***********************************************************************/
+{
+	REBCNT tail = index + len;
+	REBCNT n;
+
+	// /all or /with
+	if (flags & (AM_TRIM_ALL | AM_TRIM_WITH)) {
+		if (IS_NONE(with)) SET_INTEGER(with, 0); // only NULL by default on binary
+		replace_with(ser, index, tail, with);
+		return;
+	}
+	// /head
+	if (!flags || flags & AM_TRIM_HEAD) {
+		for (n = 0; n < len; n++) {
+			if (BIN_HEAD(ser)[index + n]) break;
+		}
+		if (n > 0) {
+			Remove_Series(ser, index, n);
+			tail -= n;
+		}
+	}
+	// /tail
+	if (!flags || flags & AM_TRIM_TAIL) {
+		for (; index < tail; tail--) {
+			if (BIN_HEAD(ser)[tail - 1]) break;
+		}
+		SERIES_TAIL(ser) = tail;
+	}
+	// these are not supported on binary values
+	if (flags & (AM_TRIM_AUTO | AM_TRIM_LINES)) {
+		Trap0(RE_BAD_REFINES);
+	}
+}

src/core/t-string.c

@@ -794,8 +794,10 @@ static struct {
 			(args & (AM_TRIM_HEAD | AM_TRIM_TAIL | AM_TRIM_LINES | AM_TRIM_ALL | AM_TRIM_WITH)))
 		)
 			Trap0(RE_BAD_REFINES);
-
-		Trim_String(VAL_SERIES(value), VAL_INDEX(value), VAL_LEN(value), args, D_ARG(ARG_TRIM_STR));
+		if (IS_BINARY(value))
+			Trim_Binary(VAL_SERIES(value), VAL_INDEX(value), VAL_LEN(value), args, D_ARG(ARG_TRIM_STR));
+		else
+			Trim_String(VAL_SERIES(value), VAL_INDEX(value), VAL_LEN(value), args, D_ARG(ARG_TRIM_STR));
 		break;
 
 	case A_SWAP:

src/tests/units/series-test.r3

@@ -280,6 +280,42 @@ Rebol [
 ===end-group===
 
 
+===start-group=== "TRIM"
+	--test-- "trim string!"
+		str1: " a b c "
+		str2: " ^(A0) ^-a b  ^- c  ^(2000) "
+		mstr: {   a ^-1^/    ab2^-  ^/  ac3  ^/  ^/^/}
+		--assert "a b c"  = trim copy str1
+		--assert "a b c"  = trim/head/tail copy str1
+		--assert "a b c " = trim/head copy str1
+		--assert " a b c" = trim/tail copy str1
+	;	--assert "a b  ^- c" = trim copy str2 ;- not like Red!
+		--assert "a ^-1^/ab2^/ac3^/" = trim copy mstr
+		--assert "a1ab2ac3" = trim/all { a ^-1^/ ab2^- ^/ ac3 ^/ ^/^/}
+		--assert "    ^-1^/    b2^-  ^/  c3  ^/  ^/^/" = trim/with copy mstr #"a"
+		--assert "    ^-1^/    b2^-  ^/  c3  ^/  ^/^/" = trim/with copy mstr 97
+	--test-- "trim binary!"
+	;@@ https://github.com/Oldes/Rebol-issues/issues/1482
+		bin: #{0011001100}
+		--assert #{110011}   = trim           copy bin
+		--assert #{110011}   = trim/head/tail copy bin
+		--assert #{11001100} = trim/head      copy bin
+		--assert #{00110011} = trim/tail      copy bin
+		--assert #{1111}     = trim/all       copy bin
+		--assert #{000000}   = trim/all/with  copy bin #{11}
+		--assert #{} = trim      #{0000}
+		--assert #{} = trim/tail #{0000}
+		--assert #{} = trim/head #{0000}
+	--test-- "trim binary! with index > 1"
+		bin: #{0000110000}
+		--assert #{00001100} = head trim/tail at copy bin 5
+		--assert #{00110000} = head trim/head at copy bin 2
+		--assert #{0011}     = head trim/all  at copy bin 2
+
+===end-group===
+
+
+
 ===start-group=== "REPLACE string!"
 	;@@ https://github.com/Oldes/Rebol-issues/issues/54
 	--test-- "issue-54"