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

moved a subset of source file to the kern package

Browse Source
This commit is contained in:
Celestino Amoroso
2026-04-27 19:43:37 +02:00
parent f100adead3
commit 4d910dd069
107 changed files with 2080 additions and 1380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
import-utils.go
+10 -8
View File
@@ -11,6 +11,8 @@ import (
"path"
"path/filepath"
"strings"
"git.portale-stac.it/go-pkg/expr/kern"
)
const (
@@ -19,8 +21,8 @@ const (
)
func checkStringParamExpected(funcName string, paramValue any, paramPos int) (err error) {
if !(IsString(paramValue) /*|| isList(paramValue)*/) {
err = fmt.Errorf("%s(): param nr %d has wrong type %s, string expected", funcName, paramPos+1, TypeName(paramValue))
if !(kern.IsString(paramValue) /*|| isList(paramValue)*/) {
err = fmt.Errorf("%s(): param nr %d has wrong type %s, string expected", funcName, paramPos+1, kern.TypeName(paramValue))
}
return
}
@@ -45,8 +47,8 @@ func addEnvImportDirs(envVarName string, dirList []string) []string {
return dirList
}
func addSearchDirs(endingPath string, dirList []string) []string {
if dirSpec, exists := getControlString(ControlSearchPath); exists {
func addSearchDirs(ctx kern.ExprContext, endingPath string, dirList []string) []string {
if dirSpec, exists := getControlString(ctx, kern.ControlSearchPath); exists {
dirs := strings.Split(dirSpec, ":")
if dirList == nil {
dirList = dirs
@@ -63,9 +65,9 @@ func addSearchDirs(endingPath string, dirList []string) []string {
return dirList
}
func buildSearchDirList(endingPath, envVarName string) (dirList []string) {
func buildSearchDirList(ctx kern.ExprContext, endingPath, envVarName string) (dirList []string) {
dirList = addEnvImportDirs(envVarName, dirList)
dirList = addSearchDirs(endingPath, dirList)
dirList = addSearchDirs(ctx, endingPath, dirList)
return
}
@@ -83,7 +85,7 @@ func searchAmongPath(filename string, dirList []string) (filePath string) {
}
for _, dir := range dirList {
if dir, err = ExpandPath(dir); err != nil {
if dir, err = kern.ExpandPath(dir); err != nil {
continue
}
if fullPath := path.Join(dir, filename); isFile(fullPath) {
@@ -106,7 +108,7 @@ func isPathRelative(filePath string) bool {
}
func makeFilepath(filename string, dirList []string) (filePath string, err error) {
if filename, err = ExpandPath(filename); err != nil {
if filename, err = kern.ExpandPath(filename); err != nil {
return
}