--- a/Nominal/Fv.thy	Mon May 03 00:01:12 2010 +0100
+++ b/Nominal/Fv.thy	Mon May 03 09:55:43 2010 +0200
@@ -650,4 +650,29 @@
 end
 *}
 
+
+ML {*
+fun define_fv_alpha_export dt binds bns ctxt =
+let
+  val (((fv_ts_loc, fv_def_loc), ord_fv_ts_loc), ctxt') =
+    define_fv dt binds bns ctxt;
+  val (alpha, ctxt'') =
+    define_alpha dt binds bns fv_ts_loc 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 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;
+  val alpha_ts = map (Morphism.term morphism) alpha_ts_loc;
+  val alpha_induct = Morphism.thm morphism alpha_induct_loc;
+  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'')
+end;
+*}
+
 end

--- a/Nominal/Lift.thy	Mon May 03 00:01:12 2010 +0100
+++ b/Nominal/Lift.thy	Mon May 03 09:55:43 2010 +0200
@@ -1,8 +1,8 @@
 theory Lift
-imports "../Nominal-General/Nominal2_Atoms" 
-        "../Nominal-General/Nominal2_Eqvt" 
-        "../Nominal-General/Nominal2_Supp" 
-        "Abs" "Perm" "Equivp" "Rsp" "Attic/Fv"
+imports "../Nominal-General/Nominal2_Atoms"
+        "../Nominal-General/Nominal2_Eqvt"
+        "../Nominal-General/Nominal2_Supp"
+        "Abs" "Perm" "Equivp" "Rsp"
 begin
 
 
@@ -66,32 +66,5 @@
 end
 *}
 
-
-
-
-ML {*
-fun define_fv_alpha_export dt binds bns ctxt =
-let
-  val (((fv_ts_loc, fv_def_loc), ord_fv_ts_loc), ctxt') =
-    define_fv dt binds bns ctxt;
-  val (alpha, ctxt'') =
-    define_alpha dt binds bns fv_ts_loc 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 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;
-  val alpha_ts = map (Morphism.term morphism) alpha_ts_loc;
-  val alpha_induct = Morphism.thm morphism alpha_induct_loc;
-  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'')
-end;
-*}
-
 end