# HG changeset patch
# User wenzelm
# Date 1470422620 -7200
# Node ID 9c4bb72d1f4f2af17fa3d7bb87d0814afd1eb747
# Parent  3646e2ba554c751712ee3f96e00a2fae049d3374
tuned;

diff -r 3646e2ba554c -r 9c4bb72d1f4f src/Pure/envir.ML
--- a/src/Pure/envir.ML	Fri Aug 05 20:40:46 2016 +0200
+++ b/src/Pure/envir.ML	Fri Aug 05 20:43:40 2016 +0200
@@ -101,7 +101,7 @@
 fun genvars name (Envir {maxidx, tenv, tyenv}, Ts) : env * term list =
   let
     fun genvs (_, [] : typ list) : term list = []
-      | genvs (n, [T]) = [Var ((name, maxidx + 1), T)]
+      | genvs (_, [T]) = [Var ((name, maxidx + 1), T)]
       | genvs (n, T :: Ts) =
           Var ((name ^ radixstring (26, "a" , n), maxidx + 1), T)
             :: genvs (n + 1, Ts);
@@ -137,16 +137,16 @@
   (case Vartab.min tyenv of SOME ((_, i), _) => i > lim | NONE => true);
 
 (*Update, checking Var-Var assignments: try to suppress higher indexes*)
-fun vupdate (aU as (a, U), t) (env as Envir {tyenv, ...}) =
+fun vupdate ((a, U), t) env =
   (case t of
     Var (nT as (name', T)) =>
       if a = name' then env     (*cycle!*)
       else if Term_Ord.indexname_ord (a, name') = LESS then
         (case lookup env nT of  (*if already assigned, chase*)
           NONE => update (nT, Var (a, T)) env
-        | SOME u => vupdate (aU, u) env)
-      else update (aU, t) env
-  | _ => update (aU, t) env);
+        | SOME u => vupdate ((a, U), u) env)
+      else update ((a, U), t) env
+  | _ => update ((a, U), t) env);
 
 
 
@@ -183,7 +183,7 @@
       | norm _ = raise Same.SAME;
   in norm end;
 
-fun norm_term2 (envir as Envir {tenv, tyenv, ...}) : term Same.operation =
+fun norm_term2 (envir as Envir {tyenv, ...}) : term Same.operation =
   let
     val normT = norm_type0 tyenv;
     fun norm (Const (a, T)) = Const (a, normT T)
@@ -322,13 +322,13 @@
     fun fast Ts (f $ u) =
           (case Type.devar tyenv (fast Ts f) of
             Type ("fun", [_, T]) => T
-          | TVar v => raise TERM (funerr, [f $ u])
+          | TVar _ => raise TERM (funerr, [f $ u])
           | _ => raise TERM (funerr, [f $ u]))
-      | fast Ts (Const (_, T)) = T
-      | fast Ts (Free (_, T)) = T
+      | fast _ (Const (_, T)) = T
+      | fast _ (Free (_, T)) = T
       | fast Ts (Bound i) =
           (nth Ts i handle General.Subscript => raise TERM ("fastype: Bound", [Bound i]))
-      | fast Ts (Var (_, T)) = T
+      | fast _ (Var (_, T)) = T
       | fast Ts (Abs (_, T, u)) = T --> fast (T :: Ts) u;
   in fast end;