1. Bugfix: implicits now properly name schematic variables. Fixes problems caused by variable name clashes. 2. reduce method now more principled: restricts to repeating on first subgoal. 3. An example declarative proof in Equivalence.thy.

2 files changed, 23 insertions, 16 deletions

diff --git a/spartan/core/Spartan.thy b/spartan/core/Spartan.thy
index a4ad300..fa6148f 100644
--- a/spartan/core/Spartan.thy
+++ b/spartan/core/Spartan.thy
@@ -52,7 +52,7 @@ paragraph \<open>
 
 typedecl o
 
-judgment has_type :: \<open>o \<Rightarrow> o \<Rightarrow> prop\<close> ("(2_:/ _)" 999)
+consts has_type :: \<open>o \<Rightarrow> o \<Rightarrow> prop\<close> ("(2_:/ _)" 999)
 
 text \<open>Type annotations for type-checking and inference.\<close>
 
@@ -232,6 +232,10 @@ method_setup rule =
   \<open>Attrib.thms >> (fn ths => K (CONTEXT_METHOD (
     CHEADGOAL o SIDE_CONDS (rule_ctac ths))))\<close>
 
+method_setup rules =
+  \<open>Attrib.thms >> (fn ths => K (CONTEXT_METHOD (
+    CREPEAT o CHEADGOAL o SIDE_CONDS (rule_ctac ths))))\<close>
+
 method_setup dest =
   \<open>Scan.lift (Scan.option (Args.parens Parse.int))
     -- Attrib.thms >> (fn (n_opt, ths) => K (CONTEXT_METHOD (
@@ -255,6 +259,8 @@ method_setup cases =
   \<open>Args.term >> (fn tm => K (CONTEXT_METHOD (
     CHEADGOAL o SIDE_CONDS (cases_ctac tm))))\<close>
 
+method facts = fact+
+
 
 subsection \<open>Reflexivity\<close>
 
@@ -310,7 +316,8 @@ setup \<open>map_theory_simpset (fn ctxt =>
   ctxt addSolver (mk_solver "" (fn ctxt' =>
     NO_CONTEXT_TACTIC ctxt' o Types.check_infer (Simplifier.prems_of ctxt'))))\<close>
 
-method reduce uses add = changed \<open>((simp add: comp add | sub comp); typechk?)+\<close>
+method reduce uses add =
+  changed \<open>repeat_new \<open>(simp add: comp add | sub comp); typechk?\<close>\<close>
 
 subsection \<open>Implicits\<close>
 
@@ -327,10 +334,7 @@ ML_file \<open>implicits.ML\<close>
 
 attribute_setup implicit = \<open>Scan.succeed Implicits.implicit_defs_attr\<close>
 
-ML \<open>
-val _ = Context.>>
-  (Syntax_Phases.term_check 1 "" (fn ctxt => map (Implicits.make_holes ctxt)))
-\<close>
+ML \<open>val _ = Context.>> (Syntax_Phases.term_check 1 "" Implicits.make_holes)\<close>
 
 text \<open>Automatically insert inhabitation judgments where needed:\<close>
 
@@ -488,7 +492,7 @@ lemma snd_type [typechk]:
 lemma snd_comp [comp]:
   assumes "a: A" "b: B a" "A: U i" "\<And>x. x: A \<Longrightarrow> B x: U i"
   shows "snd A B <a, b> \<equiv> b"
-  unfolding snd_def by reduce+
+  unfolding snd_def by reduce
 
 subsection \<open>Notation\<close>
 
diff --git a/spartan/core/implicits.ML b/spartan/core/implicits.ML
index 4d73c8d..ab64b0f 100644
--- a/spartan/core/implicits.ML
+++ b/spartan/core/implicits.ML
@@ -3,7 +3,7 @@ sig
 
 val implicit_defs: Proof.context -> (term * term) Symtab.table
 val implicit_defs_attr: attribute
-val make_holes: Proof.context -> term -> term
+val make_holes: Proof.context -> term list -> term list
 
 end = struct
 
@@ -25,16 +25,15 @@ val implicit_defs_attr = Thm.declaration_attribute (fn th =>
     Defs.map (Symtab.update (Term.term_name head, (head, def')))
   end)
 
-fun make_holes ctxt =
+fun make_holes_single ctxt tm name_ctxt =
   let
     fun iarg_to_hole (Const (\<^const_name>\<open>iarg\<close>, T)) =
           Const (\<^const_name>\<open>hole\<close>, T)
       | iarg_to_hole t = t
 
     fun expand head args =
-      let
-        fun betapplys (head', args') =
-          Term.betapplys (map_aterms iarg_to_hole head', args')
+      let fun betapplys (head', args') =
+        Term.betapplys (map_aterms iarg_to_hole head', args')
       in
         case head of
           Abs (x, T, t) =>
@@ -66,13 +65,17 @@ fun make_holes ctxt =
               in subst t (take n vs) Ts $ subst u (drop n vs) Ts end
           | subst t _ _ = t
 
-        val vars = map (fn n => Var ((n, 0), dummyT))
-          (Name.invent (Variable.names_of ctxt) "*" (count t))
+        val names = Name.invent name_ctxt "*" (count t)
+        val vars = map (fn n => Var ((n, 0), dummyT)) names
       in
-        subst t vars []
+        (subst t vars [], fold Name.declare names name_ctxt)
       end
   in
-    Lib.traverse_term expand #> holes_to_vars
+    holes_to_vars (Lib.traverse_term expand tm)
   end
 
+fun make_holes ctxt tms = #1
+  (fold_map (make_holes_single ctxt) tms (Variable.names_of ctxt))
+
+
 end