Open-Argon/argon-v3
1
0
Fork 0
mirror of https://github.com/Open-Argon/argon-v3.git synced 2025-12-06 08:56:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix broken import logic

Browse Source
This commit is contained in:
William Bell
2024-04-12 17:08:55 +01:00
parent 0a8952bc3b
commit 37a3d56b5f
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/import.go
View File

@@ -46,15 +46,19 @@ type translatedImport struct {
translated []any translated []any
p string p string
path string path string
ex string
exc string
origin string origin string
} }
var runTranslatedImport func(translatedImport, ArObject, bool) (ArObject, ArErr) var runTranslatedImport func(translatedImport, ArObject, bool) (ArObject, ArErr)
var ex string
var exc string
var exc_dir string
func init() { func init() {
runTranslatedImport = __runTranslatedImport runTranslatedImport = __runTranslatedImport
ex, _ = os.Getwd()
exc, _ = os.Executable()
exc_dir = filepath.Dir(exc)
} }
func __runTranslatedImport(translatedImport translatedImport, global ArObject, main bool) (ArObject, ArErr) { func __runTranslatedImport(translatedImport translatedImport, global ArObject, main bool) (ArObject, ArErr) {
@@ -76,8 +80,8 @@ func __runTranslatedImport(translatedImport translatedImport, global ArObject, m
"program": Map(anymap{ "program": Map(anymap{
"args": ArArray(ArgsArArray), "args": ArArray(ArgsArArray),
"origin": ArString(translatedImport.origin), "origin": ArString(translatedImport.origin),
"cwd": ArString(translatedImport.ex), "cwd": ArString(ex),
"exc": ArString(translatedImport.exc), "exc": ArString(exc),
"file": Map(anymap{ "file": Map(anymap{
"name": ArString(filepath.Base(translatedImport.p)), "name": ArString(filepath.Base(translatedImport.p)),
"path": ArString(translatedImport.p), "path": ArString(translatedImport.p),
@@ -99,15 +103,6 @@ func translateImport(realpath string, origin string) (translatedImport, ArErr) {
if extention == "" { if extention == "" {
path += ".ar" path += ".ar"
} }
ex, err := os.Getwd()
if err != nil {
return translatedImport{}, ArErr{TYPE: "Import Error", message: "Could not get working directory", EXISTS: true}
}
exc, err := os.Executable()
if err != nil {
return translatedImport{}, ArErr{TYPE: "Import Error", message: "Could not get executable", EXISTS: true}
}
executable := filepath.Dir(exc)
isABS := filepath.IsAbs(path) isABS := filepath.IsAbs(path)
var pathsToTest []string var pathsToTest []string
if isABS { if isABS {
@@ -117,15 +112,21 @@ func translateImport(realpath string, origin string) (translatedImport, ArErr) {
} }
} else { } else {
pathsToTest = []string{ pathsToTest = []string{
filepath.Join(origin, path), filepath.Join(exc_dir, path),
filepath.Join(origin, realpath, "init.ar"), filepath.Join(exc_dir, realpath, "init.ar"),
filepath.Join(origin, modules_folder, path), filepath.Join(exc_dir, modules_folder, path),
filepath.Join(origin, modules_folder, realpath, "init.ar"), filepath.Join(exc_dir, modules_folder, realpath, "init.ar"),
filepath.Join(ex, path), }
filepath.Join(ex, modules_folder, path), var currentPath string = origin
filepath.Join(ex, modules_folder, realpath, "init.ar"), var oldPath string = ""
filepath.Join(executable, modules_folder, path), for currentPath != oldPath {
filepath.Join(executable, modules_folder, realpath, "init.ar"), pathsToTest = append(pathsToTest,
filepath.Join(currentPath, path),
filepath.Join(currentPath, realpath, "init.ar"),
filepath.Join(currentPath, modules_folder, path),
filepath.Join(currentPath, modules_folder, realpath, "init.ar"))
oldPath = currentPath
currentPath = filepath.Dir(currentPath)
} }
} }
var p string var p string
@@ -158,6 +159,6 @@ func translateImport(realpath string, origin string) (translatedImport, ArErr) {
return translatedImport{}, translationerr return translatedImport{}, translationerr
} }
translatedImports[p] = translatedImport{translated, p, path, ex, exc, origin} translatedImports[p] = translatedImport{translated, p, path, origin}
return translatedImports[p], ArErr{} return translatedImports[p], ArErr{}
} }