Merge branch 'main' into tutorial_integers

dhall-lang · Nov 20, 2023 · fc5a85f · fc5a85f
2 parents 3fbfb65 + 5d4391c
commit fc5a85f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/dhall/src/Dhall/Parser/Token.hs b/dhall/src/Dhall/Parser/Token.hs
@@ -299,11 +299,14 @@ integerLiteral = (do
 -}
 naturalLiteral :: Parser Natural
 naturalLiteral = (do
-    a <-    try (char '0' >> char 'x' >> Text.Megaparsec.Char.Lexer.hexadecimal)
+    a <-    binary
+        <|> hexadecimal
         <|> decimal
         <|> (char '0' $> 0)
     return a ) <?> "literal"
   where
+    binary = try (char '0' >> char 'b' >> Text.Megaparsec.Char.Lexer.binary)
+    hexadecimal = try (char '0' >> char 'x' >> Text.Megaparsec.Char.Lexer.hexadecimal)
     decimal = do
         n <- headDigit
         ns <- many tailDigit

diff --git a/dhall/tests/format/numericLiteralsA.dhall b/dhall/tests/format/numericLiteralsA.dhall
@@ -1 +1 @@
-{ example0 = 0x42, example1 = +0x42, example2 = 1.2e20 }
+{ example0 = 0x42, example1 = +0x42, example2 = 1.2e20, example3 = -0b0111 }
diff --git a/dhall/tests/format/numericLiteralsB.dhall b/dhall/tests/format/numericLiteralsB.dhall
@@ -1 +1 @@
-{ example0 = 0x42, example1 = +0x42, example2 = 1.2e20 }
+{ example0 = 0x42, example1 = +0x42, example2 = 1.2e20, example3 = -0b0111 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{ example0 = 0x42, example1 = +0x42, example2 = 1.2e20 }
		{ example0 = 0x42, example1 = +0x42, example2 = 1.2e20, example3 = -0b0111 }