Commit 7a2abd5

committed

Remove correct radix literal matching for better performance

Halves syntime benchmark: TOTAL COUNT BEFORE: 0.116939 49694 AFTER: 0.052234 27016

1 parent 262a75c commit 7a2abd5Copy full SHA for 7a2abd5

File tree

-8

lines changed

-8

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@`
`35`	`35`	`"0x0" number "+0x0" number "-0x0" number ; Hexadecimal zero`
`36`	`36`	`"3/2" number "+3/2" number "-3/2" number ; Rational`
`37`	`37`	`"0/0" number "+0/0" number "-0/0" number ; Rational (not a syntax error)`
	`38`	`+ "36r0XYZ" number "16rFF" number "8r077" number ; Radix`
`38`	`39`	`"2r1" number "+2r1" number "-2r1" number ; Radix`
`39`	`40`	`"36R1" number "+36R1" number "-36R1" number ; Radix`
`40`	`41`
`@@ -47,7 +48,7 @@`
`47`	`48`	`"1.0/1" !number`
`48`	`49`	`"01/2" !number`
`49`	`50`	`"1/02" !number`
`50`		`- "2r2" !number`
	`51`	`+ ;"2r2" !number ;; Removed for performance`
`51`	`52`	`"1r0" !number`
`52`	`53`	`"37r36" !number`
`53`	`54`
`@@ -68,7 +69,7 @@`
`68`	`69`	`"08.9M" !number`
`69`	`70`	`"0x1fM" !number`
`70`	`71`	`"3/4M" !number`
`71`		`- "2r1M" !number`
	`72`	`+ ;"2r1M" !number ;; Removed for performance`
`72`	`73`
`73`	`74`	`;; Exponential notation`
`74`	`75`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,12 +80,8 @@ syntax match clojureCharacter "\v\\%(.$\|o%([0-3]\o{2}\|\o{1,2})\|u\x{4}\|newline\|ta`
`80`	`80`
`81`	`81`	`syntax match clojureSymbol "\v%([a-zA-Z!$&_+=\|<.>?-]\|[^\x00-\x7F])+%(:?%([a-zA-Z0-9!#$%&_+=\|'<.>/?-]\|[^\x00-\x7F]))*[#:]@<!"`
`82`	`82`
`83`		`-let s:radix_chars = "0123456789abcdefghijklmnopqrstuvwxyz"`
`84`		`-for s:radix in range(2, 36)`
`85`		`- execute 'syntax match clojureNumber "\v\c<[-+]?' . s:radix . 'r[' . strpart(s:radix_chars, 0, s:radix) . ']+>"'`
`86`		`-endfor`
`87`		`-unlet! s:radix_chars s:radix`
`88`		`-`
	`83`	`+" NB. Correct matching of radix literals was removed for better performance.`
	`84`	`+syntax match clojureNumber "\v<[-+]?%([2-9]\|[12]\d\|3[0-6])[rR][[:alnum:]]+>"`
`89`	`85`	`syntax match clojureNumber "\v<[-+]?%(0\o\|0x\x+\|[1-9]\d)N?>"`
`90`	`86`	`syntax match clojureNumber "\v<[-+]?%(0\|[1-9]\d\|%(0\|[1-9]\d)\.\d*)%(M\|[eE][-+]?\d+)?>"`
`91`	`87`	`syntax match clojureNumber "\v<[-+]?%(0\|[1-9]\d)/%(0\|[1-9]\d)>"`

Comments

(0)