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

Small tweaks to make it faster

This commit is contained in:
Miek Gieben 2012-02-19 20:51:04 +01:00
parent c15712dbf6
commit fee04d5ef9
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
zscan.go
View File

@ -79,7 +79,7 @@ func (e *ParseError) Error() (s string) {
type lex struct { type lex struct {
token string // Text of the token token string // Text of the token
err string // Error text when the lexer detects it. Not used by the grammar err string // Error text when the lexer detects it. Not used by the grammar
value int // Value: _STRING, _BLANK, etc. value uint8 // Value: _STRING, _BLANK, etc.
line int // Line in the file line int // Line in the file
column int // Column in the fil column int // Column in the fil
} }
@ -136,7 +136,7 @@ func parseZone(r io.Reader, origin, f string, t chan Token, include int) {
// Start the lexer // Start the lexer
go zlexer(s, c) go zlexer(s, c)
// 6 possible beginnings of a line, _ is a space // 6 possible beginnings of a line, _ is a space
// 0. _ _RRTYPE -> all omitted until the rrtype // 0. _RRTYPE -> all omitted until the rrtype
// 1. _OWNER _ _RRTYPE -> class/ttl omitted // 1. _OWNER _ _RRTYPE -> class/ttl omitted
// 2. _OWNER _ _STRING _ _RRTYPE -> class omitted // 2. _OWNER _ _STRING _ _RRTYPE -> class omitted
// 3. _OWNER _ _STRING _ _CLASS _ _RRTYPE -> ttl/class // 3. _OWNER _ _STRING _ _CLASS _ _RRTYPE -> ttl/class
@ -181,7 +181,7 @@ func parseZone(r io.Reader, origin, f string, t chan Token, include int) {
st = _EXPECT_OWNER_DIR st = _EXPECT_OWNER_DIR
case _OWNER: case _OWNER:
h.Name = l.token h.Name = l.token
if l.token == "@" { if l.token[0] == '@' {
h.Name = origin h.Name = origin
prevName = h.Name prevName = h.Name
st = _EXPECT_OWNER_BL st = _EXPECT_OWNER_BL
@ -480,7 +480,7 @@ func zlexer(s scanner.Scanner, c chan lex) {
case ' ', '\t': case ' ', '\t':
if quote { if quote {
// Inside quotes this is legal // Inside quotes this is legal
str[stri] = byte(x[0]) str[stri] = x[0]
stri++ stri++
break break
} }
@ -586,26 +586,26 @@ func zlexer(s scanner.Scanner, c chan lex) {
} }
if brace == 0 { if brace == 0 {
// If there is previous text, we should output it here // If there is previous text, we should output it here
if stri != 0 { if stri != 0 {
l.value = _STRING l.value = _STRING
l.token = string(str[:stri]) l.token = string(str[:stri])
if !rrtype { if !rrtype {
if _, ok := Str_rr[strings.ToUpper(l.token)]; ok { if _, ok := Str_rr[strings.ToUpper(l.token)]; ok {
l.value = _RRTYPE l.value = _RRTYPE
rrtype = true rrtype = true
} }
} }
c <- l c <- l
} }
l.value = _NEWLINE l.value = _NEWLINE
l.token = "\n" l.token = "\n"
c <- l c <- l
stri = 0 stri = 0
commt = false commt = false
rrtype = false rrtype = false
owner = true owner = true
} }
case '\\': case '\\':
// quote? // quote?
if commt { if commt {