From 046ad89679fded8c48ac72fe2f967dacd3cfd4e9 Mon Sep 17 00:00:00 2001 From: William Bell Date: Mon, 4 Mar 2024 10:50:58 +0000 Subject: [PATCH] fix main being the wrong variable --- src/import.go | 6 +++--- src/main.go | 4 ++-- src/parseImport.go | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/import.go b/src/import.go index b070beb..d47db18 100644 --- a/src/import.go +++ b/src/import.go @@ -51,13 +51,13 @@ type translatedImport struct { origin string } -var runTranslatedImport func(translatedImport, ArObject) (ArObject, ArErr) +var runTranslatedImport func(translatedImport, ArObject, bool) (ArObject, ArErr) func init() { runTranslatedImport = __runTranslatedImport } -func __runTranslatedImport(translatedImport translatedImport, global ArObject) (ArObject, ArErr) { +func __runTranslatedImport(translatedImport translatedImport, global ArObject, main bool) (ArObject, ArErr) { if _, ok := imported[translatedImport.p]; ok { return imported[translatedImport.p], ArErr{} @@ -93,7 +93,7 @@ func __runTranslatedImport(translatedImport translatedImport, global ArObject) ( return local, ArErr{} } -func translateImport(realpath string, origin string, main bool) (translatedImport, ArErr) { +func translateImport(realpath string, origin string) (translatedImport, ArErr) { extention := filepath.Ext(realpath) path := realpath if extention == "" { diff --git a/src/main.go b/src/main.go index 46ae1ff..9c6fd33 100644 --- a/src/main.go +++ b/src/main.go @@ -61,12 +61,12 @@ func main() { if e != nil { panic(e) } - translated, err := translateImport(Args[0], ex, true) + translated, err := translateImport(Args[0], ex) if err.EXISTS { panicErr(err) os.Exit(1) } - _, runimeErr := runTranslatedImport(translated, global) + _, runimeErr := runTranslatedImport(translated, global, true) if runimeErr.EXISTS { panicErr(runimeErr) os.Exit(1) diff --git a/src/parseImport.go b/src/parseImport.go index e9fe82b..e7d8c59 100644 --- a/src/parseImport.go +++ b/src/parseImport.go @@ -82,7 +82,7 @@ func parseGenericImport(code UNPARSEcode, index int, codeline []UNPARSEcode) (Ar if str, ok := toImport.(string); ok { importOBJ.pretranslated = true var err ArErr - importOBJ.translated, err = translateImport(str, filepath.Dir(filepath.ToSlash(code.path)), false) + importOBJ.translated, err = translateImport(str, filepath.Dir(filepath.ToSlash(code.path))) if err.EXISTS { if err.line == 0 { err.line = importOBJ.Line @@ -112,7 +112,7 @@ func runImport(importOBJ ArImport, stack stack, stacklevel int) (any, ArErr) { return nil, ArErr{"Type Error", "import requires a string, got type '" + typeof(val) + "'", importOBJ.Line, importOBJ.Path, importOBJ.Code, true} } parent := filepath.Dir(filepath.ToSlash(importOBJ.Path)) - translated, err = translateImport(val.(string), parent, false) + translated, err = translateImport(val.(string), parent) if err.EXISTS { if err.line == 0 { err.line = importOBJ.Line @@ -126,7 +126,7 @@ func runImport(importOBJ ArImport, stack stack, stacklevel int) (any, ArErr) { return nil, err } } - stackMap, err := runTranslatedImport(translated, stack[0]) + stackMap, err := runTranslatedImport(translated, stack[0], false) if err.EXISTS { if err.line == 0 { err.line = importOBJ.Line