Merge pull request #1773 from arturo-lang/sanitize-question-marks-in-…

…words

Sanitize `?`s in words/labels

src/vm/parse.nim

@@ -62,6 +62,8 @@ const
     Backslash                   = '\\'
     Dash                        = '-'
 
+    QuestionMark                = '?'
+
     CR                          = '\c'
     LF                          = '\L'
     EOF                         = '\0'
@@ -77,7 +79,7 @@ const
     Letters                     = {'a'..'z', 'A'..'Z'}
     PermittedIdentifiers_Start  = Letters + {'_'}
     PermittedColorChars         = Letters + Numbers
-    PermittedIdentifiers_In     = PermittedIdentifiers_Start + Numbers + {'?'}
+    PermittedIdentifiers_In     = PermittedIdentifiers_Start + Numbers
     PermittedQuantityChars      = Letters + Numbers + {'.', '/'}
 
     SemVerExtra                 = Letters + PermittedNumbers_Start + {'+', '-', '.'}
@@ -506,6 +508,9 @@ template parseIdentifier(p: var Parser, alsoAddCurrent: bool) =
     while p.buf[pos] in PermittedIdentifiers_In:
         add(p.value, p.buf[pos])
         inc(pos)
+    if p.buf[pos] == QuestionMark:
+        add(p.value, QuestionMark)
+        inc(pos)
     p.bufpos = pos
 
 template parseNumber(p: var Parser) =

tests/unittests/parser.art

@@ -0,0 +1,3 @@
+inspect [something?anotherone????]
+inspect [something?: something]
+inspect ['some?thing??]

tests/unittests/parser.res

@@ -0,0 +1,15 @@
+[ :block
+        something? :word
+        anotherone? :word
+        ?? :symbol
+        ? :symbol
+]
+[ :block
+        something? :label
+        something :word
+]
+[ :block
+        some? :literal
+        thing? :word
+        ? :symbol
+]

version/build

@@ -1 +1 @@
-3268
+3271