OZ: Improved tokenization

components/prism-oz.js

@@ -1,5 +1,8 @@
 Prism.languages.oz = {
-	'comment': /\/\*[\s\S]*?\*\/|%.*/,
+	'comment': {
+		pattern: /\/\*[\s\S]*?\*\/|%.*/,
+		greedy: true
+	},
 	'string': {
 		pattern: /"(?:[^"\\]|\\[\s\S])*"/,
 		greedy: true
@@ -18,8 +21,8 @@ Prism.languages.oz = {
 		}
 	],
 	'number': /\b(?:0[bx][\da-f]+|\d+(?:\.\d*)?(?:e~?\d+)?)\b|&(?:[^\\]|\\(?:\d{3}|.))/i,
-	'variable': /\b[A-Z][A-Za-z\d]*|`(?:[^`\\]|\\.)+`/,
-	'attr-name': /\b\w+(?=:)/,
+	'variable': /`(?:[^`\\]|\\.)+`/,
+	'attr-name': /\b\w+(?=[ \t]*:(?![:=]))/,
 	'operator': /:(?:=|::?)|<[-:=]?|=(?:=|<?:?)|>=?:?|\\=:?|!!?|[|#+\-*\/,~^@]|\b(?:andthen|div|mod|orelse)\b/,
 	'punctuation': /[\[\](){}.:;?]/
 };

tests/languages/oz/attr-name_feature.test

@@ -1,14 +1,25 @@
 menubutton(text:'Test' underline:0)
 
+% negative example
+val:=Value
+
 ----------------------------------------------------
 
 [
-	["function", "menubutton"], ["punctuation", "("],
-	["attr-name", "text"], ["punctuation", ":"], ["atom", "'Test'"],
-	["attr-name", "underline"], ["punctuation", ":"], ["number", "0"],
-	["punctuation", ")"]
+	["function", "menubutton"],
+	["punctuation", "("],
+	["attr-name", "text"],
+	["punctuation", ":"],
+	["atom", "'Test'"],
+	["attr-name", "underline"],
+	["punctuation", ":"],
+	["number", "0"],
+	["punctuation", ")"],
+
+	["comment", "% negative example"],
+	"\r\nval", ["operator", ":="], "Value"
 ]
 
 ----------------------------------------------------
 
-Checks for parameter names.
+Checks for parameter names.

tests/languages/oz/variable_feature.test

@@ -1,15 +1,7 @@
-A
-Foobar
-Foo42
-
-----------------------------------------------------
-
-[
-	["variable", "A"],
-	["variable", "Foobar"],
-	["variable", "Foo42"]
-]
-
-----------------------------------------------------
-
-Checks for variables.
+`foo`
+
+----------------------------------------------------
+
+[
+	["variable", "`foo`"]
+]