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

impliment garbage collection and move init

Browse Source
This commit is contained in:
William Bell
2023-03-25 18:19:48 +00:00
parent fa32f7b824
commit bfad2775ee
11 changed files with 64 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/import.go
View File

@@ -47,7 +47,7 @@ func readFile(path string) []UNPARSEcode {
return output
}
func importMod(realpath string, origin string, main bool) (ArObject, ArErr) {
func importMod(realpath string, origin string, main bool, global ArObject) (ArObject, ArErr) {
extention := filepath.Ext(realpath)
path := realpath
if extention == "" {
@@ -114,7 +114,7 @@ func importMod(realpath string, origin string, main bool) (ArObject, ArErr) {
for _, arg := range withoutarfile {
ArgsArArray = append(ArgsArArray, arg)
}
global := newscope()
local := newscope()
localvars := Map(anymap{
"program": Map(anymap{
"args": ArArray(ArgsArArray),
@@ -126,7 +126,7 @@ func importMod(realpath string, origin string, main bool) (ArObject, ArErr) {
if _, ok := args[0].(string); !ok {
return nil, ArErr{"Import Error", "Invalid argument type", 0, realpath, "", true}
}
return importMod(args[0].(string), filepath.Dir(p), false)
return importMod(args[0].(string), filepath.Dir(p), false, global)
}},
"cwd": ex,
"exc": exc,
@@ -138,7 +138,7 @@ func importMod(realpath string, origin string, main bool) (ArObject, ArErr) {
"scope": global,
}),
})
_, runimeErr := ThrowOnNonLoop(run(translated, stack{vars, localvars, global}))
_, runimeErr := ThrowOnNonLoop(run(translated, stack{global, localvars, local}))
importing[p] = false
if runimeErr.EXISTS {
return ArObject{}, runimeErr