go-pkg/text
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The function findInStores() didn't consider localStore

Browse Source
This commit is contained in:
Celestino Amoroso 2025-06-18 14:28:03 +02:00
parent c480e81c0a
commit f0e600dd8b
2 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
dict-set-context.go
View File

@ -44,30 +44,43 @@ func NewDictSetContextV(flags DictSetFlag, varStores []map[string]string) *DictS
return ctx return ctx
} }
func (self *DictSetContext) GetVar(name string) (value string, exists bool) { func (ctx *DictSetContext) GetVar(name string) (value string, exists bool) {
if value, exists = self.localStore[name]; !exists { if value, exists = ctx.localStore[name]; !exists {
value, exists = findInStores(name, self.varStores) value, exists = ctx.findInStores(name)
} }
return return
} }
func (self *DictSetContext) SetVar(name string, value string) (repeatedValue string) { func (ctx *DictSetContext) SetVar(name string, value string) (repeatedValue string) {
self.localStore[name] = value ctx.localStore[name] = value
return value return value
} }
func findInStores(key string, stores []map[string]string) (value string, found bool) { func (ctx *DictSetContext) findInStores(key string) (value string, found bool) {
for _, vars := range stores { if value, found = ctx.localStore[key]; !found {
for _, vars := range ctx.varStores {
if vars != nil { if vars != nil {
if value, found = vars[key]; found { if value, found = vars[key]; found {
break break
} }
} }
} }
}
return return
} }
func (self *DictSetContext) Handle(spec string, scanFlags ScannerFlag) (value string, err error) { // func findInStores(key string, stores []map[string]string) (value string, found bool) {
// for _, vars := range stores {
// if vars != nil {
// if value, found = vars[key]; found {
// break
// }
// }
// }
// return
// }
func (ctx *DictSetContext) Handle(spec string, scanFlags ScannerFlag) (value string, err error) {
var found bool var found bool
var rawValue string var rawValue string
@ -81,30 +94,30 @@ func (self *DictSetContext) Handle(spec string, scanFlags ScannerFlag) (value st
rawValue = name rawValue = name
found = true found = true
} else { } else {
rawValue, found = findInStores(name, self.varStores) rawValue, found = ctx.findInStores(name)
} }
} }
self.SetVar(pipeNameKey, name) // NOTE Maybe this line can be deleted ctx.SetVar(pipeNameKey, name) // NOTE Maybe this line can be deleted
origVarFound := found origVarFound := found
for _, part := range parts { for _, part := range parts {
var expandedPart string var expandedPart string
self.varStores[0][pipeValueKey] = rawValue ctx.varStores[0][pipeValueKey] = rawValue
self.SetVar(pipeValueKey, rawValue) ctx.SetVar(pipeValueKey, rawValue)
if expandedPart, err = Scan(self, part); err != nil { if expandedPart, err = Scan(ctx, part); err != nil {
break break
} }
self.SetVar(pipeNameKey, name) ctx.SetVar(pipeNameKey, name)
if rawValue, err = self.evalContent(origVarFound, rawValue, expandedPart); err != nil { if rawValue, err = ctx.evalContent(origVarFound, rawValue, expandedPart); err != nil {
break break
} }
origVarFound = true origVarFound = true
} }
if err == nil { if err == nil {
if len(rawValue) == 0 && (self.flags&KeepVar) != 0 { if len(rawValue) == 0 && (ctx.flags&KeepVar) != 0 {
value = Var(name) value = Var(name)
} else { } else {
value, err = Scan(self, rawValue) value, err = Scan(ctx, rawValue)
//value = rawValue //value = rawValue
} }
} }
@ -116,7 +129,7 @@ func (self *DictSetContext) Handle(spec string, scanFlags ScannerFlag) (value st
return return
} }
func (self *DictSetContext) evalContent(varFound bool, rawValue string, alternateValue string) (value string, err error) { func (ctx *DictSetContext) evalContent(varFound bool, rawValue string, alternateValue string) (value string, err error) {
var args []string var args []string
if args, err = sq.Split(alternateValue); err != nil { if args, err = sq.Split(alternateValue); err != nil {
return return
@ -127,8 +140,8 @@ func (self *DictSetContext) evalContent(varFound bool, rawValue string, alternat
op := args[0] op := args[0]
if strings.HasPrefix(op, "__") { if strings.HasPrefix(op, "__") {
var f ExpanderFunc var f ExpanderFunc
if f, err = self.GetFunc(op); err == nil { if f, err = ctx.GetFunc(op); err == nil {
value, err = f(self, rawValue, args[1:]) value, err = f(ctx, rawValue, args[1:])
} }
} else if varFound { } else if varFound {
value = rawValue value = rawValue

1
dict-set-context_test.go
View File

@ -86,7 +86,6 @@ func TestNewDictSetContext(t *testing.T) {
if (gotErr != nil && input.wantErr == nil) || (gotErr == nil && input.wantErr != nil) || (gotErr.Error() != input.wantErr.Error()) { if (gotErr != nil && input.wantErr == nil) || (gotErr == nil && input.wantErr != nil) || (gotErr.Error() != input.wantErr.Error()) {
t.Errorf("%d: %s(%q)/err = <%v>, want <%v>", i, funcName, input.source, gotErr, input.wantErr) t.Errorf("%d: %s(%q)/err = <%v>, want <%v>", i, funcName, input.source, gotErr, input.wantErr)
} }
} }
} }