aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-10-22 11:15:37 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-10-22 11:15:37 -0400
commitcf42469778104a3079191c6e871954ffb3b5c957 (patch)
treed366eb0c432244981b3d0a9eaae15e7b0273125e /lib
parent3d97fb2839259bada8b730207d4b9de58659cfeb (diff)
Checking deadline; sign-in
Diffstat (limited to 'lib')
-rw-r--r--lib/ur/basis.urs5
-rw-r--r--lib/ur/top.ur5
-rw-r--r--lib/ur/top.urs5
3 files changed, 15 insertions, 0 deletions
diff --git a/lib/ur/basis.urs b/lib/ur/basis.urs
index 7c3c0969..6536dc3f 100644
--- a/lib/ur/basis.urs
+++ b/lib/ur/basis.urs
@@ -111,6 +111,11 @@ val signal : t ::: Type -> source t -> signal t
val current : t ::: Type -> signal t -> transaction t
+(** * Time *)
+
+val now : transaction time
+
+
(** HTTP operations *)
val requestHeader : string -> transaction (option string)
diff --git a/lib/ur/top.ur b/lib/ur/top.ur
index 6a0f8751..10b3f711 100644
--- a/lib/ur/top.ur
+++ b/lib/ur/top.ur
@@ -246,6 +246,11 @@ fun oneOrNoRows1 [nm ::: Name] [fs ::: {Type}] (q : sql_query [nm = fs] []) =
(fn fs _ => return (Some fs.nm))
None
+fun oneOrNoRowsE1 [tab ::: Name] [nm ::: Name] [t ::: Type] [[tab] ~ [nm]] (q : sql_query [tab = []] [nm = t]) =
+ query q
+ (fn fs _ => return (Some fs.nm))
+ None
+
fun oneRow [tables ::: {{Type}}] [exps ::: {Type}]
[tables ~ exps] (q : sql_query tables exps) =
o <- oneOrNoRows q;
diff --git a/lib/ur/top.urs b/lib/ur/top.urs
index b6734cd3..80d402b1 100644
--- a/lib/ur/top.urs
+++ b/lib/ur/top.urs
@@ -151,6 +151,11 @@ val oneOrNoRows1 : nm ::: Name -> fs ::: {Type}
-> sql_query [nm = fs] []
-> transaction (option $fs)
+val oneOrNoRowsE1 : tab ::: Name -> nm ::: Name -> t ::: Type
+ -> [[tab] ~ [nm]] =>
+ sql_query [tab = []] [nm = t]
+ -> transaction (option t)
+
val oneRow : tables ::: {{Type}} -> exps ::: {Type}
-> [tables ~ exps] =>
sql_query tables exps