Fix bug with reading Set values from Lua scripts.

Author: SiarheiFedartsou

CHANGELOG.md

@@ -3,7 +3,10 @@
  - API:
  - FIXED: Fix inefficient osrm-routed connection handling [#6113](https://github.com/Project-OSRM/osrm-backend/pull/6113)
  - Build:
- - CHANGED: Enable more clang-tidy checks. [#6262](https://github.com/Project-OSRM/osrm-backend/pull/6270)
+ - CHANGED: Fix bug with reading Set values from Lua scripts. [#6279](https://github.com/Project-OSRM/osrm-backend/pull/6279)
+ - CHANGED: Enable even more clang-tidy checks. [#6273](https://github.com/Project-OSRM/osrm-backend/pull/6273)
+ - CHANGED: Configure CMake to not build flatbuffers tests and samples. [#6274](https://github.com/Project-OSRM/osrm-backend/pull/6274)
+ - CHANGED: Enable more clang-tidy checks. [#6270](https://github.com/Project-OSRM/osrm-backend/pull/6270)
  - CHANGED: Configure clang-tidy job on CI. [#6261](https://github.com/Project-OSRM/osrm-backend/pull/6261)
  - CHANGED: Use Github Actions for building container images [#6138](https://github.com/Project-OSRM/osrm-backend/pull/6138)
  - CHANGED: Upgrade Boost dependency to 1.70 [#6113](https://github.com/Project-OSRM/osrm-backend/pull/6113)

features/foot/restrictions.feature

@@ -29,7 +29,7 @@ Feature: Foot - Turn restrictions
  When I route I should get
  | from | to | route |
  | s | w | sj,wj,wj |
- | s | n | sj,nj,nj |
+ | s | n | sj,nj  |
  | s | e | sj,ej,ej |
 
  @only_turning
@@ -55,7 +55,7 @@ Feature: Foot - Turn restrictions
  When I route I should get
  | from | to | route |
  | s | w | sj,wj,wj |
- | s | n | sj,nj,nj |
+ | s | n | sj,nj  |
  | s | e | sj,ej,ej |
 
  @except

src/extractor/scripting_environment_lua.cpp

@@ -939,6 +939,26 @@ Sol2ScriptingEnvironment::GetStringListFromFunction(const std::string &function_
  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>();
+ }
+ BOOST_ASSERT(pair.first.is<std::string>());
+ return pair.first.as<std::string>();
+}
+
+} // namespace
+
 std::vector<std::string>
 Sol2ScriptingEnvironment::GetStringListFromTable(const std::string &table_name)
 {
@@ -954,7 +974,7 @@ Sol2ScriptingEnvironment::GetStringListFromTable(const std::string &table_name)
  {
  for (auto &&pair : table)
  {
- strings.push_back(pair.second.as<std::string>());
+ strings.emplace_back(GetSetOrSequenceValue(pair));
  }
  }
  return strings;
@@ -989,7 +1009,7 @@ Sol2ScriptingEnvironment::GetStringListsFromTable(const std::string &table_name)
  std::vector<std::string> inner_vector;
  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));
  }