Add _t suffix to all lua_wrapper_* classes

joto · joto · commit 010c71705fe0 · 2025-08-22T11:23:13.000+02:00
diff --git a/src/flex-lua-expire-output.cpp b/src/flex-lua-expire-output.cpp
@@ -97,7 +97,7 @@ int setup_flex_expire_output(lua_State *lua_state,
 /**
  * Define the osm2pgsql.ExpireOutput class/metatable.
  */
-void lua_wrapper_expire_output::init(lua_State *lua_state)
+void lua_wrapper_expire_output_t::init(lua_State *lua_state)
 {
     luaX_set_up_metatable(
         lua_state, "ExpireOutput", OSM2PGSQL_EXPIRE_OUTPUT_CLASS,
@@ -109,7 +109,7 @@ void lua_wrapper_expire_output::init(lua_State *lua_state)
          {"table", lua_trampoline_expire_output_table}});
 }
 
-int lua_wrapper_expire_output::tostring() const
+int lua_wrapper_expire_output_t::tostring() const
 {
     std::string const str =
         fmt::format("osm2pgsql.ExpireOutput[minzoom={},maxzoom={},filename={},"
@@ -121,31 +121,31 @@ int lua_wrapper_expire_output::tostring() const
     return 1;
 }
 
-int lua_wrapper_expire_output::filename() const noexcept
+int lua_wrapper_expire_output_t::filename() const noexcept
 {
     luaX_pushstring(lua_state(), self().filename());
     return 1;
 }
 
-int lua_wrapper_expire_output::maxzoom() const noexcept
+int lua_wrapper_expire_output_t::maxzoom() const noexcept
 {
     lua_pushinteger(lua_state(), self().maxzoom());
     return 1;
 }
 
-int lua_wrapper_expire_output::minzoom() const noexcept
+int lua_wrapper_expire_output_t::minzoom() const noexcept
 {
     lua_pushinteger(lua_state(), self().minzoom());
     return 1;
 }
 
-int lua_wrapper_expire_output::schema() const noexcept
+int lua_wrapper_expire_output_t::schema() const noexcept
 {
     luaX_pushstring(lua_state(), self().schema());
     return 1;
 }
 
-int lua_wrapper_expire_output::table() const noexcept
+int lua_wrapper_expire_output_t::table() const noexcept
 {
     luaX_pushstring(lua_state(), self().table());
     return 1;
diff --git a/src/flex-lua-expire-output.hpp b/src/flex-lua-expire-output.hpp
@@ -25,13 +25,13 @@ int setup_flex_expire_output(lua_State *lua_state,
                              std::string const &default_schema,
                              std::vector<expire_output_t> *expire_outputs);
 
-class lua_wrapper_expire_output : public lua_wrapper_base_t<expire_output_t>
+class lua_wrapper_expire_output_t : public lua_wrapper_base_t<expire_output_t>
 {
 public:
     static void init(lua_State *lua_state);
 
-    lua_wrapper_expire_output(lua_State *lua_state,
-                              expire_output_t *expire_output)
+    lua_wrapper_expire_output_t(lua_State *lua_state,
+                                expire_output_t *expire_output)
     : lua_wrapper_base_t(lua_state, expire_output)
     {
     }
@@ -43,6 +43,6 @@ class lua_wrapper_expire_output : public lua_wrapper_base_t<expire_output_t>
     int schema() const noexcept;
     int table() const noexcept;
 
-}; // class lua_wrapper_expire_output
+}; // class lua_wrapper_expire_output_t
 
 #endif // OSM2PGSQL_FLEX_LUA_EXPIRE_OUTPUT_HPP
diff --git a/src/flex-lua-locator.cpp b/src/flex-lua-locator.cpp
@@ -45,7 +45,7 @@ TRAMPOLINE_WRAPPED_OBJECT(locator, first_intersecting)
 
 } // anonymous namespace
 
-connection_params_t lua_wrapper_locator::s_connection_params;
+connection_params_t lua_wrapper_locator_t::s_connection_params;
 
 int setup_flex_locator(lua_State *lua_state, std::vector<locator_t> *locators)
 {
@@ -65,8 +65,8 @@ int setup_flex_locator(lua_State *lua_state, std::vector<locator_t> *locators)
     return 1;
 }
 
-void lua_wrapper_locator::init(lua_State *lua_state,
-                               connection_params_t const &connection_params)
+void lua_wrapper_locator_t::init(lua_State *lua_state,
+                                 connection_params_t const &connection_params)
 {
     s_connection_params = connection_params;
 
@@ -80,21 +80,21 @@ void lua_wrapper_locator::init(lua_State *lua_state,
          {"first_intersecting", lua_trampoline_locator_first_intersecting}});
 }
 
-int lua_wrapper_locator::tostring() const
+int lua_wrapper_locator_t::tostring() const
 {
     std::string const str{fmt::format("osm2pgsql.Locator[name={},size={}]",
                                       self().name(), self().size())};
     luaX_pushstring(lua_state(), str);
     return 1;
 }
 
-int lua_wrapper_locator::name() const noexcept
+int lua_wrapper_locator_t::name() const noexcept
 {
     luaX_pushstring(lua_state(), self().name());
     return 1;
 }
 
-int lua_wrapper_locator::add_bbox()
+int lua_wrapper_locator_t::add_bbox()
 {
     if (lua_gettop(lua_state()) < 5) {
         throw fmt_error("Need locator, name and 4 coordinates as arguments");
@@ -111,7 +111,7 @@ int lua_wrapper_locator::add_bbox()
     return 0;
 }
 
-int lua_wrapper_locator::add_from_db()
+int lua_wrapper_locator_t::add_from_db()
 {
     if (lua_gettop(lua_state()) < 1) {
         throw fmt_error("Need locator and SQL query arguments");
@@ -125,7 +125,7 @@ int lua_wrapper_locator::add_from_db()
     return 0;
 }
 
-int lua_wrapper_locator::all_intersecting()
+int lua_wrapper_locator_t::all_intersecting()
 {
     if (lua_gettop(lua_state()) < 1) {
         throw fmt_error("Need locator and geometry arguments");
@@ -149,7 +149,7 @@ int lua_wrapper_locator::all_intersecting()
     return 1;
 }
 
-int lua_wrapper_locator::first_intersecting()
+int lua_wrapper_locator_t::first_intersecting()
 {
     if (lua_gettop(lua_state()) < 1) {
         throw fmt_error("Need locator and geometry arguments");
diff --git a/src/flex-lua-locator.hpp b/src/flex-lua-locator.hpp
@@ -27,13 +27,13 @@ static char const *const OSM2PGSQL_LOCATOR_CLASS = "osm2pgsql.Locator";
 
 int setup_flex_locator(lua_State *lua_state, std::vector<locator_t> *locators);
 
-class lua_wrapper_locator : public lua_wrapper_base_t<locator_t>
+class lua_wrapper_locator_t : public lua_wrapper_base_t<locator_t>
 {
 public:
     static void init(lua_State *lua_state,
                      connection_params_t const &connection_params);
 
-    lua_wrapper_locator(lua_State *lua_state, locator_t *locator)
+    lua_wrapper_locator_t(lua_State *lua_state, locator_t *locator)
     : lua_wrapper_base_t(lua_state, locator)
     {
     }
@@ -48,6 +48,6 @@ class lua_wrapper_locator : public lua_wrapper_base_t<locator_t>
 private:
     static connection_params_t s_connection_params;
 
-}; // class lua_wrapper_locator
+}; // class lua_wrapper_locator_t
 
 #endif // OSM2PGSQL_FLEX_LUA_LOCATOR_HPP
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
@@ -454,7 +454,7 @@ int setup_flex_table(lua_State *lua_state, std::vector<flex_table_t> *tables,
 /**
  * Define the osm2pgsql.Table class/metatable.
  */
-void lua_wrapper_table::init(lua_State *lua_state)
+void lua_wrapper_table_t::init(lua_State *lua_state)
 {
     luaX_set_up_metatable(lua_state, "Table", OSM2PGSQL_TABLE_CLASS,
                           {{"__tostring", lua_trampoline_table_tostring},
@@ -465,21 +465,21 @@ void lua_wrapper_table::init(lua_State *lua_state)
                            {"columns", lua_trampoline_table_columns}});
 }
 
-int lua_wrapper_table::tostring() const
+int lua_wrapper_table_t::tostring() const
 {
     std::string const str{fmt::format("osm2pgsql.Table[{}]", self().name())};
     luaX_pushstring(lua_state(), str);
 
     return 1;
 }
 
-int lua_wrapper_table::cluster() const noexcept
+int lua_wrapper_table_t::cluster() const noexcept
 {
     lua_pushboolean(lua_state(), self().cluster_by_geom());
     return 1;
 }
 
-int lua_wrapper_table::columns() const
+int lua_wrapper_table_t::columns() const
 {
     lua_createtable(lua_state(), (int)self().num_columns(), 0);
 
@@ -502,13 +502,13 @@ int lua_wrapper_table::columns() const
     return 1;
 }
 
-int lua_wrapper_table::name() const noexcept
+int lua_wrapper_table_t::name() const noexcept
 {
     luaX_pushstring(lua_state(), self().name());
     return 1;
 }
 
-int lua_wrapper_table::schema() const noexcept
+int lua_wrapper_table_t::schema() const noexcept
 {
     luaX_pushstring(lua_state(), self().schema());
     return 1;
diff --git a/src/flex-lua-table.hpp b/src/flex-lua-table.hpp
@@ -26,12 +26,12 @@ int setup_flex_table(lua_State *lua_state, std::vector<flex_table_t> *tables,
                      std::string const &default_schema, bool updatable,
                      bool append_mode);
 
-class lua_wrapper_table : public lua_wrapper_base_t<flex_table_t>
+class lua_wrapper_table_t : public lua_wrapper_base_t<flex_table_t>
 {
 public:
     static void init(lua_State *lua_state);
 
-    lua_wrapper_table(lua_State *lua_state, flex_table_t *table)
+    lua_wrapper_table_t(lua_State *lua_state, flex_table_t *table)
     : lua_wrapper_base_t(lua_state, table)
     {
     }
@@ -42,6 +42,6 @@ class lua_wrapper_table : public lua_wrapper_base_t<flex_table_t>
     int name() const noexcept;
     int schema() const noexcept;
 
-}; // class lua_wrapper_table
+}; // class lua_wrapper_table_t
 
 #endif // OSM2PGSQL_FLEX_LUA_TABLE_HPP
diff --git a/src/flex-lua-wrapper.hpp b/src/flex-lua-wrapper.hpp
@@ -23,7 +23,7 @@
             auto *flex =                                                       \
                 static_cast<output_flex_t *>(luaX_get_context(lua_state));     \
             auto &obj = flex->get_##obj_name##_from_param();                   \
-            return lua_wrapper_##obj_name{lua_state, &obj}.func_name();        \
+            return lua_wrapper_##obj_name##_t{lua_state, &obj}.func_name();    \
         } catch (std::exception const &e) {                                    \
             return luaL_error(lua_state, "Error in '" #func_name "': %s\n",    \
                               e.what());                                       \
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
@@ -1306,9 +1306,9 @@ void output_flex_t::init_lua(std::string const &filename,
     luaX_add_table_func(lua_state(), "define_expire_output",
                         lua_trampoline_app_define_expire_output);
 
-    lua_wrapper_expire_output::init(lua_state());
-    lua_wrapper_locator::init(lua_state(), get_options()->connection_params);
-    lua_wrapper_table::init(lua_state());
+    lua_wrapper_expire_output_t::init(lua_state());
+    lua_wrapper_locator_t::init(lua_state(), get_options()->connection_params);
+    lua_wrapper_table_t::init(lua_state());
 
     // Clean up stack
     lua_settop(lua_state(), 0);

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ int setup_flex_expire_output(lua_State *lua_state,`
`97`	`97`	`/**`
`98`	`98`	`* Define the osm2pgsql.ExpireOutput class/metatable.`
`99`	`99`	`*/`
`100`		`-void lua_wrapper_expire_output::init(lua_State *lua_state)`
	`100`	`+void lua_wrapper_expire_output_t::init(lua_State *lua_state)`
`101`	`101`	`{`
`102`	`102`	`luaX_set_up_metatable(`
`103`	`103`	`lua_state, "ExpireOutput", OSM2PGSQL_EXPIRE_OUTPUT_CLASS,`
`@@ -109,7 +109,7 @@ void lua_wrapper_expire_output::init(lua_State *lua_state)`
`109`	`109`	`{"table", lua_trampoline_expire_output_table}});`
`110`	`110`	`}`
`111`	`111`
`112`		`-int lua_wrapper_expire_output::tostring() const`
	`112`	`+int lua_wrapper_expire_output_t::tostring() const`
`113`	`113`	`{`
`114`	`114`	`std::string const str =`
`115`	`115`	`fmt::format("osm2pgsql.ExpireOutput[minzoom={},maxzoom={},filename={},"`
`@@ -121,31 +121,31 @@ int lua_wrapper_expire_output::tostring() const`
`121`	`121`	`return 1;`
`122`	`122`	`}`
`123`	`123`
`124`		`-int lua_wrapper_expire_output::filename() const noexcept`
	`124`	`+int lua_wrapper_expire_output_t::filename() const noexcept`
`125`	`125`	`{`
`126`	`126`	`luaX_pushstring(lua_state(), self().filename());`
`127`	`127`	`return 1;`
`128`	`128`	`}`
`129`	`129`
`130`		`-int lua_wrapper_expire_output::maxzoom() const noexcept`
	`130`	`+int lua_wrapper_expire_output_t::maxzoom() const noexcept`
`131`	`131`	`{`
`132`	`132`	`lua_pushinteger(lua_state(), self().maxzoom());`
`133`	`133`	`return 1;`
`134`	`134`	`}`
`135`	`135`
`136`		`-int lua_wrapper_expire_output::minzoom() const noexcept`
	`136`	`+int lua_wrapper_expire_output_t::minzoom() const noexcept`
`137`	`137`	`{`
`138`	`138`	`lua_pushinteger(lua_state(), self().minzoom());`
`139`	`139`	`return 1;`
`140`	`140`	`}`
`141`	`141`
`142`		`-int lua_wrapper_expire_output::schema() const noexcept`
	`142`	`+int lua_wrapper_expire_output_t::schema() const noexcept`
`143`	`143`	`{`
`144`	`144`	`luaX_pushstring(lua_state(), self().schema());`
`145`	`145`	`return 1;`
`146`	`146`	`}`
`147`	`147`
`148`		`-int lua_wrapper_expire_output::table() const noexcept`
	`148`	`+int lua_wrapper_expire_output_t::table() const noexcept`
`149`	`149`	`{`
`150`	`150`	`luaX_pushstring(lua_state(), self().table());`
`151`	`151`	`return 1;`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ TRAMPOLINE_WRAPPED_OBJECT(locator, first_intersecting)`
`45`	`45`
`46`	`46`	`} // anonymous namespace`
`47`	`47`
`48`		`-connection_params_t lua_wrapper_locator::s_connection_params;`
	`48`	`+connection_params_t lua_wrapper_locator_t::s_connection_params;`
`49`	`49`
`50`	`50`	`int setup_flex_locator(lua_State lua_state, std::vector<locator_t> locators)`
`51`	`51`	`{`
`@@ -65,8 +65,8 @@ int setup_flex_locator(lua_State lua_state, std::vector<locator_t> locators)`
`65`	`65`	`return 1;`
`66`	`66`	`}`
`67`	`67`
`68`		`-void lua_wrapper_locator::init(lua_State *lua_state,`
`69`		`- connection_params_t const &connection_params)`
	`68`	`+void lua_wrapper_locator_t::init(lua_State *lua_state,`
	`69`	`+ connection_params_t const &connection_params)`
`70`	`70`	`{`
`71`	`71`	`s_connection_params = connection_params;`
`72`	`72`
`@@ -80,21 +80,21 @@ void lua_wrapper_locator::init(lua_State *lua_state,`
`80`	`80`	`{"first_intersecting", lua_trampoline_locator_first_intersecting}});`
`81`	`81`	`}`
`82`	`82`
`83`		`-int lua_wrapper_locator::tostring() const`
	`83`	`+int lua_wrapper_locator_t::tostring() const`
`84`	`84`	`{`
`85`	`85`	`std::string const str{fmt::format("osm2pgsql.Locator[name={},size={}]",`
`86`	`86`	`self().name(), self().size())};`
`87`	`87`	`luaX_pushstring(lua_state(), str);`
`88`	`88`	`return 1;`
`89`	`89`	`}`
`90`	`90`
`91`		`-int lua_wrapper_locator::name() const noexcept`
	`91`	`+int lua_wrapper_locator_t::name() const noexcept`
`92`	`92`	`{`
`93`	`93`	`luaX_pushstring(lua_state(), self().name());`
`94`	`94`	`return 1;`
`95`	`95`	`}`
`96`	`96`
`97`		`-int lua_wrapper_locator::add_bbox()`
	`97`	`+int lua_wrapper_locator_t::add_bbox()`
`98`	`98`	`{`
`99`	`99`	`if (lua_gettop(lua_state()) < 5) {`
`100`	`100`	`throw fmt_error("Need locator, name and 4 coordinates as arguments");`
`@@ -111,7 +111,7 @@ int lua_wrapper_locator::add_bbox()`
`111`	`111`	`return 0;`
`112`	`112`	`}`
`113`	`113`
`114`		`-int lua_wrapper_locator::add_from_db()`
	`114`	`+int lua_wrapper_locator_t::add_from_db()`
`115`	`115`	`{`
`116`	`116`	`if (lua_gettop(lua_state()) < 1) {`
`117`	`117`	`throw fmt_error("Need locator and SQL query arguments");`
`@@ -125,7 +125,7 @@ int lua_wrapper_locator::add_from_db()`
`125`	`125`	`return 0;`
`126`	`126`	`}`
`127`	`127`
`128`		`-int lua_wrapper_locator::all_intersecting()`
	`128`	`+int lua_wrapper_locator_t::all_intersecting()`
`129`	`129`	`{`
`130`	`130`	`if (lua_gettop(lua_state()) < 1) {`
`131`	`131`	`throw fmt_error("Need locator and geometry arguments");`
`@@ -149,7 +149,7 @@ int lua_wrapper_locator::all_intersecting()`
`149`	`149`	`return 1;`
`150`	`150`	`}`
`151`	`151`
`152`		`-int lua_wrapper_locator::first_intersecting()`
	`152`	`+int lua_wrapper_locator_t::first_intersecting()`
`153`	`153`	`{`
`154`	`154`	`if (lua_gettop(lua_state()) < 1) {`
`155`	`155`	`throw fmt_error("Need locator and geometry arguments");`
Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,13 @@ static char const *const OSM2PGSQL_LOCATOR_CLASS = "osm2pgsql.Locator";`
`27`	`27`
`28`	`28`	`int setup_flex_locator(lua_State lua_state, std::vector<locator_t> locators);`
`29`	`29`
`30`		`-class lua_wrapper_locator : public lua_wrapper_base_t<locator_t>`
	`30`	`+class lua_wrapper_locator_t : public lua_wrapper_base_t<locator_t>`
`31`	`31`	`{`
`32`	`32`	`public:`
`33`	`33`	`static void init(lua_State *lua_state,`
`34`	`34`	`connection_params_t const &connection_params);`
`35`	`35`
`36`		`- lua_wrapper_locator(lua_State lua_state, locator_t locator)`
	`36`	`+ lua_wrapper_locator_t(lua_State lua_state, locator_t locator)`
`37`	`37`	`: lua_wrapper_base_t(lua_state, locator)`
`38`	`38`	`{`
`39`	`39`	`}`
`@@ -48,6 +48,6 @@ class lua_wrapper_locator : public lua_wrapper_base_t<locator_t>`
`48`	`48`	`private:`
`49`	`49`	`static connection_params_t s_connection_params;`
`50`	`50`
`51`		`-}; // class lua_wrapper_locator`
	`51`	`+}; // class lua_wrapper_locator_t`
`52`	`52`
`53`	`53`	`#endif // OSM2PGSQL_FLEX_LUA_LOCATOR_HPP`
Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ int setup_flex_table(lua_State lua_state, std::vector<flex_table_t> tables,`
`454`	`454`	`/**`
`455`	`455`	`* Define the osm2pgsql.Table class/metatable.`
`456`	`456`	`*/`
`457`		`-void lua_wrapper_table::init(lua_State *lua_state)`
	`457`	`+void lua_wrapper_table_t::init(lua_State *lua_state)`
`458`	`458`	`{`
`459`	`459`	`luaX_set_up_metatable(lua_state, "Table", OSM2PGSQL_TABLE_CLASS,`
`460`	`460`	`{{"__tostring", lua_trampoline_table_tostring},`
`@@ -465,21 +465,21 @@ void lua_wrapper_table::init(lua_State *lua_state)`
`465`	`465`	`{"columns", lua_trampoline_table_columns}});`
`466`	`466`	`}`
`467`	`467`
`468`		`-int lua_wrapper_table::tostring() const`
	`468`	`+int lua_wrapper_table_t::tostring() const`
`469`	`469`	`{`
`470`	`470`	`std::string const str{fmt::format("osm2pgsql.Table[{}]", self().name())};`
`471`	`471`	`luaX_pushstring(lua_state(), str);`
`472`	`472`
`473`	`473`	`return 1;`
`474`	`474`	`}`
`475`	`475`
`476`		`-int lua_wrapper_table::cluster() const noexcept`
	`476`	`+int lua_wrapper_table_t::cluster() const noexcept`
`477`	`477`	`{`
`478`	`478`	`lua_pushboolean(lua_state(), self().cluster_by_geom());`
`479`	`479`	`return 1;`
`480`	`480`	`}`
`481`	`481`
`482`		`-int lua_wrapper_table::columns() const`
	`482`	`+int lua_wrapper_table_t::columns() const`
`483`	`483`	`{`
`484`	`484`	`lua_createtable(lua_state(), (int)self().num_columns(), 0);`
`485`	`485`
`@@ -502,13 +502,13 @@ int lua_wrapper_table::columns() const`
`502`	`502`	`return 1;`
`503`	`503`	`}`
`504`	`504`
`505`		`-int lua_wrapper_table::name() const noexcept`
	`505`	`+int lua_wrapper_table_t::name() const noexcept`
`506`	`506`	`{`
`507`	`507`	`luaX_pushstring(lua_state(), self().name());`
`508`	`508`	`return 1;`
`509`	`509`	`}`
`510`	`510`
`511`		`-int lua_wrapper_table::schema() const noexcept`
	`511`	`+int lua_wrapper_table_t::schema() const noexcept`
`512`	`512`	`{`
`513`	`513`	`luaX_pushstring(lua_state(), self().schema());`
`514`	`514`	`return 1;`
Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,12 @@ int setup_flex_table(lua_State lua_state, std::vector<flex_table_t> tables,`
`26`	`26`	`std::string const &default_schema, bool updatable,`
`27`	`27`	`bool append_mode);`
`28`	`28`
`29`		`-class lua_wrapper_table : public lua_wrapper_base_t<flex_table_t>`
	`29`	`+class lua_wrapper_table_t : public lua_wrapper_base_t<flex_table_t>`
`30`	`30`	`{`
`31`	`31`	`public:`
`32`	`32`	`static void init(lua_State *lua_state);`
`33`	`33`
`34`		`- lua_wrapper_table(lua_State lua_state, flex_table_t table)`
	`34`	`+ lua_wrapper_table_t(lua_State lua_state, flex_table_t table)`
`35`	`35`	`: lua_wrapper_base_t(lua_state, table)`
`36`	`36`	`{`
`37`	`37`	`}`
`@@ -42,6 +42,6 @@ class lua_wrapper_table : public lua_wrapper_base_t<flex_table_t>`
`42`	`42`	`int name() const noexcept;`
`43`	`43`	`int schema() const noexcept;`
`44`	`44`
`45`		`-}; // class lua_wrapper_table`
	`45`	`+}; // class lua_wrapper_table_t`
`46`	`46`
`47`	`47`	`#endif // OSM2PGSQL_FLEX_LUA_TABLE_HPP`