mirror of
https://github.com/golang/go
synced 2024-11-19 21:54:40 -07:00
html: ignore whitespace before <head> element
Pass tests2.dat, test 47: " \n " (That is, two spaces separated by a newline) | <html> | <head> | <body> Also pass tests through test 49: <!DOCTYPE html><script> </script> <title>x</title> </head> R=nigeltao CC=golang-dev https://golang.org/cl/5422043
This commit is contained in:
parent
86c08e9611
commit
750de28d6c
@ -319,9 +319,17 @@ func (p *parser) resetInsertionMode() {
|
||||
p.im = inBodyIM
|
||||
}
|
||||
|
||||
const whitespace = " \t\r\n\f"
|
||||
|
||||
// Section 11.2.5.4.1.
|
||||
func initialIM(p *parser) bool {
|
||||
switch p.tok.Type {
|
||||
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
|
||||
}
|
||||
case CommentToken:
|
||||
p.doc.Add(&Node{
|
||||
Type: CommentNode,
|
||||
@ -345,6 +353,12 @@ func initialIM(p *parser) bool {
|
||||
// Section 11.2.5.4.2.
|
||||
func beforeHTMLIM(p *parser) bool {
|
||||
switch p.tok.Type {
|
||||
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
|
||||
}
|
||||
case StartTagToken:
|
||||
if p.tok.Data == "html" {
|
||||
p.addElement(p.tok.Data, p.tok.Attr)
|
||||
@ -383,7 +397,11 @@ func beforeHeadIM(p *parser) bool {
|
||||
case ErrorToken:
|
||||
implied = true
|
||||
case TextToken:
|
||||
// TODO: distinguish whitespace text from others.
|
||||
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 {
|
||||
@ -417,8 +435,6 @@ func beforeHeadIM(p *parser) bool {
|
||||
return !implied
|
||||
}
|
||||
|
||||
const whitespace = " \t\r\n\f"
|
||||
|
||||
// Section 11.2.5.4.4.
|
||||
func inHeadIM(p *parser) bool {
|
||||
var (
|
||||
|
@ -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", 47},
|
||||
{"tests2.dat", 50},
|
||||
{"tests3.dat", 0},
|
||||
}
|
||||
for _, tf := range testFiles {
|
||||
|
Loading…
Reference in New Issue
Block a user