exp/html: improve beforeHeadIM

Add a case to ignore doctype tokens. Clean up the flow of control to more clearly match the spec. Pass one more test. R=nigeltao CC=golang-dev https://golang.org/cl/6062047

exp/html: improve beforeHeadIM
Add a case to ignore doctype tokens. Clean up the flow of control to more clearly match the spec. Pass one more test. R=nigeltao CC=golang-dev https://golang.org/cl/6062047
b65c9a63 · Andrew Balholm · Nigel Tao · b39bbf1e · b65c9a63 · b65c9a63
Commit b65c9a63 authored Apr 18, 2012 by Andrew Balholm Committed by Nigel Tao Apr 18, 2012
Show whitespace changes
Inline Side-by-side

Showing with 14 additions and 19 deletions

src/pkg/exp/html/parse.go src/pkg/exp/html/parse.go +13 -18

src/pkg/exp/html/testlogs/tests19.dat.log src/pkg/exp/html/testlogs/tests19.dat.log +1 -1

No files found.
--- a/src/pkg/exp/html/parse.go
+++ b/src/pkg/exp/html/parse.go
@@ -446,37 +446,30 @@ func beforeHTMLIM(p *parser) bool {

 // Section 12.2.5.4.3.
 func beforeHeadIM(p *parser) bool {
-	var (
-		add     bool
-		attr    []Attribute
-		implied bool
-	)
 	switch p.tok.Type {
-	case ErrorToken:
-		implied = true
 	case TextToken:
 		p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
 		if len(p.tok.Data) == 0 {
 			// It was all whitespace, so ignore it.
 			return true
 		}
-		implied = true
 	case StartTagToken:
 		switch p.tok.Data {
 		case "head":
-			add = true
-			attr = p.tok.Attr
+			p.addElement(p.tok.Data, p.tok.Attr)
+			p.head = p.top()
+			p.im = inHeadIM
+			return true
 		case "html":
 			return inBodyIM(p)
-		default:
-			implied = true
 		}
 	case EndTagToken:
 		switch p.tok.Data {
 		case "head", "body", "html", "br":
-			implied = true
+			// Drop down to adding an implied <head> tag.
 		default:
 			// Ignore the token.
+			return true
 		}
 	case CommentToken:
 		p.addChild(&Node{
@@ -484,13 +477,15 @@ func beforeHeadIM(p *parser) bool {
 			Data: p.tok.Data,
 		})
 		return true
+	case DoctypeToken:
+		// Ignore the token.
+		return true
 	}
-	if add || implied {
-		p.addElement("head", attr)
+
+	p.addElement("head", nil)
 	p.head = p.top()
-	}
 	p.im = inHeadIM
-	return !implied
+	return false
 }

 // Section 12.2.5.4.4.

--- a/src/pkg/exp/html/testlogs/tests19.dat.log
+++ b/src/pkg/exp/html/testlogs/tests19.dat.log
 FAIL "<!doctype html><math><mn DefinitionUrl=\"foo\">"
-FAIL "<!doctype html><html></p><!--foo-->"
+PASS "<!doctype html><html></p><!--foo-->"
 PASS "<!doctype html><head></head></p><!--foo-->"
 FAIL "<!doctype html><body><p><pre>"
 FAIL "<!doctype html><body><p><listing>"