From 632a2c59b12b525edac2fffa4ddd57b3de068707 Mon Sep 17 00:00:00 2001 From: Andrew Balholm Date: Fri, 4 Nov 2011 15:48:11 +1100 Subject: [PATCH] html: properly close element when an new starts. Pass tests1.dat, test 87:
X
| | | | | | | |
| | | | | "X" R=nigeltao CC=golang-dev https://golang.org/cl/5343041 --- src/pkg/html/parse.go | 17 +++++++++++------ src/pkg/html/parse_test.go | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/pkg/html/parse.go b/src/pkg/html/parse.go index 0204b7c281c..811e2654731 100644 --- a/src/pkg/html/parse.go +++ b/src/pkg/html/parse.go @@ -943,22 +943,27 @@ func inRowIM(p *parser) (insertionMode, bool) { case StartTagToken: switch p.tok.Data { case "td", "th": - // TODO: clear the stack back to a table row context. + p.clearStackToContext(tableRowContextStopTags) p.addElement(p.tok.Data, p.tok.Attr) p.afe = append(p.afe, &scopeMarker) return inCellIM, true + case "caption", "col", "colgroup", "tbody", "tfoot", "thead", "tr": + if p.popUntil(tableScopeStopTags, "tr") { + return inTableBodyIM, false + } + // Ignore the token. + return inRowIM, true default: // TODO. } case EndTagToken: switch p.tok.Data { case "tr": - if !p.elementInScope(tableScopeStopTags, "tr") { - return inRowIM, true + if p.popUntil(tableScopeStopTags, "tr") { + return inTableBodyIM, true } - p.clearStackToContext(tableRowContextStopTags) - p.oe.pop() - return inTableBodyIM, true + // Ignore the token. + return inRowIM, true case "table": if p.popUntil(tableScopeStopTags, "tr") { return inTableBodyIM, false diff --git a/src/pkg/html/parse_test.go b/src/pkg/html/parse_test.go index 8dc00ba484c..a6398e7a124 100644 --- a/src/pkg/html/parse_test.go +++ b/src/pkg/html/parse_test.go @@ -133,7 +133,7 @@ func TestParser(t *testing.T) { rc := make(chan io.Reader) go readDat(filename, rc) // TODO(nigeltao): Process all test cases, not just a subset. - for i := 0; i < 86; i++ { + for i := 0; i < 87; i++ { // Parse the #data section. b, err := ioutil.ReadAll(<-rc) if err != nil {