Allow : inside field-names #81

dbaumgarten · Aug 15, 2021 · 011089a · 011089a
1 parent 31bc87e
commit 011089a
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 5 deletions.
diff --git a/docs/js/prism-nolol.js b/docs/js/prism-nolol.js
@@ -5,6 +5,6 @@ Prism.languages.nolol = {
     'keyword': /\b(if|then|else|end|goto|define|while|do|include|macro|break|continue|block|line|expr)\b/i,
     'operator': /\b(and|or|not)\b/i,
     'function': /[a-z0-9_]+(?=\()/i,
-    'variable': /:[a-zA-Z0-9_]+|^[a-zA-Z]+[a-zA-Z0-9_]*/,
+    'variable': /:[a-zA-Z0-9_:]+|^[a-zA-Z]+[a-zA-Z0-9_]*/,
     'constant': /[0-9]+(\.[0-9]+)?/
 };
diff --git a/docs/js/prism-yolol.js b/docs/js/prism-yolol.js
@@ -4,6 +4,6 @@ Prism.languages.yolol = {
     'keyword': /((?<=^|\\s|[^a-zA-Z_:])(if|then|else|end|goto)+)|(?<=^|\\s|[^a-zA-Z0-9_:])(not|abs|sqrt|sin|cos|tan|asin|acos|atan)(?=[^a-zA-Z0-9_:]|$)/i,
     'operator': /(?<=[^a-zA-Z0-9_:])(and|or)(?=[^a-zA-Z0-9_:])/i,
     'function': /[a-z0-9_]+(?=\()/i,
-    'variable': /:[a-zA-Z0-9_]+|^[a-zA-Z]+[a-zA-Z0-9_]*/,
+    'variable': /:[a-zA-Z0-9_:]+|^[a-zA-Z]+[a-zA-Z0-9_]*/,
     'constant': /[0-9]+(\.[0-9]+)?/
 };
diff --git a/examples/yolol/operations4.yolol b/examples/yolol/operations4.yolol
@@ -14,4 +14,6 @@ i="abc" j=i-- k=--i :testd=i=="a" and j=="ab" and k=="a"
 foo=2
 foo^=10
 :textexpass=foo==1024
+:::boo:::=123
+:testbullshit=:::boo:::==123
 :done=1
diff --git a/examples/yolol/operations4_test.yaml b/examples/yolol/operations4_test.yaml
@@ -16,5 +16,6 @@ cases:
       testra: 1
       testfact: 1
       textexpass: 1
+      testbullshit: 1
 
 
diff --git a/pkg/parser/ast/tokenizer.go b/pkg/parser/ast/tokenizer.go
@@ -73,7 +73,7 @@ var keywordRegex1 = regexp.MustCompile(`(?i)^(and|or|not|abs|sqrt|sin|cos|tan|as
 var keywordRegex2 = regexp.MustCompile(`(?i)^(if|then|else|end|goto)`)
 var keywordRegexes = []*regexp.Regexp{keywordRegex1, keywordRegex2}
 
-var identifierRegex = regexp.MustCompile("^:[a-zA-Z0-9_]+|^[a-zA-Z]+[a-zA-Z0-9_]*")
+var identifierRegex = regexp.MustCompile("^:[a-zA-Z0-9_:]+|^[a-zA-Z]+[a-zA-Z0-9_]*")
 
 var numberRegex = regexp.MustCompile("^[0-9]+(\\.[0-9]+)?")
 

diff --git a/vscode-yolol/syntaxes/nolol.tmGrammar.json b/vscode-yolol/syntaxes/nolol.tmGrammar.json
@@ -66,7 +66,7 @@
 			"name": "keyword.operator"
 		},
 		"extvariable": {
-			"match": ":[a-zA-Z0-9_]+",
+			"match": ":[a-zA-Z0-9_:]+",
 			"name": "variable.language"
 		},
 		"variable": {

diff --git a/vscode-yolol/syntaxes/yolol.tmGrammar.json b/vscode-yolol/syntaxes/yolol.tmGrammar.json
@@ -66,7 +66,7 @@
 			"name": "keyword.operator"
 		},
 		"extvariable": {
-			"match": ":[a-zA-Z0-9_]+",
+			"match": ":[a-zA-Z0-9_:]+",
 			"name": "variable.language"
 		},
 		"variable": {