# HG changeset patch
# User krauss
# Date 1273877142 -7200
# Node ID ae0809cff6f05889037d96af57194f23e2a18ef4
# Parent  705b58fde4764108610ef10a6378dda5f3004985
normalize atyp names after unconstrainT, which may rename atyps arbitrarily;

diff -r 705b58fde476 -r ae0809cff6f0 src/Pure/axclass.ML
--- a/src/Pure/axclass.ML	Sat May 15 15:07:39 2010 +0200
+++ b/src/Pure/axclass.ML	Sat May 15 00:45:42 2010 +0200
@@ -422,8 +422,8 @@
     val rel = Logic.dest_classrel prop handle TERM _ => err ();
     val (c1, c2) = cert_classrel thy rel handle TYPE _ => err ();
     val th' = th
-      |> Drule.instantiate' [SOME (ctyp_of thy (TVar ((Name.aT, 0), [c1])))] []
-      |> Thm.unconstrainT;
+      |> Thm.unconstrainT
+      |> Drule.instantiate' [SOME (ctyp_of thy (TVar ((Name.aT, 0), [])))] [];
     val _ = shyps_topped th' orelse raise Fail "add_classrel: nontop shyps after unconstrain";
   in
     thy
@@ -441,15 +441,15 @@
 
     val args = Name.names Name.context Name.aT Ss;
     val T = Type (t, map TFree args);
-    val std_vars = map (fn (a, S) => SOME (ctyp_of thy (TVar ((a, 0), S)))) args;
+    val std_vars = map (fn (a, S) => SOME (ctyp_of thy (TVar ((a, 0), [])))) args;
 
     val missing_params = Sign.complete_sort thy [c]
       |> maps (these o Option.map #params o try (get_info thy))
       |> filter_out (fn (const, _) => can (get_inst_param thy) (const, t))
       |> (map o apsnd o map_atyps) (K T);
     val th' = th
-      |> Drule.instantiate' std_vars []
-      |> Thm.unconstrainT;
+      |> Thm.unconstrainT
+      |> Drule.instantiate' std_vars [];
     val _ = shyps_topped th' orelse raise Fail "add_arity: nontop shyps after unconstrain";
   in
     thy