diff options
| author |  Adam Chlipala <adam@chlipala.net> | 2010-10-10 14:41:03 -0400 |
|---|---|---|
| committer | Adam Chlipala <adam@chlipala.net> | 2010-10-10 14:41:03 -0400 |
| commit | 948aa854af8ca5560a1eea5221c4a1f3a6901970 (patch) | |
| tree | 2e1c023171139b80bf24b4ec2b5a85115973e945 /demo | |
| parent | bfeac162a328dba937a28e747e4fc4006fac500c (diff) | |
Hopeful fix for the Great Unification Bug
Diffstat (limited to 'demo')
| -rw-r--r-- | demo/crud.ur | 4 | ||||
| -rw-r--r-- | demo/crud3.ur | 2 | ||||
| -rw-r--r-- | demo/metaform.ur | 9 | ||||
| -rw-r--r-- | demo/view.ur | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/demo/crud.ur b/demo/crud.ur index 2fc82c1b..4d2753ea 100644 --- a/demo/crud.ur +++ b/demo/crud.ur @@ -78,7 +78,7 @@ functor Make(M : sig <form> {@foldR [colMeta] [fn cols => xml form [] (map snd cols)] - (fn [nm :: Name] [t ::_] [rest ::_] [[nm] ~ rest] (col : colMeta t) (acc : xml form [] (map snd rest)) => <xml> + (fn [nm :: Name] [t ::_] [rest ::_] [[nm] ~ rest] (col : colMeta t) acc => <xml> <li> {cdata col.Nam}: {col.Widget [nm]}</li> {useMore acc} </xml>) @@ -128,7 +128,7 @@ functor Make(M : sig None => return <xml><body>Not found!</body></xml> | Some fs => return <xml><body><form> {@foldR2 [fst] [colMeta] [fn cols => xml form [] (map snd cols)] - (fn [nm :: Name] [t ::_] [rest ::_] [[nm] ~ rest] (v : t.1) (col : colMeta t) + (fn [nm :: Name] [t ::_] [rest ::_] [[nm] ~ rest] v (col : colMeta t) (acc : xml form [] (map snd rest)) => <xml> <li> {cdata col.Nam}: {col.WidgetPopulated [nm] v}</li> diff --git a/demo/crud3.ur b/demo/crud3.ur index c336af30..5be035dd 100644 --- a/demo/crud3.ur +++ b/demo/crud3.ur @@ -20,7 +20,7 @@ open Crud.Make(struct <textbox{#B}/> </subform> </xml>), - Parse = (fn p => p.A ^ p.B), + Parse = (fn p : {A : string, B : string} => p.A ^ p.B), Inject = _ } } diff --git a/demo/metaform.ur b/demo/metaform.ur index 729b7d08..c6a6e54b 100644 --- a/demo/metaform.ur +++ b/demo/metaform.ur @@ -15,11 +15,10 @@ functor Make (M : sig fun main () = return <xml><body> <form> {@foldUR [string] [fn cols => xml form [] (mapU string cols)] - (fn [nm :: Name] [rest ::_] [[nm] ~ rest] name - (acc : xml form [] (mapU string rest)) => <xml> - <li> {[name]}: <textbox{nm}/></li> - {useMore acc} - </xml>) + (fn [nm :: Name] [rest ::_] [[nm] ~ rest] name acc => <xml> + <li> {[name]}: <textbox{nm}/></li> + {useMore acc} + </xml>) <xml/> M.fl M.names} <submit action={handler}/> diff --git a/demo/view.ur b/demo/view.ur index 84c179f4..0dcb42fa 100644 --- a/demo/view.ur +++ b/demo/view.ur @@ -1,7 +1,7 @@ table t : { A : int } view v = SELECT t.A AS A FROM t WHERE t.A > 7 -fun list [u] (_ : fieldsOf u [A = int]) (title : string) (x : u) = +fun list [u] (_ : fieldsOf u [A = int]) (title : string) (x : u) : transaction xbody = xml <- queryX (SELECT * FROM x) (fn r : {X : {A : int}} => <xml><li>{[r.X.A]}</li></xml>); return <xml> |