Move config code into its own package
This commit is contained in:
parent
2b7d6d45df
commit
7b4738125b
@ -453,14 +453,14 @@ def go_type_data(parser_func: ParserFuncType, ctype: str) -> Tuple[str, str]:
|
|||||||
if p == 'float':
|
if p == 'float':
|
||||||
return 'float64', 'strconv.ParseFloat(val, 10, 64)'
|
return 'float64', 'strconv.ParseFloat(val, 10, 64)'
|
||||||
if p == 'to_bool':
|
if p == 'to_bool':
|
||||||
return 'bool', 'utils.StringToBool(val), nil'
|
return 'bool', 'config.StringToBool(val), nil'
|
||||||
th = get_type_hints(parser_func)
|
th = get_type_hints(parser_func)
|
||||||
rettype = th['return']
|
rettype = th['return']
|
||||||
return {int: 'int64', str: 'string', float: 'float64'}[rettype], f'{p}(val)'
|
return {int: 'int64', str: 'string', float: 'float64'}[rettype], f'{p}(val)'
|
||||||
|
|
||||||
|
|
||||||
def gen_go_code(defn: Definition) -> str:
|
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
|
a = lines.append
|
||||||
choices = {}
|
choices = {}
|
||||||
go_types = {}
|
go_types = {}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
// License: GPLv3 Copyright: 2023, Kovid Goyal, <kovid at kovidgoyal.net>
|
// License: GPLv3 Copyright: 2023, Kovid Goyal, <kovid at kovidgoyal.net>
|
||||||
|
|
||||||
package utils
|
package config
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
@ -9,6 +9,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"io/fs"
|
"io/fs"
|
||||||
|
"kitty/tools/utils"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
@ -173,5 +174,5 @@ func (self *LinesScanner) Err() error {
|
|||||||
func (self *ConfigParser) ParseOverrides(overrides ...string) error {
|
func (self *ConfigParser) ParseOverrides(overrides ...string) error {
|
||||||
s := LinesScanner{lines: overrides}
|
s := LinesScanner{lines: overrides}
|
||||||
self.seen_includes = make(map[string]bool)
|
self.seen_includes = make(map[string]bool)
|
||||||
return self.parse(&s, "<overrides>", ConfigDir(), 0)
|
return self.parse(&s, "<overrides>", utils.ConfigDir(), 0)
|
||||||
}
|
}
|
||||||
@ -1,6 +1,6 @@
|
|||||||
// License: GPLv3 Copyright: 2023, Kovid Goyal, <kovid at kovidgoyal.net>
|
// License: GPLv3 Copyright: 2023, Kovid Goyal, <kovid at kovidgoyal.net>
|
||||||
|
|
||||||
package utils
|
package config
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
Loading…
x
Reference in New Issue
Block a user