Skip to content

G
go
Commit 27cb1cbb authored by Andrew Balholm's avatar Andrew Balholm Committed by Nigel Tao
Browse files
Options

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
parent 16a82828
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 30 deletions
src/pkg/exp/html/parse_test.go
View file @ 27cb1cbb
...@@ -385,6 +385,8 @@ var renderTestBlacklist = map[string]bool{ ...@@ -385,6 +385,8 @@ var renderTestBlacklist = map[string]bool{
// The second <a> will be reparented to the first <table>'s parent. This // 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'. // 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, `<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: // More cases of <a> being reparented:
`<a href="blah">aba<table><a href="foo">br<tr><td></td></tr>x</table>aoe`: true, `<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, `<a><table><a></table><p><a><div><a>`: true,
...@@ -394,15 +396,25 @@ var renderTestBlacklist = map[string]bool{ ...@@ -394,15 +396,25 @@ var renderTestBlacklist = map[string]bool{
// A <plaintext> element is reparented, putting it before a table. // A <plaintext> element is reparented, putting it before a table.
// A <plaintext> element can't have anything after it in HTML. // 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. // 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 <`: true,
`<!doctype html><script><!--<script <a`: 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 </script`: true,
`<!doctype html><script><!--<script </scripta`: true, `<!doctype html><script><!--<script </scripta`: true,
`<!doctype html><script><!--<script -`: true, `<!doctype html><script><!--<script -`: true,
`<!doctype html><script><!--<script -a`: true, `<!doctype html><script><!--<script -a`: true,
`<!doctype html><script><!--<script -<`: true,
`<!doctype html><script><!--<script --`: true, `<!doctype html><script><!--<script --`: true,
`<!doctype html><script><!--<script --a`: true, `<!doctype html><script><!--<script --a`: true,
`<!doctype html><script><!--<script --<`: true,
`<script><!--<script `: true, `<script><!--<script `: true,
`<script><!--<script <a`: true, `<script><!--<script <a`: true,
`<script><!--<script </script`: true, `<script><!--<script </script`: true,
...@@ -411,6 +423,12 @@ var renderTestBlacklist = map[string]bool{ ...@@ -411,6 +423,12 @@ var renderTestBlacklist = map[string]bool{
`<script><!--<script -a`: true, `<script><!--<script -a`: true,
`<script><!--<script --`: true, `<script><!--<script --`: true,
`<script><!--<script --a`: 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) { func TestNodeConsistency(t *testing.T) {
......
src/pkg/exp/html/render.go
View file @ 27cb1cbb
...@@ -195,27 +195,21 @@ func render1(w writer, n *Node) error { ...@@ -195,27 +195,21 @@ func render1(w writer, n *Node) error {
switch n.Data { switch n.Data {
case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "xmp": case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "xmp":
for _, c := range n.Child { for _, c := range n.Child {
if c.Type != TextNode { 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 { if _, err := w.WriteString(c.Data); err != nil {
return err return err
} }
} else {
if err := render1(w, c); err != nil {
return err
}
}
} }
if n.Data == "plaintext" { if n.Data == "plaintext" {
// Don't render anything else. <plaintext> must be the // Don't render anything else. <plaintext> must be the
// last element in the file, with no closing tag. // last element in the file, with no closing tag.
return plaintextAbort 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: default:
for _, c := range n.Child { for _, c := range n.Child {
if err := render1(w, c); err != nil { if err := render1(w, c); err != nil {
......
src/pkg/exp/html/testlogs/tests16.dat.log
View file @ 27cb1cbb
...@@ -30,10 +30,10 @@ PASS "<!doctype html><script><!--</script " ...@@ -30,10 +30,10 @@ PASS "<!doctype html><script><!--</script "
PASS "<!doctype html><script><!--<s" PASS "<!doctype html><script><!--<s"
PASS "<!doctype html><script><!--<script" PASS "<!doctype html><script><!--<script"
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" PASS "<!doctype html><script><!--<script <a"
PARSE "<!doctype html><script><!--<script </" PASS "<!doctype html><script><!--<script </"
PARSE "<!doctype html><script><!--<script </s" PASS "<!doctype html><script><!--<script </s"
PASS "<!doctype html><script><!--<script </script" PASS "<!doctype html><script><!--<script </script"
PASS "<!doctype html><script><!--<script </scripta" PASS "<!doctype html><script><!--<script </scripta"
PASS "<!doctype html><script><!--<script </script " PASS "<!doctype html><script><!--<script </script "
...@@ -48,10 +48,10 @@ PASS "<!doctype html><script><!--<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 </script </script>"
PASS "<!doctype html><script><!--<script -" PASS "<!doctype html><script><!--<script -"
PASS "<!doctype html><script><!--<script -a" 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 --a" 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 --><" PASS "<!doctype html><script><!--<script --><"
PASS "<!doctype html><script><!--<script --></" PASS "<!doctype html><script><!--<script --></"
...@@ -126,10 +126,10 @@ PASS "<script><!--</script " ...@@ -126,10 +126,10 @@ PASS "<script><!--</script "
PASS "<script><!--<s" PASS "<script><!--<s"
PASS "<script><!--<script" PASS "<script><!--<script"
PASS "<script><!--<script " PASS "<script><!--<script "
PARSE "<script><!--<script <" PASS "<script><!--<script <"
PASS "<script><!--<script <a" PASS "<script><!--<script <a"
PARSE "<script><!--<script </" PASS "<script><!--<script </"
PARSE "<script><!--<script </s" PASS "<script><!--<script </s"
PASS "<script><!--<script </script" PASS "<script><!--<script </script"
PASS "<script><!--<script </scripta" PASS "<script><!--<script </scripta"
PASS "<script><!--<script </script " PASS "<script><!--<script </script "
...@@ -188,4 +188,4 @@ PASS "<xmp><!--<xmp></xmp>--></xmp>" ...@@ -188,4 +188,4 @@ PASS "<xmp><!--<xmp></xmp>--></xmp>"
PASS "<noembed><!--<noembed></noembed>--></noembed>" PASS "<noembed><!--<noembed></noembed>--></noembed>"
PASS "<!doctype html><table>\n" PASS "<!doctype html><table>\n"
PASS "<!doctype html><table><td><span><font></span><span>" 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>"
src/pkg/exp/html/testlogs/tests18.dat.log
View file @ 27cb1cbb
PASS "<!doctype html><plaintext></plaintext>" PASS "<!doctype html><plaintext></plaintext>"
PARSE "<!doctype html><table><plaintext></plaintext>" PASS "<!doctype html><table><plaintext></plaintext>"
PARSE "<!doctype html><table><tbody><plaintext></plaintext>" PASS "<!doctype html><table><tbody><plaintext></plaintext>"
PARSE "<!doctype html><table><tbody><tr><plaintext></plaintext>" PASS "<!doctype html><table><tbody><tr><plaintext></plaintext>"
PARSE "<!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><td><plaintext></plaintext>"
PASS "<!doctype html><table><caption><plaintext></plaintext>" PASS "<!doctype html><table><caption><plaintext></plaintext>"
PASS "<!doctype html><table><tr><style></script></style>abc" PASS "<!doctype html><table><tr><style></script></style>abc"
......
src/pkg/exp/html/testlogs/tests19.dat.log
View file @ 27cb1cbb
...@@ -100,5 +100,5 @@ PASS "<!doctype html><a><b></a><basefont>" ...@@ -100,5 +100,5 @@ PASS "<!doctype html><a><b></a><basefont>"
PASS "<!doctype html><a><b></a><bgsound>" PASS "<!doctype html><a><b></a><bgsound>"
PASS "<!doctype html><figcaption><article></figcaption>a" PASS "<!doctype html><figcaption><article></figcaption>a"
PASS "<!doctype html><summary><article></summary>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" PASS "<!DOCTYPE html><div>a<a></div>b<p>c</p>d"
src/pkg/exp/html/testlogs/tests20.dat.log
View file @ 27cb1cbb
...@@ -19,7 +19,7 @@ PASS "<!doctype html><p><button><xmp>" ...@@ -19,7 +19,7 @@ PASS "<!doctype html><p><button><xmp>"
PASS "<!doctype html><p><button></p>" PASS "<!doctype html><p><button></p>"
PASS "<!doctype html><address><button></address>a" PASS "<!doctype html><address><button></address>a"
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><svg>"
PASS "<!doctype html><p><figcaption>" PASS "<!doctype html><p><figcaption>"
PASS "<!doctype html><p><summary>" PASS "<!doctype html><p><summary>"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7