Control vars are now stored in the globalCtx only.

However, it is still allowed to store control var in a local context in special situation

ast.go

@@ -108,7 +108,7 @@ func (self *ast) Eval(ctx ExprContext) (result any, err error) {
 	self.Finish()
 
 	if self.root != nil {
-		initDefaultVars(ctx)
+		// initDefaultVars(ctx)
 		if self.forest != nil {
 			for _, root := range self.forest {
 				if result, err = root.compute(ctx); err == nil {

context-helpers.go

@@ -22,13 +22,11 @@ func exportFunc(ctx ExprContext, name string, info ExprFunc) {
 	if name[0] == '@' {
 		name = name[1:]
 	}
-	// ctx.RegisterFunc(name, info.Functor(), info.MinArgs(), info.MaxArgs())
-	// ctx.RegisterFuncInfo(name, info)
 	ctx.RegisterFunc(name, info.Functor(), info.ReturnType(), info.Params())
 }
 
 func exportObjects(destCtx, sourceCtx ExprContext) {
-	exportAll := isEnabled(sourceCtx, control_export_all)
+	exportAll := CtrlIsEnabled(sourceCtx, control_export_all)
 	// fmt.Printf("Exporting from sourceCtx [%p] to destCtx [%p] -- exportAll=%t\n", sourceCtx, destCtx, exportAll)
 	// Export variables
 	for _, refName := range sourceCtx.EnumVars(func(name string) bool { return exportAll || name[0] == '@' }) {

control.go

@@ -4,8 +4,6 @@
 // control.go
 package expr
 
-import "strings"
-
 // Preset control variables
 const (
 	ControlPreset        = "_preset"
@@ -34,60 +32,6 @@ func initDefaultVars(ctx ExprContext) {
 	ctx.SetVar(ControlSearchPath, init_search_path)
 }
 
-func CtrlEnable(ctx ExprContext, name string) (currentStatus bool) {
-	if !strings.HasPrefix(name, "_") {
-		name = "_" + name
-	}
-	if v, exists := ctx.GetVar(name); exists && IsBool(v) {
-		currentStatus, _ = v.(bool)
-	}
-
-	ctx.SetVar(name, true)
-	return currentStatus
-}
-
-func CtrlDisable(ctx ExprContext, name string) (currentStatus bool) {
-	if !strings.HasPrefix(name, "_") {
-		name = "_" + name
-	}
-	if v, exists := ctx.GetVar(name); exists && IsBool(v) {
-		currentStatus, _ = v.(bool)
-	}
-
-	ctx.SetVar(name, false)
-	return currentStatus
-}
-
-func CtrlSet(ctx ExprContext, name string, newValue any) (currentValue any) {
-	if !strings.HasPrefix(name, "_") {
-		name = "_" + name
-	}
-	currentValue, _ = ctx.GetVar(name)
-
-	ctx.SetVar(name, newValue)
-	for parent := ctx.GetParent(); parent != nil; parent = parent.GetParent() {
-		parent.SetVar(name, newValue)
-	}
-	return currentValue
-}
-
-func CtrlGet(ctx ExprContext, name string) (currentValue any) {
-	if !strings.HasPrefix(name, "_") {
-		name = "_" + name
-	}
-	currentValue, _ = ctx.GetVar(name)
-	return currentValue
-}
-
-func isEnabled(ctx ExprContext, name string) (status bool) {
-	if v, exists := ctx.GetVar(name); exists {
-		if b, ok := v.(bool); ok {
-			status = b
-		}
-	}
-	return
-}
-
 func getControlString(ctx ExprContext, name string) (s string, exists bool) {
 	var v any
 	if v, exists = ctx.GetVar(name); exists {

global-context.go

@@ -4,7 +4,10 @@
 // global-context.go
 package expr
 
-import "path/filepath"
+import (
+	"path/filepath"
+	"strings"
+)
 
 var globalCtx *SimpleStore
 
@@ -63,7 +66,70 @@ func GetFuncInfo(ctx ExprContext, name string) (item ExprFunc, exists bool, owne
 	return
 }
 
+func GlobalCtrlSet(name string, newValue any) (currentValue any) {
+	if !strings.HasPrefix(name, "_") {
+		name = "_" + name
+	}
+	currentValue, _ = globalCtx.GetVar(name)
+
+	globalCtx.SetVar(name, newValue)
+	return currentValue
+}
+
+func GlobalCtrlGet(name string) (currentValue any) {
+	if !strings.HasPrefix(name, "_") {
+		name = "_" + name
+	}
+	currentValue, _ = globalCtx.GetVar(name)
+	return currentValue
+}
+
+func CtrlEnable(ctx ExprContext, name string) (currentStatus bool) {
+	if !strings.HasPrefix(name, "_") {
+		name = "_" + name
+	}
+	if v, exists := ctx.GetVar(name); exists && IsBool(v) {
+		currentStatus, _ = v.(bool)
+	}
+
+	ctx.SetVar(name, true)
+	return currentStatus
+}
+
+func CtrlDisable(ctx ExprContext, name string) (currentStatus bool) {
+	if !strings.HasPrefix(name, "_") {
+		name = "_" + name
+	}
+	if v, exists := ctx.GetVar(name); exists && IsBool(v) {
+		currentStatus, _ = v.(bool)
+	}
+
+	ctx.SetVar(name, false)
+	return currentStatus
+}
+
+func CtrlIsEnabled(ctx ExprContext, name string) (status bool) {
+	var v any
+	var exists bool
+
+	if !strings.HasPrefix(name, "_") {
+		name = "_" + name
+	}
+
+	if v, exists = ctx.GetVar(name); !exists {
+		v, exists = globalCtx.GetVar(name)
+	}
+
+	if exists {
+		if b, ok := v.(bool); ok {
+			status = b
+		}
+	}
+	return
+}
+
 func init() {
 	globalCtx = NewSimpleStore()
+	initDefaultVars(globalCtx)
 	ImportBuiltinsFuncs(globalCtx)
 }

operator-bool.go

@@ -48,7 +48,7 @@ func newAndTerm(tk *Token) (inst *term) {
 }
 
 func evalAnd(ctx ExprContext, self *term) (v any, err error) {
-	if isEnabled(ctx, ControlBoolShortcut) {
+	if CtrlIsEnabled(ctx, ControlBoolShortcut) {
 		v, err = evalAndWithShortcut(ctx, self)
 	} else {
 		v, err = evalAndWithoutShortcut(ctx, self)
@@ -117,7 +117,7 @@ func newOrTerm(tk *Token) (inst *term) {
 }
 
 func evalOr(ctx ExprContext, self *term) (v any, err error) {
-	if isEnabled(ctx, ControlBoolShortcut) {
+	if CtrlIsEnabled(ctx, ControlBoolShortcut) {
 		v, err = evalOrWithShortcut(ctx, self)
 	} else {
 		v, err = evalOrWithoutShortcut(ctx, self)

operator-context.go

@@ -34,7 +34,8 @@ func evalContextValue(ctx ExprContext, self *term) (v any, err error) {
 		if formatter, ok := sourceCtx.(Formatter); ok {
 			v = formatter.ToString(0)
 		} else {
-			keys := sourceCtx.EnumVars(func(name string) bool { return name[0] != '_' })
+			// keys := sourceCtx.EnumVars(func(name string) bool { return name[0] != '_' })
+			keys := sourceCtx.EnumVars(nil)
 			d := make(map[string]any)
 			for _, key := range keys {
 				d[key], _ = sourceCtx.GetVar(key)

simple-store.go

@@ -54,7 +54,7 @@ func (ctx *SimpleStore) Merge(src ExprContext) {
 func varsCtxToBuilder(sb *strings.Builder, ctx ExprContext, indent int) {
 	sb.WriteString("vars: {\n")
 	first := true
-	for _, name := range ctx.EnumVars(filterPrivName) {
+	for _, name := range ctx.EnumVars(nil) {
 		if first {
 			first = false
 		} else {