FIX: trim on block! removing nones only from head and tail, trim/all everywhere

resolves: Oldes/Rebol-issues#2482

Author: Oldes

src/core/s-trim.c

@@ -3,6 +3,7 @@
 **  REBOL [R3] Language Interpreter and Run-time Environment
 **
 **  Copyright 2012 REBOL Technologies
+**  Copyright 2012-2022 Rebol Open Source Developers
 **  REBOL is a trademark of REBOL Technologies
 **
 **  Licensed under the Apache License, Version 2.0 (the "License");
@@ -331,3 +332,42 @@ static REBFLG find_in_uni(REBUNI *up, REBINT len, REBUNI c)
 		Trap0(RE_BAD_REFINES);
 	}
 }
+
+/***********************************************************************
+**
+*/	void Trim_Block(REBSER *ser, REBCNT index, REBCNT flags)
+/*
+***********************************************************************/
+{
+	REBVAL *blk = BLK_HEAD(ser);
+	REBCNT out = index;
+	REBCNT end = ser->tail;
+
+	if (flags & AM_TRIM_ALL) {
+		if (flags != (flags & AM_TRIM_ALL)) Trap0(RE_BAD_REFINES);
+		for (; index < end; index++) {
+			if (VAL_TYPE(blk + index) > REB_NONE) {
+				*BLK_SKIP(ser, out) = blk[index];
+				out++;
+			}
+		}
+		Remove_Series(ser, out, end - out);
+		return;
+	}
+	
+	if (flags & ~(AM_TRIM_HEAD | AM_TRIM_TAIL)) Trap0(RE_BAD_REFINES);
+
+	if (!flags || flags & AM_TRIM_TAIL) {
+		for (; end >= (index + 1); end--) {
+			if (VAL_TYPE(blk + end - 1) > REB_NONE) break;
+		}
+		Remove_Series(ser, end, ser->tail - end);
+	}
+
+	if (!flags || flags & AM_TRIM_HEAD) {
+		for (; index < end; index++) {
+			if (VAL_TYPE(blk + index) > REB_NONE) break;
+		}
+		Remove_Series(ser, out, index - out);
+	}
+}

src/core/t-block.c

@@ -3,6 +3,7 @@
 **  REBOL [R3] Language Interpreter and Run-time Environment
 **
 **  Copyright 2012 REBOL Technologies
+**  Copyright 2012-2022 Rebol Open Source Developers
 **  REBOL is a trademark of REBOL Technologies
 **
 **  Licensed under the Apache License, Version 2.0 (the "License");
@@ -505,45 +506,6 @@ static struct {
 }
 
 
-/***********************************************************************
-**
-*/	static void Trim_Block(REBSER *ser, REBCNT index, REBCNT flags)
-/*
-**		See Trim_String().
-**
-***********************************************************************/
-{
-	REBVAL *blk = BLK_HEAD(ser);
-	REBCNT out = index;
-	REBCNT end = ser->tail;
-
-	if (flags & AM_TRIM_TAIL) {
-		for (; end >= (index+1); end--) {
-			if (VAL_TYPE(blk+end-1) > REB_NONE) break;
-		}
-		Remove_Series(ser, end, ser->tail - end);
-		if (!(flags & AM_TRIM_HEAD) || index >= end) return;
-	}
-
-	if (flags & AM_TRIM_HEAD) {
-		for (; index < end; index++) {
-			if (VAL_TYPE(blk+index) > REB_NONE) break;
-		}
-		Remove_Series(ser, out, index - out);
-	}
-
-	if (flags == 0) {
-		for (; index < end; index++) {
-			if (VAL_TYPE(blk+index) > REB_NONE) {
-				*BLK_SKIP(ser, out) = blk[index];
-				out++;
-			}
-		}
-		Remove_Series(ser, out, end - out);
-	}
-}
-
-
 /***********************************************************************
 **
 */	void Shuffle_Block(REBVAL *value, REBFLG secure)
@@ -865,7 +827,6 @@ static struct {
 
 	case A_TRIM:
 		args = Find_Refines(ds, ALL_TRIM_REFS);
-		if (args & ~(AM_TRIM_HEAD|AM_TRIM_TAIL)) Trap0(RE_BAD_REFINES);
 		Trim_Block(ser, index, args);
 		break;
 

src/core/t-string.c

@@ -3,6 +3,7 @@
 **  REBOL [R3] Language Interpreter and Run-time Environment
 **
 **  Copyright 2012 REBOL Technologies
+**  Copyright 2012-2022 Rebol Open Source Developers
 **  REBOL is a trademark of REBOL Technologies
 **
 **  Licensed under the Apache License, Version 2.0 (the "License");

src/tests/units/series-test.r3

@@ -324,6 +324,11 @@ Rebol [
 		;@@ https://github.com/Oldes/Rebol-issues/issues/825
 		--assert [1 #[none] 2 #[none]] = trim/head copy blk
 		--assert [#[none] 1 #[none] 2] = trim/tail copy blk
+		;@@ https://github.com/Oldes/Rebol-issues/issues/2482
+		--assert [1 #[none] 2] = trim     copy blk
+		--assert [1 2]         = trim/all copy blk
+		--assert all [error? e: try [trim/head/all []] e/id = 'bad-refines]
+		--assert all [error? e: try [trim/tail/all []] e/id = 'bad-refines]
 
 ===end-group===