summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-09-26 12:45:19 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-09-26 12:45:19 -0400
commit9a7c15c058f6bafef3fee702382197815f335ee9 (patch)
treec51cf1438d3cbb7637a2d95f47b19d5953a9817c
parenta2ab1cb6d782e13944ba21fd0368528e5a27ee9e (diff)
Whitelisting tags that may be self-closed
-rw-r--r--src/monoize.sml25
-rw-r--r--tests/empties.ur4
-rw-r--r--tests/empties.urp3
-rw-r--r--tests/empties.urs1
4 files changed, 32 insertions, 1 deletions
diff --git a/src/monoize.sml b/src/monoize.sml
index e9f1588e..c3d91074 100644
--- a/src/monoize.sml
+++ b/src/monoize.sml
@@ -36,6 +36,19 @@ structure L' = Mono
structure IM = IntBinaryMap
structure IS = IntBinarySet
+structure SS = BinarySetFn(struct
+ type ord_key = string
+ val compare = String.compare
+ end)
+
+val singletons = SS.addList (SS.empty,
+ ["link",
+ "br",
+ "p",
+ "hr",
+ "input",
+ "button"])
+
val dummyTyp = (L'.TDatatype (0, ref (L'.Enum, [])), E.dummySpan)
structure U = MonoUtil
@@ -2603,6 +2616,16 @@ fun monoExp (env, st, fm) (all as (e, loc)) =
loc),
fm)
end
+
+ fun isSingleton () =
+ let
+ val (bef, aft) = Substring.splitl (not o Char.isSpace) (Substring.full tag)
+ in
+ SS.member (singletons, if Substring.isEmpty aft then
+ tag
+ else
+ Substring.string bef)
+ end
in
case xml of
(L.EApp ((L.ECApp (
@@ -2610,7 +2633,7 @@ fun monoExp (env, st, fm) (all as (e, loc)) =
_), _),
_), _),
(L.EPrim (Prim.String s), _)), _) =>
- if CharVector.all Char.isSpace s then
+ if CharVector.all Char.isSpace s andalso isSingleton () then
((L'.EStrcat (tagStart, (L'.EPrim (Prim.String " />"), loc)), loc), fm)
else
normal ()
diff --git a/tests/empties.ur b/tests/empties.ur
new file mode 100644
index 00000000..62003083
--- /dev/null
+++ b/tests/empties.ur
@@ -0,0 +1,4 @@
+fun main () = return <xml><body>
+ <table> <tr> <th/> <td><p/></td> </tr> </table>
+ <form><textbox{#A}/></form>
+</body></xml>
diff --git a/tests/empties.urp b/tests/empties.urp
new file mode 100644
index 00000000..92ce98f8
--- /dev/null
+++ b/tests/empties.urp
@@ -0,0 +1,3 @@
+debug
+
+empties
diff --git a/tests/empties.urs b/tests/empties.urs
new file mode 100644
index 00000000..6ac44e0b
--- /dev/null
+++ b/tests/empties.urs
@@ -0,0 +1 @@
+val main : unit -> transaction page