Browse Source

Moved stripComments to read.go.

master
stephen 12 years ago
parent
commit
8f74ead862
  1. 12
      conf.go
  2. 10
      read.go

12
conf.go

@ -160,18 +160,6 @@ func NewConfigFile() *ConfigFile { @@ -160,18 +160,6 @@ func NewConfigFile() *ConfigFile {
return c
}
func stripComments(l string) string {
// comments are preceded by space or TAB
for _, c := range []string{" ;", "\t;", " #", "\t#"} {
if i := strings.Index(l, c); i != -1 {
l = l[0:i]
}
}
return l
}
func firstIndex(s string, delim []byte) int {
for i := 0; i < len(s); i++ {
for j := 0; j < len(delim); j++ {

10
read.go

@ -109,3 +109,13 @@ func (c *ConfigFile) Read(reader io.Reader) (err os.Error) { @@ -109,3 +109,13 @@ func (c *ConfigFile) Read(reader io.Reader) (err os.Error) {
}
return nil
}
func stripComments(l string) string {
// comments are preceded by space or TAB
for _, c := range []string{" ;", "\t;", " #", "\t#"} {
if i := strings.Index(l, c); i != -1 {
l = l[0:i]
}
}
return l
}

Loading…
Cancel
Save