Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

What4 bump #1221

Merged
merged 2 commits into from
Jun 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cabal.GHC-8.10.2.config
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,8 @@ constraints: any.Cabal ==3.2.0.0,
void -safe,
any.wcwidth ==0.0.2,
wcwidth -cli +split-base,
any.what4 ==1.2.1,
what4 -drealtestdisable -solvertests -stptestdisable,
any.wl-pprint-annotated ==0.1.0.1,
any.xml ==1.3.14,
any.zenc ==0.1.1,
Expand Down
2 changes: 1 addition & 1 deletion cabal.GHC-8.10.3.config
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ constraints: any.Cabal ==3.2.1.0,
warp +allow-sendfilefd -network-bytestring -warp-debug,
any.wcwidth ==0.0.2,
wcwidth -cli +split-base,
any.what4 ==1.1,
any.what4 ==1.2.1,
what4 -drealtestdisable -solvertests -stptestdisable,
any.word8 ==0.1.3,
any.x509 ==1.7.5,
Expand Down
2 changes: 1 addition & 1 deletion cabal.GHC-8.6.5.config
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ constraints: any.Cabal ==2.4.0.1,
void -safe,
any.wcwidth ==0.0.2,
wcwidth -cli +split-base,
any.what4 ==1.1,
any.what4 ==1.2.1,
what4 -drealtestdisable -solvertests -stptestdisable,
any.wl-pprint-annotated ==0.1.0.1,
any.xml ==1.3.14,
Expand Down
2 changes: 1 addition & 1 deletion cabal.GHC-8.8.4.config
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ constraints: any.Cabal ==3.0.1.0,
void -safe,
any.wcwidth ==0.0.2,
wcwidth -cli +split-base,
any.what4 ==1.1,
any.what4 ==1.2.1,
what4 -drealtestdisable -solvertests -stptestdisable,
any.wl-pprint-annotated ==0.1.0.1,
any.xml ==1.3.14,
Expand Down
2 changes: 1 addition & 1 deletion cryptol.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ library
mtl >= 2.2.1,
time >= 1.6.0.1,
panic >= 0.3,
what4 >= 1.1 && < 1.2
what4 >= 1.2 && < 1.3

Build-tool-depends: alex:alex, happy:happy
hs-source-dirs: src
Expand Down
15 changes: 15 additions & 0 deletions tests/issues/issue1210.cry
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
mwe : [2] -> [2][1] -> Bit
property mwe i r = r@0 == (r@0) << 0*i

mwe' : [2] -> [1] -> Bit
property mwe' i r = r == (r << 0*i)

mwe'' : Bit
property mwe'' = r == (r << i)
where r = 1:[1]
i = 0:[2]

bitget : [12] -> [436][8] -> Bit
property bitget i r = i < 3488 ==> bit_gf == if bit_bit then 0x0001 else 0x0000
where bit_gf = (zext (((r@(i/8)) >> (i%8) ) && 1))
bit_bit = (join (map reverse r))@i
6 changes: 6 additions & 0 deletions tests/issues/issue1210.icry
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
:l issue1210.cry
:check
:set prover=sbv-z3
:prove
:set prover=w4-z3
:prove
31 changes: 31 additions & 0 deletions tests/issues/issue1210.icry.stdout
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Loading module Cryptol
Loading module Cryptol
Loading module Main
property mwe Using exhaustive testing.
Testing... Passed 16 tests.
Q.E.D.
property mwe' Using exhaustive testing.
Testing... Passed 8 tests.
Q.E.D.
property mwe'' Using exhaustive testing.
Testing... Passed 1 tests.
Q.E.D.
property bitget Using random testing.
Testing... Passed 100 tests.
Expected test coverage: 0.00% (100 of 2^^3500 values)
:prove mwe
Q.E.D.
:prove mwe'
Q.E.D.
:prove mwe''
Q.E.D.
:prove bitget
Q.E.D.
:prove mwe
Q.E.D.
:prove mwe'
Q.E.D.
:prove mwe''
Q.E.D.
:prove bitget
Q.E.D.