From 4c4b30aaac5c60803f8c196599ba8bbbe470f31a Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Wed, 7 Feb 2024 01:29:29 -0500 Subject: [PATCH] Fix typo in type name --- src/scripting/lua_terrainfilter.cpp | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/scripting/lua_terrainfilter.cpp b/src/scripting/lua_terrainfilter.cpp index 5ad46e85090..0dc5d9a1262 100644 --- a/src/scripting/lua_terrainfilter.cpp +++ b/src/scripting/lua_terrainfilter.cpp @@ -46,7 +46,7 @@ private: std::string errormessage_; }; -using knows_sets_t = std::map>; +using known_sets_t = std::map>; using offset_list_t = std::vector>; using std::string_view; using dynamic_bitset = boost::dynamic_bitset<>; @@ -190,12 +190,12 @@ public: //build_filter impl namespace { -std::unique_ptr build_filter(lua_State* L, int res_index, knows_sets_t& ks); +std::unique_ptr build_filter(lua_State* L, int res_index, known_sets_t& ks); class con_filter : public filter_impl { public: - con_filter(lua_State* L, int res_index, knows_sets_t& ks) + con_filter(lua_State* L, int res_index, known_sets_t& ks) :list_() { LOG_LMG << "creating con filter"; @@ -212,7 +212,7 @@ public: class and_filter : public con_filter { public: - and_filter(lua_State* L, int res_index, knows_sets_t& ks) + and_filter(lua_State* L, int res_index, known_sets_t& ks) : con_filter(L, res_index, ks) { LOG_LMG << "created and filter"; @@ -233,7 +233,7 @@ public: class or_filter : public con_filter { public: - or_filter(lua_State* L, int res_index, knows_sets_t& ks) + or_filter(lua_State* L, int res_index, known_sets_t& ks) : con_filter(L, res_index, ks) { LOG_LMG << "created or filter"; @@ -254,7 +254,7 @@ public: class nand_filter : public con_filter { public: - nand_filter(lua_State* L, int res_index, knows_sets_t& ks) + nand_filter(lua_State* L, int res_index, known_sets_t& ks) : con_filter(L, res_index, ks) { LOG_LMG << "created nand filter"; @@ -275,7 +275,7 @@ public: class nor_filter : public con_filter { public: - nor_filter(lua_State* L, int res_index, knows_sets_t& ks) + nor_filter(lua_State* L, int res_index, known_sets_t& ks) : con_filter(L, res_index, ks) { LOG_LMG << "created nor filter"; @@ -296,7 +296,7 @@ public: class cached_filter : public filter_impl { public: - cached_filter(lua_State* L, int res_index, knows_sets_t& ks) + cached_filter(lua_State* L, int res_index, known_sets_t& ks) : filter_() , cache_() { @@ -333,7 +333,7 @@ public: class x_filter : public filter_impl { public: - x_filter(lua_State* L, int /*res_index*/, knows_sets_t&) + x_filter(lua_State* L, int /*res_index*/, known_sets_t&) : filter_() { LOG_LMG << "creating x filter"; @@ -353,7 +353,7 @@ public: class y_filter : public filter_impl { public: - y_filter(lua_State* L, int /*res_index*/, knows_sets_t&) + y_filter(lua_State* L, int /*res_index*/, known_sets_t&) : filter_() { LOG_LMG << "creating y filter"; @@ -375,7 +375,7 @@ public: class onborder_filter : public filter_impl { public: - onborder_filter(lua_State*, int /*res_index*/, knows_sets_t&) + onborder_filter(lua_State*, int /*res_index*/, known_sets_t&) { LOG_LMG << "creating onborder filter"; } @@ -390,7 +390,7 @@ public: class terrain_filter : public filter_impl { public: - terrain_filter(lua_State* L, int /*res_index*/, knows_sets_t&) + terrain_filter(lua_State* L, int /*res_index*/, known_sets_t&) : filter_() { LOG_LMG << "creating terrain filter"; @@ -416,7 +416,7 @@ static const offset_list_t odd_offsets_default = {{1 , -1}, {1 , 0}, {0 , 1}, {- class adjacent_filter : public filter_impl { public: - adjacent_filter(lua_State* L, int res_index, knows_sets_t& ks) + adjacent_filter(lua_State* L, int res_index, known_sets_t& ks) : filter_() { LOG_LMG << "creating adjacent filter"; @@ -463,7 +463,7 @@ public: class findin_filter : public filter_impl { public: - findin_filter(lua_State* L, int res_index, knows_sets_t& ks) + findin_filter(lua_State* L, int res_index, known_sets_t& ks) : set_(nullptr) { LOG_LMG << "creating findin filter"; @@ -472,7 +472,7 @@ public: lua_pop(L, 1); //TODO: c++14: use heterogenous lookup. - auto insert_res = ks.insert(knows_sets_t::value_type{id, {}}); + auto insert_res = ks.insert(known_sets_t::value_type{id, {}}); if(insert_res.second && res_index > 0) { // istable(L, res_index) was already checked. if(luaW_tableget(L, res_index, id.c_str())) { @@ -497,7 +497,7 @@ class radius_filter : public filter_impl { public: - radius_filter(lua_State* L, int res_index, knows_sets_t& ks) + radius_filter(lua_State* L, int res_index, known_sets_t& ks) : radius_() , filter_radius_() , filter_() @@ -545,7 +545,7 @@ public: class formula_filter : public filter_impl { public: - formula_filter(lua_State* L, int, knows_sets_t&) + formula_filter(lua_State* L, int, known_sets_t&) : formula_() { LOG_LMG << "creating formula filter"; @@ -587,7 +587,7 @@ static const std::unordered_map keys { { "radius", F_RADIUS } }; -std::unique_ptr build_filter(lua_State* L, int res_index, knows_sets_t& ks) +std::unique_ptr build_filter(lua_State* L, int res_index, known_sets_t& ks) { LOG_LMG << "buildfilter: start"; if(!lua_istable(L, -1)) {