Add binary literal (ref: elm#2248)

Author: decioferreira

examples/src/NumericSeparators.guida

@@ -0,0 +1,63 @@
+module NumericSeparators exposing (main)
+
+import Html exposing (div, table, td, text, tr)
+import Html.Attributes exposing (style)
+
+
+ints : List ( String, Int )
+ints =
+    [ ( "2_000", 2_000 )
+    , ( "42_000_000", 42_000_000 )
+    ]
+
+
+floats : List ( String, Float )
+floats =
+    [ ( "111_000.602", 111_000.602 )
+    , ( "1_000.4_205", 1_000.4_205 )
+    , ( "0.000_1", 0.000_1 )
+    , ( "0.000_000_1", 0.000_000_1 )
+    ]
+
+
+hexadecimals : List ( String, Int )
+hexadecimals =
+    [ ( "0x1F_2A", 0x1F_2A )
+    , ( "0xDEADBEEF", 0xDEADBEEF )
+    , ( "0xDE_AD_BE_EF", 0xDE_AD_BE_EF )
+    ]
+
+binaries : List ( String, Int )
+binaries =
+    [ ( "0b1010", 0b1010 )
+    , ( "0b01010110_00111000", 0b01010110_00111000 )
+    , ( "0b0101_0110_0011_1000", 0b0101_0110_0011_1000 )
+    ]
+
+
+tableRow : (a -> String) -> ( String, a ) -> Html.Html msg
+tableRow toString ( label, value ) =
+    tr []
+        [ td [ style "min-width" "150px", style "padding" "7px" ] [ text label ]
+        , td [ style "min-width" "150px", style "padding" "7px" ] [ text (toString value) ]
+        ]
+
+
+main =
+    div
+        [ style "width" "100%"
+        , style "width" "100%"
+        , style "display" "flex"
+        , style "justify-content" "center"
+        , style "align-item" "center"
+        ]
+        [ table
+            [ style "margin" "150px"
+            , style "padding" "20px"
+            ]
+            (List.map (tableRow String.fromInt) ints
+                ++ List.map (tableRow String.fromFloat) floats
+                ++ List.map (tableRow String.fromInt) hexadecimals
+                ++ List.map (tableRow String.fromInt) binaries
+            )
+        ]

examples/src/Underscores.guida

@@ -8,7 +8,7 @@ module Compiler.Parse.Number exposing
 
 import Compiler.AST.Utils.Binop as Binop
 import Compiler.Parse.Primitives as P exposing (Col, Row)
-import Compiler.Parse.SyntaxVersion as SyntaxVersion exposing (SyntaxVersion)
+import Compiler.Parse.SyntaxVersion as SV exposing (SyntaxVersion)
 import Compiler.Parse.Variable as Var
 import Compiler.Reporting.Error.Syntax as E
 
@@ -49,7 +49,7 @@ number syntaxVersion toExpectation toError =
                     word =
                         charAtPos pos src
                 in
-                if word == '_' && isGuida syntaxVersion then
+                if word == '_' && syntaxVersion == SV.Guida then
                     P.Cerr row col (toError E.NumberNoLeadingOrTrailingUnderscores)
 
                 else if not (isDecimalDigit word) then
@@ -102,8 +102,9 @@ number syntaxVersion toExpectation toError =
 
                                 parsed : Maybe Float
                                 parsed =
-                                    if isGuida syntaxVersion then
-                                        String.replace "_" "" raw |> String.toFloat
+                                    if syntaxVersion == SV.Guida then
+                                        String.replace "_" "" raw
+                                            |> String.toFloat
 
                                     else
                                         String.toFloat raw
@@ -155,7 +156,7 @@ chompInt syntaxVersion src pos end n =
         else if word == 'e' || word == 'E' then
             chompExponent syntaxVersion src (pos + 1) end
 
-        else if isGuida syntaxVersion && word == '_' then
+        else if word == '_' && syntaxVersion == SV.Guida then
             chompUnderscore_ syntaxVersion src pos end n
 
         else if isDirtyEnd src pos end word then
@@ -255,7 +256,7 @@ chompFraction syntaxVersion src pos end n =
             nextWord =
                 charAtPos pos1 src
         in
-        if isGuida syntaxVersion && nextWord == '_' then
+        if nextWord == '_' && syntaxVersion == SV.Guida then
             Err_ (pos + 1) E.NumberNoUnderscoresAdjacentToDecimalOrExponent
 
         else if isDecimalDigit nextWord then
@@ -279,7 +280,7 @@ chompFractionHelp syntaxVersion src pos end =
         if isDecimalDigit word then
             chompFractionHelp syntaxVersion src (pos + 1) end
 
-        else if isGuida syntaxVersion && word == '_' then
+        else if word == '_' && syntaxVersion == SV.Guida then
             if (pos + 1) == end then
                 Err_ pos E.NumberNoLeadingOrTrailingUnderscores
 
@@ -326,7 +327,7 @@ chompExponent syntaxVersion src pos end =
         if isDecimalDigit word then
             chompExponentHelp syntaxVersion src (pos + 1) end
 
-        else if isGuida syntaxVersion && word == '_' then
+        else if word == '_' && syntaxVersion == SV.Guida then
             Err_ pos E.NumberNoUnderscoresAdjacentToDecimalOrExponent
 
         else if word == '+' || word == '-' then
@@ -339,7 +340,7 @@ chompExponent syntaxVersion src pos end =
                 nextWord =
                     charAtPos pos1 src
             in
-            if isGuida syntaxVersion && nextWord == '_' then
+            if nextWord == '_' && syntaxVersion == SV.Guida then
                 Err_ (pos + 1) E.NumberNoUnderscoresAdjacentToDecimalOrExponent
 
             else if pos1 < end && isDecimalDigit nextWord then
@@ -363,7 +364,7 @@ chompExponentHelp syntaxVersion src pos end =
             word =
                 charAtPos pos src
         in
-        if isDecimalDigit word || (isGuida syntaxVersion && word == '_') then
+        if isDecimalDigit word || (word == '_' && syntaxVersion == SV.Guida) then
             chompExponentHelp syntaxVersion src (pos + 1) end
 
         else
@@ -386,12 +387,19 @@ chompZero syntaxVersion src pos end =
                 charAtPos pos src
         in
         if word == 'x' then
-            if isGuida syntaxVersion && charAtPos (pos + 1) src == '_' then
+            if charAtPos (pos + 1) src == '_' && syntaxVersion == SV.Guida then
                 Err_ (pos + 1) E.NumberNoUnderscoresAdjacentToHexadecimalPreFix
 
             else
                 chompHexInt syntaxVersion src (pos + 1) end
 
+        else if word == 'b' && syntaxVersion == SV.Guida then
+            if charAtPos (pos + 1) src == '_' then
+                Err_ (pos + 1) E.NumberNoUnderscoresAdjacentToBinaryPreFix
+
+            else
+                chompBinInt src (pos + 1) end
+
         else if word == '.' then
             chompFraction syntaxVersion src pos end 0
 
@@ -424,6 +432,25 @@ chompHexInt syntaxVersion src pos end =
         OkInt newPos answer
 
 
+chompBinInt : String -> Int -> Int -> Outcome
+chompBinInt src pos end =
+    let
+        ( newPos, answer ) =
+            chompBin src pos end
+    in
+    if answer == -4 then
+        Err_ (newPos + 1) E.NumberNoConsecutiveUnderscores
+
+    else if answer == -3 then
+        Err_ newPos E.NumberNoLeadingOrTrailingUnderscores
+
+    else if answer < 0 then
+        Err_ newPos E.NumberBinDigit
+
+    else
+        OkInt newPos answer
+
+
 
 -- CHOMP HEX
 
@@ -474,7 +501,7 @@ stepHex syntaxVersion src pos end word acc =
     else if 'A' <= word && word <= 'F' then
         16 * acc + 10 + (Char.toCode word - Char.toCode 'A')
 
-    else if isGuida syntaxVersion && '_' == word then
+    else if word == '_' && syntaxVersion == SV.Guida then
         let
             nextWord : Char
             nextWord =
@@ -505,6 +532,78 @@ stepHex syntaxVersion src pos end word acc =
 
 
 
+-- CHOMP BIN
+
+
+chompBin : String -> Int -> Int -> ( Int, Int )
+chompBin src pos end =
+    chompBinHelp src pos end -1 0
+
+
+chompBinHelp : String -> Int -> Int -> Int -> Int -> ( Int, Int )
+chompBinHelp src pos end answer accumulator =
+    if pos >= end then
+        ( pos, answer )
+
+    else
+        let
+            newAnswer : Int
+            newAnswer =
+                stepBin src pos end (charAtPos pos src) accumulator
+        in
+        if newAnswer < 0 then
+            ( pos
+            , if newAnswer == -1 then
+                answer
+
+              else if newAnswer == -3 then
+                -3
+
+              else if newAnswer == -4 then
+                -4
+
+              else
+                -2
+            )
+
+        else
+            chompBinHelp src (pos + 1) end newAnswer newAnswer
+
+
+stepBin : String -> Int -> Int -> Char -> Int -> Int
+stepBin src pos end word acc =
+    if '0' <= word && word <= '1' then
+        2 * acc + (Char.toCode word - Char.toCode '0')
+
+    else if word == '_' then
+        let
+            nextWord : Char
+            nextWord =
+                charAtPos (pos + 1) src
+        in
+        if nextWord == '_' then
+            -4
+
+        else
+            let
+                validNextWord : Bool
+                validNextWord =
+                    '0' <= nextWord && nextWord <= '1'
+            in
+            if pos + 1 == end || not validNextWord then
+                -3
+
+            else
+                acc
+
+    else if isDirtyEnd src pos end word then
+        -2
+
+    else
+        -1
+
+
+
 -- PRECEDENCE
 
 
@@ -531,7 +630,7 @@ precedence toExpectation =
 
 
 
--- helpers
+-- CHAR AT POSITION
 
 
 charAtPos : Int -> String -> Char
@@ -540,8 +639,3 @@ charAtPos pos src =
         |> String.uncons
         |> Maybe.map Tuple.first
         |> Maybe.withDefault ' '
-
-
-isGuida : SyntaxVersion -> Bool
-isGuida syntaxVersion =
-    syntaxVersion == SyntaxVersion.Guida

src/Compiler/Parse/Number.elm

@@ -13,6 +13,7 @@ import Compiler.Data.OneOrMore as OneOrMore exposing (OneOrMore)
 import Compiler.Elm.ModuleName as ModuleName
 import Compiler.Json.Encode as E
 import Compiler.Nitpick.PatternMatches as P
+import Compiler.Parse.SyntaxVersion as SV exposing (SyntaxVersion)
 import Compiler.Reporting.Annotation as A
 import Compiler.Reporting.Doc as D
 import Compiler.Reporting.Error.Canonicalize as Canonicalize
@@ -62,11 +63,11 @@ type Error
 -- TO REPORT
 
 
-toReports : Code.Source -> Error -> NE.Nonempty Report.Report
-toReports source err =
+toReports : SyntaxVersion -> Code.Source -> Error -> NE.Nonempty Report.Report
+toReports syntaxVersion source err =
     case err of
         BadSyntax syntaxError ->
-            NE.singleton (Syntax.toReport source syntaxError)
+            NE.singleton (Syntax.toReport syntaxVersion source syntaxError)
 
         BadImports errs ->
             NE.map (Import.toReport source) errs
@@ -152,7 +153,7 @@ moduleToDoc root { absolutePath, source, error } =
     let
         reports : NE.Nonempty Report.Report
         reports =
-            toReports (Code.toSource source) error
+            toReports (SV.fileSyntaxVersion absolutePath) (Code.toSource source) error
 
         relativePath : Utils.FilePath
         relativePath =
@@ -197,7 +198,7 @@ toJson { name, absolutePath, source, error } =
     let
         reports : NE.Nonempty Report.Report
         reports =
-            toReports (Code.toSource source) error
+            toReports (SV.fileSyntaxVersion absolutePath) (Code.toSource source) error
     in
     E.object
         [ ( "path", E.string absolutePath )