aboutsummaryrefslogtreecommitdiff
path: root/src/pkg/exp
diff options
context:
space:
mode:
authorAndrew Balholm <andybalholm@gmail.com>2012-08-15 11:44:25 +1000
committerNigel Tao <nigeltao@golang.org>2012-08-15 11:44:25 +1000
commit27cb1cbb2e360b2ced4d3419ebd646d9d36acf5e (patch)
tree6523ea790484753dc9c7fba3d1320095f08a37f5 /src/pkg/exp
parent16a82828a2a552d01285d2cd3f01ed36b000b680 (diff)
downloadgo-27cb1cbb2e360b2ced4d3419ebd646d9d36acf5e.tar.xz
exp/html: skip render and reparse on more tests that build badly-formed parse trees
All of the remaining tests that had as status of PARSE rather than PASS had good reasons for not passing the render-and-reparse step: the correct parse tree is badly formed, so when it is rendered out as HTML, the result doesn't parse into the same tree. So add them to the list of tests where that step is skipped. Also, I discovered that it is possible to end up with HTML elements (not just text) inside a raw text element through reparenting. So change the rendering routines to handle that situation as sensibly as possible (which still isn't very sensible, but this is HTML5). R=nigeltao CC=golang-dev https://golang.org/cl/6446137
Diffstat (limited to 'src/pkg/exp')
-rw-r--r--src/pkg/exp/html/parse_test.go20
-rw-r--r--src/pkg/exp/html/render.go22
-rw-r--r--src/pkg/exp/html/testlogs/tests16.dat.log18
-rw-r--r--src/pkg/exp/html/testlogs/tests18.dat.log8
-rw-r--r--src/pkg/exp/html/testlogs/tests19.dat.log2
-rw-r--r--src/pkg/exp/html/testlogs/tests20.dat.log2
6 files changed, 42 insertions, 30 deletions
diff --git a/src/pkg/exp/html/parse_test.go b/src/pkg/exp/html/parse_test.go
index e159b492f5..a68ef12d40 100644
--- a/src/pkg/exp/html/parse_test.go
+++ b/src/pkg/exp/html/parse_test.go
@@ -385,6 +385,8 @@ var renderTestBlacklist = map[string]bool{
// The second <a> will be reparented to the first <table>'s parent. This
// results in an <a> whose parent is an <a>, which is not 'well-formed'.
`<a><table><td><a><table></table><a></tr><a></table><b>X</b>C<a>Y`: true,
+ // The same thing with a <p>:
+ `<p><table></p>`: true,
// More cases of <a> being reparented:
`<a href="blah">aba<table><a href="foo">br<tr><td></td></tr>x</table>aoe`: true,
`<a><table><a></table><p><a><div><a>`: true,
@@ -393,16 +395,26 @@ var renderTestBlacklist = map[string]bool{
`<!DOCTYPE html><body><b><nobr>1<table><nobr></b><i><nobr>2<nobr></i>3`: true,
// A <plaintext> element is reparented, putting it before a table.
// A <plaintext> element can't have anything after it in HTML.
- `<table><plaintext><td>`: true,
+ `<table><plaintext><td>`: true,
+ `<!doctype html><table><plaintext></plaintext>`: true,
+ `<!doctype html><table><tbody><plaintext></plaintext>`: true,
+ `<!doctype html><table><tbody><tr><plaintext></plaintext>`: true,
+ // A form inside a table inside a form doesn't work either.
+ `<!doctype html><form><table></form><form></table></form>`: true,
// A script that ends at EOF may escape its own closing tag when rendered.
`<!doctype html><script><!--<script `: true,
+ `<!doctype html><script><!--<script <`: true,
`<!doctype html><script><!--<script <a`: true,
+ `<!doctype html><script><!--<script </`: true,
+ `<!doctype html><script><!--<script </s`: true,
`<!doctype html><script><!--<script </script`: true,
`<!doctype html><script><!--<script </scripta`: true,
`<!doctype html><script><!--<script -`: true,
`<!doctype html><script><!--<script -a`: true,
+ `<!doctype html><script><!--<script -<`: true,
`<!doctype html><script><!--<script --`: true,
`<!doctype html><script><!--<script --a`: true,
+ `<!doctype html><script><!--<script --<`: true,
`<script><!--<script `: true,
`<script><!--<script <a`: true,
`<script><!--<script </script`: true,
@@ -411,6 +423,12 @@ var renderTestBlacklist = map[string]bool{
`<script><!--<script -a`: true,
`<script><!--<script --`: true,
`<script><!--<script --a`: true,
+ `<script><!--<script <`: true,
+ `<script><!--<script </`: true,
+ `<script><!--<script </s`: true,
+ // Reconstructing the active formatting elements results in a <plaintext>
+ // element that contains an <a> element.
+ `<!doctype html><p><a><plaintext>b`: true,
}
func TestNodeConsistency(t *testing.T) {
diff --git a/src/pkg/exp/html/render.go b/src/pkg/exp/html/render.go
index de9706528f..10a756e266 100644
--- a/src/pkg/exp/html/render.go
+++ b/src/pkg/exp/html/render.go
@@ -195,11 +195,14 @@ func render1(w writer, n *Node) error {
switch n.Data {
case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "xmp":
for _, c := range n.Child {
- if c.Type != TextNode {
- return fmt.Errorf("html: raw text element <%s> has non-text child node", n.Data)
- }
- if _, err := w.WriteString(c.Data); err != nil {
- return err
+ if c.Type == TextNode {
+ if _, err := w.WriteString(c.Data); err != nil {
+ return err
+ }
+ } else {
+ if err := render1(w, c); err != nil {
+ return err
+ }
}
}
if n.Data == "plaintext" {
@@ -207,15 +210,6 @@ func render1(w writer, n *Node) error {
// last element in the file, with no closing tag.
return plaintextAbort
}
- case "textarea", "title":
- for _, c := range n.Child {
- if c.Type != TextNode && n.Namespace == "" {
- return fmt.Errorf("html: RCDATA element <%s> has non-text child node", n.Data)
- }
- if err := render1(w, c); err != nil {
- return err
- }
- }
default:
for _, c := range n.Child {
if err := render1(w, c); err != nil {
diff --git a/src/pkg/exp/html/testlogs/tests16.dat.log b/src/pkg/exp/html/testlogs/tests16.dat.log
index 23e2789eea..6bb850adcc 100644
--- a/src/pkg/exp/html/testlogs/tests16.dat.log
+++ b/src/pkg/exp/html/testlogs/tests16.dat.log
@@ -30,10 +30,10 @@ PASS "<!doctype html><script><!--</script "
PASS "<!doctype html><script><!--<s"
PASS "<!doctype html><script><!--<script"
PASS "<!doctype html><script><!--<script "
-PARSE "<!doctype html><script><!--<script <"
+PASS "<!doctype html><script><!--<script <"
PASS "<!doctype html><script><!--<script <a"
-PARSE "<!doctype html><script><!--<script </"
-PARSE "<!doctype html><script><!--<script </s"
+PASS "<!doctype html><script><!--<script </"
+PASS "<!doctype html><script><!--<script </s"
PASS "<!doctype html><script><!--<script </script"
PASS "<!doctype html><script><!--<script </scripta"
PASS "<!doctype html><script><!--<script </script "
@@ -48,10 +48,10 @@ PASS "<!doctype html><script><!--<script </script </script/"
PASS "<!doctype html><script><!--<script </script </script>"
PASS "<!doctype html><script><!--<script -"
PASS "<!doctype html><script><!--<script -a"
-PARSE "<!doctype html><script><!--<script -<"
+PASS "<!doctype html><script><!--<script -<"
PASS "<!doctype html><script><!--<script --"
PASS "<!doctype html><script><!--<script --a"
-PARSE "<!doctype html><script><!--<script --<"
+PASS "<!doctype html><script><!--<script --<"
PASS "<!doctype html><script><!--<script -->"
PASS "<!doctype html><script><!--<script --><"
PASS "<!doctype html><script><!--<script --></"
@@ -126,10 +126,10 @@ PASS "<script><!--</script "
PASS "<script><!--<s"
PASS "<script><!--<script"
PASS "<script><!--<script "
-PARSE "<script><!--<script <"
+PASS "<script><!--<script <"
PASS "<script><!--<script <a"
-PARSE "<script><!--<script </"
-PARSE "<script><!--<script </s"
+PASS "<script><!--<script </"
+PASS "<script><!--<script </s"
PASS "<script><!--<script </script"
PASS "<script><!--<script </scripta"
PASS "<script><!--<script </script "
@@ -188,4 +188,4 @@ PASS "<xmp><!--<xmp></xmp>--></xmp>"
PASS "<noembed><!--<noembed></noembed>--></noembed>"
PASS "<!doctype html><table>\n"
PASS "<!doctype html><table><td><span><font></span><span>"
-PARSE "<!doctype html><form><table></form><form></table></form>"
+PASS "<!doctype html><form><table></form><form></table></form>"
diff --git a/src/pkg/exp/html/testlogs/tests18.dat.log b/src/pkg/exp/html/testlogs/tests18.dat.log
index d52663e922..376a483b38 100644
--- a/src/pkg/exp/html/testlogs/tests18.dat.log
+++ b/src/pkg/exp/html/testlogs/tests18.dat.log
@@ -1,8 +1,8 @@
PASS "<!doctype html><plaintext></plaintext>"
-PARSE "<!doctype html><table><plaintext></plaintext>"
-PARSE "<!doctype html><table><tbody><plaintext></plaintext>"
-PARSE "<!doctype html><table><tbody><tr><plaintext></plaintext>"
-PARSE "<!doctype html><table><tbody><tr><plaintext></plaintext>"
+PASS "<!doctype html><table><plaintext></plaintext>"
+PASS "<!doctype html><table><tbody><plaintext></plaintext>"
+PASS "<!doctype html><table><tbody><tr><plaintext></plaintext>"
+PASS "<!doctype html><table><tbody><tr><plaintext></plaintext>"
PASS "<!doctype html><table><td><plaintext></plaintext>"
PASS "<!doctype html><table><caption><plaintext></plaintext>"
PASS "<!doctype html><table><tr><style></script></style>abc"
diff --git a/src/pkg/exp/html/testlogs/tests19.dat.log b/src/pkg/exp/html/testlogs/tests19.dat.log
index 7025103d47..b394c2528f 100644
--- a/src/pkg/exp/html/testlogs/tests19.dat.log
+++ b/src/pkg/exp/html/testlogs/tests19.dat.log
@@ -100,5 +100,5 @@ PASS "<!doctype html><a><b></a><basefont>"
PASS "<!doctype html><a><b></a><bgsound>"
PASS "<!doctype html><figcaption><article></figcaption>a"
PASS "<!doctype html><summary><article></summary>a"
-PARSE "<!doctype html><p><a><plaintext>b"
+PASS "<!doctype html><p><a><plaintext>b"
PASS "<!DOCTYPE html><div>a<a></div>b<p>c</p>d"
diff --git a/src/pkg/exp/html/testlogs/tests20.dat.log b/src/pkg/exp/html/testlogs/tests20.dat.log
index c2a1442193..7537201161 100644
--- a/src/pkg/exp/html/testlogs/tests20.dat.log
+++ b/src/pkg/exp/html/testlogs/tests20.dat.log
@@ -19,7 +19,7 @@ PASS "<!doctype html><p><button><xmp>"
PASS "<!doctype html><p><button></p>"
PASS "<!doctype html><address><button></address>a"
PASS "<!doctype html><address><button></address>a"
-PARSE "<p><table></p>"
+PASS "<p><table></p>"
PASS "<!doctype html><svg>"
PASS "<!doctype html><p><figcaption>"
PASS "<!doctype html><p><summary>"
generated by cgit v1.3-5-g9baa (git 2.53.0) at 2026-04-17 01:15:48 +0000