lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lang: interpolate: Rename interpolate functions to please linters

Browse Source
This commit is contained in:
James Shubin
2023-09-19 14:19:50 -04:00
parent 089267837d
commit 1ec837089e
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lang/gapi/gapi.go
View File

@@ -253,7 +253,7 @@ func (obj *GAPI) Cli(cliInfo *gapi.CliInfo) (*gapi.Deploy, error) {
LexParser: parser.LexParse, LexParser: parser.LexParse,
Downloader: downloader, Downloader: downloader,
StrInterpolater: interpolate.InterpolateStr, StrInterpolater: interpolate.StrInterpolate,
//World: obj.World, // TODO: do we need this? //World: obj.World, // TODO: do we need this?
Prefix: prefix, Prefix: prefix,
@@ -726,7 +726,7 @@ func (obj *GAPI) Get(getInfo *gapi.GetInfo) error {
LexParser: parser.LexParse, LexParser: parser.LexParse,
Downloader: downloader, Downloader: downloader,
StrInterpolater: interpolate.InterpolateStr, StrInterpolater: interpolate.StrInterpolate,
//World: obj.World, // TODO: do we need this? //World: obj.World, // TODO: do we need this?
Prefix: prefix, Prefix: prefix,

16
lang/interpolate/interpolate.go
View File

@@ -38,21 +38,21 @@ const (
UseHilInterpolation = false UseHilInterpolation = false
) )
// InterpolateStr interpolates a string and returns the representative AST. // StrInterpolate interpolates a string and returns the representative AST.
func InterpolateStr(str string, pos *interfaces.Pos, data *interfaces.Data) (interfaces.Expr, error) { func StrInterpolate(str string, pos *interfaces.Pos, data *interfaces.Data) (interfaces.Expr, error) {
if data.Debug { if data.Debug {
data.Logf("interpolating: %s", str) data.Logf("interpolating: %s", str)
} }
if UseHilInterpolation { if UseHilInterpolation {
return InterpolateHil(str, pos, data) return HilInterpolate(str, pos, data)
} }
return InterpolateRagel(str, pos, data) return RagelInterpolate(str, pos, data)
} }
// InterpolateRagel interpolates a string and returns the representative AST. It // RagelInterpolate interpolates a string and returns the representative AST. It
// uses the ragel parser to perform the string interpolation. // uses the ragel parser to perform the string interpolation.
func InterpolateRagel(str string, pos *interfaces.Pos, data *interfaces.Data) (interfaces.Expr, error) { func RagelInterpolate(str string, pos *interfaces.Pos, data *interfaces.Data) (interfaces.Expr, error) {
sequence, err := Parse(str) sequence, err := Parse(str)
if err != nil { if err != nil {
return nil, errwrap.Wrapf(err, "parser failed") return nil, errwrap.Wrapf(err, "parser failed")
@@ -101,9 +101,9 @@ func InterpolateRagel(str string, pos *interfaces.Pos, data *interfaces.Data) (i
return result, errwrap.Wrapf(result.Init(data), "init failed") return result, errwrap.Wrapf(result.Init(data), "init failed")
} }
// InterpolateHil interpolates a string and returns the representative AST. This // HilInterpolate interpolates a string and returns the representative AST. This
// particular implementation uses the hashicorp hil library and syntax to do so. // particular implementation uses the hashicorp hil library and syntax to do so.
func InterpolateHil(str string, pos *interfaces.Pos, data *interfaces.Data) (interfaces.Expr, error) { func HilInterpolate(str string, pos *interfaces.Pos, data *interfaces.Data) (interfaces.Expr, error) {
var line, column int = -1, -1 var line, column int = -1, -1
var filename string var filename string
if pos != nil { if pos != nil {

6
lang/interpolate/interpolate_test.go
View File

@@ -217,7 +217,7 @@ func TestInterpolate0(t *testing.T) {
data := &interfaces.Data{ data := &interfaces.Data{
// TODO: add missing fields here if/when needed // TODO: add missing fields here if/when needed
StrInterpolater: InterpolateStr, StrInterpolater: StrInterpolate,
Debug: testing.Verbose(), // set via the -test.v flag to `go test` Debug: testing.Verbose(), // set via the -test.v flag to `go test`
Logf: func(format string, v ...interface{}) { Logf: func(format string, v ...interface{}) {
@@ -472,7 +472,7 @@ func TestInterpolateBasicStmt(t *testing.T) {
data := &interfaces.Data{ data := &interfaces.Data{
// TODO: add missing fields here if/when needed // TODO: add missing fields here if/when needed
StrInterpolater: InterpolateStr, StrInterpolater: StrInterpolate,
Debug: testing.Verbose(), // set via the -test.v flag to `go test` Debug: testing.Verbose(), // set via the -test.v flag to `go test`
Logf: func(format string, v ...interface{}) { Logf: func(format string, v ...interface{}) {
@@ -797,7 +797,7 @@ func TestInterpolateBasicExpr(t *testing.T) {
data := &interfaces.Data{ data := &interfaces.Data{
// TODO: add missing fields here if/when needed // TODO: add missing fields here if/when needed
StrInterpolater: InterpolateStr, StrInterpolater: StrInterpolate,
Debug: testing.Verbose(), // set via the -test.v flag to `go test` Debug: testing.Verbose(), // set via the -test.v flag to `go test`
Logf: func(format string, v ...interface{}) { Logf: func(format string, v ...interface{}) {

6
lang/interpret_test.go
View File

@@ -452,7 +452,7 @@ func TestAstFunc0(t *testing.T) {
data := &interfaces.Data{ data := &interfaces.Data{
// TODO: add missing fields here if/when needed // TODO: add missing fields here if/when needed
StrInterpolater: interpolate.InterpolateStr, StrInterpolater: interpolate.StrInterpolate,
Debug: testing.Verbose(), // set via the -test.v flag to `go test` Debug: testing.Verbose(), // set via the -test.v flag to `go test`
Logf: func(format string, v ...interface{}) { Logf: func(format string, v ...interface{}) {
@@ -824,7 +824,7 @@ func TestAstFunc1(t *testing.T) {
Modules: "/" + interfaces.ModuleDirectory, // not really needed here afaict Modules: "/" + interfaces.ModuleDirectory, // not really needed here afaict
LexParser: parser.LexParse, LexParser: parser.LexParse,
StrInterpolater: interpolate.InterpolateStr, StrInterpolater: interpolate.StrInterpolate,
Debug: testing.Verbose(), // set via the -test.v flag to `go test` Debug: testing.Verbose(), // set via the -test.v flag to `go test`
Logf: func(format string, v ...interface{}) { Logf: func(format string, v ...interface{}) {
@@ -1309,7 +1309,7 @@ func TestAstFunc2(t *testing.T) {
Modules: "/" + interfaces.ModuleDirectory, // not really needed here afaict Modules: "/" + interfaces.ModuleDirectory, // not really needed here afaict
LexParser: parser.LexParse, LexParser: parser.LexParse,
StrInterpolater: interpolate.InterpolateStr, StrInterpolater: interpolate.StrInterpolate,
Debug: testing.Verbose(), // set via the -test.v flag to `go test` Debug: testing.Verbose(), // set via the -test.v flag to `go test`
Logf: func(format string, v ...interface{}) { Logf: func(format string, v ...interface{}) {

2
lang/lang.go
View File

@@ -147,7 +147,7 @@ func (obj *Lang) Init() error {
LexParser: parser.LexParse, LexParser: parser.LexParse,
Downloader: nil, // XXX: is this used here? Downloader: nil, // XXX: is this used here?
StrInterpolater: interpolate.InterpolateStr, StrInterpolater: interpolate.StrInterpolate,
//World: obj.World, // TODO: do we need this? //World: obj.World, // TODO: do we need this?
Prefix: obj.Prefix, Prefix: obj.Prefix,