Fix a bug in compile-time evaluation.

compiler/uint_emu.m: Fix the bounds check for valid uint values. compiler/{int,uint}_emu.m: Use integer.two/0 in a few spots.
Mercury-Language · Apr 19, 2023 · 8e1b91e · 8e1b91e
1 parent a959c47
commit 8e1b91e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/compiler/int_emu.m b/compiler/int_emu.m
@@ -169,8 +169,8 @@
 :- pred to_int_in_range(bits_per_int::in, integer::in, int::out) is semidet.
 
 to_int_in_range(bits_per_int(BitsPerInt), Integer, Int) :-
-    Integer >= -pow(integer(2), integer(BitsPerInt - 1)),
-    Integer =< pow(integer(2), integer(BitsPerInt - 1)) - one,
+    Integer >= -pow(integer.two, integer(BitsPerInt - 1)),
+    Integer =< pow(integer.two, integer(BitsPerInt - 1)) - one,
     integer.to_int(Integer, Int).
 
 %----------------------------------------------------------------------------%

diff --git a/compiler/uint_emu.m b/compiler/uint_emu.m
@@ -140,7 +140,7 @@
 
 to_uint_in_range(bits_per_uint(BitsPerUInt), Integer, UInt) :-
     Integer >= integer.zero,
-    Integer =< pow(integer(2), integer(BitsPerUInt)),
+    Integer < pow(integer.two, integer(BitsPerUInt)),
     integer.to_uint(Integer, UInt).
 
 %----------------------------------------------------------------------------%