diff options
| author | Chantal Keller <Chantal.Keller@lri.fr> | 2017-10-03 10:49:12 +0200 |
|---|---|---|
| committer | Chantal Keller <Chantal.Keller@lri.fr> | 2017-10-03 10:49:12 +0200 |
| commit | 041e5eef89b1db909f076494204eda2c20562bb8 (patch) | |
| tree | d666942546d91bde494a31b1e1347dfa46de4ddc /src/trace/smtForm.ml | |
| parent | c41d405ee2c9e2ab070c69d91feb8441ab570590 (diff) | |
| download | smtcoq-041e5eef89b1db909f076494204eda2c20562bb8.tar.gz smtcoq-041e5eef89b1db909f076494204eda2c20562bb8.zip | |
Compiles with Coq-8.6
Diffstat (limited to 'src/trace/smtForm.ml')
| -rw-r--r-- | src/trace/smtForm.ml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/trace/smtForm.ml b/src/trace/smtForm.ml index 8f2fea8..1abea36 100644 --- a/src/trace/smtForm.ml +++ b/src/trace/smtForm.ml @@ -17,7 +17,6 @@ open Util open SmtMisc open CoqTerms -open Errors module type ATOM = sig @@ -315,7 +314,7 @@ module Make (Atom:ATOM) = let l1 = mk_hform b1 in let l2 = mk_hform b2 in get reify (Fapp (Fimp, [|l1;l2|])) - | _ -> error "SmtForm.Form.of_coq: wrong number of arguments for implb") + | _ -> Structures.error "SmtForm.Form.of_coq: wrong number of arguments for implb") | CCifb -> (* We should also be able to reify if then else *) begin match args with @@ -324,7 +323,7 @@ module Make (Atom:ATOM) = let l2 = mk_hform b2 in let l3 = mk_hform b3 in get reify (Fapp(Fite, [|l1;l2;l3|])) - | _ -> error "SmtForm.Form.of_coq: wrong number of arguments for ifb" + | _ -> Structures.error "SmtForm.Form.of_coq: wrong number of arguments for ifb" end | _ -> let a = atom_of_coq h in @@ -336,7 +335,7 @@ module Make (Atom:ATOM) = let l1 = mk_hform b1 in let l2 = mk_hform b2 in get reify (f [|l1; l2|]) - | _ -> error "SmtForm.Form.of_coq: wrong number of arguments" + | _ -> Structures.error "SmtForm.Form.of_coq: wrong number of arguments" and mk_fnot i args = match args with @@ -350,7 +349,7 @@ module Make (Atom:ATOM) = let l = if r = 0 then l else neg l in if q = 0 then l else get reify (Fapp(Fnot2 q, [|l|])) - | _ -> error "SmtForm.Form.mk_hform: wrong number of arguments for negb" + | _ -> Structures.error "SmtForm.Form.mk_hform: wrong number of arguments for negb" and mk_fand acc args = match args with @@ -362,7 +361,7 @@ module Make (Atom:ATOM) = else let l1 = mk_hform t1 in get reify (Fapp(Fand, Array.of_list (l1::l2::acc))) - | _ -> error "SmtForm.Form.mk_hform: wrong number of arguments for andb" + | _ -> Structures.error "SmtForm.Form.mk_hform: wrong number of arguments for andb" and mk_for acc args = match args with @@ -374,7 +373,7 @@ module Make (Atom:ATOM) = else let l1 = mk_hform t1 in get reify (Fapp(For, Array.of_list (l1::l2::acc))) - | _ -> error "SmtForm.Form.mk_hform: wrong number of arguments for orb" in + | _ -> Structures.error "SmtForm.Form.mk_hform: wrong number of arguments for orb" in let l = mk_hform c in l |