summaryrefslogtreecommitdiff
path: root/demo/more
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adam@chlipala.net>2011-12-20 19:02:04 -0500
committerGravatar Adam Chlipala <adam@chlipala.net>2011-12-20 19:02:04 -0500
commit68494954ab57a448c90b612e047b6785db133522 (patch)
tree5358ac1a4e610aa945310524d94aa0aeaf8cc3ac /demo/more
parent1e79d3c76b59c86b605fa8d1c63dd9f0589b11a6 (diff)
Redo HTML context classification, to keep regular <body> tags out of <table> and <tr>
Diffstat (limited to 'demo/more')
-rw-r--r--demo/more/dlist.ur14
-rw-r--r--demo/more/dlist.urs6
-rw-r--r--demo/more/grid.ur2
3 files changed, 11 insertions, 11 deletions
diff --git a/demo/more/dlist.ur b/demo/more/dlist.ur
index 884ab8a1..a5af8d25 100644
--- a/demo/more/dlist.ur
+++ b/demo/more/dlist.ur
@@ -66,7 +66,7 @@ fun replace [t] dl ls =
set dl (Nonempty {Head = Cons (x, hd), Tail = tlS})
end
-fun renderDyn [ctx] [ctx ~ body] [t] (f : t -> position -> xml (ctx ++ body) [] []) filter pos len dl = <xml>
+fun renderDyn [ctx] [ctx ~ [Dyn]] [t] (f : t -> position -> xml (ctx ++ [Dyn]) [] []) filter pos len dl = <xml>
<dyn signal={dl' <- signal dl;
case dl' of
Empty => return <xml/>
@@ -119,8 +119,8 @@ fun renderDyn [ctx] [ctx ~ body] [t] (f : t -> position -> xml (ctx ++ body) []
end}/>
</xml>
-fun renderFlat [ctx] [ctx ~ body] [t] (f : t -> position -> xml (ctx ++ body) [] [])
- : option int -> list (t * position) -> xml (ctx ++ body) [] [] =
+fun renderFlat [ctx] [ctx ~ [Dyn]] [t] (f : t -> position -> xml (ctx ++ [Dyn]) [] [])
+ : option int -> list (t * position) -> xml (ctx ++ [Dyn]) [] [] =
let
fun renderFlat' len ls =
case len of
@@ -186,10 +186,10 @@ fun sort [t] (cmp : t -> t -> signal bool) =
sort'
end
-fun render [ctx] [ctx ~ body] [t] f (r : {Filter : t -> signal bool,
- Sort : signal (option (t -> t -> signal bool)),
- StartPosition : signal (option int),
- MaxLength : signal (option int)}) dl = <xml>
+fun render [ctx] [ctx ~ [Dyn]] [t] f (r : {Filter : t -> signal bool,
+ Sort : signal (option (t -> t -> signal bool)),
+ StartPosition : signal (option int),
+ MaxLength : signal (option int)}) dl = <xml>
<dyn signal={len <- r.MaxLength;
cmp <- r.Sort;
pos <- r.StartPosition;
diff --git a/demo/more/dlist.urs b/demo/more/dlist.urs
index 3509ef2d..115c72be 100644
--- a/demo/more/dlist.urs
+++ b/demo/more/dlist.urs
@@ -12,11 +12,11 @@ val size : t ::: Type -> dlist t -> signal int
val numPassing : t ::: Type -> (t -> signal bool) -> dlist t -> signal int
val foldl : t ::: Type -> acc ::: Type -> (t -> acc -> signal acc) -> acc -> dlist t -> signal acc
-val render : ctx ::: {Unit} -> [ctx ~ body] => t ::: Type
- -> (t -> position -> xml (ctx ++ body) [] [])
+val render : ctx ::: {Unit} -> [ctx ~ [Dyn]] => t ::: Type
+ -> (t -> position -> xml (ctx ++ [Dyn]) [] [])
-> {StartPosition : signal (option int),
MaxLength : signal (option int),
Filter : t -> signal bool,
Sort : signal (option (t -> t -> signal bool)) (* <= *)}
-> dlist t
- -> xml (ctx ++ body) [] []
+ -> xml (ctx ++ [Dyn]) [] []
diff --git a/demo/more/grid.ur b/demo/more/grid.ur
index 9375e811..dd0cb813 100644
--- a/demo/more/grid.ur
+++ b/demo/more/grid.ur
@@ -125,7 +125,7 @@ functor Make(M : sig
<table class={tabl}>
<tr class={tr}>
<th/> <th/> <th><button value="No sort" onclick={set grid.Sort None}/></th>
- {@mapX2 [fst3] [colMeta M.row] [[Body, Tr]]
+ {@mapX2 [fst3] [colMeta M.row] [tr]
(fn [nm :: Name] [p :: (Type * Type * Type)] [rest :: {(Type * Type * Type)}] [[nm] ~ rest]
data (meta : colMeta M.row p) =>
<xml><th class={th}>