AST-89 Range restricted Nat* and Int*

src/codegen/compile.ml

@@ -5132,6 +5132,48 @@ and compile_lit_pat env l =
   | (NatLit _ | IntLit _) ->
     compile_lit_as env SR.Vanilla l ^^
     BigNum.compile_eq env
+  | Nat8Lit _ ->
+    snd (compile_lit env l) ^^
+    compile_eq env Type.(Prim Nat8)
+  | Nat16Lit _ ->
+    snd (compile_lit env l) ^^
+    compile_eq env Type.(Prim Nat16)
+  | Nat32Lit _ ->
+    BoxedSmallWord.unbox env ^^
+    snd (compile_lit env l) ^^
+    compile_eq env Type.(Prim Nat32)
+  | Nat64Lit _ ->
+    BoxedWord.unbox env ^^
+    snd (compile_lit env l) ^^
+    compile_eq env Type.(Prim Nat64)
+  | Int8Lit _ ->
+    snd (compile_lit env l) ^^
+    compile_eq env Type.(Prim Int8)
+  | Int16Lit _ ->
+    snd (compile_lit env l) ^^
+    compile_eq env Type.(Prim Int16)
+  | Int32Lit _ ->
+    BoxedSmallWord.unbox env ^^
+    snd (compile_lit env l) ^^
+    compile_eq env Type.(Prim Int32)
+  | Int64Lit _ ->
+    BoxedWord.unbox env ^^
+    snd (compile_lit env l) ^^
+    compile_eq env Type.(Prim Int64)
+  | Word8Lit _ ->
+    snd (compile_lit env l) ^^
+    compile_eq env Type.(Prim Word8)
+  | Word16Lit _ ->
+    snd (compile_lit env l) ^^
+    compile_eq env Type.(Prim Word16)
+  | Word32Lit _ ->
+    BoxedSmallWord.unbox env ^^
+    snd (compile_lit env l) ^^
+    compile_eq env Type.(Prim Word32)
+  | Word64Lit _ ->
+    BoxedWord.unbox env ^^
+    snd (compile_lit env l) ^^
+    compile_eq env Type.(Prim Word64)
   | (TextLit t) ->
     Text.lit env t ^^
     Text.compare env

src/lowering/desugar.ml

@@ -29,6 +29,10 @@ let apply_sign op l = Syntax.(match op, l with
   | PosOp, l -> l
   | NegOp, NatLit n -> NatLit (Value.Nat.sub Value.Nat.zero n)
   | NegOp, IntLit n -> IntLit (Value.Int.sub Value.Int.zero n)
+  | NegOp, Int8Lit n -> Int8Lit (Value.Int_8.sub Value.Int_8.zero n)
+  | NegOp, Int16Lit n -> Int16Lit (Value.Int_16.sub Value.Int_16.zero n)
+  | NegOp, Int32Lit n -> Int32Lit (Value.Int_32.sub Value.Int_32.zero n)
+  | NegOp, Int64Lit n -> Int64Lit (Value.Int_64.sub Value.Int_64.zero n)
   | _, _ -> raise (Invalid_argument "Invalid signed pattern")
   )
 

test/run/ranged-nums.as

@@ -16,3 +16,32 @@ let _ = -127 : Int8;
 let _ = -32767 : Int16;
 let _ = -2_147_483_647 : Int32;
 let _ = -9_223_372_036_854_775_807 : Int64;
+
+// test patterns
+
+func n8 (n : Nat8) = assert (switch n { case 0 false; case 1 false; case 42 true; case _ false });
+func n16 (n : Nat16) = assert (switch n { case 0 false; case 1 false; case 65000 true; case _ false });
+func n32 (n : Nat32) = assert (switch n { case 0 false; case 1 false; case 4_294_967_295 true; case _ false });
+func n64 (n : Nat64) = assert (switch n { case 0 false; case 1 false; case 42 true; case _ false });
+
+
+n8 42;
+n16 65000;
+n32 4_294_967_295;
+n64 42;
+
+
+func i8 (n : Int8) = assert (switch n { case 0 false; case (-42) true; case 1 false; case 42 true; case _ false });
+func i16 (n : Int16) = assert (switch n { case 0 false; case (-32000) true; case 1 false; case 32000 true; case _ false });
+func i32 (n : Int32) = assert (switch n { case 0 false; case (-20000000) true; case 1 false; case 1_294_967_295 true; case _ false });
+func i64 (n : Int64) = assert (switch n { case 0 false; case (-420000000000) true; case 1 false; case 42 true; case _ false });
+
+
+i8 42;
+i8 (-42);
+i16 32000;
+i16 (-32000);
+i32 1_294_967_295;
+i32 (-20000000);
+i64 (-420000000000);
+i64 42;

test/run/words.as

@@ -276,3 +276,17 @@ func checkpointJuliett() {};
     assert (3 : Word8 ** (4 : Word8) == (81 : Word8));
     assert (3 : Word8 ** (5 : Word8) == (243 : Word8));
 };
+
+
+// check whether patterns work
+
+func w8 (n : Word8) = assert (switch n { case 0 false; case 1 false; case 42 true; case _ false });
+func w16 (n : Word16) = assert (switch n { case 0 false; case 1 false; case 65000 true; case _ false });
+func w32 (n : Word32) = assert (switch n { case 0 false; case 1 false; case 4_294_967_295 true; case _ false });
+func w64 (n : Word64) = assert (switch n { case 0 false; case 1 false; case 42 true; case _ false });
+
+
+w8 42;
+w16 65000;
+w32 4_294_967_295;
+w64 42;