summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-04-04 11:46:24 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-04-04 11:46:24 -0400
commit0e5d32d1caf9b4267c76193fc787e12ea7691fc8 (patch)
tree3979ccacac613495cad0e9aa5a76e8d8fba76b7b /lib
parent6059e157bd5b18742f8546d5231150b061a24d1b (diff)
Checking spans in dyns
Diffstat (limited to 'lib')
-rw-r--r--lib/js/urweb.js4
-rw-r--r--lib/ur/basis.urs6
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/js/urweb.js b/lib/js/urweb.js
index d3c144b9..4a447a5b 100644
--- a/lib/js/urweb.js
+++ b/lib/js/urweb.js
@@ -154,6 +154,10 @@ function pfl(s) {
throw "Can't parse float: " + s;
}
+function cat(s1, s2) {
+ return s1 + s2;
+}
+
function whine(msg) {
alert(msg);
throw msg;
diff --git a/lib/ur/basis.urs b/lib/ur/basis.urs
index 586c5ef9..f95e8eba 100644
--- a/lib/ur/basis.urs
+++ b/lib/ur/basis.urs
@@ -375,8 +375,8 @@ con form = [Body, Form]
con tabl = [Body, Table]
con tr = [Body, Tr]
-val dyn : ctx ::: {Unit} -> use ::: {Type} -> bind ::: {Type} -> unit
- -> tag [Signal = signal (xml ctx use bind)] ctx [] use bind
+val dyn : use ::: {Type} -> bind ::: {Type} -> unit
+ -> tag [Signal = signal (xml body use bind)] body [] use bind
val head : unit -> tag [] html head [] []
val title : unit -> tag [] head [] [] []
@@ -393,6 +393,8 @@ con bodyTagStandalone = fn (attrs :: {Type}) =>
val br : bodyTagStandalone []
+val span : bodyTag []
+
val p : bodyTag []
val b : bodyTag []
val i : bodyTag []