oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Optimize table creation

Browse source
This commit is contained in:
ShadowNinja 2013-11-30 12:11:07 -05:00
parent 06baf05c64
commit 4594ba6522
5 changed files with 50 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/script/lua_api/l_server.cpp
View file

@ -229,16 +229,13 @@ int ModApiServer::l_get_modnames(lua_State *L)
// mods_sorted; not great performance but the number of mods on a
// server will likely be small.
for(std::list<std::string>::iterator i = mods_unsorted.begin();
i != mods_unsorted.end(); ++i)
{
i != mods_unsorted.end(); ++i) {
bool added = false;
for(std::list<std::string>::iterator x = mods_sorted.begin();
x != mods_sorted.end(); ++x)
{
x != mods_sorted.end(); ++x) {
// I doubt anybody using Minetest will be using
// anything not ASCII based :)
if((*i).compare(*x) <= 0)
{
if(i->compare(*x) <= 0) {
mods_sorted.insert(x, *i);
added = true;
break;
@ -248,25 +245,12 @@ int ModApiServer::l_get_modnames(lua_State *L)
mods_sorted.push_back(*i);
}
// Get the table insertion function from Lua.
lua_getglobal(L, "table");
lua_getfield(L, -1, "insert");
int insertion_func = lua_gettop(L);
// Package them up for Lua
lua_newtable(L);
int new_table = lua_gettop(L);
std::list<std::string>::iterator i = mods_sorted.begin();
while(i != mods_sorted.end())
{
lua_pushvalue(L, insertion_func);
lua_pushvalue(L, new_table);
lua_pushstring(L, (*i).c_str());
if(lua_pcall(L, 2, 0, 0) != 0)
{
script_error(L);
}
++i;
lua_createtable(L, mods_sorted.size(), 0);
std::list<std::string>::iterator iter = mods_sorted.begin();
for (u16 i = 0; iter != mods_sorted.end(); iter++) {
lua_pushstring(L, iter->c_str());
lua_rawseti(L, -2, ++i);
}
return 1;
}