TroupeLang · AStenbaek · Aug 24, 2025 · Aug 24, 2025 · Aug 24, 2025 · Aug 24, 2025
diff --git a/compiler/src/Lexer.x b/compiler/src/Lexer.x
@@ -16,12 +16,15 @@ import Control.Monad.Except
 import Data.Char (isSpace, toLower)
 import Data.List (dropWhileEnd)
 import Data.Char ( chr )
-import Numeric ( readDec )
+import Numeric ( readDec, readBin, readOct, readHex )
 import Control.Monad (when)
 }
 
 %wrapper "monadUserState"
 
+$bindigit = [01]
+$octdigit = 0-7
+$hexdigit = [0-9A-Fa-f]
 $digit = 0-9
 $alpha = [a-zA-Z]
 $alpha_ = [$alpha \_]
@@ -30,7 +33,10 @@ $graphic    = $printable # $white
 @sym        = $alpha_ [$alpha $digit \_ \']*
 @string     = \" ($printable # \")* \"
 @label      = \`\{ ($printable # \})*  \}\`
-
+@declit     = $digit[\_$digit]*
+@binlit     = 0[bB]$bindigit[\_$bindigit]*
+@octlit     = 0[oO]$octdigit[\_$octdigit]*
+@hexlit     = 0[xX]$hexdigit[\_$hexdigit]*
 
 tokens:-
 -- Whitespace insensitive
@@ -109,7 +115,12 @@ tokens:-
 <state_dclabel> "#root-integrity"       { mkL TokenDCRootInteg }
 <state_dclabel> "#null-confidentiality" { mkL TokenDCNullConf }
 <state_dclabel> "#null-integrity"       { mkL TokenDCNullInteg }
-<0>   $digit+                        { mkLs (\s -> TokenNum (read s)) }
+-- Integer literal parsing inspired by https://github.com/ocaml/ocaml/blob/trunk/parsing/lexer.mll
+<0>   @declit                        { mkLs (\s -> TokenNum (read (filter (/='_') s))) }
+<0>   @binlit                        { mkLs (\s -> TokenNum (fst (head (readBin (filter (/='_') (drop 2 s)))))) }
+<0>   @octlit                        { mkLs (\s -> TokenNum (fst (head (readOct (filter (/='_') (drop 2 s)))))) }
+<0>   @hexlit                        { mkLs (\s -> TokenNum (fst (head (readHex (filter (/='_') (drop 2 s)))))) }
+<0>   (@declit|@binlit|@octlit|@hexlit)@sym { \(_, _, _, s) _ -> lexerError ("Invalid literal " ++ s) }
 <0>   [\<][\<]                       { mkL TokenBinShiftLeft }
 <0>   [\>][\>]                       { mkL TokenBinShiftRight }
 <0>   [\~][\>][\>]                   { mkL TokenBinZeroShiftRight }
@@ -386,9 +397,6 @@ lexerError msg =
   where
     trim = reverse . dropWhile (== ' ') . reverse . dropWhile (== ' ')
 
-
-
-
 -- we use a custom version of monadScan so that we have full
 -- control over the error reporting; this one is based on 
 -- the built-in alexMonadScan

diff --git a/tests/cmp/int-lit1.golden b/tests/cmp/int-lit1.golden
@@ -0,0 +1,3 @@
+Parse Error:
+Invalid literal 0x_A
+ at 1:5 before end of line
diff --git a/tests/cmp/int-lit1.trp b/tests/cmp/int-lit1.trp
@@ -0,0 +1 @@
+0x_A
diff --git a/tests/cmp/int-lit2.golden b/tests/cmp/int-lit2.golden
@@ -0,0 +1,3 @@
+Parse Error:
+Invalid literal 1_x_0
+ at 1:6 before end of line
diff --git a/tests/cmp/int-lit2.trp b/tests/cmp/int-lit2.trp
@@ -0,0 +1 @@
+1_x_0
diff --git a/tests/cmp/int-lit3.golden b/tests/cmp/int-lit3.golden
@@ -0,0 +1,3 @@
+Parse Error:
+Invalid literal 0b12
+ at 1:5 before end of line
diff --git a/tests/cmp/int-lit3.trp b/tests/cmp/int-lit3.trp
@@ -0,0 +1 @@
+0b12
diff --git a/tests/cmp/int-lit4.golden b/tests/cmp/int-lit4.golden
@@ -0,0 +1,3 @@
+Parse Error:
+Invalid literal 0o8
+ at 1:4 before end of line
diff --git a/tests/cmp/int-lit4.trp b/tests/cmp/int-lit4.trp
@@ -0,0 +1 @@
+0o8
diff --git a/tests/rt/pos/core/int-lit1.golden b/tests/rt/pos/core/int-lit1.golden
@@ -0,0 +1,2 @@
+2025-08-24T19:08:18.468Z [RTM] [32minfo[39m: Skipping network creation. Observe that all external IO operations will yield a runtime error.
+>>> Main thread finished with value: 1000000@{}%{}
diff --git a/tests/rt/pos/core/int-lit1.trp b/tests/rt/pos/core/int-lit1.trp
@@ -0,0 +1 @@
+1_000_000
diff --git a/tests/rt/pos/core/int-lit2.golden b/tests/rt/pos/core/int-lit2.golden
@@ -0,0 +1,2 @@
+2025-08-24T19:08:15.976Z [RTM] [32minfo[39m: Skipping network creation. Observe that all external IO operations will yield a runtime error.
+>>> Main thread finished with value: 27@{}%{}
diff --git a/tests/rt/pos/core/int-lit2.trp b/tests/rt/pos/core/int-lit2.trp
@@ -0,0 +1 @@
+0b11011
diff --git a/tests/rt/pos/core/int-lit3.golden b/tests/rt/pos/core/int-lit3.golden
@@ -0,0 +1,2 @@
+2025-08-24T19:08:15.975Z [RTM] [32minfo[39m: Skipping network creation. Observe that all external IO operations will yield a runtime error.
+>>> Main thread finished with value: 511@{}%{}
diff --git a/tests/rt/pos/core/int-lit3.trp b/tests/rt/pos/core/int-lit3.trp
@@ -0,0 +1 @@
+0o777
diff --git a/tests/rt/pos/core/int-lit4.golden b/tests/rt/pos/core/int-lit4.golden
@@ -0,0 +1,2 @@
+2025-08-24T19:08:23.402Z [RTM] [32minfo[39m: Skipping network creation. Observe that all external IO operations will yield a runtime error.
+>>> Main thread finished with value: 175@{}%{}
diff --git a/tests/rt/pos/core/int-lit4.trp b/tests/rt/pos/core/int-lit4.trp
@@ -0,0 +1 @@
+0xaf
diff --git a/tests/rt/pos/core/int-lit5.golden b/tests/rt/pos/core/int-lit5.golden
@@ -0,0 +1,2 @@
+2025-08-24T19:08:23.450Z [RTM] [32minfo[39m: Skipping network creation. Observe that all external IO operations will yield a runtime error.
+>>> Main thread finished with value: 5@{}%{}
diff --git a/tests/rt/pos/core/int-lit5.trp b/tests/rt/pos/core/int-lit5.trp
@@ -0,0 +1 @@
+0b1__0__1
diff --git a/tests/rt/pos/core/int-lit6.golden b/tests/rt/pos/core/int-lit6.golden
@@ -0,0 +1,2 @@
+2025-08-24T19:08:26.140Z [RTM] [32minfo[39m: Skipping network creation. Observe that all external IO operations will yield a runtime error.
+>>> Main thread finished with value: 299@{}%{}
diff --git a/tests/rt/pos/core/int-lit6.trp b/tests/rt/pos/core/int-lit6.trp
@@ -0,0 +1 @@
+0o4_5_____3
diff --git a/tests/rt/pos/core/int-lit7.golden b/tests/rt/pos/core/int-lit7.golden
@@ -0,0 +1,2 @@
+2025-08-24T19:08:26.048Z [RTM] [32minfo[39m: Skipping network creation. Observe that all external IO operations will yield a runtime error.
+>>> Main thread finished with value: 174@{}%{}
diff --git a/tests/rt/pos/core/int-lit7.trp b/tests/rt/pos/core/int-lit7.trp
@@ -0,0 +1 @@
+0xA______________E_____
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		2025-08-24T19:08:18.468Z [RTM] [32minfo[39m: Skipping network creation. Observe that all external IO operations will yield a runtime error.
		>>> Main thread finished with value: 1000000@{}%{}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		2025-08-24T19:08:15.976Z [RTM] [32minfo[39m: Skipping network creation. Observe that all external IO operations will yield a runtime error.
		>>> Main thread finished with value: 27@{}%{}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		2025-08-24T19:08:15.975Z [RTM] [32minfo[39m: Skipping network creation. Observe that all external IO operations will yield a runtime error.
		>>> Main thread finished with value: 511@{}%{}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		2025-08-24T19:08:23.402Z [RTM] [32minfo[39m: Skipping network creation. Observe that all external IO operations will yield a runtime error.
		>>> Main thread finished with value: 175@{}%{}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		2025-08-24T19:08:23.450Z [RTM] [32minfo[39m: Skipping network creation. Observe that all external IO operations will yield a runtime error.
		>>> Main thread finished with value: 5@{}%{}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		2025-08-24T19:08:26.140Z [RTM] [32minfo[39m: Skipping network creation. Observe that all external IO operations will yield a runtime error.
		>>> Main thread finished with value: 299@{}%{}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		2025-08-24T19:08:26.048Z [RTM] [32minfo[39m: Skipping network creation. Observe that all external IO operations will yield a runtime error.
		>>> Main thread finished with value: 174@{}%{}