# HG changeset patch # User huffman # Date 1294514289 28800 # Node ID 655f583840d02671e0fa57ebb4bf7a0021d4cc6c # Parent 18500bd1f47b2e4c7960b120b0a7e6f62a69aa2e use proper syntactic types for 'syntax' commands diff -r 18500bd1f47b -r 655f583840d0 src/HOL/HOLCF/Cfun.thy --- a/src/HOL/HOLCF/Cfun.thy Sat Jan 08 10:02:43 2011 -0800 +++ b/src/HOL/HOLCF/Cfun.thy Sat Jan 08 11:18:09 2011 -0800 @@ -30,7 +30,7 @@ subsection {* Syntax for continuous lambda abstraction *} -syntax "_cabs" :: "'a" +syntax "_cabs" :: "[logic, logic] \ logic" parse_translation {* (* rewrite (_cabs x t) => (Abs_cfun (%x. t)) *) @@ -46,10 +46,10 @@ text {* Syntax for nested abstractions *} syntax - "_Lambda" :: "[cargs, 'a] \ logic" ("(3LAM _./ _)" [1000, 10] 10) + "_Lambda" :: "[cargs, logic] \ logic" ("(3LAM _./ _)" [1000, 10] 10) syntax (xsymbols) - "_Lambda" :: "[cargs, 'a] \ logic" ("(3\ _./ _)" [1000, 10] 10) + "_Lambda" :: "[cargs, logic] \ logic" ("(3\ _./ _)" [1000, 10] 10) parse_ast_translation {* (* rewrite (LAM x y z. t) => (_cabs x (_cabs y (_cabs z t))) *) diff -r 18500bd1f47b -r 655f583840d0 src/HOL/HOLCF/ConvexPD.thy --- a/src/HOL/HOLCF/ConvexPD.thy Sat Jan 08 10:02:43 2011 -0800 +++ b/src/HOL/HOLCF/ConvexPD.thy Sat Jan 08 11:18:09 2011 -0800 @@ -181,7 +181,7 @@ "xs \\ ys == convex_plus\xs\ys" syntax - "_convex_pd" :: "args \ 'a convex_pd" ("{_}\") + "_convex_pd" :: "args \ logic" ("{_}\") translations "{x,xs}\" == "{x}\ \\ {xs}\" diff -r 18500bd1f47b -r 655f583840d0 src/HOL/HOLCF/LowerPD.thy --- a/src/HOL/HOLCF/LowerPD.thy Sat Jan 08 10:02:43 2011 -0800 +++ b/src/HOL/HOLCF/LowerPD.thy Sat Jan 08 11:18:09 2011 -0800 @@ -136,7 +136,7 @@ "xs \\ ys == lower_plus\xs\ys" syntax - "_lower_pd" :: "args \ 'a lower_pd" ("{_}\") + "_lower_pd" :: "args \ logic" ("{_}\") translations "{x,xs}\" == "{x}\ \\ {xs}\" diff -r 18500bd1f47b -r 655f583840d0 src/HOL/HOLCF/Sprod.thy --- a/src/HOL/HOLCF/Sprod.thy Sat Jan 08 10:02:43 2011 -0800 +++ b/src/HOL/HOLCF/Sprod.thy Sat Jan 08 11:18:09 2011 -0800 @@ -44,7 +44,8 @@ "ssplit = (\ f p. seq\p\(f\(sfst\p)\(ssnd\p)))" syntax - "_stuple" :: "['a, args] => 'a ** 'b" ("(1'(:_,/ _:'))") + "_stuple" :: "[logic, args] \ logic" ("(1'(:_,/ _:'))") + translations "(:x, y, z:)" == "(:x, (:y, z:):)" "(:x, y:)" == "CONST spair\x\y" diff -r 18500bd1f47b -r 655f583840d0 src/HOL/HOLCF/UpperPD.thy --- a/src/HOL/HOLCF/UpperPD.thy Sat Jan 08 10:02:43 2011 -0800 +++ b/src/HOL/HOLCF/UpperPD.thy Sat Jan 08 11:18:09 2011 -0800 @@ -134,7 +134,7 @@ "xs \\ ys == upper_plus\xs\ys" syntax - "_upper_pd" :: "args \ 'a upper_pd" ("{_}\") + "_upper_pd" :: "args \ logic" ("{_}\") translations "{x,xs}\" == "{x}\ \\ {xs}\" diff -r 18500bd1f47b -r 655f583840d0 src/HOL/HOLCF/ex/Letrec.thy --- a/src/HOL/HOLCF/ex/Letrec.thy Sat Jan 08 10:02:43 2011 -0800 +++ b/src/HOL/HOLCF/ex/Letrec.thy Sat Jan 08 11:18:09 2011 -0800 @@ -17,12 +17,12 @@ nonterminal recbinds and recbindt and recbind syntax - "_recbind" :: "['a, 'a] \ recbind" ("(2_ =/ _)" 10) + "_recbind" :: "[logic, logic] \ recbind" ("(2_ =/ _)" 10) "" :: "recbind \ recbindt" ("_") "_recbindt" :: "[recbind, recbindt] \ recbindt" ("_,/ _") "" :: "recbindt \ recbinds" ("_") "_recbinds" :: "[recbindt, recbinds] \ recbinds" ("_;/ _") - "_Letrec" :: "[recbinds, 'a] \ 'a" ("(Letrec (_)/ in (_))" 10) + "_Letrec" :: "[recbinds, logic] \ logic" ("(Letrec (_)/ in (_))" 10) translations (recbindt) "x = a, (y,ys) = (b,bs)" == (recbindt) "(x,y,ys) = (a,b,bs)"