Skip to content

Commit

Permalink
Merge branch 'digiline-non-reentrant' of https://github.com/CiaranG/m…
Browse files Browse the repository at this point in the history
…inetest-mod-mesecons into CiaranG-digiline-non-reentrant

Conflicts:
	mesecons_luacontroller/init.lua
  • Loading branch information
Jeija committed Mar 16, 2014
2 parents 38ff900 + 5002315 commit b50721c
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions mesecons_luacontroller/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
-- ports = get_real_portstates(pos): gets if inputs are powered from outside
-- newport = merge_portstates(state1, state2): just does result = state1 or state2 for every port
-- action_setports(pos, rule, state): activates/deactivates the mesecons according to the portstates (helper for action)
-- action(pos, ports): Applies new portstates to a luacontroller at pos
-- action(pos, ports, digiline_msgs): Applies new portstates to a luacontroller at pos, and sends pending digiline messages
-- lc_update(pos): updates the controller at pos by executing the code
-- reset_meta (pos, code, errmsg): performs a software-reset, installs new code and prints error messages
-- reset (pos): performs a hardware reset, turns off all ports
Expand Down Expand Up @@ -99,7 +99,7 @@ local setport = function (pos, rule, state)
end
end

local action = function (pos, ports)
local action = function (pos, ports, digiline_msgs)
local node = minetest.get_node(pos)
local name = node.name
local vports = minetest.registered_nodes[name].virtual_portstates
Expand All @@ -116,6 +116,13 @@ local action = function (pos, ports)
if ports.c ~= vports.c then setport(pos, rules.c, ports.c) end
if ports.d ~= vports.d then setport(pos, rules.d, ports.d) end
end

if digiline then
for i = 1, #digiline_msgs do
digiline:receptor_send(pos, digiline.rules.default,
digiline_msgs[i].channel, digiline_msgs[i].msg)
end
end
end

--------------------
Expand Down Expand Up @@ -366,6 +373,7 @@ end
-- Parsing function --
----------------------

lc_digiline_msgs = nil
lc_update = function (pos, event)
local meta = minetest.get_meta(pos)
if not interrupt_allow(meta, event) then return end
Expand All @@ -381,6 +389,7 @@ lc_update = function (pos, event)
local env = create_environment(pos, mem, event)

-- create the sandbox and execute code
lc_digiline_msgs = {}
local chunk, msg = create_sandbox (code, env)
if not chunk then return msg end
local success, msg = pcall(f)
Expand All @@ -389,8 +398,8 @@ lc_update = function (pos, event)

save_memory(meta, mem)

-- Actually set the ports
minetest.after(0, action, pos, env.port)
-- Actually set the ports and send digiline messages
minetest.after(0, action, pos, env.port, lc_digiline_msgs)
end

local reset_meta = function(pos, code, errmsg)
Expand All @@ -409,7 +418,7 @@ end

local reset = function (pos)
minetest.get_meta(pos):set_string("lc_interrupts", "")
action(pos, {a=false, b=false, c=false, d=false}, true)
action(pos, {a=false, b=false, c=false, d=false}, {})
end

-- ______
Expand Down

0 comments on commit b50721c

Please sign in to comment.