Merge branch 'master' into noprompt-regexp

guns · guns · commit 9a28d6a8d1a0 · 2013-03-09T20:43:21.000-06:00
* master:
  Only allow leading 0 in numbers for octal literals
  Fix clojureNumber pattern
  Move clojureRegexp back down past clojureDispatch
  Use \%( in match pattern
  Convert clojureNumber to \v pattern
  clojureNumber takes precedence over clojureSymbol

Conflicts:
	syntax/clojure.vim
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
@@ -54,12 +54,12 @@ for s:radix in range(2, 36)
 endfor
 unlet! s:radix_chars s:radix
 
-syntax match clojureSymbol "\v([a-zA-Z!$&*_+=|<.>?-]|[^\x00-\x7F])+(:?([a-zA-Z0-9!#$%&*_+=|'<.>/?-]|[^\x00-\x7F]))*[#:]@<!"
+syntax match clojureSymbol "\v%([a-zA-Z!$&*_+=|<.>?-]|[^\x00-\x7F])+%(:?%([a-zA-Z0-9!#$%&*_+=|'<.>/?-]|[^\x00-\x7F]))*[#:]@<!"
 
-syntax match clojureNumber "\<[-+]\=\d\+\(\.\d*\)\=\(M\|\([eE][-+]\?\d\+\)\)\?\>"
-syntax match clojureNumber "\<[-+]\=\d\+N\?\>"
-syntax match clojureNumber "\<[-+]\=0x\x\+\>"
-syntax match clojureNumber "\<[-+]\=\d\+/\d\+\>"
+syntax match clojureNumber "\v<[-+]?%(0\o*|[1-9]\d*|%(0|[1-9]\d*)\.\d*)%(M|[eE][-+]?\d+)?>"
+syntax match clojureNumber "\v<[-+]?%(0\o*|[1-9]\d*)N>"
+syntax match clojureNumber "\v<[-+]?0x\x+>"
+syntax match clojureNumber "\v<[-+]?%(0|[1-9]\d*)/%(0|[1-9]\d*)>"
 
 syntax match clojureVarArg "&"
 
