From: NeilBrown <neil@brown.name>
Date: Wed, 29 May 2019 08:19:54 +0000 (+1000)
Subject: scanner: handle unknown marks once.
X-Git-Url: https://ocean-lang.org/code/?p=ocean;a=commitdiff_plain;h=91f07aed5745363d8d612c600dd66e863088f978

scanner: handle unknown marks once.

There were two places in the code that tried to handle
unknown marks.  We only need one.

Signed-off-by: NeilBrown <neil@brown.name>
---

diff --git a/csrc/scanner.mdc b/csrc/scanner.mdc
index e90690a..6eee089 100644
--- a/csrc/scanner.mdc
+++ b/csrc/scanner.mdc
@@ -402,15 +402,6 @@ before assuming that we have an unknown mark
 	## parse comment
 	## unknown mark
 
-###### unknown mark
-	if (tk.txt.len) {
-		if (ignored & (1<<TK_mark))
-			tk.num = TK_error;
-		else
-			tk.num = TK_mark;
-		return tk;
-	}
-
 ### Strings
 
 Strings start with one of single quote, double quote, or back quote
@@ -878,7 +869,10 @@ we have an unknown mark, otherwise this must be an error.
 ###### unknown mark
 	/* one unknown character */
 	close_token(state, &tk);
-	tk.num = TK_error;
+	if (ignored & (1<<TK_mark))
+		tk.num = TK_error;
+	else
+		tk.num = TK_mark;
 	return tk;
 
 ## Tools For The Task