html: close <option> element when opening <optgroup>

Pass tests1.dat, test 34: <!DOCTYPE html>A<option>B<optgroup>C<select>D</option>E | <!DOCTYPE html> | <html> | <head> | <body> | "A" | <option> | "B" | <optgroup> | "C" | <select> | "DE" Also passes tests 35-48. Test 48 is: </ COM--MENT > R=nigeltao CC=golang-dev https://golang.org/cl/5311063

html: close <option> element when opening <optgroup>
bd07e4f2 · Andrew Balholm · Nigel Tao · 2cf53598 · bd07e4f2 · bd07e4f2
Commit bd07e4f2 authored Oct 27, 2011 by Andrew Balholm Committed by Nigel Tao Oct 27, 2011
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

src/pkg/html/parse.go src/pkg/html/parse.go +6 -0

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
@@ -594,6 +594,12 @@ func inBodyIM(p *parser) (insertionMode, bool) {
 			}
 			p.popUntil(buttonScopeStopTags, "p")
 			p.addElement("li", p.tok.Attr)
+		case "optgroup", "option":
+			if p.top().Data == "option" {
+				p.oe.pop()
+			}
+			p.reconstructActiveFormattingElements()
+			p.addElement(p.tok.Data, p.tok.Attr)
 		default:
 			// TODO.
 			p.addElement(p.tok.Data, p.tok.Attr)

--- 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 < 34; i++ {
+		for i := 0; i < 49; i++ {
 			// Parse the #data section.
 			b, err := ioutil.ReadAll(<-rc)
 			if err != nil {