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

2 files changed, 36 insertions, 9 deletions

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