summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2008-10-12 11:44:43 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2008-10-12 11:44:43 -0400
commitdb7a947275c7bcb44a095b25ccf95526af68d737 (patch)
treed2c3e249ae3f66b0dc3092b7dc465c606e4dae16 /lib
parent036679102be68e0f1bb12c3e9a354bb743fde219 (diff)
Basis indents and type-checks with new twiddle syntax
Diffstat (limited to 'lib')
-rw-r--r--lib/basis.urs256
1 files changed, 145 insertions, 111 deletions
diff --git a/lib/basis.urs b/lib/basis.urs
index c1030874..352cd77a 100644
--- a/lib/basis.urs
+++ b/lib/basis.urs
@@ -52,42 +52,46 @@ con sql_exp :: {{Type}} -> {{Type}} -> {Type} -> Type -> Type
con sql_subset :: {{Type}} -> {{Type}} -> Type
val sql_subset : keep_drop :: {({Type} * {Type})}
- -> sql_subset
- (fold (fn nm => fn fields :: ({Type} * {Type}) => fn acc =>
- [nm] ~ acc => fields.1 ~ fields.2 =>
- [nm = fields.1 ++ fields.2] ++ acc) [] keep_drop)
- (fold (fn nm => fn fields :: ({Type} * {Type}) => fn acc =>
- [nm] ~ acc =>
- [nm = fields.1] ++ acc) [] keep_drop)
-val sql_subset_all : tables :: {{Type}}
- -> sql_subset tables tables
+ -> sql_subset
+ (fold (fn nm (fields :: ({Type} * {Type}))
+ acc [[nm] ~ acc]
+ [fields.1 ~ fields.2] =>
+ [nm = fields.1 ++ fields.2]
+ ++ acc) [] keep_drop)
+ (fold (fn nm (fields :: ({Type} * {Type}))
+ acc [[nm] ~ acc] =>
+ [nm = fields.1] ++ acc)
+ [] keep_drop)
+val sql_subset_all : tables :: {{Type}} -> sql_subset tables tables
val sql_query1 : tables ::: {{Type}}
- -> grouped ::: {{Type}}
- -> selectedFields ::: {{Type}}
- -> selectedExps ::: {Type}
- -> {From : $(fold (fn nm => fn fields :: {Type} => fn acc =>
- [nm] ~ acc => [nm = sql_table fields] ++ acc) [] tables),
- Where : sql_exp tables [] [] bool,
- GroupBy : sql_subset tables grouped,
- Having : sql_exp grouped tables [] bool,
- SelectFields : sql_subset grouped selectedFields,
- SelectExps : $(fold (fn nm => fn t :: Type => fn acc =>
- [nm] ~ acc => [nm = sql_exp grouped tables [] t] ++ acc) [] selectedExps) }
- -> sql_query1 tables selectedFields selectedExps
+ -> grouped ::: {{Type}}
+ -> selectedFields ::: {{Type}}
+ -> selectedExps ::: {Type}
+ -> {From : $(fold (fn nm (fields :: {Type}) acc [[nm] ~ acc] =>
+ [nm = sql_table fields] ++ acc)
+ [] tables),
+ Where : sql_exp tables [] [] bool,
+ GroupBy : sql_subset tables grouped,
+ Having : sql_exp grouped tables [] bool,
+ SelectFields : sql_subset grouped selectedFields,
+ SelectExps : $(fold (fn nm (t :: Type) acc [[nm] ~ acc] =>
+ [nm = sql_exp grouped tables [] t]
+ ++ acc) [] selectedExps) }
+ -> sql_query1 tables selectedFields selectedExps
type sql_relop
val sql_union : sql_relop
val sql_intersect : sql_relop
val sql_except : sql_relop
val sql_relop : tables1 ::: {{Type}}
- -> tables2 ::: {{Type}}
- -> selectedFields ::: {{Type}}
- -> selectedExps ::: {Type}
- -> sql_relop
- -> sql_query1 tables1 selectedFields selectedExps
- -> sql_query1 tables2 selectedFields selectedExps
- -> sql_query1 selectedFields selectedFields selectedExps
+ -> tables2 ::: {{Type}}
+ -> selectedFields ::: {{Type}}
+ -> selectedExps ::: {Type}
+ -> sql_relop
+ -> sql_query1 tables1 selectedFields selectedExps
+ -> sql_query1 tables2 selectedFields selectedExps
+ -> sql_query1 selectedFields selectedFields selectedExps
type sql_direction
val sql_asc : sql_direction
@@ -96,54 +100,63 @@ val sql_desc : sql_direction
con sql_order_by :: {{Type}} -> {Type} -> Type
val sql_order_by_Nil : tables ::: {{Type}} -> exps :: {Type} -> sql_order_by tables exps
val sql_order_by_Cons : tables ::: {{Type}} -> exps ::: {Type} -> t ::: Type
- -> sql_exp tables [] exps t -> sql_direction -> sql_order_by tables exps
- -> sql_order_by tables exps
+ -> sql_exp tables [] exps t -> sql_direction
+ -> sql_order_by tables exps
+ -> sql_order_by tables exps
type sql_limit
val sql_no_limit : sql_limit
val sql_limit : int -> sql_limit
-
+
type sql_offset
val sql_no_offset : sql_offset
val sql_offset : int -> sql_offset
val sql_query : tables ::: {{Type}}
- -> selectedFields ::: {{Type}}
- -> selectedExps ::: {Type}
- -> {Rows : sql_query1 tables selectedFields selectedExps,
- OrderBy : sql_order_by tables selectedExps,
- Limit : sql_limit,
- Offset : sql_offset}
- -> sql_query selectedFields selectedExps
-
-val sql_field : otherTabs ::: {{Type}} -> otherFields ::: {Type} -> fieldType ::: Type -> agg ::: {{Type}}
- -> exps ::: {Type}
- -> tab :: Name -> field :: Name
- -> sql_exp ([tab = [field = fieldType] ++ otherFields] ++ otherTabs) agg exps fieldType
-
-val sql_exp : tabs ::: {{Type}} -> agg ::: {{Type}} -> t ::: Type -> rest ::: {Type} -> nm :: Name
- -> sql_exp tabs agg ([nm = t] ++ rest) t
+ -> selectedFields ::: {{Type}}
+ -> selectedExps ::: {Type}
+ -> {Rows : sql_query1 tables selectedFields selectedExps,
+ OrderBy : sql_order_by tables selectedExps,
+ Limit : sql_limit,
+ Offset : sql_offset}
+ -> sql_query selectedFields selectedExps
+
+val sql_field : otherTabs ::: {{Type}} -> otherFields ::: {Type}
+ -> fieldType ::: Type -> agg ::: {{Type}}
+ -> exps ::: {Type}
+ -> tab :: Name -> field :: Name
+ -> sql_exp
+ ([tab = [field = fieldType] ++ otherFields] ++ otherTabs)
+ agg exps fieldType
+
+val sql_exp : tabs ::: {{Type}} -> agg ::: {{Type}} -> t ::: Type -> rest ::: {Type}
+ -> nm :: Name
+ -> sql_exp tabs agg ([nm = t] ++ rest) t
class sql_injectable
val sql_bool : sql_injectable bool
val sql_int : sql_injectable int
val sql_float : sql_injectable float
val sql_string : sql_injectable string
-val sql_inject : tables ::: {{Type}} -> agg ::: {{Type}} -> exps ::: {Type} -> t ::: Type
- -> sql_injectable t -> t -> sql_exp tables agg exps t
+val sql_inject : tables ::: {{Type}} -> agg ::: {{Type}} -> exps ::: {Type}
+ -> t ::: Type
+ -> sql_injectable t -> t -> sql_exp tables agg exps t
con sql_unary :: Type -> Type -> Type
val sql_not : sql_unary bool bool
-val sql_unary : tables ::: {{Type}} -> agg ::: {{Type}} -> exps ::: {Type} -> arg ::: Type -> res ::: Type
- -> sql_unary arg res -> sql_exp tables agg exps arg -> sql_exp tables agg exps res
+val sql_unary : tables ::: {{Type}} -> agg ::: {{Type}} -> exps ::: {Type}
+ -> arg ::: Type -> res ::: Type
+ -> sql_unary arg res -> sql_exp tables agg exps arg
+ -> sql_exp tables agg exps res
con sql_binary :: Type -> Type -> Type -> Type
val sql_and : sql_binary bool bool bool
val sql_or : sql_binary bool bool bool
val sql_binary : tables ::: {{Type}} -> agg ::: {{Type}} -> exps ::: {Type}
- -> arg1 ::: Type -> arg2 ::: Type -> res ::: Type
- -> sql_binary arg1 arg2 res -> sql_exp tables agg exps arg1 -> sql_exp tables agg exps arg2
- -> sql_exp tables agg exps res
+ -> arg1 ::: Type -> arg2 ::: Type -> res ::: Type
+ -> sql_binary arg1 arg2 res -> sql_exp tables agg exps arg1
+ -> sql_exp tables agg exps arg2
+ -> sql_exp tables agg exps res
type sql_comparison
val sql_eq : sql_comparison
@@ -159,11 +172,13 @@ val sql_comparison : tables ::: {{Type}} -> agg ::: {{Type}} -> exps ::: {Type}
-> sql_exp tables agg exps bool
val sql_count : tables ::: {{Type}} -> agg ::: {{Type}} -> exps ::: {Type}
- -> unit -> sql_exp tables agg exps int
+ -> unit -> sql_exp tables agg exps int
con sql_aggregate :: Type -> Type
-val sql_aggregate : tables ::: {{Type}} -> agg ::: {{Type}} -> exps ::: {Type} -> t ::: Type
- -> sql_aggregate t -> sql_exp agg agg exps t -> sql_exp tables agg exps t
+val sql_aggregate : tables ::: {{Type}} -> agg ::: {{Type}} -> exps ::: {Type}
+ -> t ::: Type
+ -> sql_aggregate t -> sql_exp agg agg exps t
+ -> sql_exp tables agg exps t
class sql_summable
val sql_summable_int : sql_summable int
@@ -183,19 +198,21 @@ val sql_min : t ::: Type -> sql_maxable t -> sql_aggregate t
con transaction :: Type -> Type
val return : t ::: Type
- -> t -> transaction t
+ -> t -> transaction t
val bind : t1 ::: Type -> t2 ::: Type
- -> transaction t1 -> (t1 -> transaction t2)
- -> transaction t2
+ -> transaction t1 -> (t1 -> transaction t2)
+ -> transaction t2
-val query : tables ::: {{Type}} -> exps ::: {Type} -> tables ~ exps
- => state ::: Type
- -> sql_query tables exps
- -> ($(exps ++ fold (fn nm (fields :: {Type}) acc => [nm] ~ acc => [nm = $fields] ++ acc) [] tables)
- -> state
- -> transaction state)
- -> state
- -> transaction state
+val query : tables ::: {{Type}} -> exps ::: {Type}
+ -> fn [tables ~ exps] =>
+ state ::: Type
+ -> sql_query tables exps
+ -> ($(exps ++ fold (fn nm (fields :: {Type}) [[nm] ~ acc] =>
+ [nm = $fields] ++ acc) [] tables)
+ -> state
+ -> transaction state)
+ -> state
+ -> transaction state
(*** Database mutators *)
@@ -204,22 +221,26 @@ type dml
val dml : dml -> transaction unit
val insert : fields ::: {Type}
- -> sql_table fields
- -> $(fold (fn nm (t :: Type) acc => [nm] ~ acc =>
- [nm = sql_exp [] [] [] t] ++ acc) [] fields)
- -> dml
-
-val update : changed :: {Type} -> unchanged ::: {Type} -> changed ~ unchanged
- => $(fold (fn nm (t :: Type) acc => [nm] ~ acc =>
- [nm = sql_exp [T = changed ++ unchanged] [] [] t] ++ acc) [] changed)
- -> sql_table (changed ++ unchanged)
- -> sql_exp [T = changed ++ unchanged] [] [] bool
- -> dml
+ -> sql_table fields
+ -> $(fold (fn nm (t :: Type) acc [[nm] ~ acc] =>
+ [nm = sql_exp [] [] [] t] ++ acc)
+ [] fields)
+ -> dml
+
+val update : changed :: {Type} -> unchanged ::: {Type} ->
+ fn [changed ~ unchanged] =>
+ $(fold (fn nm (t :: Type) acc [[nm] ~ acc] =>
+ [nm = sql_exp [T = changed ++ unchanged] [] [] t]
+ ++ acc)
+ [] changed)
+ -> sql_table (changed ++ unchanged)
+ -> sql_exp [T = changed ++ unchanged] [] [] bool
+ -> dml
val delete : fields ::: {Type}
- -> sql_table fields
- -> sql_exp [T = fields] [] [] bool
- -> dml
+ -> sql_table fields
+ -> sql_exp [T = fields] [] [] bool
+ -> dml
(*** Sequences *)
@@ -234,24 +255,29 @@ con tag :: {Type} -> {Unit} -> {Unit} -> {Type} -> {Type} -> Type
con xml :: {Unit} -> {Type} -> {Type} -> Type
val cdata : ctx ::: {Unit} -> use ::: {Type} -> string -> xml ctx use []
-val tag : attrsGiven ::: {Type} -> attrsAbsent ::: {Type} -> attrsGiven ~ attrsAbsent
- => ctxOuter ::: {Unit} -> ctxInner ::: {Unit}
- -> useOuter ::: {Type} -> useInner ::: {Type} -> useOuter ~ useInner
- => bindOuter ::: {Type} -> bindInner ::: {Type} -> bindOuter ~ bindInner
- => $attrsGiven
- -> tag (attrsGiven ++ attrsAbsent) ctxOuter ctxInner useOuter bindOuter
- -> xml ctxInner useInner bindInner
- -> xml ctxOuter (useOuter ++ useInner) (bindOuter ++ bindInner)
+val tag : attrsGiven ::: {Type} -> attrsAbsent ::: {Type}
+ -> ctxOuter ::: {Unit} -> ctxInner ::: {Unit}
+ -> useOuter ::: {Type} -> useInner ::: {Type}
+ -> bindOuter ::: {Type} -> bindInner ::: {Type}
+ -> fn [attrsGiven ~ attrsAbsent]
+ [useOuter ~ useInner]
+ [bindOuter ~ bindInner] =>
+ $attrsGiven
+ -> tag (attrsGiven ++ attrsAbsent)
+ ctxOuter ctxInner useOuter bindOuter
+ -> xml ctxInner useInner bindInner
+ -> xml ctxOuter (useOuter ++ useInner) (bindOuter ++ bindInner)
val join : ctx ::: {Unit}
-> use1 ::: {Type} -> bind1 ::: {Type} -> bind2 ::: {Type}
- -> use1 ~ bind1 => bind1 ~ bind2
- => xml ctx use1 bind1
- -> xml ctx (use1 ++ bind1) bind2
- -> xml ctx use1 (bind1 ++ bind2)
-val useMore : ctx ::: {Unit} -> use1 ::: {Type} -> use2 ::: {Type} -> bind ::: {Type}
- -> use1 ~ use2
- => xml ctx use1 bind
- -> xml ctx (use1 ++ use2) bind
+ -> fn [use1 ~ bind1] [bind1 ~ bind2] =>
+ xml ctx use1 bind1
+ -> xml ctx (use1 ++ bind1) bind2
+ -> xml ctx use1 (bind1 ++ bind2)
+val useMore : ctx ::: {Unit} -> use1 ::: {Type} -> use2 ::: {Type}
+ -> bind ::: {Type}
+ -> fn [use1 ~ use2] =>
+ xml ctx use1 bind
+ -> xml ctx (use1 ++ use2) bind
con xhtml = xml [Html]
con page = xhtml [] []
@@ -272,10 +298,14 @@ val head : unit -> tag [] html head [] []
val title : unit -> tag [] head [] [] []
val body : unit -> tag [] html body [] []
-con bodyTag = fn attrs :: {Type} => ctx ::: {Unit} -> [Body] ~ ctx => unit
- -> tag attrs ([Body] ++ ctx) ([Body] ++ ctx) [] []
-con bodyTagStandalone = fn attrs :: {Type} => ctx ::: {Unit} -> [Body] ~ ctx => unit
- -> tag attrs ([Body] ++ ctx) [] [] []
+con bodyTag = fn (attrs :: {Type}) =>
+ ctx ::: {Unit} ->
+ fn [[Body] ~ ctx] =>
+ unit -> tag attrs ([Body] ++ ctx) ([Body] ++ ctx) [] []
+con bodyTagStandalone = fn (attrs :: {Type}) =>
+ ctx ::: {Unit}
+ -> fn [[Body] ~ ctx] =>
+ unit -> tag attrs ([Body] ++ ctx) [] [] []
val br : bodyTagStandalone []
@@ -289,13 +319,15 @@ val li : bodyTag []
val a : bodyTag [Link = transaction page]
-val lform : ctx ::: {Unit} -> [Body] ~ ctx => bind ::: {Type}
- -> xml form [] bind
- -> xml ([Body] ++ ctx) [] []
-con lformTag = fn ty :: Type => fn inner :: {Unit} => fn attrs :: {Type} =>
- ctx ::: {Unit} -> [LForm] ~ ctx
- => nm :: Name -> unit
- -> tag attrs ([LForm] ++ ctx) inner [] [nm = ty]
+val lform : ctx ::: {Unit} -> bind ::: {Type}
+ -> fn [[Body] ~ ctx] =>
+ xml form [] bind
+ -> xml ([Body] ++ ctx) [] []
+con lformTag = fn (ty :: Type) (inner :: {Unit}) (attrs :: {Type}) =>
+ ctx ::: {Unit}
+ -> fn [[LForm] ~ ctx] =>
+ nm :: Name -> unit
+ -> tag attrs ([LForm] ++ ctx) inner [] [nm = ty]
val textbox : lformTag string [] [Value = string]
val password : lformTag string [] []
val ltextarea : lformTag string [] []
@@ -310,9 +342,11 @@ con select = [Select]
val lselect : lformTag string select []
val loption : unit -> tag [Value = string] select [] [] []
-val submit : ctx ::: {Unit} -> [LForm] ~ ctx
- => use ::: {Type} -> unit
- -> tag [Action = $use -> transaction page] ([LForm] ++ ctx) ([LForm] ++ ctx) use []
+val submit : ctx ::: {Unit} -> use ::: {Type}
+ -> fn [[LForm] ~ ctx] =>
+ unit
+ -> tag [Action = $use -> transaction page]
+ ([LForm] ++ ctx) ([LForm] ++ ctx) use []
(*** Tables *)