Patch numeric underscores (#112)

HexFloatLiterals, NumericUnderscores, BinaryLiterals
atom-haskell · Dec 6, 2017 · f90eb7d · f90eb7d
1 parent 1cf735f
commit f90eb7d
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 34 deletions.
diff --git a/grammars/haskell autocompletion hint.cson b/grammars/haskell autocompletion hint.cson
@@ -911,21 +911,29 @@
     ]
   'lit_num':
     'patterns': [
+      {
+        'name': 'constant.numeric.hexfloat.haskell'
+        'match': '0[xX][0-9a-fA-F_]*(?:\\.[0-9a-fA-F_]+(?:[pP][+-]?[0-9_]+)?|[pP][+-]?[0-9_]+)'
+      }
       {
         'name': 'constant.numeric.hexadecimal.haskell'
-        'match': '0[xX][0-9a-fA-F]+'
+        'match': '0[xX][_0-9a-fA-F]+'
       }
       {
         'name': 'constant.numeric.octal.haskell'
-        'match': '0[oO][0-7]+'
+        'match': '0[oO][_0-7]+'
+      }
+      {
+        'name': 'constant.numeric.binary.haskell'
+        'match': '0[bB][_01]+'
       }
       {
         'name': 'constant.numeric.float.haskell'
-        'match': '[0-9]+(\\.[0-9]+[eE][+-]?|\\.|[eE][+-]?)[0-9]+'
+        'match': '[0-9][0-9_]*(?:\\.[0-9_]+(?:[eE][+-]?[0-9_]+)?|[eE][+-]?[0-9_]+)'
       }
       {
         'name': 'constant.numeric.decimal.haskell'
-        'match': '[0-9]+'
+        'match': '[0-9][_0-9]*'
       }
     ]
   'operator':

diff --git a/grammars/haskell message hint.cson b/grammars/haskell message hint.cson
diff --git a/grammars/haskell type hint.cson b/grammars/haskell type hint.cson
diff --git a/grammars/haskell.cson b/grammars/haskell.cson
diff --git a/grammars/liquid haskell.cson b/grammars/liquid haskell.cson
diff --git a/grammars/literate haskell.cson b/grammars/literate haskell.cson
diff --git a/grammars/module signature.cson b/grammars/module signature.cson
diff --git a/src/include/repository.coffee b/src/include/repository.coffee
@@ -1,6 +1,6 @@
 prelude = require './prelude'
 pragmas = require './pragmas'
-{ balanced } = require './util'
+{ balanced, floatPattern } = require './util'
 
 module.exports=
   block_comment:
@@ -496,17 +496,23 @@ module.exports=
     name: 'punctuation.separator.comma.haskell'
     match: /,/
   lit_num: [
+    name: 'constant.numeric.hexfloat.haskell'
+    match: "0[xX]#{floatPattern('[0-9a-fA-F_]','[pP]')}"
+  ,
     name: 'constant.numeric.hexadecimal.haskell'
-    match: '0[xX][0-9a-fA-F]+'
+    match: '0[xX][_0-9a-fA-F]+'
   ,
     name: 'constant.numeric.octal.haskell'
-    match: '0[oO][0-7]+'
+    match: '0[oO][_0-7]+'
+  ,
+    name: 'constant.numeric.binary.haskell'
+    match: '0[bB][_01]+'
   ,
     name: 'constant.numeric.float.haskell'
-    match: '[0-9]+(\\.[0-9]+[eE][+-]?|\\.|[eE][+-]?)[0-9]+'
+    match: "[0-9]#{floatPattern('[0-9_]', '[eE]')}"
   ,
     name: 'constant.numeric.decimal.haskell'
-    match: '[0-9]+'
+    match: '[0-9][_0-9]*'
   ]
   operator:
     name: 'keyword.operator.haskell'

diff --git a/src/include/util.coffee b/src/include/util.coffee
@@ -22,4 +22,8 @@ balanced = (name, left, right, inner, ignore = '') ->
   else
     "(?<#{name}>(?:[^#{left}#{right}#{ignore}]|#{left}\\g<#{name}>#{right})*)"
 
-module.exports = {list, listMaybe, concat, balanced}
+floatPattern = (digit, exp) ->
+  exponent = "#{exp}[+-]?[0-9_]+"
+  "#{digit}*(?:\\.#{digit}+(?:#{exponent})?|#{exponent})"
+
+module.exports = {list, listMaybe, concat, balanced, floatPattern}