1 files changed, 23 insertions, 15 deletions
diff --git a/spartan/lib/elimination.ML b/spartan/lib/elimination.ML
index bd23c94..617f83e 100644
--- a/spartan/lib/elimination.ML
+++ b/spartan/lib/elimination.ML
@@ -1,38 +1,46 @@
 (*  Title:      elimination.ML
     Author:     Joshua Chen
 
-Type elimination automation.
+Type elimination setup.
 *)
 
-structure Elim = struct
+structure Elim: sig
+
+val rules: Proof.context -> (thm * indexname list) list
+val lookup_rule: Proof.context -> Termtab.key -> (thm * indexname list) option
+val register_rule: term list -> thm -> Context.generic -> Context.generic
+
+end = struct
 
 (** Context data **)
+
 (* Elimination rule data *)
+
+(*Stores elimination rules together with a list of the indexnames of the
+  variables each rule eliminates. Keyed by head of the type being eliminated.*)
 structure Rules = Generic_Data (
-  type T = thm Termtab.table
+  type T = (thm * indexname list) Termtab.table
   val empty = Termtab.empty
   val extend = I
-  val merge = Termtab.merge Thm.eq_thm_prop
+  val merge = Termtab.merge (eq_fst Thm.eq_thm_prop)
 )
 
-fun register_rule rl =
+fun rules ctxt = map (op #2) (Termtab.dest (Rules.get (Context.Proof ctxt)))
+fun lookup_rule ctxt = Termtab.lookup (Rules.get (Context.Proof ctxt))
+fun register_rule tms rl =
   let val hd = Term.head_of (Lib.type_of_typing (Thm.major_prem_of rl))
-  in Rules.map (Termtab.update (hd, rl)) end
+  in Rules.map (Termtab.update (hd, (rl, map (#1 o dest_Var) tms))) end
 
-fun get_rule ctxt = Termtab.lookup (Rules.get (Context.Proof ctxt))
 
-fun rules ctxt = map (op #2) (Termtab.dest (Rules.get (Context.Proof ctxt)))
-
-(* Set up [elims] attribute *)
+(* [elims] attribute *)
 val _ = Theory.setup (
   Attrib.setup \<^binding>\<open>elims\<close>
-    (Scan.lift (Scan.succeed (Thm.declaration_attribute register_rule))) ""
+    (Scan.repeat Args.term_pattern >>
+      (Thm.declaration_attribute o register_rule))
+    ""
   #> Global_Theory.add_thms_dynamic (\<^binding>\<open>elims\<close>,
-      fn context => (rules (Context.proof_of context)))
+      fn context => (map #1 (rules (Context.proof_of context))))
 )
 
-(** General elimination-induction tactic **)
-
-
 
 end