Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/lua/vm/executor.ex
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,15 @@ defmodule Lua.VM.Executor do

# get_upvalue
defp do_execute([{:get_upvalue, dest, index} | rest], regs, upvalues, proto, state) do
cell_ref = Enum.at(upvalues, index)
cell_ref = elem(upvalues, index)
value = Map.get(state.upvalue_cells, cell_ref)
regs = put_elem(regs, dest, value)
do_execute(rest, regs, upvalues, proto, state)
end

# set_upvalue
defp do_execute([{:set_upvalue, index, source} | rest], regs, upvalues, proto, state) do
cell_ref = Enum.at(upvalues, index)
cell_ref = elem(upvalues, index)
value = elem(regs, source)
state = %{state | upvalue_cells: Map.put(state.upvalue_cells, cell_ref, value)}
do_execute(rest, regs, upvalues, proto, state)
Expand Down Expand Up @@ -438,11 +438,11 @@ defmodule Lua.VM.Executor do

{:parent_upvalue, index, _name}, {cells, state} ->
# Share the parent's upvalue cell
{[Enum.at(upvalues, index) | cells], state}
{[elem(upvalues, index) | cells], state}
end)

captured_upvalues = Enum.reverse(captured_upvalues_reversed)
closure = {:lua_closure, nested_proto, captured_upvalues}
closure = {:lua_closure, nested_proto, List.to_tuple(captured_upvalues)}
regs = put_elem(regs, dest, closure)
do_execute(rest, regs, upvalues, proto, state)
end
Expand Down
2 changes: 1 addition & 1 deletion lib/lua/vm/stdlib.ex
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ defmodule Lua.VM.Stdlib do
# Compiler currently never returns errors, always succeeds
{:ok, prototype} = Lua.Compiler.compile(ast)
# Create a closure from the compiled prototype
closure = {:lua_closure, prototype, %{}}
closure = {:lua_closure, prototype, {}}
{[closure], state}

{:error, reason} ->
Expand Down
2 changes: 1 addition & 1 deletion test/support/lua_test_case.ex
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ defmodule Lua.TestCase do
case Lua.Compiler.compile(ast, source: chunk_name) do
{:ok, proto} ->
# Return a closure that will execute the proto when called
closure = {:lua_closure, proto, []}
closure = {:lua_closure, proto, {}}
{[closure], state}

{:error, error} ->
Expand Down