Added comment support

This commit is contained in:
Caleb Gardner
2021-09-19 23:35:58 -05:00
parent e0646abf19
commit 1be4378071
+31 -8
View File
@@ -90,16 +90,38 @@ func parseConf() (links map[int]string, err error) {
lineNum := 0 lineNum := 0
links = make(map[int]string) links = make(map[int]string)
rdr := bufio.NewReader(conf) rdr := bufio.NewReader(conf)
multilineComment := false
var line string
for { for {
lineNum++ if line == "" {
var origLine string lineNum++
origLine, err = rdr.ReadString('\n') line, err = rdr.ReadString('\n')
if err != nil && origLine == "" { if err != nil && line == "" {
break break
} else if origLine == "" { } else if line == "" {
continue continue
}
} }
line := strings.ReplaceAll(origLine, "\t", " ") startCom, endCom := strings.Index(line, "/*"), strings.Index(line, "*/")
if multilineComment {
if endCom != -1 {
line = line[endCom:]
} else {
continue
}
}
if startCom != -1 {
if endCom != -1 {
line = line[:startCom] + line[endCom:]
continue
}
line = line[:startCom]
multilineComment = true
}
if strings.Contains(line, "//") {
line = line[:strings.Index(line, "//")]
}
line = strings.ReplaceAll(line, "\t", " ")
for strings.Contains(line, " ") { for strings.Contains(line, " ") {
line = strings.Replace(line, " ", " ", -1) line = strings.Replace(line, " ", " ", -1)
} }
@@ -117,6 +139,7 @@ func parseConf() (links map[int]string, err error) {
return nil, errors.New("invalid line #" + strconv.Itoa(lineNum)) return nil, errors.New("invalid line #" + strconv.Itoa(lineNum))
} }
links[i] = split[1] links[i] = split[1]
line = ""
} }
err = nil err = nil
if len(links) == 0 { if len(links) == 0 {