Merge branch 'master' of github.com:smtcoq/smtcoq into coq-8.10

5 files changed, 52 insertions, 14 deletions

diff --git a/src/BEST_PRACTICE.md b/src/BEST_PRACTICE.md
index 0854551..a61ec79 100644
--- a/src/BEST_PRACTICE.md
+++ b/src/BEST_PRACTICE.md
@@ -1,7 +1,8 @@
 # Proofs
 ## Axioms
 
-No axiom should be added. No library adding axioms should be imported.
+No axiom should be added. No library adding axioms should be imported
+(except Int63 and Array).
 
 
 ## Hints
@@ -13,6 +14,9 @@ the project is named `smtcoq_core`.
 
 
 # Code organization
+## Documentation
+Every OCaml module comes with a documented interface.
+
 ## Theories
 
 Theories are organized in sub-directories whose names are the names of
diff --git a/src/Conversion_tactics.v b/src/Conversion_tactics.v
index ecf1be8..cb0c090 100644
--- a/src/Conversion_tactics.v
+++ b/src/Conversion_tactics.v
@@ -457,4 +457,4 @@ End nat_convert_type.
 
 Module nat_convert_mod := convert nat_convert_type.
 
-Ltac nat_convert := fold Nat.add Nat.mul Nat.leb Nat.ltb Nat.eqb; nat_convert_mod.convert.
+Ltac nat_convert := nat_convert_mod.convert.
diff --git a/src/verit/verit.ml b/src/verit/verit.ml
index 17a230f..39f60c0 100644
--- a/src/verit/verit.ml
+++ b/src/verit/verit.ml
@@ -185,20 +185,27 @@ let call_verit _ rt ro ra' rf' first lsmt =
 
   let win = open_in wname in
 
-  let raise_warnings () =
+  let raise_warnings_errors () =
     try
       while true do
         let l = input_line win in
+        let n = String.length l in
         if l = "warning : proof_done: status is still open" then
           raise Unknown
+        else if l = "Invalid memory reference" then
+          Structures.warning "verit-warning" ("veriT outputted the warning: " ^ l)
+        else if n >= 7 && String.sub l 0 7 = "warning" then
+          Structures.warning "verit-warning" ("veriT outputted the warning: " ^ (String.sub l 7 (n-7)))
+        else if n >= 8 && String.sub l 0 8 = "error : " then
+          Structures.error ("veriT failed with the error: " ^ (String.sub l 8 (n-8)))
         else
-          Structures.warning "verit-warning" ("Verit.call_verit: command " ^ command ^ " outputs the warning: " ^ l);
+          Structures.error ("veriT failed with the error: " ^ l)
       done
     with End_of_file -> () in
 
   try
     if exit_code <> 0 then Structures.warning "verit-non-zero-exit-code" ("Verit.call_verit: command " ^ command ^ " exited with code " ^ string_of_int exit_code);
-    raise_warnings ();
+    raise_warnings_errors ();
     let res = import_trace ra' rf' logfilename (Some first) lsmt in
     close_in win; Sys.remove wname; res
   with x -> close_in win; Sys.remove wname;
diff --git a/src/versions/standard/Makefile.local b/src/versions/standard/Makefile.local
index 045af88..8abc72c 100644
--- a/src/versions/standard/Makefile.local
+++ b/src/versions/standard/Makefile.local
@@ -5,16 +5,19 @@
 
 
 test :
-	cd ../unit-tests; make
+	cd ../unit-tests; make cleanvo; make
 
 ztest :
-	cd ../unit-tests; make zchaff
+	cd ../unit-tests; make cleanvo; make zchaff
 
 vtest :
-	cd ../unit-tests; make verit
+	cd ../unit-tests; make cleanvo; make verit
 
 lfsctest :
-	cd ../unit-tests; make lfsc
+	cd ../unit-tests; make cleanvo; make lfsc
+
+paralleltest :
+	cd ../unit-tests; make parallel
 
 clean::
 	cd ../unit-tests; make clean
diff --git a/src/versions/standard/g_smtcoq_standard.mlg b/src/versions/standard/g_smtcoq_standard.mlg
index 8e273db..443d558 100644
--- a/src/versions/standard/g_smtcoq_standard.mlg
+++ b/src/versions/standard/g_smtcoq_standard.mlg
@@ -80,17 +80,41 @@ TACTIC EXTEND Tactic_zchaff
 | [ "zchaff_bool_no_check" ] -> { Zchaff.tactic_no_check () }
 END
 
-{ let lemmas_list = ref [] }
+{
+
+let lemmas_list = Summary.ref ~name:"Selected lemmas" []
+
+let cache_lemmas (_, lems) =
+  lemmas_list := lems
+
+let declare_lemmas : Structures.constr_expr list -> Libobject.obj =
+  let open Libobject in
+  declare_object
+    {
+      (default_object "LEMMAS") with
+      cache_function = cache_lemmas;
+      load_function = (fun _ -> cache_lemmas);
+    }
+
+let add_lemmas lems =
+  Lib.add_anonymous_leaf (declare_lemmas (lems @ !lemmas_list))
+
+let clear_lemmas () =
+  Lib.add_anonymous_leaf (declare_lemmas [])
+
+let get_lemmas () = !lemmas_list
+
+}
 
 VERNAC COMMAND EXTEND Add_lemma CLASSIFIED AS SIDEFF
-| [ "Add_lemmas" constr_list(lems) ] -> { lemmas_list := lems @ !lemmas_list }
-| [ "Clear_lemmas" ] -> { lemmas_list := [] }
+| [ "Add_lemmas" constr_list(lems) ] -> { add_lemmas lems }
+| [ "Clear_lemmas" ] -> { clear_lemmas () }
 END
 
 
 TACTIC EXTEND Tactic_verit
-| [ "verit_bool_base" constr_list(lpl) ] -> { Verit.tactic (List.map EConstr.Unsafe.to_constr lpl) !lemmas_list }
-| [ "verit_bool_no_check_base" constr_list(lpl) ] -> { Verit.tactic_no_check (List.map EConstr.Unsafe.to_constr lpl) !lemmas_list }
+| [ "verit_bool_base" constr_list(lpl) ] -> { Verit.tactic (List.map EConstr.Unsafe.to_constr lpl) (get_lemmas ()) }
+| [ "verit_bool_no_check_base" constr_list(lpl) ] -> { Verit.tactic_no_check (List.map EConstr.Unsafe.to_constr lpl) (get_lemmas ()) }
 END
 
 TACTIC EXTEND Tactic_cvc4