From 1ec837089ef397c794b71e6c4a2f0727ae8fc765 Mon Sep 17 00:00:00 2001 From: James Shubin Date: Tue, 19 Sep 2023 14:19:50 -0400 Subject: [PATCH] lang: interpolate: Rename interpolate functions to please linters --- lang/gapi/gapi.go | 4 ++-- lang/interpolate/interpolate.go | 16 ++++++++-------- lang/interpolate/interpolate_test.go | 6 +++--- lang/interpret_test.go | 6 +++--- lang/lang.go | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lang/gapi/gapi.go b/lang/gapi/gapi.go index 45d8d50f..1f840c2c 100644 --- a/lang/gapi/gapi.go +++ b/lang/gapi/gapi.go @@ -253,7 +253,7 @@ func (obj *GAPI) Cli(cliInfo *gapi.CliInfo) (*gapi.Deploy, error) { LexParser: parser.LexParse, Downloader: downloader, - StrInterpolater: interpolate.InterpolateStr, + StrInterpolater: interpolate.StrInterpolate, //World: obj.World, // TODO: do we need this? Prefix: prefix, @@ -726,7 +726,7 @@ func (obj *GAPI) Get(getInfo *gapi.GetInfo) error { LexParser: parser.LexParse, Downloader: downloader, - StrInterpolater: interpolate.InterpolateStr, + StrInterpolater: interpolate.StrInterpolate, //World: obj.World, // TODO: do we need this? Prefix: prefix, diff --git a/lang/interpolate/interpolate.go b/lang/interpolate/interpolate.go index 8730a462..56f213d1 100644 --- a/lang/interpolate/interpolate.go +++ b/lang/interpolate/interpolate.go @@ -38,21 +38,21 @@ const ( UseHilInterpolation = false ) -// InterpolateStr interpolates a string and returns the representative AST. -func InterpolateStr(str string, pos *interfaces.Pos, data *interfaces.Data) (interfaces.Expr, error) { +// StrInterpolate interpolates a string and returns the representative AST. +func StrInterpolate(str string, pos *interfaces.Pos, data *interfaces.Data) (interfaces.Expr, error) { if data.Debug { data.Logf("interpolating: %s", str) } 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. -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) if err != nil { 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") } -// 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. -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 filename string if pos != nil { diff --git a/lang/interpolate/interpolate_test.go b/lang/interpolate/interpolate_test.go index 9a717918..18495e67 100644 --- a/lang/interpolate/interpolate_test.go +++ b/lang/interpolate/interpolate_test.go @@ -217,7 +217,7 @@ func TestInterpolate0(t *testing.T) { data := &interfaces.Data{ // TODO: add missing fields here if/when needed - StrInterpolater: InterpolateStr, + StrInterpolater: StrInterpolate, Debug: testing.Verbose(), // set via the -test.v flag to `go test` Logf: func(format string, v ...interface{}) { @@ -472,7 +472,7 @@ func TestInterpolateBasicStmt(t *testing.T) { data := &interfaces.Data{ // TODO: add missing fields here if/when needed - StrInterpolater: InterpolateStr, + StrInterpolater: StrInterpolate, Debug: testing.Verbose(), // set via the -test.v flag to `go test` Logf: func(format string, v ...interface{}) { @@ -797,7 +797,7 @@ func TestInterpolateBasicExpr(t *testing.T) { data := &interfaces.Data{ // TODO: add missing fields here if/when needed - StrInterpolater: InterpolateStr, + StrInterpolater: StrInterpolate, Debug: testing.Verbose(), // set via the -test.v flag to `go test` Logf: func(format string, v ...interface{}) { diff --git a/lang/interpret_test.go b/lang/interpret_test.go index 7d1fe8d7..2cdc3c3f 100644 --- a/lang/interpret_test.go +++ b/lang/interpret_test.go @@ -452,7 +452,7 @@ func TestAstFunc0(t *testing.T) { data := &interfaces.Data{ // 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` Logf: func(format string, v ...interface{}) { @@ -824,7 +824,7 @@ func TestAstFunc1(t *testing.T) { Modules: "/" + interfaces.ModuleDirectory, // not really needed here afaict LexParser: parser.LexParse, - StrInterpolater: interpolate.InterpolateStr, + StrInterpolater: interpolate.StrInterpolate, Debug: testing.Verbose(), // set via the -test.v flag to `go test` Logf: func(format string, v ...interface{}) { @@ -1309,7 +1309,7 @@ func TestAstFunc2(t *testing.T) { Modules: "/" + interfaces.ModuleDirectory, // not really needed here afaict LexParser: parser.LexParse, - StrInterpolater: interpolate.InterpolateStr, + StrInterpolater: interpolate.StrInterpolate, Debug: testing.Verbose(), // set via the -test.v flag to `go test` Logf: func(format string, v ...interface{}) { diff --git a/lang/lang.go b/lang/lang.go index 24e9d679..e8d4a9b9 100644 --- a/lang/lang.go +++ b/lang/lang.go @@ -147,7 +147,7 @@ func (obj *Lang) Init() error { LexParser: parser.LexParse, Downloader: nil, // XXX: is this used here? - StrInterpolater: interpolate.InterpolateStr, + StrInterpolater: interpolate.StrInterpolate, //World: obj.World, // TODO: do we need this? Prefix: obj.Prefix,