summaryrefslogtreecommitdiff
path: root/lib/top.urs
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2008-10-12 11:50:21 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2008-10-12 11:50:21 -0400
commiteb45f499c2e18f154ad59d75cf29c3903af5c725 (patch)
treee54cc3d2f36dc95111b0323eedb5d6aac81bfb93 /lib/top.urs
parentdb7a947275c7bcb44a095b25ccf95526af68d737 (diff)
top.urs indents and type-checks with new twiddle syntax
Diffstat (limited to 'lib/top.urs')
-rw-r--r--lib/top.urs114
1 files changed, 68 insertions, 46 deletions
diff --git a/lib/top.urs b/lib/top.urs
index 684ebfb8..bf26d534 100644
--- a/lib/top.urs
+++ b/lib/top.urs
@@ -3,71 +3,93 @@ con record = fn t :: {Type} => $t
con fstTT = fn t :: (Type * Type) => t.1
con sndTT = fn t :: (Type * Type) => t.2
-con mapTT = fn f :: Type -> Type => fold (fn nm t acc => [nm] ~ acc =>
- [nm = f t] ++ acc) []
+con mapTT = fn f :: Type -> Type => fold (fn nm t acc [[nm] ~ acc] =>
+ [nm = f t] ++ acc) []
-con mapT2T = fn f :: (Type * Type) -> Type => fold (fn nm t acc => [nm] ~ acc =>
- [nm = f t] ++ acc) []
+con mapT2T = fn f :: (Type * Type) -> Type => fold (fn nm t acc [[nm] ~ acc] =>
+ [nm = f t] ++ acc) []
con ex = fn tf :: (Type -> Type) =>
- res ::: Type -> (choice :: Type -> tf choice -> res) -> res
+ res ::: Type -> (choice :: Type -> tf choice -> res) -> res
val ex : tf :: (Type -> Type) -> choice :: Type -> tf choice -> ex tf
val compose : t1 ::: Type -> t2 ::: Type -> t3 ::: Type
- -> (t2 -> t3) -> (t1 -> t2) -> (t1 -> t3)
+ -> (t2 -> t3) -> (t1 -> t2) -> (t1 -> t3)
val txt : t ::: Type -> ctx ::: {Unit} -> use ::: {Type} -> show t -> t
- -> xml ctx use []
+ -> xml ctx use []
val foldTR : tf :: (Type -> Type) -> tr :: ({Type} -> Type)
- -> (nm :: Name -> t :: Type -> rest :: {Type} -> [nm] ~ rest
- => tf t -> tr rest -> tr ([nm = t] ++ rest))
- -> tr [] -> r :: {Type} -> $(mapTT tf r) -> tr r
+ -> (nm :: Name -> t :: Type -> rest :: {Type}
+ -> fn [[nm] ~ rest] =>
+ tf t -> tr rest -> tr ([nm = t] ++ rest))
+ -> tr [] -> r :: {Type} -> $(mapTT tf r) -> tr r
val foldT2R : tf :: ((Type * Type) -> Type) -> tr :: ({(Type * Type)} -> Type)
- -> (nm :: Name -> t :: (Type * Type) -> rest :: {(Type * Type)} -> [nm] ~ rest
- => tf t -> tr rest -> tr ([nm = t] ++ rest))
- -> tr [] -> r :: {(Type * Type)} -> $(mapT2T tf r) -> tr r
-
-val foldTR2 : tf1 :: (Type -> Type) -> tf2 :: (Type -> Type) -> tr :: ({Type} -> Type)
- -> (nm :: Name -> t :: Type -> rest :: {Type} -> [nm] ~ rest
- => tf1 t -> tf2 t -> tr rest -> tr ([nm = t] ++ rest))
- -> tr [] -> r :: {Type} -> $(mapTT tf1 r) -> $(mapTT tf2 r) -> tr r
-
+ -> (nm :: Name -> t :: (Type * Type) -> rest :: {(Type * Type)}
+ -> fn [[nm] ~ rest] =>
+ tf t -> tr rest -> tr ([nm = t] ++ rest))
+ -> tr [] -> r :: {(Type * Type)} -> $(mapT2T tf r) -> tr r
+
+val foldTR2 : tf1 :: (Type -> Type) -> tf2 :: (Type -> Type)
+ -> tr :: ({Type} -> Type)
+ -> (nm :: Name -> t :: Type -> rest :: {Type}
+ -> fn [[nm] ~ rest] =>
+ tf1 t -> tf2 t -> tr rest -> tr ([nm = t] ++ rest))
+ -> tr []
+ -> r :: {Type} -> $(mapTT tf1 r) -> $(mapTT tf2 r) -> tr r
+
val foldT2R2 : tf1 :: ((Type * Type) -> Type) -> tf2 :: ((Type * Type) -> Type)
- -> tr :: ({(Type * Type)} -> Type)
- -> (nm :: Name -> t :: (Type * Type) -> rest :: {(Type * Type)} -> [nm] ~ rest
- => tf1 t -> tf2 t -> tr rest -> tr ([nm = t] ++ rest))
- -> tr [] -> r :: {(Type * Type)} -> $(mapT2T tf1 r) -> $(mapT2T tf2 r) -> tr r
+ -> tr :: ({(Type * Type)} -> Type)
+ -> (nm :: Name -> t :: (Type * Type) -> rest :: {(Type * Type)}
+ -> fn [[nm] ~ rest] =>
+ tf1 t -> tf2 t -> tr rest -> tr ([nm = t] ++ rest))
+ -> tr [] -> r :: {(Type * Type)}
+ -> $(mapT2T tf1 r) -> $(mapT2T tf2 r) -> tr r
val foldTRX : tf :: (Type -> Type) -> ctx :: {Unit}
- -> (nm :: Name -> t :: Type -> rest :: {Type} -> [nm] ~ rest
- => tf t -> xml ctx [] [])
- -> r :: {Type} -> $(mapTT tf r) -> xml ctx [] []
+ -> (nm :: Name -> t :: Type -> rest :: {Type}
+ -> fn [[nm] ~ rest] =>
+ tf t -> xml ctx [] [])
+ -> r :: {Type} -> $(mapTT tf r) -> xml ctx [] []
val foldT2RX : tf :: ((Type * Type) -> Type) -> ctx :: {Unit}
- -> (nm :: Name -> t :: (Type * Type) -> rest :: {(Type * Type)} -> [nm] ~ rest
- => tf t -> xml ctx [] [])
- -> r :: {(Type * Type)} -> $(mapT2T tf r) -> xml ctx [] []
+ -> (nm :: Name -> t :: (Type * Type) -> rest :: {(Type * Type)}
+ -> fn [[nm] ~ rest] =>
+ tf t -> xml ctx [] [])
+ -> r :: {(Type * Type)} -> $(mapT2T tf r) -> xml ctx [] []
val foldTRX2 : tf1 :: (Type -> Type) -> tf2 :: (Type -> Type) -> ctx :: {Unit}
- -> (nm :: Name -> t :: Type -> rest :: {Type} -> [nm] ~ rest
- => tf1 t -> tf2 t -> xml ctx [] [])
- -> r :: {Type} -> $(mapTT tf1 r) -> $(mapTT tf2 r) -> xml ctx [] []
-
-val foldT2RX2 : tf1 :: ((Type * Type) -> Type) -> tf2 :: ((Type * Type) -> Type) -> ctx :: {Unit}
- -> (nm :: Name -> t :: (Type * Type) -> rest :: {(Type * Type)} -> [nm] ~ rest
- => tf1 t -> tf2 t -> xml ctx [] [])
- -> r :: {(Type * Type)} -> $(mapT2T tf1 r) -> $(mapT2T tf2 r) -> xml ctx [] []
+ -> (nm :: Name -> t :: Type -> rest :: {Type}
+ -> fn [[nm] ~ rest] =>
+ tf1 t -> tf2 t -> xml ctx [] [])
+ -> r :: {Type}
+ -> $(mapTT tf1 r) -> $(mapTT tf2 r) -> xml ctx [] []
+
+val foldT2RX2 : tf1 :: ((Type * Type) -> Type) -> tf2 :: ((Type * Type) -> Type)
+ -> ctx :: {Unit}
+ -> (nm :: Name -> t :: (Type * Type) -> rest :: {(Type * Type)}
+ -> fn [[nm] ~ rest] =>
+ tf1 t -> tf2 t -> xml ctx [] [])
+ -> r :: {(Type * Type)}
+ -> $(mapT2T tf1 r) -> $(mapT2T tf2 r) -> xml ctx [] []
val queryX : tables ::: {{Type}} -> exps ::: {Type} -> ctx ::: {Unit}
- -> sql_query tables exps -> tables ~ exps
- => ($(exps ++ fold (fn nm (fields :: {Type}) acc => [nm] ~ acc => [nm = $fields] ++ acc) [] tables)
- -> xml ctx [] [])
- -> transaction (xml ctx [] [])
-
-val oneOrNoRows : tables ::: {{Type}} -> exps ::: {Type} -> sql_query tables exps
- -> tables ~ exps
- => transaction
- (option $(exps ++ fold (fn nm (fields :: {Type}) acc => [nm] ~ acc => [nm = $fields] ++ acc) [] tables))
+ -> sql_query tables exps
+ -> fn [tables ~ exps] =>
+ ($(exps ++ fold (fn nm (fields :: {Type}) acc [[nm] ~ acc] =>
+ [nm = $fields] ++ acc) [] tables)
+ -> xml ctx [] [])
+ -> transaction (xml ctx [] [])
+
+val oneOrNoRows : tables ::: {{Type}} -> exps ::: {Type}
+ -> sql_query tables exps
+ -> fn [tables ~ exps] =>
+ transaction
+ (option
+ $(exps
+ ++ fold (fn nm (fields :: {Type}) acc
+ [[nm] ~ acc] =>
+ [nm = $fields] ++ acc)
+ [] tables))