community
/
dns
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More tweaks for parsing

This commit is contained in:
Miek Gieben 2011-12-16 10:48:33 +01:00
parent a5baf52283
commit 4d5f6d66e2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zscan.go
View File

@ -9,9 +9,7 @@ import (
) )
// Only used when debugging the parser itself. // Only used when debugging the parser itself.
var _DEBUG = false var _DEBUG = true
// Tokinize a RFC 1035 zone file. The tokenizer will normalize it: // Tokinize a RFC 1035 zone file. The tokenizer will normalize it:
// * Add ownernames if they are left blank; // * Add ownernames if they are left blank;
@ -51,8 +49,10 @@ type ParseError struct {
} }
func (e *ParseError) Error() string { func (e *ParseError) Error() string {
s := e.err + ": `" + e.lex.token + "' at line: " + strconv.Itoa(e.lex.line) + va := strconv.Itoa(e.lex.value)
" and column: " + strconv.Itoa(e.lex.column) s := e.err + ": `" + e.lex.token + "' (value: " + va + ") at line: " +
strconv.Itoa(e.lex.line) + " and column: " +
strconv.Itoa(e.lex.column)
return s return s
} }

6
zscan_rr.go
View File

@ -88,13 +88,13 @@ func setRR(h RR_Header, c chan Lex) (RR, *ParseError) {
func slurpRemainder(c chan Lex) *ParseError { func slurpRemainder(c chan Lex) *ParseError {
l := <-c l := <-c
if _DEBUG { if _DEBUG {
fmt.Printf("%\v", l) fmt.Printf("%v\n", l)
} }
switch l.value { switch l.value {
case _BLANK: case _BLANK:
l = <-c l = <-c
if _DEBUG { if _DEBUG {
fmt.Printf("%\v", l) fmt.Printf("%v\n", l)
} }
if l.value != _NEWLINE && l.value != _EOF { if l.value != _NEWLINE && l.value != _EOF {
return &ParseError{"garbage after rdata", l} return &ParseError{"garbage after rdata", l}
@ -105,7 +105,7 @@ func slurpRemainder(c chan Lex) *ParseError {
case _EOF: case _EOF:
// Ok // Ok
default: default:
return &ParseError{"garbage after rdata", l} return &ParseError{"garbage after directly rdata", l}
} }
return nil return nil
} }