From 31467d29d77e7063317f13a38affd66f70bcff80 Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Wed, 4 Dec 2019 08:09:51 -0500 Subject: [PATCH] Deprecate wml_utils.split in favour of stringx.split --- data/lua/wml-utils.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/data/lua/wml-utils.lua b/data/lua/wml-utils.lua index fd4a6247f46..e6f89936a0a 100644 --- a/data/lua/wml-utils.lua +++ b/data/lua/wml-utils.lua @@ -2,7 +2,12 @@ local utils = {vwriter = {}} function utils.split(s) - return tostring(s or ""):gmatch("[^%s,][^,]*") + return coroutine.wrap(function() + local split = s:split() + for _,s in ipairs(split) do + coroutine.yield(s) + end + end) end function utils.check_key(val, key, tag, convert_spaces) @@ -179,5 +184,6 @@ end utils.trim = wesnoth.deprecate_api('wml_utils.trim', 'stringx.trim', 1, nil, stringx.trim) utils.parenthetical_split = wesnoth.deprecate_api('wml_utils.parenthetical_split', 'stringx.quoted_split or stringx.split', 1, nil, utils.parenthetical_split) +utils.split = wesnoth.deprecate_api('wml_utils.split', 'stringx.split', 1, nil, utils.split) return utils