exp/html: correctly handle <title> after </head>

The <title> element was getting removed from the stack of open elements, when its parent, the <head> element should have been removed instead. Pass 2 additional tests. R=nigeltao CC=golang-dev https://golang.org/cl/6449101

exp/html: correctly handle <title> after </head>
The <title> element was getting removed from the stack of open elements, when its parent, the <head> element should have been removed instead. Pass 2 additional tests. R=nigeltao CC=golang-dev https://golang.org/cl/6449101
5530a426 · Andrew Balholm · Nigel Tao · 0bfa31e9 · 5530a426 · 5530a426
Commit 5530a426 authored Aug 07, 2012 by Andrew Balholm Committed by Nigel Tao Aug 07, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

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

tests7.dat.log src/pkg/exp/html/testlogs/tests7.dat.log +2 -2

No files found.
--- a/src/pkg/exp/html/parse.go
+++ b/src/pkg/exp/html/parse.go
@@ -669,7 +669,7 @@ func afterHeadIM(p *parser) bool {
 			return true
 		case a.Base, a.Basefont, a.Bgsound, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
 			p.oe = append(p.oe, p.head)
-			defer p.oe.pop()
+			defer p.oe.remove(p.head)
 			return inHeadIM(p)
 		case a.Head:
 			// Ignore the token.

--- a/src/pkg/exp/html/testlogs/tests7.dat.log
+++ b/src/pkg/exp/html/testlogs/tests7.dat.log
 PASS "<!doctype html><body><title>X</title>"
 PASS "<!doctype html><table><title>X</title></table>"
-FAIL "<!doctype html><head></head><title>X</title>"
-FAIL "<!doctype html></head><title>X</title>"
+PASS "<!doctype html><head></head><title>X</title>"
+PASS "<!doctype html></head><title>X</title>"
 PASS "<!doctype html><table><meta></table>"
 PASS "<!doctype html><table>X<tr><td><table> <meta></table></table>"
 PASS "<!doctype html><html> <head>"