Remove correct radix literal matching for better performance

guns · guns · commit 7a2abd5b393d · 2017-02-08T19:39:35.000-06:00
Halves syntime benchmark:

           TOTAL      COUNT
BEFORE:    0.116939   49694
AFTER:     0.052234   27016
diff --git a/clj/test/vim_clojure_static/syntax_test.clj b/clj/test/vim_clojure_static/syntax_test.clj
@@ -35,6 +35,7 @@
     "0x0"        number "+0x0"  number "-0x0"  number ; Hexadecimal zero
     "3/2"        number "+3/2"  number "-3/2"  number ; Rational
     "0/0"        number "+0/0"  number "-0/0"  number ; Rational (not a syntax error)
+    "36r0XYZ"    number "16rFF" number "8r077" number ; Radix
     "2r1"        number "+2r1"  number "-2r1"  number ; Radix
     "36R1"       number "+36R1" number "-36R1" number ; Radix
 
@@ -47,7 +48,7 @@
     "1.0/1" !number
     "01/2" !number
     "1/02" !number
-    "2r2" !number
+    ; "2r2" !number ;; Removed for performance
     "1r0" !number
     "37r36" !number
 
@@ -68,7 +69,7 @@
     "08.9M" !number
     "0x1fM" !number
     "3/4M" !number
-    "2r1M" !number
+    ; "2r1M" !number ;; Removed for performance
 
     ;; Exponential notation
 
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
@@ -80,12 +80,8 @@ syntax match clojureCharacter "\v\\%(.$|o%([0-3]\o{2}|\o{1,2})|u\x{4}|newline|ta
 
 syntax match clojureSymbol "\v%([a-zA-Z!$&*_+=|<.>?-]|[^\x00-\x7F])+%(:?%([a-zA-Z0-9!#$%&*_+=|'<.>/?-]|[^\x00-\x7F]))*[#:]@<!"
 
-let s:radix_chars = "0123456789abcdefghijklmnopqrstuvwxyz"
-for s:radix in range(2, 36)
-	execute 'syntax match clojureNumber "\v\c<[-+]?' . s:radix . 'r[' . strpart(s:radix_chars, 0, s:radix) . ']+>"'
-endfor
-unlet! s:radix_chars s:radix
-
+" NB. Correct matching of radix literals was removed for better performance.
+syntax match clojureNumber "\v<[-+]?%([2-9]|[12]\d|3[0-6])[rR][[:alnum:]]+>"
 syntax match clojureNumber "\v<[-+]?%(0\o*|0x\x+|[1-9]\d*)N?>"
 syntax match clojureNumber "\v<[-+]?%(0|[1-9]\d*|%(0|[1-9]\d*)\.\d*)%(M|[eE][-+]?\d+)?>"
 syntax match clojureNumber "\v<[-+]?%(0|[1-9]\d*)/%(0|[1-9]\d*)>"
