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.

Sign up for GitHub

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

Jump to bottom

Recognize rewrite rules using intEq and intModEq relations. #1297

Merged
merged 2 commits into from
Aug 26, 2021
Merged

Recognize rewrite rules using intEq and intModEq relations. #1297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
033b866
Recognize rewrite rules using `intEq` and `intModEq` relations.
Aug 26, 2021
162c720
Add regression test for rewrite rules with `intEq` and `intModEq`.
Aug 26, 2021
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
39 changes: 39 additions & 0 deletions intTests/test_rewrite_int/test.saw
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// This test ensures that rewrite rules using `intEq` and `intModEq` will work.

let ss0 = add_cryptol_defs ["ecEq"] (cryptol_ss ());

let {{
squareInt : Integer -> Integer
squareInt x = x * x

squareZ5 : Z 5 -> Z 5
squareZ5 x = x * x
}};

let prove_rule t =
do {
thm <- prove_print z3 (rewrite ss0 t);
print thm;
return thm;
};

squareInt_plus <-
prove_rule {{ \x y -> squareInt (x + y) == squareInt x + squareInt y + 2 * x * y }};

squareInt_times <-
prove_rule {{ \x y -> squareInt (x * y) == squareInt x * squareInt y }};

squareZ5_plus <-
prove_rule {{ \x y -> squareZ5 (x + y) == squareZ5 x + squareZ5 y + 2 * x * y }};

squareZ5_times <-
prove_rule {{ \x y -> squareZ5 (x * y) == squareZ5 x * squareZ5 y }};

let ss1 = addsimps [squareInt_plus, squareInt_times, squareZ5_plus, squareZ5_times] ss0;
let tac = do { simplify ss1; print_goal; w4_unint_z3 ["squareInt", "squareZ5"]; };

prove_print tac
{{ \x y z -> squareInt (x * y + z) == squareInt x * squareInt y + squareInt z + 2 * x * y * z }};

prove_print tac
{{ \x y z -> squareZ5 (x * y + z) == squareZ5 x * squareZ5 y + squareZ5 z + 2 * x * y * z }};
1 change: 1 addition & 0 deletions intTests/test_rewrite_int/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$SAW test.saw
10 changes: 10 additions & 0 deletions saw-core/src/Verifier/SAW/Rewriter.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,12 @@ vecEqIdent = mkIdent (mkModuleName ["Prelude"]) "vecEq"
equalNatIdent :: Ident
equalNatIdent = mkIdent (mkModuleName ["Prelude"]) "equalNat"

intEqIdent :: Ident
intEqIdent = mkIdent (mkModuleName ["Prelude"]) "intEq"

intModEqIdent :: Ident
intModEqIdent = mkIdent (mkModuleName ["Prelude"]) "intModEq"

-- | Converts a universally quantified equality proposition from a
-- Term representation to a RewriteRule.
ruleOfTerm :: Term -> Maybe a -> RewriteRule a
Expand Down Expand Up @@ -345,6 +351,10 @@ ruleOfProp (R.asApplyAll -> (R.isGlobalDef boolEqIdent -> Just (), [x, y])) ann
Just $ mkRewriteRule [] x y ann
ruleOfProp (R.asApplyAll -> (R.isGlobalDef vecEqIdent -> Just (), [_, _, _, x, y])) ann =
Just $ mkRewriteRule [] x y ann
ruleOfProp (R.asApplyAll -> (R.isGlobalDef intEqIdent -> Just (), [x, y])) ann =
Just $ mkRewriteRule [] x y ann
ruleOfProp (R.asApplyAll -> (R.isGlobalDef intModEqIdent -> Just (), [_, x, y])) ann =
Just $ mkRewriteRule [] x y ann
ruleOfProp (unwrapTermF -> Constant _ body) ann = ruleOfProp body ann
ruleOfProp (R.asEq -> Just (_, x, y)) ann =
Just $ mkRewriteRule [] x y ann
Expand Down