
diff -r 41054d1eb6f0 -r 9978fc6d91e9 Nominal/Lift.thy
--- a/Nominal/Lift.thy	Wed Apr 14 10:50:11 2010 +0200
+++ b/Nominal/Lift.thy	Wed Apr 14 11:08:33 2010 +0200
@@ -1,7 +1,7 @@
 theory Lift
 imports "../Nominal-General/Nominal2_Atoms" 
         "../Nominal-General/Nominal2_Eqvt" 
-        "../Nominal_General/Nominal2_Supp" 
+        "../Nominal-General/Nominal2_Supp" 
         "Abs" "Perm" "Equivp" "Rsp"
 begin
 
@@ -69,13 +69,16 @@
 ML {*
 fun define_fv_alpha_export dt binds bns ctxt =
 let
-  val ((((fv_ts_loc, fv_def_loc), ord_fv_ts_loc), alpha), ctxt') =
-    define_fv_alpha dt binds bns ctxt;
+  val (((fv_ts_loc, fv_def_loc), ord_fv_ts_loc), ctxt') =
+    define_fv dt binds bns ctxt;
+  val fv_ts_nobn = take (length bns) fv_ts_loc
+  val (alpha, ctxt'') =
+    define_alpha dt binds bns fv_ts_nobn ctxt';
   val alpha_ts_loc = #preds alpha
   val alpha_induct_loc = #induct alpha
   val alpha_intros_loc = #intrs alpha;
   val alpha_cases_loc = #elims alpha
-  val morphism = ProofContext.export_morphism ctxt' ctxt;
+  val morphism = ProofContext.export_morphism ctxt'' ctxt;
   val fv_ts = map (Morphism.term morphism) fv_ts_loc;
   val ord_fv_ts = map (Morphism.term morphism) ord_fv_ts_loc;
   val fv_def = Morphism.fact morphism fv_def_loc;
@@ -84,7 +87,7 @@
   val alpha_intros = Morphism.fact morphism alpha_intros_loc
   val alpha_cases = Morphism.fact morphism alpha_cases_loc
 in
-  ((((fv_ts, ord_fv_ts), fv_def), ((alpha_ts, alpha_intros), (alpha_cases, alpha_induct))), ctxt')
+  ((((fv_ts, ord_fv_ts), fv_def), ((alpha_ts, alpha_intros), (alpha_cases, alpha_induct))), ctxt'')
 end;
 *}
 




