# HG changeset patch
# User Adam Chlipala <adam@chlipala.net>
# Date 1299886584 18000
# Node ID 44f78d6fec29bba196b015701718823c81732633
# Parent  66092ce45a762daf0083475b08688cd0e21047da
Make 'ex' kind-generic

diff -r 66092ce45a76 -r 44f78d6fec29 lib/ur/top.ur
--- a/lib/ur/top.ur	Thu Mar 10 20:22:03 2011 -0500
+++ b/lib/ur/top.ur	Fri Mar 11 18:36:24 2011 -0500
@@ -61,13 +61,15 @@
 
 con mapU = K ==> fn f :: K => map (fn _ :: Unit => f)
 
-con ex = fn tf :: (Type -> Type) =>
-            res ::: Type -> (choice :: Type -> tf choice -> res) -> res
+con ex = K ==> fn tf :: (K -> Type) =>
+            res ::: Type -> (choice :: K -> tf choice -> res) -> res
 
-fun ex [tf :: (Type -> Type)] [choice :: Type] (body : tf choice) : ex tf =
- fn [res] (f : choice :: Type -> tf choice -> res) =>
+fun ex_intro [K] [tf :: K -> Type] [choice :: K] (body : tf choice) : ex tf =
+ fn [res] (f : choice :: K -> tf choice -> res) =>
     f [choice] body
 
+fun ex_elim [K] [tf ::: K -> Type] (v : ex tf) [res ::: Type] = @@v [res]
+
 fun compose [t1 ::: Type] [t2 ::: Type] [t3 ::: Type]
             (f1 : t2 -> t3) (f2 : t1 -> t2) (x : t1) = f1 (f2 x)
 
diff -r 66092ce45a76 -r 44f78d6fec29 lib/ur/top.urs
--- a/lib/ur/top.urs	Thu Mar 10 20:22:03 2011 -0500
+++ b/lib/ur/top.urs	Fri Mar 11 18:36:24 2011 -0500
@@ -31,10 +31,10 @@
 
 con mapU = K ==> fn f :: K => map (fn _ :: Unit => f)
 
-con ex = fn tf :: (Type -> Type) =>
-            res ::: Type -> (choice :: Type -> tf choice -> res) -> res
+con ex :: K --> (K -> Type) -> Type
 
-val ex : tf :: (Type -> Type) -> choice :: Type -> tf choice -> ex tf
+val ex_intro : K --> tf :: (K -> Type) -> choice :: K -> tf choice -> ex tf
+val ex_elim : K --> tf ::: (K -> Type) -> ex tf -> res ::: Type -> (choice :: K -> tf choice -> res) -> res
 
 val compose : t1 ::: Type -> t2 ::: Type -> t3 ::: Type
               -> (t2 -> t3) -> (t1 -> t2) -> (t1 -> t3)