diff options
| author | Andrew Balholm <andybalholm@gmail.com> | 2011-10-27 10:26:11 +1100 |
|---|---|---|
| committer | Nigel Tao <nigeltao@golang.org> | 2011-10-27 10:26:11 +1100 |
| commit | 833fb4198d2f4ff3add2e8a14bfe6c91413f7601 (patch) | |
| tree | 1ccd382502bdba51501dd81979ae306f3bae7493 /src/pkg/html | |
| parent | bd07e4f25906f4443811e3b6bdb4ff2918beed0c (diff) | |
| download | go-833fb4198d2f4ff3add2e8a14bfe6c91413f7601.tar.xz | |
html: parse <style> elements inside <head> element.
Also correctly handle EOF inside a <style> element.
Pass tests1.dat, test 49:
<!DOCTYPE html><style> EOF
| <!DOCTYPE html>
| <html>
| <head>
| <style>
| " EOF"
| <body>
R=nigeltao
CC=golang-dev
https://golang.org/cl/5321057
Diffstat (limited to 'src/pkg/html')
| -rw-r--r-- | src/pkg/html/parse.go | 4 | ||||
| -rw-r--r-- | src/pkg/html/parse_test.go | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/pkg/html/parse.go b/src/pkg/html/parse.go index 823f7aad29..276f0b7fbf 100644 --- a/src/pkg/html/parse.go +++ b/src/pkg/html/parse.go @@ -443,7 +443,7 @@ func inHeadIM(p *parser) (insertionMode, bool) { switch p.tok.Data { case "meta": // TODO. - case "script", "title": + case "script", "title", "noscript", "noframes", "style": p.addElement(p.tok.Data, p.tok.Attr) p.setOriginalIM(inHeadIM) return textIM, true @@ -763,6 +763,8 @@ func (p *parser) inBodyEndTagOther(tag string) { // Section 11.2.5.4.8. func textIM(p *parser) (insertionMode, bool) { switch p.tok.Type { + case ErrorToken: + p.oe.pop() case TextToken: p.addText(p.tok.Data) return textIM, true diff --git a/src/pkg/html/parse_test.go b/src/pkg/html/parse_test.go index 5022a4f779..86f1298d5e 100644 --- a/src/pkg/html/parse_test.go +++ b/src/pkg/html/parse_test.go @@ -132,7 +132,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 < 49; i++ { + for i := 0; i < 50; i++ { // Parse the #data section. b, err := ioutil.ReadAll(<-rc) if err != nil { |