simple-var-store.go and simple-func-store.go merged in a single file named simple-store.go

global-context.go

@@ -6,7 +6,7 @@ package expr
 
 import "path/filepath"
 
-var globalCtx *SimpleFuncStore
+var globalCtx *SimpleStore
 
 func ImportInContext(name string) (exists bool) {
 	var mod *module
@@ -50,6 +50,6 @@ func GetFuncInfo(ctx ExprContext, name string) (item ExprFunc, exists bool, owne
 }
 
 func init() {
-	globalCtx = NewSimpleFuncStore()
+	globalCtx = NewSimpleStore()
 	ImportBuiltinsFuncs(globalCtx)
 }