ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make config line parsing in Go use same algorithm as in python

Browse source
This commit is contained in:
Kovid Goyal 2023-11-22 10:01:45 +05:30
parent fc64ef41b3
commit 882d471c90
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/config/api.go
View file

@ -11,7 +11,9 @@ import (
"io/fs"
"os"
"path/filepath"
"regexp"
"strings"
"sync"
"kitty/tools/utils"
)
@ -49,6 +51,10 @@ func (self *ConfigParser) BadLines() []ConfigLine {
return self.bad_lines
}
var key_pat = sync.OnceValue(func() *regexp.Regexp {
return regexp.MustCompile(`([a-zA-Z][a-zA-Z0-9_-]*)\s+(.+)$`)
})
func (self *ConfigParser) parse(scanner Scanner, name, base_path_for_includes string, depth int) error {
if self.seen_includes[name] { // avoid include loops
return nil
@ -119,7 +125,12 @@ func (self *ConfigParser) parse(scanner Scanner, name, base_path_for_includes st
}
continue
}
key, val := line, ""
m := key_pat().FindStringSubmatch(line)
if len(m) < 3 {
self.bad_lines = append(self.bad_lines, ConfigLine{Src_file: name, Line: line, Line_number: lnum, Err: fmt.Errorf("Invalid config line: %#v", line)})
continue
}
key, val := m[1], m[2]
for i, ch := range line {
if ch == ' ' || ch == '\t' {
key = line[:i]