# HG changeset patch
# User wenzelm
# Date 1369925612 -7200
# Node ID 2d634bfa1bbf9c9184c8869ddd4ae5bb2ddc1463
# Parent  5f6e885382e97b0f5607e69cb04eac5f3276662d
more standard fold/fold_rev;

diff -r 5f6e885382e9 -r 2d634bfa1bbf src/Tools/IsaPlanner/isand.ML
--- a/src/Tools/IsaPlanner/isand.ML	Thu May 30 16:48:50 2013 +0200
+++ b/src/Tools/IsaPlanner/isand.ML	Thu May 30 16:53:32 2013 +0200
@@ -53,17 +53,15 @@
     let
       val premts = Thm.prems_of th;
 
-      fun allify_prem_var (vt as (n,ty),t)  =
+      fun allify_prem_var (vt as (n,ty)) t =
           (Logic.all_const ty) $ (Abs(n,ty,Term.abstract_over (Free vt, t)))
 
-      fun allify_prem Ts p = List.foldr allify_prem_var p Ts
+      val allify_prem = fold_rev allify_prem_var
 
       val cTs = map (ctermify o Free) Ts
       val cterm_asms = map (ctermify o allify_prem Ts) premts
       val allifyied_asm_thms = map (Drule.forall_elim_list cTs o Thm.assume) cterm_asms
-    in
-      (Library.foldl (fn (x,y) => y COMP x) (th, allifyied_asm_thms), cterm_asms)
-    end;
+    in (fold (curry op COMP) allifyied_asm_thms th, cterm_asms) end;
 
 (* make free vars into schematic vars with index zero *)
 fun unfix_frees frees =
diff -r 5f6e885382e9 -r 2d634bfa1bbf src/Tools/IsaPlanner/rw_inst.ML
--- a/src/Tools/IsaPlanner/rw_inst.ML	Thu May 30 16:48:50 2013 +0200
+++ b/src/Tools/IsaPlanner/rw_inst.ML	Thu May 30 16:53:32 2013 +0200
@@ -67,8 +67,8 @@
     (* using these names create lambda-abstracted version of the rule *)
     val abstractions = rev (Ts' ~~ tonames);
     val abstract_rule =
-      Library.foldl (fn (th,((n,ty),ct)) => Thm.abstract_rule n ct th)
-        (uncond_rule, abstractions);
+      fold (fn ((n, ty), ct) => Thm.abstract_rule n ct)
+        abstractions uncond_rule;
   in (cprems, abstract_rule) end;
 
 
@@ -83,17 +83,16 @@
   let
     val rule_conds = Thm.prems_of rule_inst;
     val (_, cond_vs) =
-      Library.foldl (fn ((tyvs, vs), t) =>
-                (union (op =) (Misc_Legacy.term_tvars t) tyvs,
-                 union (op =) (map Term.dest_Var (Misc_Legacy.term_vars t)) vs))
-            (([], []), rule_conds);
+      fold (fn t => fn (tyvs, vs) =>
+        (union (op =) (Misc_Legacy.term_tvars t) tyvs,
+         union (op =) (map Term.dest_Var (Misc_Legacy.term_vars t)) vs)) rule_conds ([], []);
     val termvars = map Term.dest_Var (Misc_Legacy.term_vars tgt);
     val vars_to_fix = union (op =) termvars cond_vs;
     val ys = IsaND.variant_names ctxt (tgt :: rule_conds) (map (fst o fst) vars_to_fix);
   in map2 (fn (xi, T) => fn y => ((xi, T), Free (y, T))) vars_to_fix ys end;
 
 (* make a new fresh typefree instantiation for the given tvar *)
-fun new_tfree (tv as (ix,sort), (pairs,used)) =
+fun new_tfree (tv as (ix,sort)) (pairs, used) =
   let val v = singleton (Name.variant_list used) (string_of_indexname ix)
   in ((ix,(sort,TFree(v,sort)))::pairs, v::used) end;
 
@@ -104,11 +103,11 @@
   let
     val ignore_ixs = map fst ignore_insts;
     val (tvars, tfrees) =
-      List.foldr (fn (t, (varixs, tfrees)) =>
+      fold_rev (fn t => fn (varixs, tfrees) =>
         (Misc_Legacy.add_term_tvars (t,varixs),
-         Misc_Legacy.add_term_tfrees (t,tfrees))) ([],[]) ts;
+         Misc_Legacy.add_term_tfrees (t,tfrees))) ts ([], []);
     val unfixed_tvars = filter (fn (ix,s) => not (member (op =) ignore_ixs ix)) tvars;
-    val (fixtyinsts, _) = List.foldr new_tfree ([], map fst tfrees) unfixed_tvars
+    val (fixtyinsts, _) = fold_rev new_tfree unfixed_tvars ([], map fst tfrees)
   in (fixtyinsts, tfrees) end;
 
 
@@ -176,10 +175,9 @@
 
     (* type-instantiate the var instantiations *)
     val insts_tyinst =
-      List.foldr (fn ((ix,(ty,t)),insts_tyinst) =>
+      fold_rev (fn (ix, (ty, t)) => fn insts_tyinst =>
         (ix, (Term.typ_subst_TVars term_typ_inst ty, Term.subst_TVars term_typ_inst t))
-          :: insts_tyinst)
-        [] unprepinsts;
+          :: insts_tyinst) unprepinsts [];
 
     (* cross-instantiate *)
     val insts_tyinst_inst = cross_inst insts_tyinst;
diff -r 5f6e885382e9 -r 2d634bfa1bbf src/Tools/eqsubst.ML
--- a/src/Tools/eqsubst.ML	Thu May 30 16:48:50 2013 +0200
+++ b/src/Tools/eqsubst.ML	Thu May 30 16:53:32 2013 +0200
@@ -110,14 +110,14 @@
 fun mk_fake_bound_name n = ":b_" ^ n;
 fun fakefree_badbounds Ts t =
   let val (FakeTs, Ts, newnames) =
-    List.foldr (fn ((n, ty), (FakeTs, Ts, usednames)) =>
+    fold_rev (fn (n, ty) => fn (FakeTs, Ts, usednames) =>
       let
         val newname = singleton (Name.variant_list usednames) n
       in
         ((mk_fake_bound_name newname, ty) :: FakeTs,
           (newname, ty) :: Ts,
           newname :: usednames)
-      end) ([], [], []) Ts
+      end) Ts ([], [], [])
   in (FakeTs, Ts, Term.subst_bounds (map Free FakeTs, t)) end;
 
 (* before matching we need to fake the bound vars that are missing an