The function findInStores() didn't consider localStore

dict-set-context.go

@@ -44,30 +44,43 @@ func NewDictSetContextV(flags DictSetFlag, varStores []map[string]string) *DictS
 	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
 }
 
-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
 }
 
-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 {
-		if vars != nil {
+		for _, vars := range ctx.varStores {
-			if value, found = vars[key]; found {
+			if vars != nil {
-				break
+				if value, found = vars[key]; found {
+					break
+				}
 			}
 		}
 	}
 	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 rawValue string
 
@@ -81,30 +94,30 @@ func (self *DictSetContext) Handle(spec string, scanFlags ScannerFlag) (value st
 				rawValue = name
 				found = true
 			} 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
 		for _, part := range parts {
 			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
 			}
-			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
 			}
 			origVarFound = true
 		}
 		if err == nil {
-			if len(rawValue) == 0 && (self.flags&KeepVar) != 0 {
+			if len(rawValue) == 0 && (ctx.flags&KeepVar) != 0 {
 				value = Var(name)
 			} else {
-				value, err = Scan(self, rawValue)
+				value, err = Scan(ctx, rawValue)
 				//value = rawValue
 			}
 		}
@@ -116,7 +129,7 @@ func (self *DictSetContext) Handle(spec string, scanFlags ScannerFlag) (value st
 	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
 	if args, err = sq.Split(alternateValue); err != nil {
 		return
@@ -127,8 +140,8 @@ func (self *DictSetContext) evalContent(varFound bool, rawValue string, alternat
 		op := args[0]
 		if strings.HasPrefix(op, "__") {
 			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 {
 			value = rawValue

dict-set-context_test.go

@@ -33,13 +33,13 @@ func TestNewDictSetContext(t *testing.T) {
 	   err = fmt.Errorf("unsupported '%%%c' time specifier at %d", ch, i)
 	*/
 	now := time.Now()
-	yday := now.Add(-24*time.Hour)
+	yday := now.Add(-24 * time.Hour)
 	inputs := []inputType{
 		{ctx2, `form: ${|__time-fmt now ""}`, fmt.Sprintf("form: %d-%02d-%02d %02d:%02d:%02d", now.Year(), now.Month(), now.Day(), now.Hour(), now.Minute(), now.Second()), nil},
 		{ctx2, `form: ${|__time-fmt now "%-D"}`, fmt.Sprintf("form: %d-%d-%d", now.Year(), now.Month(), now.Day()), nil},
 		{ctx2, `form: ${|__time-fmt now "%:T"}`, fmt.Sprintf("form: %d:%d:%d", now.Hour(), now.Minute(), now.Second()), nil},
-		{ctx2, `form: ${|__time-fmt now "%02:T"}`,"", errors.New("invalid time specifier format at 3")},
+		{ctx2, `form: ${|__time-fmt now "%02:T"}`, "", errors.New("invalid time specifier format at 3")},
-		{ctx2, `form: ${|__time-fmt ""}`,"", errors.New("time value is empty")},
+		{ctx2, `form: ${|__time-fmt ""}`, "", errors.New("time value is empty")},
 		{ctx2, `form: ${|__time-fmt yesterday "%-D"}`, fmt.Sprintf("form: %d-%d-%d", yday.Year(), yday.Month(), yday.Day()), nil},
 		{ctx1, "${one|pippo}", "1", nil},
 		{ctx1, "${one|__default pluto}", "1", nil},
@@ -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()) {
 			t.Errorf("%d: %s(%q)/err = <%v>, want <%v>", i, funcName, input.source, gotErr, input.wantErr)
 		}
-
 	}
 }