0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Further simplify [if] implementation

Browse source
This commit is contained in:
Charles Dang 2015-02-13 19:55:07 +11:00
parent 448e300763
commit 3a6579b9c2
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
data/lua/wml-tags.lua
View file

@ -401,11 +401,7 @@ wml_actions.command = handle_event_commands
-- the table, using the [] operator, rather than by using the point syntax
wml_actions["if"] = function(cfg)
local has_then = helper.get_child(cfg, "then")
local has_elseif = helper.get_child(cfg, "elseif")
local has_else = helper.get_child(cfg, "else")
if not (has_then or has_elseif or has_else) then
if not (helper.get_child(cfg, 'then') or helper.get_child(cfg, 'elseif') or helper.get_child(cfg, 'else')) then
helper.wml_error("[if] didn't find any [then], [elseif], or [else] children.")
end
@ -414,21 +410,21 @@ wml_actions["if"] = function(cfg)
handle_event_commands(then_child)
end
return -- stop after executing [then] tags
else
for elseif_child in helper.child_range(cfg, "elseif") do
if wesnoth.eval_conditional(elseif_child) then -- we'll evaluate the [elseif] tags one by one
for then_tag in helper.child_range(elseif_child, "then") do
handle_event_commands(then_tag)
end
return -- stop on first matched condition
end
end
end
-- no matched condition, try the [else] tags
for else_child in helper.child_range(cfg, "else") do
handle_event_commands(else_child)
for elseif_child in helper.child_range(cfg, "elseif") do
if wesnoth.eval_conditional(elseif_child) then -- we'll evaluate the [elseif] tags one by one
for then_tag in helper.child_range(elseif_child, "then") do
handle_event_commands(then_tag)
end
return -- stop on first matched condition
end
end
-- no matched condition, try the [else] tags
for else_child in helper.child_range(cfg, "else") do
handle_event_commands(else_child)
end
end
wml_actions["while"] = function( cfg )