Fix regexp patterns for Nevod language.

components/prism-nevod.js

@@ -16,16 +16,21 @@ Prism.languages.nevod = {
 		lookbehind: true,
 		inside: {
 			'pattern-name': {
-				pattern: /#?[a-zA-Z0-9\-.]+/,
+				pattern: /^#?[a-zA-Z0-9\-.]+/,
 				alias: 'class-name',
 			},
 			'attributes': {
 				pattern: /\(.*\)/,
 				inside: {
-					'attr-name': /[a-zA-Z0-9\-.]+/,
-					'attr-hidden-mark': /~/,
-					'attr-punctuation': /[,]/,
-					'attr-bracket': /[()]/,
+					'attr-name': {
+						pattern: /[a-zA-Z0-9\-.]+/,
+						alias: 'variable',
+					},
+					'punctuation': /[,()]/,
+					'operator': {
+						pattern: /~/,
+						alias: 'attr-hidden-mark',
+					},
 				},
 			},
 		},
@@ -36,18 +41,33 @@ Prism.languages.nevod = {
 		lookbehind: true,
 	},
 	'keyword': /@(?:require|namespace|pattern|search|inside|outside|having|where)\b/,
-	'builtin': {
-		pattern: /\b(?:Word|Punct|Symbol|Space|LineBreak|Start|End|Alpha|AlphaNum|Num|NumAlpha|Blank|WordBreak|Any)(?:\(.*\)|\b)/,
+	'standard-pattern': {
+		pattern: /\b(?:Word|Punct|Symbol|Space|LineBreak|Start|End|Alpha|AlphaNum|Num|NumAlpha|Blank|WordBreak|Any)(?:\([a-zA-Z0-9\-.,\s+]*\))?/,
 		inside: {
-			'name': /.+\b/,
-			'params': /\(.*\)/,
+			'standard-pattern-name': {
+				pattern: /^[a-zA-Z0-9\-.]+/,
+				alias: 'builtin',
+			},
+			'quantifier': {
+				pattern: /\b\d+\s*(?:\+|-\s*\d+)?(?=\W)/,
+				alias: 'number',
+			},
+			'standard-pattern-attr': {
+				pattern: /[a-zA-Z0-9\-.]+/,
+				alias: 'builtin',
+			},
+			'punctuation': /[,()]/,
 		},
 	},
 	'quantifier': {
-		pattern: /\b\d+(?:\+|-\d+)?\b/,
+		pattern: /\b\d+\s*(?:\+|-\s*\d+)?(?=\W)/,
 		alias: 'number',
 	},
 	'operator': [
+		{
+			pattern: /=/,
+			alias: 'pattern-def',
+		},
 		{
 			pattern: /&/,
 			alias: 'conjunction',
@@ -80,10 +100,13 @@ Prism.languages.nevod = {
 	'attr-capture': {
 		pattern: /[a-zA-Z0-9\-.]+\s*:/,
 		inside: {
-			'attr-name': /[a-zA-Z0-9\-.]+/,
+			'attr-name': {
+				pattern: /[a-zA-Z0-9\-.]+/,
+				alias: 'variable',
+			},
 			'colon': /:/,
 		},
 	},
-	'punctuation': /[:;,()=]/,
-	'name': /\S+/
+	'punctuation': /[:;,()]/,
+	'name': /[a-zA-Z0-9\-.]+/
 }