# HG changeset patch
# User wenzelm
# Date 1247772542 -7200
# Node ID 2d071ac5032f8fbb6305845f0d3b6ffc28e8b895
# Parent  c2f4ee07647f0bb3f0d570102499658fd6a5bdab
export incr_tvar_same;
tuned;

diff -r c2f4ee07647f -r 2d071ac5032f src/Pure/logic.ML
--- a/src/Pure/logic.ML	Thu Jul 16 21:28:39 2009 +0200
+++ b/src/Pure/logic.ML	Thu Jul 16 21:29:02 2009 +0200
@@ -54,8 +54,9 @@
   val close_form: term -> term
   val combound: term * int * int -> term
   val rlist_abs: (string * typ) list * term -> term
+  val incr_tvar_same: int -> typ Same.operation
+  val incr_tvar: int -> typ -> typ
   val incr_indexes: typ list * int -> term -> term
-  val incr_tvar: int -> typ -> typ
   val lift_abs: int -> term -> term -> term
   val lift_all: int -> term -> term -> term
   val strip_assums_hyp: term -> term list
@@ -303,18 +304,20 @@
 fun rlist_abs ([], body) = body
   | rlist_abs ((a,T)::pairs, body) = rlist_abs(pairs, Abs(a, T, body));
 
-
-fun incrT k = Term_Subst.map_atypsT_same
+fun incr_tvar_same k = Term_Subst.map_atypsT_same
   (fn TVar ((a, i), S) => TVar ((a, i + k), S)
     | _ => raise Same.SAME);
 
+fun incr_tvar 0 T = T
+  | incr_tvar k T = incr_tvar_same k T handle Same.SAME => T;
+
 (*For all variables in the term, increment indexnames and lift over the Us
     result is ?Gidx(B.(lev+n-1),...,B.lev) where lev is abstraction level *)
 fun incr_indexes ([], 0) t = t
   | incr_indexes (Ts, k) t =
       let
         val n = length Ts;
-        val incrT = if k = 0 then I else incrT k;
+        val incrT = if k = 0 then I else incr_tvar_same k;
 
         fun incr lev (Var ((x, i), T)) =
               combound (Var ((x, i + k), Ts ---> Same.commit incrT T), lev, n)
@@ -329,9 +332,6 @@
           | incr _ (t as Bound _) = t;
       in incr 0 t handle Same.SAME => t end;
 
-fun incr_tvar 0 T = T
-  | incr_tvar k T = incrT k T handle Same.SAME => T;
-
 
 (* Lifting functions from subgoal and increment:
     lift_abs operates on terms