PureBasic: Added missing keyword and fixed constants ending with $ (#…

…3320)
PrismJS · Feb 3, 2022 · d6c5372 · d6c5372
1 parent 82d0ca1
commit d6c5372
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/components/prism-purebasic.js b/components/prism-purebasic.js
@@ -9,14 +9,14 @@ slightly changed to pass all tests
 // PureBasic support, steal stuff from ansi-c
 Prism.languages.purebasic = Prism.languages.extend('clike', {
 	'comment': /;.*/,
-	'keyword': /\b(?:align|and|as|break|calldebugger|case|compilercase|compilerdefault|compilerelse|compilerelseif|compilerendif|compilerendselect|compilererror|compilerif|compilerselect|continue|data|datasection|debug|debuglevel|declare|declarec|declarecdll|declaredll|declaremodule|default|define|dim|disableasm|disabledebugger|disableexplicit|else|elseif|enableasm|enabledebugger|enableexplicit|end|enddatasection|enddeclaremodule|endenumeration|endif|endimport|endinterface|endmacro|endmodule|endprocedure|endselect|endstructure|endstructureunion|endwith|enumeration|extends|fakereturn|for|foreach|global|gosub|goto|if|import|importc|includebinary|includefile|includepath|interface|macro|module|newlist|newmap|next|not|or|procedure|procedurec|procedurecdll|proceduredll|procedurereturn|protected|prototype|prototypec|read|redim|repeat|restore|return|runtime|select|shared|static|step|structure|structureunion|swap|threaded|to|until|wend|while|with|xincludefile|xor)\b/i,
+	'keyword': /\b(?:align|and|as|break|calldebugger|case|compilercase|compilerdefault|compilerelse|compilerelseif|compilerendif|compilerendselect|compilererror|compilerif|compilerselect|continue|data|datasection|debug|debuglevel|declare|declarec|declarecdll|declaredll|declaremodule|default|define|dim|disableasm|disabledebugger|disableexplicit|else|elseif|enableasm|enabledebugger|enableexplicit|end|enddatasection|enddeclaremodule|endenumeration|endif|endimport|endinterface|endmacro|endmodule|endprocedure|endselect|endstructure|endstructureunion|endwith|enumeration|extends|fakereturn|for|foreach|forever|global|gosub|goto|if|import|importc|includebinary|includefile|includepath|interface|macro|module|newlist|newmap|next|not|or|procedure|procedurec|procedurecdll|proceduredll|procedurereturn|protected|prototype|prototypec|read|redim|repeat|restore|return|runtime|select|shared|static|step|structure|structureunion|swap|threaded|to|until|wend|while|with|xincludefile|xor)\b/i,
 	'function': /\b\w+(?:\.\w+)?\s*(?=\()/,
 	'number': /(?:\$[\da-f]+|\b-?(?:\d+(?:\.\d+)?|\.\d+)(?:e[+-]?\d+)?)\b/i,
 	'operator': /(?:@\*?|\?|\*)\w+|-[>-]?|\+\+?|!=?|<<?=?|>>?=?|==?|&&?|\|?\||[~^%?*/@]/
 });
 
 Prism.languages.insertBefore('purebasic', 'keyword', {
-	'tag': /#\w+/,
+	'tag': /#\w+\$?/,
 	'asm': {
 		pattern: /(^[\t ]*)!.*/m,
 		lookbehind: true,

diff --git a/components/prism-purebasic.min.js b/components/prism-purebasic.min.js
diff --git a/tests/languages/purebasic/keyword_feature.test b/tests/languages/purebasic/keyword_feature.test
@@ -99,6 +99,7 @@ INCLUDEFILE
 XINCLUDEFILE
 MACRO
 ENDMACRO
+FOREVER
 
 ----------------------------------------------------
 
@@ -203,7 +204,8 @@ ENDMACRO
 	["keyword", "INCLUDEFILE"],
 	["keyword", "XINCLUDEFILE"],
 	["keyword", "MACRO"],
-	["keyword", "ENDMACRO"]
+	["keyword", "ENDMACRO"],
+  ["keyword", "FOREVER"]
 ]
 
 ----------------------------------------------------

diff --git a/tests/languages/purebasic/tag_feature.test b/tests/languages/purebasic/tag_feature.test
@@ -1,7 +1,9 @@
 #foo
+#NULL$
 
 ----------------------------------------------------
 
 [
-	["tag", "#foo"]
+	["tag", "#foo"],
+	["tag", "#NULL$"]
 ]