KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move config code into its own package

Browse Source
This commit is contained in:
Kovid Goyal 2023-02-18 22:01:40 +05:30
parent 2b7d6d45df
commit 7b4738125b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kitty/conf/generate.py
View File

@ -453,14 +453,14 @@ def go_type_data(parser_func: ParserFuncType, ctype: str) -> Tuple[str, str]:
if p == 'float':
return 'float64', 'strconv.ParseFloat(val, 10, 64)'
if p == 'to_bool':
return 'bool', 'utils.StringToBool(val), nil'
return 'bool', 'config.StringToBool(val), nil'
th = get_type_hints(parser_func)
rettype = th['return']
return {int: 'int64', str: 'string', float: 'float64'}[rettype], f'{p}(val)'
def gen_go_code(defn: Definition) -> str:
lines = ['import "fmt"', 'import "strconv"', 'import "kitty/tools/utils"', 'var _ = fmt.Println', 'var _ = utils.StringToBool', 'var _ = strconv.Atoi']
lines = ['import "fmt"', 'import "strconv"', 'import "kitty/tools/config"', 'var _ = fmt.Println', 'var _ = config.StringToBool', 'var _ = strconv.Atoi']
a = lines.append
choices = {}
go_types = {}

5
tools/utils/config.go → tools/config/api.go
View File

@ -1,6 +1,6 @@
// License: GPLv3 Copyright: 2023, Kovid Goyal, <kovid at kovidgoyal.net>
package utils
package config
import (
"bufio"
@ -9,6 +9,7 @@ import (
"fmt"
"io"
"io/fs"
"kitty/tools/utils"
"os"
"path/filepath"
"strings"
@ -173,5 +174,5 @@ func (self *LinesScanner) Err() error {
func (self *ConfigParser) ParseOverrides(overrides ...string) error {
s := LinesScanner{lines: overrides}
self.seen_includes = make(map[string]bool)
return self.parse(&s, "<overrides>", ConfigDir(), 0)
return self.parse(&s, "<overrides>", utils.ConfigDir(), 0)
}

2
tools/utils/config_test.go → tools/config/api_test.go
View File

@ -1,6 +1,6 @@
// License: GPLv3 Copyright: 2023, Kovid Goyal, <kovid at kovidgoyal.net>
package utils
package config
import (
"fmt"