diff --git a/api.go b/api.go index 5abcb71..aaf4dfa 100644 --- a/api.go +++ b/api.go @@ -37,6 +37,7 @@ import ( var hshMod *moonlight.Table func hilbishLoader(mlr *moonlight.Runtime) moonlight.Value { + println("hilbish loader called") var exports = map[string]moonlight.Export{ "alias": {hlalias, 2, false}, "appendPath": {hlappendPath, 1, false}, diff --git a/lua.go b/lua.go index 9e05af1..b0a584a 100644 --- a/lua.go +++ b/lua.go @@ -52,7 +52,7 @@ func luaInit() { */ // Add more paths that Lua can require from - _, err := l.DoString("package.path = package.path .. " + requirePaths) + _, err := l.DoString("print(type(hilbish)); package.path = package.path .. " + requirePaths) if err != nil { fmt.Fprintln(os.Stderr, err) fmt.Fprintln(os.Stderr, "Could not add Hilbish require paths! Libraries will be missing. This shouldn't happen.") diff --git a/moonlight/loader_clua.go b/moonlight/loader_clua.go index 6f3a601..0bb2c17 100644 --- a/moonlight/loader_clua.go +++ b/moonlight/loader_clua.go @@ -15,7 +15,7 @@ func (mlr *Runtime) LoadLibrary(ldr Loader, name string) { } mlr.state.GetGlobal("package") - mlr.state.GetField(-1, "preload") + mlr.state.GetField(-1, "loaded") mlr.state.PushGoFunction(cluaLoader) mlr.state.SetField(-2, name) } diff --git a/moonlight/table_clua.go b/moonlight/table_clua.go index 4533553..75cee49 100644 --- a/moonlight/table_clua.go +++ b/moonlight/table_clua.go @@ -41,3 +41,7 @@ func ToTable(v Value) *Table { func TryTable(v Value) (*Table, bool) { return nil, false } + +func (t *Table) setRefIdx(mlr *Runtime, i idx) { + t.refIdx = mlr.state.Ref(i) +} diff --git a/moonlight/util_clua.go b/moonlight/util_clua.go index aa60f0e..2729cbb 100644 --- a/moonlight/util_clua.go +++ b/moonlight/util_clua.go @@ -8,5 +8,6 @@ func (mlr *Runtime) DoString(code string) (Value, error) { } func (mlr *Runtime) DoFile(filename string) error { - return mlr.state.DoFile(filename) + //return mlr.state.DoFile(filename) + return nil }