mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-14 18:06:44 +00:00
Code Issues Releases Wiki Activity

Merge branch 'var_copy' into 'master'

Browse source 
Do not copy vector

See merge request OpenMW/openmw!3401
This commit is contained in:
psi29a 2023-09-05 07:32:57 +00:00
commit 58a3fcb972
No known key found for this signature in database
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
components/lua/utf8.cpp
View file

@ -110,18 +110,19 @@ namespace LuaUtf8
}; };
utf8["codes"] = [](std::string_view s) { utf8["codes"] = [](std::string_view s) {
std::vector<int64_t> pos_byte{ 1 }; return sol::as_function(
return sol::as_function([s, pos_byte]() mutable -> sol::optional<std::pair<int64_t, int64_t>> { [s, pos_byte = std::vector<int64_t>{ 1 }]() mutable -> sol::optional<std::pair<int64_t, int64_t>> {
if (pos_byte.back() <= static_cast<int64_t>(s.size())) if (pos_byte.back() <= static_cast<int64_t>(s.size()))
{ {
const auto pair = decodeNextUTF8Character(s, pos_byte); const auto pair = decodeNextUTF8Character(s, pos_byte);
if (pair.second == -1) if (pair.second == -1)
throw std::runtime_error("Invalid UTF-8 code at position " + std::to_string(pos_byte.size())); throw std::runtime_error(
"Invalid UTF-8 code at position " + std::to_string(pos_byte.size()));
return pair; return pair;
} }
return sol::nullopt; return sol::nullopt;
}); });
}; };
utf8["len"] = [](std::string_view s, utf8["len"] = [](std::string_view s,