mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exp/html: refactor the parser.read method. 

R=andybalholm
CC=golang-dev
https://golang.org/cl/6463070
This commit is contained in:
Nigel Tao 2012-08-21 20:59:02 +10:00
parent 46c9346d74
commit fa0e9cd279
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/pkg/exp/html/parse.go
View File

@ -398,20 +398,6 @@ func (p *parser) reconstructActiveFormattingElements() {
} }
} }
// read reads the next token from the tokenizer.
func (p *parser) read() error {
// CDATA sections are allowed only in foreign content.
n := p.oe.top()
p.tokenizer.AllowCDATA(n != nil && n.Namespace != "")
p.tokenizer.Next()
p.tok = p.tokenizer.Token()
if p.tok.Type == ErrorToken {
return p.tokenizer.Err()
}
return nil
}
// Section 12.2.4. // Section 12.2.4.
func (p *parser) acknowledgeSelfClosingTag() { func (p *parser) acknowledgeSelfClosingTag() {
p.hasSelfClosingToken = false p.hasSelfClosingToken = false
@ -2014,9 +2000,17 @@ func (p *parser) parse() error {
// Iterate until EOF. Any other error will cause an early return. // Iterate until EOF. Any other error will cause an early return.
var err error var err error
for err != io.EOF { for err != io.EOF {
err = p.read() // CDATA sections are allowed only in foreign content.
if err != nil && err != io.EOF { n := p.oe.top()
return err p.tokenizer.AllowCDATA(n != nil && n.Namespace != "")
// Read and parse the next token.
p.tokenizer.Next()
p.tok = p.tokenizer.Token()
if p.tok.Type == ErrorToken {
err = p.tokenizer.Err()
if err != nil && err != io.EOF {
return err
}
} }
p.parseCurrentToken() p.parseCurrentToken()
} }