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

html: parse <style> elements inside <head> element.
833fb419 · Andrew Balholm · Nigel Tao · bd07e4f2 · 833fb419 · 833fb419
Commit 833fb419 authored Oct 27, 2011 by Andrew Balholm Committed by Nigel Tao Oct 27, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

src/pkg/html/parse.go src/pkg/html/parse.go +3 -1

src/pkg/html/parse_test.go src/pkg/html/parse_test.go +1 -1

No files found.
--- 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

--- 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 {