html: parse </optgroup> and </option>

Pass tests2.dat, test 35: <!DOCTYPE html><select><optgroup><option></optgroup><option><select><option> | <!DOCTYPE html> | <html> | <head> | <body> | <select> | <optgroup> | <option> | <option> | <option> Also pass tests through test 41: <!DOCTYPE html> R=nigeltao, rsc CC=golang-dev https://golang.org/cl/5395045

html: parse </optgroup> and </option>
3276afd4 · Andrew Balholm · Nigel Tao · 8c6461bc · 3276afd4 · 3276afd4
Commit 3276afd4 authored Nov 16, 2011 by Andrew Balholm Committed by Nigel Tao Nov 16, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

parse.go src/pkg/html/parse.go +10 -2

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
@@ -1245,9 +1245,17 @@ func inSelectIM(p *parser) bool {
 	case EndTagToken:
 		switch p.tok.Data {
 		case "option":
-			// TODO.
+			if p.top().Data == "option" {
+				p.oe.pop()
+			}
 		case "optgroup":
-			// TODO.
+			i := len(p.oe) - 1
+			if p.oe[i].Data == "option" {
+				i--
+			}
+			if p.oe[i].Data == "optgroup" {
+				p.oe = p.oe[:i]
+			}
 		case "select":
 			endSelect = true
 		default:

--- a/src/pkg/html/parse_test.go
+++ b/src/pkg/html/parse_test.go
@@ -134,7 +134,7 @@ func TestParser(t *testing.T) {
 	}{
 		// TODO(nigeltao): Process all the test cases from all the .dat files.
 		{"tests1.dat", -1},
-		{"tests2.dat", 35},
+		{"tests2.dat", 42},
 		{"tests3.dat", 0},
 	}
 	for _, tf := range testFiles {