summaryrefslogtreecommitdiff
path: root/lib/ur/top.urs
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-02-21 15:33:20 -0500
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-02-21 15:33:20 -0500
commitc40cb1851bc27f0a0a99648be21dacb821b65ed9 (patch)
tree6ec268a6e7aaa927f41c76e354e78ca55585f69a /lib/ur/top.urs
parent9f20d9299eab7caab6421860b6a54f831af73921 (diff)
"Hello world" compiles, after replacing type-level fold with map
Diffstat (limited to 'lib/ur/top.urs')
-rw-r--r--lib/ur/top.urs52
1 files changed, 17 insertions, 35 deletions
diff --git a/lib/ur/top.urs b/lib/ur/top.urs
index d6315b92..49aad50c 100644
--- a/lib/ur/top.urs
+++ b/lib/ur/top.urs
@@ -8,17 +8,7 @@ con fstTTT = fn t :: (Type * Type * Type) => t.1
con sndTTT = fn t :: (Type * Type * Type) => t.2
con thdTTT = fn t :: (Type * Type * Type) => t.3
-con mapTT = fn f :: Type -> Type => fold (fn nm t acc [[nm] ~ acc] =>
- [nm = f t] ++ acc) []
-
-con mapUT = fn f :: Type => fold (fn nm t acc [[nm] ~ acc] =>
- [nm = f] ++ acc) []
-
-con mapT2T = fn f :: (Type * Type) -> Type => fold (fn nm t acc [[nm] ~ acc] =>
- [nm = f t] ++ acc) []
-
-con mapT3T = fn f :: (Type * Type * Type) -> Type => fold (fn nm t acc [[nm] ~ acc] =>
- [nm = f t] ++ acc) []
+con mapUT = fn f :: Type => map (fn _ :: Unit => f)
con ex = fn tf :: (Type -> Type) =>
res ::: Type -> (choice :: Type -> tf choice -> res) -> res
@@ -53,19 +43,19 @@ val foldTR : tf :: (Type -> Type) -> tr :: ({Type} -> Type)
-> (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
+ -> tr [] -> r :: {Type} -> $(map tf r) -> tr r
val foldT2R : tf :: ((Type * Type) -> Type) -> tr :: ({(Type * Type)} -> Type)
-> (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
+ -> tr [] -> r :: {(Type * Type)} -> $(map tf r) -> tr r
val foldT3R : tf :: ((Type * Type * Type) -> Type) -> tr :: ({(Type * Type * Type)} -> Type)
-> (nm :: Name -> t :: (Type * Type * Type) -> rest :: {(Type * Type * Type)}
-> fn [[nm] ~ rest] =>
tf t -> tr rest -> tr ([nm = t] ++ rest))
- -> tr [] -> r :: {(Type * Type * Type)} -> $(mapT3T tf r) -> tr r
+ -> tr [] -> r :: {(Type * Type * Type)} -> $(map tf r) -> tr r
val foldTR2 : tf1 :: (Type -> Type) -> tf2 :: (Type -> Type)
-> tr :: ({Type} -> Type)
@@ -73,7 +63,7 @@ val foldTR2 : tf1 :: (Type -> Type) -> tf2 :: (Type -> 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
+ -> r :: {Type} -> $(map tf1 r) -> $(map tf2 r) -> tr r
val foldT2R2 : tf1 :: ((Type * Type) -> Type) -> tf2 :: ((Type * Type) -> Type)
-> tr :: ({(Type * Type)} -> Type)
@@ -81,7 +71,7 @@ val foldT2R2 : tf1 :: ((Type * Type) -> Type) -> tf2 :: ((Type * 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
+ -> $(map tf1 r) -> $(map tf2 r) -> tr r
val foldT3R2 : tf1 :: ((Type * Type * Type) -> Type) -> tf2 :: ((Type * Type * Type) -> Type)
-> tr :: ({(Type * Type * Type)} -> Type)
@@ -89,32 +79,32 @@ val foldT3R2 : tf1 :: ((Type * Type * Type) -> Type) -> tf2 :: ((Type * Type * T
-> fn [[nm] ~ rest] =>
tf1 t -> tf2 t -> tr rest -> tr ([nm = t] ++ rest))
-> tr [] -> r :: {(Type * Type * Type)}
- -> $(mapT3T tf1 r) -> $(mapT3T tf2 r) -> tr r
+ -> $(map tf1 r) -> $(map tf2 r) -> tr r
val foldTRX : tf :: (Type -> Type) -> ctx :: {Unit}
-> (nm :: Name -> t :: Type -> rest :: {Type}
-> fn [[nm] ~ rest] =>
tf t -> xml ctx [] [])
- -> r :: {Type} -> $(mapTT tf r) -> xml ctx [] []
+ -> r :: {Type} -> $(map tf r) -> xml ctx [] []
val foldT2RX : tf :: ((Type * Type) -> Type) -> ctx :: {Unit}
-> (nm :: Name -> t :: (Type * Type) -> rest :: {(Type * Type)}
-> fn [[nm] ~ rest] =>
tf t -> xml ctx [] [])
- -> r :: {(Type * Type)} -> $(mapT2T tf r) -> xml ctx [] []
+ -> r :: {(Type * Type)} -> $(map tf r) -> xml ctx [] []
val foldT3RX : tf :: ((Type * Type * Type) -> Type) -> ctx :: {Unit}
-> (nm :: Name -> t :: (Type * Type * Type) -> rest :: {(Type * Type * Type)}
-> fn [[nm] ~ rest] =>
tf t -> xml ctx [] [])
- -> r :: {(Type * Type * Type)} -> $(mapT3T tf r) -> xml ctx [] []
+ -> r :: {(Type * Type * Type)} -> $(map tf r) -> xml ctx [] []
val foldTRX2 : tf1 :: (Type -> Type) -> tf2 :: (Type -> Type) -> ctx :: {Unit}
-> (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 [] []
+ -> $(map tf1 r) -> $(map tf2 r) -> xml ctx [] []
val foldT2RX2 : tf1 :: ((Type * Type) -> Type) -> tf2 :: ((Type * Type) -> Type)
-> ctx :: {Unit}
@@ -122,7 +112,7 @@ val foldT2RX2 : tf1 :: ((Type * Type) -> Type) -> tf2 :: ((Type * Type) -> Type)
-> fn [[nm] ~ rest] =>
tf1 t -> tf2 t -> xml ctx [] [])
-> r :: {(Type * Type)}
- -> $(mapT2T tf1 r) -> $(mapT2T tf2 r) -> xml ctx [] []
+ -> $(map tf1 r) -> $(map tf2 r) -> xml ctx [] []
val foldT3RX2 : tf1 :: ((Type * Type * Type) -> Type) -> tf2 :: ((Type * Type * Type) -> Type)
@@ -131,21 +121,19 @@ val foldT3RX2 : tf1 :: ((Type * Type * Type) -> Type) -> tf2 :: ((Type * Type *
-> fn [[nm] ~ rest] =>
tf1 t -> tf2 t -> xml ctx [] [])
-> r :: {(Type * Type * Type)}
- -> $(mapT3T tf1 r) -> $(mapT3T tf2 r) -> xml ctx [] []
+ -> $(map tf1 r) -> $(map tf2 r) -> xml ctx [] []
val queryX : tables ::: {{Type}} -> exps ::: {Type} -> ctx ::: {Unit}
-> sql_query tables exps
-> fn [tables ~ exps] =>
- ($(exps ++ fold (fn nm (fields :: {Type}) acc [[nm] ~ acc] =>
- [nm = $fields] ++ acc) [] tables)
+ ($(exps ++ map (fn fields :: {Type} => $fields) tables)
-> xml ctx [] [])
-> transaction (xml ctx [] [])
val queryX' : tables ::: {{Type}} -> exps ::: {Type} -> ctx ::: {Unit}
-> sql_query tables exps
-> fn [tables ~ exps] =>
- ($(exps ++ fold (fn nm (fields :: {Type}) acc [[nm] ~ acc] =>
- [nm = $fields] ++ acc) [] tables)
+ ($(exps ++ map (fn fields :: {Type} => $fields) tables)
-> transaction (xml ctx [] []))
-> transaction (xml ctx [] [])
@@ -155,20 +143,14 @@ val oneOrNoRows : tables ::: {{Type}} -> exps ::: {Type}
transaction
(option
$(exps
- ++ fold (fn nm (fields :: {Type}) acc
- [[nm] ~ acc] =>
- [nm = $fields] ++ acc)
- [] tables))
+ ++ map (fn fields :: {Type} => $fields) tables))
val oneRow : tables ::: {{Type}} -> exps ::: {Type}
-> sql_query tables exps
-> fn [tables ~ exps] =>
transaction
$(exps
- ++ fold (fn nm (fields :: {Type}) acc
- [[nm] ~ acc] =>
- [nm = $fields] ++ acc)
- [] tables)
+ ++ map (fn fields :: {Type} => $fields) tables)
val eqNullable : tables ::: {{Type}} -> agg ::: {{Type}} -> exps ::: {Type}
-> t ::: Type -> sql_injectable (option t)