diff options
| author | Alasdair Armstrong | 2017-11-08 15:08:18 +0000 |
|---|---|---|
| committer | Alasdair Armstrong | 2017-11-08 15:08:18 +0000 |
| commit | 275ded17e9d0824a932fe23607fe4f7d7b1da62f (patch) | |
| tree | 140e49f6ae13ddd8fba52388a79fccf982e1f457 /src/rewriter.ml | |
| parent | 2def55466c941aa8d4b933ecd93a7d3eb739fce8 (diff) | |
| parent | 9dc4a4bb20a53889b0aee43563d41fd7065a226a (diff) | |
Merge branch 'experiments' of https://bitbucket.org/Peter_Sewell/sail into experiments
Diffstat (limited to 'src/rewriter.ml')
| -rw-r--r-- | src/rewriter.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rewriter.ml b/src/rewriter.ml index 3cf017d1..edda208d 100644 --- a/src/rewriter.ml +++ b/src/rewriter.ml @@ -1859,7 +1859,7 @@ let rewrite_guarded_clauses l cs = let bitwise_and_exp exp1 exp2 = let (E_aux (_,(l,_))) = exp1 in - let andid = Id_aux (Id "bool_and", gen_loc l) in + let andid = Id_aux (Id "and_bool", gen_loc l) in annot_exp (E_app(andid,[exp1;exp2])) l (env_of exp1) bool_typ let rec contains_bitvector_pat (P_aux (pat,annot)) = match pat with @@ -2561,7 +2561,7 @@ let rewrite_constraint = let rec rewrite_nc (NC_aux (nc_aux, l)) = mk_exp (rewrite_nc_aux nc_aux) and rewrite_nc_aux = function | NC_bounded_ge (n1, n2) -> E_app_infix (mk_exp (E_sizeof n1), mk_id ">=", mk_exp (E_sizeof n2)) - | NC_bounded_le (n1, n2) -> E_app_infix (mk_exp (E_sizeof n1), mk_id ">=", mk_exp (E_sizeof n2)) + | NC_bounded_le (n1, n2) -> E_app_infix (mk_exp (E_sizeof n1), mk_id "<=", mk_exp (E_sizeof n2)) | NC_equal (n1, n2) -> E_app_infix (mk_exp (E_sizeof n1), mk_id "==", mk_exp (E_sizeof n2)) | NC_not_equal (n1, n2) -> E_app_infix (mk_exp (E_sizeof n1), mk_id "!=", mk_exp (E_sizeof n2)) | NC_and (nc1, nc2) -> E_app_infix (rewrite_nc nc1, mk_id "&", rewrite_nc nc2) |