--- a/src/HOL/Tools/Predicate_Compile/predicate_compile.ML Sat Oct 24 16:55:42 2009 +0200
+++ b/src/HOL/Tools/Predicate_Compile/predicate_compile.ML Sat Oct 24 16:55:42 2009 +0200
@@ -17,71 +17,6 @@
val priority = tracing;
-(* tuple processing *)
-
-fun expand_tuples thy intro =
- let
- fun rewrite_args [] (pats, intro_t, ctxt) = (pats, intro_t, ctxt)
- | rewrite_args (arg::args) (pats, intro_t, ctxt) =
- (case HOLogic.strip_tupleT (fastype_of arg) of
- (Ts as _ :: _ :: _) =>
- let
- fun rewrite_arg' (Const ("Pair", _) $ _ $ t2, Type ("*", [_, T2]))
- (args, (pats, intro_t, ctxt)) = rewrite_arg' (t2, T2) (args, (pats, intro_t, ctxt))
- | rewrite_arg' (t, Type ("*", [T1, T2])) (args, (pats, intro_t, ctxt)) =
- let
- val ([x, y], ctxt') = Variable.variant_fixes ["x", "y"] ctxt
- val pat = (t, HOLogic.mk_prod (Free (x, T1), Free (y, T2)))
- (*val _ = tracing ("Rewriting term " ^
- (Syntax.string_of_term_global thy (fst pat)) ^ " to " ^
- (Syntax.string_of_term_global thy (snd pat)) ^ " in " ^
- (Syntax.string_of_term_global thy intro_t))*)
- val intro_t' = Pattern.rewrite_term thy [pat] [] intro_t
- val args' = map (Pattern.rewrite_term thy [pat] []) args
- in
- rewrite_arg' (Free (y, T2), T2) (args', (pat::pats, intro_t', ctxt'))
- end
- | rewrite_arg' _ (args, (pats, intro_t, ctxt)) = (args, (pats, intro_t, ctxt))
- val (args', (pats, intro_t', ctxt')) = rewrite_arg' (arg, fastype_of arg)
- (args, (pats, intro_t, ctxt))
- in
- rewrite_args args' (pats, intro_t', ctxt')
- end
- | _ => rewrite_args args (pats, intro_t, ctxt))
- fun rewrite_prem atom =
- let
- val (_, args) = strip_comb atom
- in rewrite_args args end
- val ctxt = ProofContext.init thy
- val (((T_insts, t_insts), [intro']), ctxt1) = Variable.import false [intro] ctxt
- val intro_t = prop_of intro'
- val concl = Logic.strip_imp_concl intro_t
- val (p, args) = strip_comb (HOLogic.dest_Trueprop concl)
- val (pats', intro_t', ctxt2) = rewrite_args args ([], intro_t, ctxt1)
- val (pats', intro_t', ctxt3) =
- fold_atoms rewrite_prem intro_t' (pats', intro_t', ctxt2)
- (*val _ = Output.tracing ("intro_t': " ^ (Syntax.string_of_term_global thy intro_t'))
- val _ = Output.tracing ("pats : " ^ (commas (map
- (fn (t1, t2) => (Syntax.string_of_term_global thy t1) ^ " -> " ^
- Syntax.string_of_term_global thy t2) pats'))*)
- fun rewrite_pat (ct1, ct2) =
- (ct1, cterm_of thy (Pattern.rewrite_term thy pats' [] (term_of ct2)))
- val t_insts' = map rewrite_pat t_insts
- (*val _ = Output.tracing ("t_insts':" ^ (commas (map
- (fn (ct1, ct2) => (Syntax.string_of_term_global thy (term_of ct1) ^ " -> " ^
- Syntax.string_of_term_global thy (term_of ct2))) t_insts')))*)
- val intro'' = Thm.instantiate (T_insts, t_insts') intro
- (*val _ = Output.tracing ("intro'':" ^ (Display.string_of_thm_global thy intro''))*)
- val [intro'''] = Variable.export ctxt3 ctxt [intro'']
- (*val _ = Output.tracing ("intro''':" ^ (Display.string_of_thm_global thy intro'''))*)
- in
- intro'''
- end
-
- (* eliminating fst/snd functions *)
-val simplify_fst_snd = Simplifier.full_simplify
- (HOL_basic_ss addsimps [@{thm fst_conv}, @{thm snd_conv}, @{thm Pair_eq}])
-
(* Some last processing *)
fun remove_pointless_clauses intro =
@@ -145,8 +80,8 @@
val _ = print_intross thy''' "Introduction rules with new constants: " intross3
val intross4 = map (maps remove_pointless_clauses) intross3
val _ = print_intross thy''' "After removing pointless clauses: " intross4
- val intross5 = burrow (map (AxClass.overload thy''')) intross4
- val intross6 = burrow (map (simplify_fst_snd o expand_tuples thy''')) intross5
+ val intross5 = map (map (AxClass.overload thy''')) intross4
+ val intross6 = burrow (map (expand_tuples thy''')) intross5
val _ = print_intross thy''' "introduction rules before registering: " intross6
val _ = print_step options "Registering introduction rules..."
val thy'''' = fold Predicate_Compile_Core.register_intros intross6 thy'''