moved a subset of source file to the kern package

2026-04-27 19:43:37 +02:00
parent f100adead3
commit 4d910dd069
107 changed files with 2080 additions and 1380 deletions
@@ -7,101 +7,68 @@ package expr
 import (
 	"path/filepath"
 	"strings"
+
+	"git.portale-stac.it/go-pkg/expr/kern"
 )

-var globalCtx *SimpleStore
+//var globalCtx *SimpleStore

-func ImportInContext(name string) (exists bool) {
-	var mod *builtinModule
-	if mod, exists = builtinModuleRegister[name]; exists {
-		mod.importFunc(globalCtx)
-		mod.imported = true
+func ImportInContext(ctx kern.ExprContext, name string) (exists bool) {
+	if globalCtx := ctx.GetGlobal(); globalCtx != nil {
+		var mod *builtinModule
+		if mod, exists = builtinModuleRegister[name]; exists {
+			mod.importFunc(globalCtx)
+			mod.imported = true
+		}
 	}
 	return
 }

-func ImportInContextByGlobPattern(pattern string) (count int, err error) {
-	var matched bool
-	for name, mod := range builtinModuleRegister {
-		if matched, err = filepath.Match(pattern, name); err == nil {
-			if matched {
-				count++
-				mod.importFunc(globalCtx)
-				mod.imported = true
+func ImportInContextByGlobPattern(ctx kern.ExprContext, pattern string) (count int, err error) {
+	if globalCtx := ctx.GetGlobal(); globalCtx != nil {
+		var matched bool
+		for name, mod := range builtinModuleRegister {
+			if matched, err = filepath.Match(pattern, name); err == nil {
+				if matched {
+					count++
+					mod.importFunc(globalCtx)
+					mod.imported = true
+				}
+			} else {
+				break
 			}
-		} else {
-			break
 		}
 	}
 	return
 }

-func GetVar(ctx ExprContext, name string) (value any, exists bool) {
-	if value, exists = ctx.GetVar(name); !exists {
-		value, exists = globalCtx.GetVar(name)
-	}
-	return
-}
-
-func GetLocalFuncInfo(ctx ExprContext, name string) (item ExprFunc, exists bool) {
-	var v any
-	if len(name) > 0 {
-		if v, exists = ctx.GetVar(name); exists && isFunctor(v) {
-			f, _ := v.(Functor)
-			item = f.GetFunc()
-		} else {
-			item, exists = ctx.GetFuncInfo(name)
+func GlobalCtrlSet(ctx kern.ExprContext, name string, newValue any) (currentValue any) {
+	if globalCtx := ctx.GetGlobal(); globalCtx != nil {
+		if !strings.HasPrefix(name, "_") {
+			name = "_" + name
 		}
+
+		currentValue, _ = globalCtx.GetVar(name)
+		globalCtx.SetVar(name, newValue)
 	}
-	return
-}
-
-func GetFuncInfo(ctx ExprContext, name string) (item ExprFunc, exists bool) {
-	// if len(name) > 0 {
-	// 	if item, exists = GetLocalFuncInfo(ctx, name); exists {
-	// 		ownerCtx = ctx
-	// 	} else if item, exists = globalCtx.GetFuncInfo(name); exists {
-	// 		ownerCtx = globalCtx
-	// 	}
-	// }
-	item, exists, _ = GetFuncInfoAndOwner(ctx, name)
-	return
-}
-
-func GetFuncInfoAndOwner(ctx ExprContext, name string) (item ExprFunc, exists bool, ownerCtx ExprContext) {
-	if len(name) > 0 {
-		if item, exists = GetLocalFuncInfo(ctx, name); exists {
-			ownerCtx = ctx
-		} else if item, exists = globalCtx.GetFuncInfo(name); exists {
-			ownerCtx = globalCtx
-		}
-	}
-	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
+func GlobalCtrlGet(ctx kern.ExprContext, name string) (currentValue any) {
+	if globalCtx := ctx.GetGlobal(); globalCtx != nil {
+		if !strings.HasPrefix(name, "_") {
+			name = "_" + name
+		}
+		currentValue, _ = globalCtx.GetVar(name)
 	}
-	currentValue, _ = globalCtx.GetVar(name)
 	return currentValue
 }

-func CtrlEnable(ctx ExprContext, name string) (currentStatus bool) {
+func CtrlEnable(ctx kern.ExprContext, name string) (currentStatus bool) {
 	if !strings.HasPrefix(name, "_") {
 		name = "_" + name
 	}
-	if v, exists := ctx.GetVar(name); exists && IsBool(v) {
+	if v, exists := ctx.GetVar(name); exists && kern.IsBool(v) {
 		currentStatus, _ = v.(bool)
 	}

@@ -109,11 +76,11 @@ func CtrlEnable(ctx ExprContext, name string) (currentStatus bool) {
 	return currentStatus
 }

-func CtrlDisable(ctx ExprContext, name string) (currentStatus bool) {
+func CtrlDisable(ctx kern.ExprContext, name string) (currentStatus bool) {
 	if !strings.HasPrefix(name, "_") {
 		name = "_" + name
 	}
-	if v, exists := ctx.GetVar(name); exists && IsBool(v) {
+	if v, exists := ctx.GetVar(name); exists && kern.IsBool(v) {
 		currentStatus, _ = v.(bool)
 	}

@@ -121,36 +88,39 @@ func CtrlDisable(ctx ExprContext, name string) (currentStatus bool) {
 	return currentStatus
 }

-func CtrlIsEnabled(ctx ExprContext, name string) (status bool) {
-	var v any
-	var exists bool
+// func CtrlIsEnabled(ctx ExprContext, name string) (status bool) {
+// 	var v any
+// 	var exists bool

-	if !strings.HasPrefix(name, "_") {
-		name = "_" + name
-	}
+// 	if !strings.HasPrefix(name, "_") {
+// 		name = "_" + name
+// 	}

-	if v, exists = ctx.GetVar(name); !exists {
-		v, exists = globalCtx.GetVar(name)
-	}
+// 	if v, exists = ctx.GetVar(name); !exists {
+// 		v, exists = globalCtx.GetVar(name)
+// 	}

-	if exists {
-		if b, ok := v.(bool); ok {
-			status = b
+// 	if exists {
+// 		if b, ok := v.(bool); ok {
+// 			status = b
+// 		}
+// 	}
+// 	return
+// }
+
+func getControlString(ctx kern.ExprContext, name string) (s string, exists bool) {
+	if globalCtx := ctx.GetGlobal(); globalCtx != nil {
+		var v any
+		if v, exists = globalCtx.GetVar(name); exists {
+			s, exists = v.(string)
 		}
 	}
 	return
 }

-func getControlString(name string) (s string, exists bool) {
-	var v any
-	if v, exists = globalCtx.GetVar(name); exists {
-		s, exists = v.(string)
-	}
+func InitGlobal() (ctx kern.ExprContext) {
+	ctx = NewSimpleStoreWithoutGlobalContext()
+	kern.InitDefaultVars(ctx)
+	ImportBuiltinsFuncs(ctx)
 	return
 }
-
-func init() {
-	globalCtx = NewSimpleStore()
-	initDefaultVars(globalCtx)
-	ImportBuiltinsFuncs(globalCtx)
-}