Merge CDisjoint and TDisjoint

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/top.ur b/lib/top.ur
index 990a18fa..e7c4a988 100644
--- a/lib/top.ur
+++ b/lib/top.ur
@@ -22,7 +22,7 @@ fun txt (t ::: Type) (ctx ::: {Unit}) (use ::: {Type}) (sh : show t) (v : t) = c
 
 fun foldTR (tf :: Type -> Type) (tr :: {Type} -> Type)
         (f : nm :: Name -> t :: Type -> rest :: {Type} -> [nm] ~ rest
-                -> tf t -> tr rest -> tr ([nm = t] ++ rest))
+                => tf t -> tr rest -> tr ([nm = t] ++ rest))
         (i : tr []) =
         fold [fn r :: {Type} => $(mapTT tf r) -> tr r]
                 (fn (nm :: Name) (t :: Type) (rest :: {Type}) (acc : _ -> tr rest) =>
@@ -32,7 +32,7 @@ fun foldTR (tf :: Type -> Type) (tr :: {Type} -> Type)
 
 fun foldT2R (tf :: (Type * Type) -> Type) (tr :: {(Type * Type)} -> Type)
         (f : nm :: Name -> t :: (Type * Type) -> rest :: {(Type * Type)} -> [nm] ~ rest
-                -> tf t -> tr rest -> tr ([nm = t] ++ rest))
+                => tf t -> tr rest -> tr ([nm = t] ++ rest))
         (i : tr []) =
         fold [fn r :: {(Type * Type)} => $(mapT2T tf r) -> tr r]
                 (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)}) (acc : _ -> tr rest) =>
@@ -42,7 +42,7 @@ fun foldT2R (tf :: (Type * Type) -> Type) (tr :: {(Type * Type)} -> Type)
 
 fun foldTR2 (tf1 :: Type -> Type) (tf2 :: Type -> Type) (tr :: {Type} -> Type)
         (f : nm :: Name -> t :: Type -> rest :: {Type} -> [nm] ~ rest
-                -> tf1 t -> tf2 t -> tr rest -> tr ([nm = t] ++ rest))
+                => tf1 t -> tf2 t -> tr rest -> tr ([nm = t] ++ rest))
         (i : tr []) =
         fold [fn r :: {Type} => $(mapTT tf1 r) -> $(mapTT tf2 r) -> tr r]
                 (fn (nm :: Name) (t :: Type) (rest :: {Type}) (acc : _ -> _ -> tr rest) =>
@@ -52,7 +52,7 @@ fun foldTR2 (tf1 :: Type -> Type) (tf2 :: Type -> Type) (tr :: {Type} -> Type)
 
 fun foldT2R2 (tf1 :: (Type * Type) -> Type) (tf2 :: (Type * Type) -> Type) (tr :: {(Type * Type)} -> Type)
         (f : nm :: Name -> t :: (Type * Type) -> rest :: {(Type * Type)} -> [nm] ~ rest
-                -> tf1 t -> tf2 t -> tr rest -> tr ([nm = t] ++ rest))
+                => tf1 t -> tf2 t -> tr rest -> tr ([nm = t] ++ rest))
         (i : tr []) =
         fold [fn r :: {(Type * Type)} => $(mapT2T tf1 r) -> $(mapT2T tf2 r) -> tr r]
                 (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)}) (acc : _ -> _ -> tr rest) =>
@@ -62,7 +62,7 @@ fun foldT2R2 (tf1 :: (Type * Type) -> Type) (tf2 :: (Type * Type) -> Type) (tr :
 
 fun foldTRX (tf :: Type -> Type) (ctx :: {Unit})
         (f : nm :: Name -> t :: Type -> rest :: {Type} -> [nm] ~ rest
-                -> tf t -> xml ctx [] []) =
+                => tf t -> xml ctx [] []) =
         foldTR [tf] [fn _ => xml ctx [] []]
                 (fn (nm :: Name) (t :: Type) (rest :: {Type}) =>
                         [[nm] ~ rest] =>
@@ -71,7 +71,7 @@ fun foldTRX (tf :: Type -> Type) (ctx :: {Unit})
 
 fun foldT2RX (tf :: (Type * Type) -> Type) (ctx :: {Unit})
         (f : nm :: Name -> t :: (Type * Type) -> rest :: {(Type * Type)} -> [nm] ~ rest
-                -> tf t -> xml ctx [] []) =
+                => tf t -> xml ctx [] []) =
         foldT2R [tf] [fn _ => xml ctx [] []]
                 (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)}) =>
                         [[nm] ~ rest] =>
@@ -80,7 +80,7 @@ fun foldT2RX (tf :: (Type * Type) -> Type) (ctx :: {Unit})
 
 fun foldTRX2 (tf1 :: Type -> Type) (tf2 :: Type -> Type) (ctx :: {Unit})
         (f : nm :: Name -> t :: Type -> rest :: {Type} -> [nm] ~ rest
-                -> tf1 t -> tf2 t -> xml ctx [] []) =
+                => tf1 t -> tf2 t -> xml ctx [] []) =
         foldTR2 [tf1] [tf2] [fn _ => xml ctx [] []]
                 (fn (nm :: Name) (t :: Type) (rest :: {Type}) =>
                         [[nm] ~ rest] =>
@@ -89,7 +89,7 @@ fun foldTRX2 (tf1 :: Type -> Type) (tf2 :: Type -> Type) (ctx :: {Unit})
 
 fun foldT2RX2 (tf1 :: (Type * Type) -> Type) (tf2 :: (Type * Type) -> Type) (ctx :: {Unit})
         (f : nm :: Name -> t :: (Type * Type) -> rest :: {(Type * Type)} -> [nm] ~ rest
-                -> tf1 t -> tf2 t -> xml ctx [] []) =
+                => tf1 t -> tf2 t -> xml ctx [] []) =
         foldT2R2 [tf1] [tf2] [fn _ => xml ctx [] []]
                 (fn (nm :: Name) (t :: (Type * Type)) (rest :: {(Type * Type)}) =>
                         [[nm] ~ rest] =>