Merge pull request #6531 from malmaud/master

Fix #6509 (recognize _ in numeric literals in textmate syntax highlighting)
JuliaLang · Apr 15, 2014 · d9307d0 · d9307d0
2 parents 3766e86 + 8a53061
commit d9307d0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/contrib/Julia.tmbundle/Syntaxes/Julia.tmLanguage b/contrib/Julia.tmbundle/Syntaxes/Julia.tmLanguage
@@ -255,7 +255,7 @@
 			<array>
 				<dict>
 					<key>match</key>
-					<string>((\b0(x|X)[0-9a-fA-F]+)|(\b0o[0-7]+)|(\b0b[0-1]+)|((\b[0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]*)?(im)?|\bInf(32)?\b|\bNaN(32)?\b)</string>
+					<string>((\b0(x|X)[0-9a-fA-F](_?[0-9a-fA-F])*)|(\b0o[0-7](_?[0-7])*)|(\b0b[0-1](_?[0-1])*)|((\b[0-9](_?[0-9])*\.?(_?[0-9]*))|(\.[0-9](_?[0-9])*))((e|E)(\+|-)?(_?[0-9])*)?(im)?|\bInf(32)?\b|\bNaN(32)?\b)</string>
 					<key>name</key>
 					<string>constant.numeric.julia</string>
 				</dict>