src/HOL/Tools/Datatype/datatype_abs_proofs.ML
changeset 32915 a7a97960054b
parent 32906 ac97e8735cc2
child 32952 aeb1e44fbc19
--- a/src/HOL/Tools/Datatype/datatype_abs_proofs.ML	Mon Oct 12 15:26:50 2009 +0200
+++ b/src/HOL/Tools/Datatype/datatype_abs_proofs.ML	Tue Oct 13 08:36:39 2009 +0200
@@ -20,8 +20,8 @@
     attribute list -> theory -> thm list * theory
   val prove_primrec_thms : config -> string list ->
     descr list -> (string * sort) list ->
-      (string -> thm list) -> thm list list -> thm list list ->
-        simpset -> thm -> theory -> (string list * thm list) * theory
+      (string -> thm list) -> thm list list -> thm list list * thm list list ->
+        thm -> theory -> (string list * thm list) * theory
   val prove_case_thms : config -> string list ->
     descr list -> (string * sort) list ->
       string list -> thm list -> theory -> (thm list list * string list) * theory
@@ -88,7 +88,7 @@
 (*************************** primrec combinators ******************************)
 
 fun prove_primrec_thms (config : config) new_type_names descr sorts
-    injects_of constr_inject dist_rewrites dist_ss induct thy =
+    injects_of constr_inject (dist_rewrites, other_dist_rewrites) induct thy =
   let
     val _ = message config "Constructing primrec combinators ...";
 
@@ -170,7 +170,7 @@
         val distinct_tac =
           (if i < length newTs then
              full_simp_tac (HOL_ss addsimps (nth dist_rewrites i)) 1
-           else full_simp_tac dist_ss 1);
+           else full_simp_tac (HOL_ss addsimps (flat other_dist_rewrites)) 1);
 
         val inject = map (fn r => r RS iffD1)
           (if i < length newTs then nth constr_inject i