FIX: does not allow refinement ending with a colon char

resolves: Oldes/Rebol-issues#2281
Oldes · Apr 10, 2024 · fdf662b · fdf662b
1 parent 409c96e
commit fdf662b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/boot/strings.reb b/src/boot/strings.reb
@@ -50,6 +50,7 @@ scan: ; Used by scanner. Keep in sync with Value_Types in scan.h file!
 	"issue"
 	"tag"
 	"path"
+	"ref"
 	"refine"
 	"construct"
 	"map"

diff --git a/src/core/l-scan.c b/src/core/l-scan.c
@@ -997,7 +997,10 @@
 				scan_state->begin--;
 				type = TOKEN_REFINE;
 				// Fast easy case:
-		        if (ONLY_LEX_FLAG(flags, LEX_SPECIAL_WORD)) return type;
+				if (ONLY_LEX_FLAG(flags, LEX_SPECIAL_WORD))
+					return type;
+				if (*(scan_state->end - 1) == ':')
+					return -type;
 				goto scanword;
             }
 			if (*cp == '<' || *cp == '>') {
@@ -1414,14 +1417,15 @@
 		np = Skip_Left_Arrow(cp);
 		if (!np) return -type;
 		scan_state->end = np;
-		return type;
 	}
 	else {
 		np = Skip_Right_Arrow(cp);
 		if (!np) return -type;
 		scan_state->end = np;
-		return type;
 	}
+	if (type == TOKEN_REFINE && (*(scan_state->end - 1)) == ':')
+		type = -type;
+	return type;
 }
 
 

diff --git a/src/tests/units/lexer-test.r3 b/src/tests/units/lexer-test.r3
@@ -153,6 +153,10 @@ Rebol [
 		--assert all [error? e: try [load {%a^^b}] e/id = 'invalid]
 		--assert all [error? e: try [load {%a^^ }] e/id = 'invalid]
 
+	--test-- "Invalid refine"
+	;@@ https://github.com/Oldes/Rebol-issues/issues/2281
+		--assert all [error? e: try [load {/a:}] e/id = 'invalid]
+
 ===end-group===
-Original file line number
+Diff line change
@@ Expand Up @@
     	"issue"
     	"tag"
     	"path"
+    	"ref"
     	"refine"
     	"construct"
     	"map"
@@ Expand Down @@