# HG changeset patch
# User Cezary Kaliszyk <cezarykaliszyk@gmail.com>
# Date 1337688059 -7200
# Node ID 4cf3a4d367991307abc644189de15683abf2c53c
# Parent  c25386402f6a97596607410bde151f74e5366541
Added workaround for broken quotient_type in tip isabelle.

diff -r c25386402f6a -r 4cf3a4d36799 Nominal/Nominal2_Abs.thy
--- a/Nominal/Nominal2_Abs.thy	Sat May 12 20:54:00 2012 +0100
+++ b/Nominal/Nominal2_Abs.thy	Tue May 22 14:00:59 2012 +0200
@@ -457,10 +457,22 @@
 
 section {* Quotient types *}
 
-quotient_type 
+(* FIXME: The three could be defined together, but due to bugs
+   introduced by the lifting package it doesn't work anymore *)
+quotient_type
     'a abs_set = "(atom set \<times> 'a::pt)" / "alpha_abs_set"
-and 'b abs_res = "(atom set \<times> 'b::pt)" / "alpha_abs_res"
-and 'c abs_lst = "(atom list \<times> 'c::pt)" / "alpha_abs_lst"
+  apply(rule_tac [!] equivpI)
+  unfolding reflp_def refl_on_def symp_def sym_def transp_def trans_def
+  by (auto intro: alphas_abs_sym alphas_abs_refl alphas_abs_trans simp only:)
+
+quotient_type
+    'b abs_res = "(atom set \<times> 'b::pt)" / "alpha_abs_res"
+  apply(rule_tac [!] equivpI)
+  unfolding reflp_def refl_on_def symp_def sym_def transp_def trans_def
+  by (auto intro: alphas_abs_sym alphas_abs_refl alphas_abs_trans simp only:)
+
+quotient_type
+   'c abs_lst = "(atom list \<times> 'c::pt)" / "alpha_abs_lst"
   apply(rule_tac [!] equivpI)
   unfolding reflp_def refl_on_def symp_def sym_def transp_def trans_def
   by (auto intro: alphas_abs_sym alphas_abs_refl alphas_abs_trans simp only:)
diff -r c25386402f6a -r 4cf3a4d36799 Nominal/nominal_dt_quot.ML
--- a/Nominal/nominal_dt_quot.ML	Sat May 12 20:54:00 2012 +0100
+++ b/Nominal/nominal_dt_quot.ML	Tue May 22 14:00:59 2012 +0200
@@ -58,7 +58,7 @@
 fun define_qtypes qtys_descr alpha_tys alpha_trms alpha_equivp_thms lthy =
   let
     val qty_args1 = map2 (fn ty => fn trm => (ty, trm, false)) alpha_tys alpha_trms
-    val qty_args2 = (map2 (fn descr => fn args1 => (descr, args1, NONE)) qtys_descr qty_args1)
+    val qty_args2 = (map2 (fn descr => fn args1 => (descr, args1, (NONE, false))) qtys_descr qty_args1)
     val qty_args3 = qty_args2 ~~ alpha_equivp_thms
   in
     fold_map Quotient_Type.add_quotient_type qty_args3 lthy