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

lang: ast, interpolate: Pass through uninterpolated strings

Browse Source 
We don't need to make a new reference for nothing.
This commit is contained in:
James Shubin
2025-06-06 00:35:52 -04:00
parent 4f977dbe57
commit 5d44cd28db
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lang/ast/structs.go
View File

@@ -7527,7 +7527,8 @@ func (obj *ExprStr) Interpolate() (interfaces.Expr, error) {
if err != nil {
return nil, err
}
if result == nil {
// a nil result means unchanged, string didn't need interpolating done
if result == nil { // we still copy since Interpolate always "copies"
return &ExprStr{
Textarea: obj.Textarea,
data: obj.data,

25
lang/interpolate/interpolate.go
View File

@@ -55,7 +55,8 @@ const (
UseOptimizedConcat = true
)
// StrInterpolate interpolates a string and returns the representative AST.
// StrInterpolate interpolates a string and returns the representative AST. If
// there was nothing to interpolate, this returns (nil, nil).
func StrInterpolate(str string, pos *interfaces.Pos, data *interfaces.Data) (interfaces.Expr, error) {
if data.Debug {
data.Logf("interpolating: %s", str)
@@ -68,13 +69,25 @@ func StrInterpolate(str string, pos *interfaces.Pos, data *interfaces.Data) (int
}
// 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. If there was
// nothing to interpolate, this returns (nil, nil).
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")
}
// If we didn't find anything of value, we got an empty string...
if len(sequence) == 0 && str == "" { // be doubly sure...
return nil, nil // pass through, nothing changed
}
if len(sequence) == 1 {
if x, ok := sequence[0].(Literal); ok && x.Value == str {
return nil, nil // pass through, nothing changed
}
}
exprs := []interfaces.Expr{}
for _, term := range sequence {
@@ -95,14 +108,6 @@ func RagelInterpolate(str string, pos *interfaces.Pos, data *interfaces.Data) (i
}
}
// If we didn't find anything of value, we got an empty string...
if len(sequence) == 0 && str == "" { // be doubly sure...
expr := &ast.ExprStr{
V: "",
}
exprs = append(exprs, expr)
}
// The parser produces non-optimal results where two strings are next to
// each other, when they could be statically combined together.
simplified, err := simplifyExprList(exprs)