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

Lua API: Also make sure the expanded form of context-free generators accepts translatable strings

Browse source
This commit is contained in:
Celtic Minstrel 2021-02-20 17:08:19 -05:00
parent 7206d0cf4b
commit 0cc39f985d
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/scripting/lua_kernel_base.cpp
View file

@ -242,11 +242,16 @@ static int intf_name_generator(lua_State *L)
return lua_error(L);
}
if(lua_isstring(L, -1)) {
data[lua_tostring(L,-2)] = utils::split(lua_tostring(L,-1),'|');
auto& productions = data[lua_tostring(L,-2)] = utils::split(luaW_checktstring(L,-1).str(), '|');
if(productions.size() > 1) {
deprecated_message("wesnoth.name_generator('cfg', {nonterminal = 'a|b'})", DEP_LEVEL::INDEFINITE, "1.17", "Non-terminals should now be assigned an array of productions instead of a single string containing productions separated by | - but a single string is fine if it's only one production");
}
} else if(lua_istable(L, -1)) {
data[lua_tostring(L,-2)] = lua_check<std::vector<std::string>>(L, -1);
const auto& split = lua_check<std::vector<t_string>>(L, -1);
auto& productions = data[lua_tostring(L,-2)];
std::transform(split.begin(), split.end(), std::back_inserter(productions), std::mem_fn(&t_string::str));
} else {
lua_pushstring(L, "CFG generator: invalid noterminal value (must be a string or list of strings)");
lua_pushstring(L, "CFG generator: invalid nonterminal value (must be a string or list of strings)");
return lua_error(L);
}
}