upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-06 19:48:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[while]: added sanity checks for missing [do] tags

Browse Source
This commit is contained in:
Elvish_Hunter 2014-04-03 12:28:17 +02:00
parent c81530509f
commit cf55cf84e6
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
data/lua/wml-tags.lua
View File

@ -339,10 +339,6 @@ local function if_while_handler(max_iter, pass, fail, cfg)
end end
end end
local function while_handler(cfg)
if_while_handler(65536, "do", nil, cfg)
end
-- since if and while are Lua keywords, we can't create functions with such names -- since if and while are Lua keywords, we can't create functions with such names
-- instead, we store the following anonymous functions directly into -- instead, we store the following anonymous functions directly into
-- the table, using the [] operator, rather than by using the point syntax -- the table, using the [] operator, rather than by using the point syntax
@ -378,7 +374,20 @@ wml_actions["if"] = function( cfg )
end end
end end
wml_actions["while"] = while_handler wml_actions["while"] = function( cfg )
-- check if the [do] sub-tag is missing, and raise error if so
if not helper.get_child( cfg, "do" ) then
helper.wml_error "[while] missing required [do] tag"
end
-- we have at least one [do], execute them up to 65536 times
for i = 1, 65536 do
if wesnoth.eval_conditional( cfg ) then
for do_child in helper.child_range( cfg, "do" ) do
handle_event_commands( do_child )
end
else return end
end
end
function wml_actions.switch(cfg) function wml_actions.switch(cfg)
local value = wesnoth.get_variable(cfg.variable) local value = wesnoth.get_variable(cfg.variable)