FIX: report full failed expression when assert fails

resolves: Oldes/Rebol-issues#2231
Oldes · Dec 9, 2020 · cedd821 · cedd821
1 parent b4c6da2
commit cedd821
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/core/n-data.c b/src/core/n-data.c
@@ -176,7 +176,7 @@ static int Check_Char_Range(REBVAL *val, REBINT limit)
 			index = Do_Next(block, i = index, 0); // stack volatile
 			ds = DS_POP; // volatile stack reference
 			if (IS_FALSE(ds)) {
-				Set_Block(ds, Copy_Block_Len(block, i, 3));
+				Set_Block(ds, Copy_Block(VAL_SERIES(value), VAL_INDEX(value))); // #2231
 				Trap1(RE_ASSERT_FAILED, ds);
 			}
 			if (THROWN(ds)) return R_TOS1;

diff --git a/src/tests/units/error-test.r3 b/src/tests/units/error-test.r3
@@ -71,6 +71,14 @@ Rebol [
 			e/id   = 'assert-failed
 			e/arg1 = [not none? none]
 		]
+
+	--test-- "assert with longer expression"
+		;@@ https://github.com/Oldes/Rebol-issues/issues/2231
+		--assert all [
+			error? e: try [assert [true 1 + 3 = 2 true]]
+			e/id   = 'assert-failed
+			e/arg1 = [true 1 + 3 = 2 true]
+		]
 
 	--test-- "valid assert/type"
 		x: 1