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

allow import without as

Browse Source
This commit is contained in:
William Bell
2023-06-20 23:51:23 +01:00
parent 3cec4a2339
commit ad3ef3b673
2 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/import.go
View File

@@ -95,9 +95,9 @@ func importMod(realpath string, origin string, main bool, global ArObject) (ArOb
}
if !found {
return ArObject{}, ArErr{TYPE: "Import Error", message: "File does not exist: " + realpath, EXISTS: true}
return ArObject{}, ArErr{TYPE: "Import Error", message: "File does not exist: " + path, EXISTS: true}
} else if importing[p] {
return ArObject{}, ArErr{TYPE: "Import Error", message: "Circular import: " + realpath, EXISTS: true}
return ArObject{}, ArErr{TYPE: "Import Error", message: "Circular import: " + path, EXISTS: true}
} else if _, ok := imported[p]; ok {
return imported[p], ArErr{}
}
@@ -136,8 +136,7 @@ func importMod(realpath string, origin string, main bool, global ArObject) (ArOb
"name": filepath.Base(p),
"path": p,
}),
"main": main,
"scope": global,
"main": main,
}),
})
_, runimeErr := ThrowOnNonLoop(run(translated, stack{global, localvars, local}))