Merge branch 'master' of github.com:JustusAdam/language-haskell

JustusAdam · Dec 21, 2017 · 195d9bf · 195d9bf
2 parents 0e0bf2f + 1399b0e
commit 195d9bf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/syntaxes/haskell.tmLanguage b/syntaxes/haskell.tmLanguage
@@ -339,15 +339,15 @@
 		</dict>
 		<dict>
 			<key>comment</key>
-			<string>Floats are always decimal</string>
+			<string>Floats are decimal or hexadecimal</string>
 			<key>match</key>
-			<string>\b([0-9]+\.[0-9]+([eE][+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+)\b</string>
+			<string>\b([0-9](_*[0-9])*\.[0-9](_*[0-9])*(_*[eE][-+]?[0-9](_*[0-9])*)?|[0-9](_*[0-9])*_*[eE][-+]?[0-9](_*[0-9])*|0[xX]_*[0-9a-fA-F](_*[0-9a-fA-F])*\.[0-9a-fA-F](_*[0-9a-fA-F])*(_*[pP][-+]?[0-9](_*[0-9])*)?|0[xX]_*[0-9a-fA-F](_*[0-9a-fA-F])*_*[pP][-+]?[0-9](_*[0-9])*)\b</string>
 			<key>name</key>
 			<string>constant.numeric.float.haskell</string>
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b([0-9]+|0([xX][0-9a-fA-F]+|[oO][0-7]+))\b</string>
+			<string>\b([0-9](_*[0-9])*|0([xX]_*[0-9a-fA-F](_*[0-9a-fA-F])*|[oO]_*[0-7](_*[0-7])*|[bB]_*[01](_*[01])*))\b</string>
 			<key>name</key>
 			<string>constant.numeric.haskell</string>
 		</dict>