# HG changeset patch
# User Cezary Kaliszyk <kaliszyk@in.tum.de>
# Date 1308229252 -32400
# Node ID 9f667f6da04f3013975d833a94c2b82a67df3c86
# Parent  a30d0bb7686919a99ac6f209343a97a1f73193ff# Parent  bb647489f130627f5ca820f1914fd66503d1a581
merge

diff -r bb647489f130 -r 9f667f6da04f Nominal/Ex/CPS/CPS3_DanvyFilinski.thy
--- a/Nominal/Ex/CPS/CPS3_DanvyFilinski.thy	Thu Jun 16 13:32:36 2011 +0100
+++ b/Nominal/Ex/CPS/CPS3_DanvyFilinski.thy	Thu Jun 16 22:00:52 2011 +0900
@@ -49,7 +49,6 @@
   apply simp
   apply (thin_tac "eqvt ka")
   apply (rule_tac x="(c, ca, x, xa, M, Ma)" and ?'a="name" in obtain_fresh)
-  apply (subgoal_tac "eqvt_at CPS1_CPS2_sumC (Inr (Ma, ca~))")
   apply (subgoal_tac "Abs c (CPS1_CPS2_sumC (Inr (M, c~))) = Abs a (CPS1_CPS2_sumC (Inr (M, a~)))")
   prefer 2
   apply (simp add: Abs1_eq_iff')
@@ -130,9 +129,7 @@
   apply (simp add: fresh_def supp_at_base)
   apply (metis atom_eq_iff permute_swap_cancel2 swap_atom_simps(3))
 --"-"
-  prefer 2
   apply (rule_tac x="(c, ca, x, xa, M, Ma)" and ?'a="name" in obtain_fresh)
-  apply (subgoal_tac "eqvt_at CPS1_CPS2_sumC (Inr (Ma, ca~))")
   apply (subgoal_tac "Abs c (CPS1_CPS2_sumC (Inr (M, c~))) = Abs a (CPS1_CPS2_sumC (Inr (M, a~)))")
   prefer 2
   apply (simp add: Abs1_eq_iff')
@@ -212,11 +209,10 @@
   apply (metis Nominal2_Base.swap_commute fresh_permute_iff permute_swap_cancel2)
   apply (simp add: fresh_def supp_at_base)
   apply (metis atom_eq_iff permute_swap_cancel2 swap_atom_simps(3))
---"Only left subgoals are eqvt for the other side"
-  oops
+  done
 
-(*termination
-  sorry
+termination
+  by lexicographic_order
 
 definition psi:: "lt => lt"
   where "psi V == V*(\<lambda>x. x)"
@@ -237,7 +233,6 @@
   apply assumption
   apply rule
   done
-*)
 
 end