VHDL: Move operator overloading before strings, don't capture if not …

…needed, handle \r\n and \r, fix numbers

components/prism-vhdl.js

@@ -5,20 +5,19 @@ Prism.languages.vhdl = {
 		'pattern': /\b[oxb]"[\da-f_]+"|"[01uxzwlh-]+"/i,
 		'alias': 'number'
 	},
-	'string': /"(\\\n|\\?.)*?"/,
-	'constant': /\b(use|library)\b/i,
-	// support for predefined attributes included
-	'keyword': /\b('active|'ascending|'base|'delayed|'driving|'driving_value|'event|'high|'image|'instance_name|'last_active|'last_event|'last_value|'left|'leftof|'length|'low|'path_name|'pos|'pred|'quiet|'range|'reverse_range|'right|'rightof|'simple_name|'stable|'succ|'transaction|'val|'value|access|after|alias|all|architecture|array|assert|attribute|begin|block|body|buffer|bus|case|component|configuration|constant|disconnect|downto|else|elsif|end|entity|exit|file|for|function|generate|generic|group|guarded|if|impure|in|inertial|inout|is|label|library|linkage|literal|loop|map|new|next|null|of|on|open|others|out|package|port|postponed|procedure|process|pure|range|record|register|reject|report|return|select|severity|shared|signal|subtype|then|to|transport|type|unaffected|units|until|use|variable|wait|when|while|with)\b/i,
-	'boolean': /\b(true|false)\b/i,
-	'function': {
-		// support for operator overloading included
-		pattern: /([a-z0-9_]+|"\S+")\(/i,
-		inside: {
-			punctuation: /\(/
-		}
+	// support for operator overloading included
+	'quoted-function': {
+		pattern: /"\S+?"(?=\()/,
+		alias: 'function'
 	},
+	'string': /"(?:[^\\\r\n]|\\?(?:\r\n|[\s\S]))*?"/,
+	'constant': /\b(?:use|library)\b/i,
+	// support for predefined attributes included
+	'keyword': /\b(?:'active|'ascending|'base|'delayed|'driving|'driving_value|'event|'high|'image|'instance_name|'last_active|'last_event|'last_value|'left|'leftof|'length|'low|'path_name|'pos|'pred|'quiet|'range|'reverse_range|'right|'rightof|'simple_name|'stable|'succ|'transaction|'val|'value|access|after|alias|all|architecture|array|assert|attribute|begin|block|body|buffer|bus|case|component|configuration|constant|disconnect|downto|else|elsif|end|entity|exit|file|for|function|generate|generic|group|guarded|if|impure|in|inertial|inout|is|label|library|linkage|literal|loop|map|new|next|null|of|on|open|others|out|package|port|postponed|procedure|process|pure|range|record|register|reject|report|return|select|severity|shared|signal|subtype|then|to|transport|type|unaffected|units|until|use|variable|wait|when|while|with)\b/i,
+	'boolean': /\b(?:true|false)\b/i,
+	'function': /[a-z0-9_]+(?=\()/i,
 	// decimal, based, physical, and exponential numbers supported
-	'number': /'[01uxzwlh-]'|\b\d+[_.]*(#[\da-f_.]+#)?(e[-+]?\d+)?/i,
-	'operator': /<=?|>=?|:=|[-+*/&=]|\b(abs|not|mod|rem|sll|srl|sla|sra|rol|ror|and|or|nand|xnor|xor|nor)\b/i,
+	'number': /'[01uxzwlh-]'|\b(?:\d+#[\da-f_.]+#|\d[\d_.]*)(?:e[-+]?\d+)?/i,
+	'operator': /[<>]=?|:=|[-+*/&=]|\b(?:abs|not|mod|rem|sll|srl|sla|sra|rol|ror|and|or|nand|xnor|xor|nor)\b/i,
 	'punctuation': /[{}[\];(),.:]/
 };