Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Migrate to C++17. Update sol2 to 3.3.0.

Browse Source
This commit is contained in:
Siarhei Fedartsou 2022-07-13 21:14:09 +03:00
parent b35800059e
commit f9ccc0c2bf
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/extractor/scripting_environment_lua.cpp
View File

@ -939,6 +939,22 @@ Sol2ScriptingEnvironment::GetStringListFromFunction(const std::string &function_
return strings; return strings;
} }
namespace {
// string list can be defined either as a Set(see profiles/lua/set.lua) or as a Sequence (see profiles/lua/sequence.lua)
// `Set` is a table with keys that are actual values we are looking for and values that always `true`.
// `Sequence` is a table with keys that are indices and values that are actual values we are looking for.
std::string GetSetOrSequenceValue(const std::pair<sol::object, sol::object>& pair) {
if (pair.second.is<std::string>())
{
return pair.second.as<std::string>();
}
return pair.first.as<std::string>();
}
} // namespace
std::vector<std::string> std::vector<std::string>
Sol2ScriptingEnvironment::GetStringListFromTable(const std::string &table_name) Sol2ScriptingEnvironment::GetStringListFromTable(const std::string &table_name)
{ {
@ -950,7 +966,7 @@ Sol2ScriptingEnvironment::GetStringListFromTable(const std::string &table_name)
{ {
for (auto &&pair : *table) for (auto &&pair : *table)
{ {
strings.push_back(pair.second.as<std::string>()); strings.emplace_back(GetSetOrSequenceValue(pair));
} }
} }
return strings; return strings;
@ -981,7 +997,7 @@ Sol2ScriptingEnvironment::GetStringListsFromTable(const std::string &table_name)
std::vector<std::string> inner_vector; std::vector<std::string> inner_vector;
for (const auto &inner_pair : inner_table) for (const auto &inner_pair : inner_table)
{ {
inner_vector.push_back(inner_pair.first.as<std::string>()); inner_vector.emplace_back(GetSetOrSequenceValue(inner_pair));
} }
string_lists.push_back(std::move(inner_vector)); string_lists.push_back(std::move(inner_vector));
} }