Smarty: Optimized regexps + fixed punctuation and operators

PrismJS · Aug 31, 2015 · 1446700 · 1446700
1 parent 85d8a55
commit 1446700
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/components/prism-smarty.js b/components/prism-smarty.js
@@ -18,8 +18,8 @@
 					pattern: /^\{|\}$/i,
 					alias: 'punctuation'
 				},
-				'string': /(["'])(\\?.)*?\1/,
-				'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/,
+				'string': /(["'])(?:\\?.)*?\1/,
+				'number': /\b-?(?:0x[\dA-Fa-f]+|\d*\.?\d+(?:[Ee][-+]?\d+)?)\b/,
 				'variable': [
 					/\$(?!\d)\w+/,
 					/#(?!\d)\w+#/,
@@ -48,12 +48,14 @@
 							pattern: /(=\s*)(?!\d)\w+/,
 							lookbehind: true
 						},
-						"punctuation": /=/
+						"operator": /=/
 					}
 				},
-				'punctuation': /[\[\]().,=\|:`]|\->/,
+				'punctuation': [
+					/[\[\]().,:`]|\->/
+				],
 				'operator': [
-					/[+\-*\/%]|===?|[!<>]=?|&&|\|\|/,
+					/[+\-*\/%]|==?=?|[!<>]=?|&&|\|\|?/,
 					/\bis\s+(?:not\s+)?(?:div|even|odd)(?:\s+by)?\b/,
 					/\b(?:eq|neq?|gt|lt|gt?e|lt?e|not|mod|or|and)\b/
 				],

diff --git a/components/prism-smarty.min.js b/components/prism-smarty.min.js