Triplehx3/luanti
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce std::string_view into wider use (#14368)

Browse Source
This commit is contained in:
sfan5
2024-02-17 15:35:33 +01:00
committed by GitHub
parent fa47af737f
commit 6ca214fefc
74 changed files with 501 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/script/lua_api/l_metadata.cpp
View File

@@ -115,9 +115,7 @@ int MetaDataRef::l_set_string(lua_State *L)
MetaDataRef *ref = checkAnyMetadata(L, 1);
std::string name = luaL_checkstring(L, 2);
size_t len = 0;
const char *s = lua_tolstring(L, 3, &len);
std::string str(s, len);
auto str = readParam<std::string_view>(L, 3);
IMetadata *meta = ref->getmeta(!str.empty());
if (meta != NULL && meta->setString(name, str))
@@ -300,9 +298,8 @@ bool MetaDataRef::handleFromTable(lua_State *L, int table, IMetadata *meta)
while (lua_next(L, fieldstable) != 0) {
// key at index -2 and value at index -1
std::string name = readParam<std::string>(L, -2);
size_t cl;
const char *cs = lua_tolstring(L, -1, &cl);
meta->setString(name, std::string(cs, cl));
auto value = readParam<std::string_view>(L, -1);
meta->setString(name, value);
lua_pop(L, 1); // Remove value, keep key for next iteration
}
lua_pop(L, 1);