Merge pull request #2353 from joto/misc-cleanups

lonvia · web-flow · commit b6b71516c000 · 2025-07-08T08:40:56.000+02:00
Miscellaneous refactorings
diff --git a/src/expire-output.hpp b/src/expire-output.hpp
@@ -29,16 +29,16 @@ class expire_output_t
 public:
     expire_output_t() = default;
 
-    std::string filename() const noexcept { return m_filename; }
+    std::string const &filename() const noexcept { return m_filename; }
 
     void set_filename(std::string filename)
     {
         m_filename = std::move(filename);
     }
 
-    std::string schema() const noexcept { return m_schema; }
+    std::string const &schema() const noexcept { return m_schema; }
 
-    std::string table() const noexcept { return m_table; }
+    std::string const &table() const noexcept { return m_table; }
 
     void set_schema_and_table(std::string schema, std::string table)
     {
diff --git a/src/flex-lua-expire-output.cpp b/src/flex-lua-expire-output.cpp
@@ -138,31 +138,31 @@ int lua_wrapper_expire_output::tostring() const
     return 1;
 }
 
-int lua_wrapper_expire_output::filename() const
+int lua_wrapper_expire_output::filename() const noexcept
 {
     luaX_pushstring(lua_state(), self().filename());
     return 1;
 }
 
-int lua_wrapper_expire_output::maxzoom() const
+int lua_wrapper_expire_output::maxzoom() const noexcept
 {
     lua_pushinteger(lua_state(), self().maxzoom());
     return 1;
 }
 
-int lua_wrapper_expire_output::minzoom() const
+int lua_wrapper_expire_output::minzoom() const noexcept
 {
     lua_pushinteger(lua_state(), self().minzoom());
     return 1;
 }
 
-int lua_wrapper_expire_output::schema() const
+int lua_wrapper_expire_output::schema() const noexcept
 {
     luaX_pushstring(lua_state(), self().schema());
     return 1;
 }
 
-int lua_wrapper_expire_output::table() const
+int lua_wrapper_expire_output::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
@@ -37,11 +37,11 @@ class lua_wrapper_expire_output : public lua_wrapper_base<expire_output_t>
     }
 
     int tostring() const;
-    int filename() const;
-    int maxzoom() const;
-    int minzoom() const;
-    int schema() const;
-    int table() const;
+    int filename() const noexcept;
+    int maxzoom() const noexcept;
+    int minzoom() const noexcept;
+    int schema() const noexcept;
+    int table() const noexcept;
 
 }; // class lua_wrapper_expire_output
 
diff --git a/src/flex-lua-locator.cpp b/src/flex-lua-locator.cpp
@@ -104,7 +104,7 @@ int lua_wrapper_locator::tostring() const
     return 1;
 }
 
-int lua_wrapper_locator::name() const
+int lua_wrapper_locator::name() const noexcept
 {
     luaX_pushstring(lua_state(), self().name());
     return 1;
@@ -158,7 +158,7 @@ int lua_wrapper_locator::all_intersecting()
     int n = 0;
     for (auto const& name : names) {
         lua_pushinteger(lua_state(), ++n);
-        lua_pushstring(lua_state(), name.c_str());
+        luaX_pushstring(lua_state(), name);
         lua_rawset(lua_state(), -3);
     }
 
@@ -182,7 +182,7 @@ int lua_wrapper_locator::first_intersecting()
         return 0;
     }
 
-    lua_pushstring(lua_state(), name.c_str());
+    luaX_pushstring(lua_state(), name);
 
     return 1;
 }
diff --git a/src/flex-lua-locator.hpp b/src/flex-lua-locator.hpp
@@ -39,7 +39,7 @@ class lua_wrapper_locator : public lua_wrapper_base<locator_t>
     }
 
     int tostring() const;
-    int name() const;
+    int name() const noexcept;
     int add_bbox();
     int add_from_db();
     int all_intersecting();
diff --git a/src/flex-lua-table.cpp b/src/flex-lua-table.cpp
@@ -488,7 +488,7 @@ int lua_wrapper_table::tostring() const
     return 1;
 }
 
-int lua_wrapper_table::cluster() const
+int lua_wrapper_table::cluster() const noexcept
 {
     lua_pushboolean(lua_state(), self().cluster_by_geom());
     return 1;
@@ -503,12 +503,11 @@ int lua_wrapper_table::columns() const
         lua_pushinteger(lua_state(), ++n);
         lua_newtable(lua_state());
 
-        luaX_add_table_str(lua_state(), "name", column.name().c_str());
-        luaX_add_table_str(lua_state(), "type", column.type_name().c_str());
-        luaX_add_table_str(lua_state(), "sql_type",
-                           column.sql_type_name().c_str());
+        luaX_add_table_str(lua_state(), "name", column.name());
+        luaX_add_table_str(lua_state(), "type", column.type_name());
+        luaX_add_table_str(lua_state(), "sql_type", column.sql_type_name());
         luaX_add_table_str(lua_state(), "sql_modifiers",
-                           column.sql_modifiers().c_str());
+                           column.sql_modifiers());
         luaX_add_table_bool(lua_state(), "not_null", column.not_null());
         luaX_add_table_bool(lua_state(), "create_only", column.create_only());
 
@@ -518,13 +517,13 @@ int lua_wrapper_table::columns() const
     return 1;
 }
 
-int lua_wrapper_table::name() const
+int lua_wrapper_table::name() const noexcept
 {
     luaX_pushstring(lua_state(), self().name());
     return 1;
 }
 
-int lua_wrapper_table::schema() const
+int lua_wrapper_table::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
@@ -37,10 +37,10 @@ class lua_wrapper_table : public lua_wrapper_base<flex_table_t>
     }
 
     int tostring() const;
-    int cluster() const;
+    int cluster() const noexcept;
     int columns() const;
-    int name() const;
-    int schema() const;
+    int name() const noexcept;
+    int schema() const noexcept;
 
 }; // class lua_wrapper_table
 
diff --git a/src/lua-setup.cpp b/src/lua-setup.cpp
@@ -33,7 +33,7 @@ void setup_lua_environment(lua_State *lua_state, std::string const &filename,
     if (!dir_path.empty()) {
         dir_path += std::filesystem::path::preferred_separator;
     }
-    luaX_add_table_str(lua_state, "config_dir", dir_path.c_str());
+    luaX_add_table_str(lua_state, "config_dir", dir_path);
 
     luaX_add_table_str(lua_state, "mode", append_mode ? "append" : "create");
 }
diff --git a/src/lua-utils.cpp b/src/lua-utils.cpp
@@ -76,10 +76,10 @@ void luaX_add_table_str(lua_State *lua_state, char const *key,
 }
 
 void luaX_add_table_str(lua_State *lua_state, char const *key,
-                        char const *value, std::size_t size) noexcept
+                        std::string_view value) noexcept
 {
     lua_pushstring(lua_state, key);
-    lua_pushlstring(lua_state, value, size);
+    luaX_pushstring(lua_state, value);
     lua_rawset(lua_state, -3);
 }
 
diff --git a/src/lua-utils.hpp b/src/lua-utils.hpp
@@ -28,7 +28,7 @@ void luaX_pushstring(lua_State *lua_state, std::string_view str) noexcept;
 void luaX_add_table_str(lua_State *lua_state, char const *key,
                         char const *value) noexcept;
 void luaX_add_table_str(lua_State *lua_state, char const *key,
-                        char const *value, std::size_t size) noexcept;
+                        std::string_view value) noexcept;
 void luaX_add_table_int(lua_State *lua_state, char const *key,
                         int64_t value) noexcept;
 void luaX_add_table_num(lua_State *lua_state, char const *key,
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
@@ -1281,7 +1281,7 @@ void output_flex_t::init_lua(std::string const &filename,
     lua_createtable(lua_state(), 0, (int)properties.size());
     for (auto const &property : properties) {
         luaX_add_table_str(lua_state(), property.first.c_str(),
-                           property.second.c_str());
+                           property.second);
     }
     lua_rawset(lua_state(), -3);
 
diff --git a/src/tagtransform-lua.cpp b/src/tagtransform-lua.cpp
@@ -111,8 +111,8 @@ bool lua_tagtransform_t::filter_tags(osmium::OSMObject const &o, bool *polygon,
         taglist_t tags;
         tags.add_attributes(o);
         for (auto const &t : tags) {
-            lua_pushstring(lua_state(), t.key.c_str());
-            lua_pushstring(lua_state(), t.value.c_str());
+            luaX_pushstring(lua_state(), t.key);
+            luaX_pushstring(lua_state(), t.value);
             lua_rawset(lua_state(), -3);
             ++sz;
         }
@@ -158,8 +158,8 @@ bool lua_tagtransform_t::filter_rel_member_tags(
     lua_newtable(lua_state()); /* relations key value table */
 
     for (auto const &rel_tag : rel_tags) {
-        lua_pushstring(lua_state(), rel_tag.key.c_str());
-        lua_pushstring(lua_state(), rel_tag.value.c_str());
+        luaX_pushstring(lua_state(), rel_tag.key);
+        luaX_pushstring(lua_state(), rel_tag.value);
         lua_rawset(lua_state(), -3);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -29,16 +29,16 @@ class expire_output_t`
`29`	`29`	`public:`
`30`	`30`	`expire_output_t() = default;`
`31`	`31`
`32`		`- std::string filename() const noexcept { return m_filename; }`
	`32`	`+ std::string const &filename() const noexcept { return m_filename; }`
`33`	`33`
`34`	`34`	`void set_filename(std::string filename)`
`35`	`35`	`{`
`36`	`36`	`m_filename = std::move(filename);`
`37`	`37`	`}`
`38`	`38`
`39`		`- std::string schema() const noexcept { return m_schema; }`
	`39`	`+ std::string const &schema() const noexcept { return m_schema; }`
`40`	`40`
`41`		`- std::string table() const noexcept { return m_table; }`
	`41`	`+ std::string const &table() const noexcept { return m_table; }`
`42`	`42`
`43`	`43`	`void set_schema_and_table(std::string schema, std::string table)`
`44`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -138,31 +138,31 @@ int lua_wrapper_expire_output::tostring() const`
`138`	`138`	`return 1;`
`139`	`139`	`}`
`140`	`140`
`141`		`-int lua_wrapper_expire_output::filename() const`
	`141`	`+int lua_wrapper_expire_output::filename() const noexcept`
`142`	`142`	`{`
`143`	`143`	`luaX_pushstring(lua_state(), self().filename());`
`144`	`144`	`return 1;`
`145`	`145`	`}`
`146`	`146`
`147`		`-int lua_wrapper_expire_output::maxzoom() const`
	`147`	`+int lua_wrapper_expire_output::maxzoom() const noexcept`
`148`	`148`	`{`
`149`	`149`	`lua_pushinteger(lua_state(), self().maxzoom());`
`150`	`150`	`return 1;`
`151`	`151`	`}`
`152`	`152`
`153`		`-int lua_wrapper_expire_output::minzoom() const`
	`153`	`+int lua_wrapper_expire_output::minzoom() const noexcept`
`154`	`154`	`{`
`155`	`155`	`lua_pushinteger(lua_state(), self().minzoom());`
`156`	`156`	`return 1;`
`157`	`157`	`}`
`158`	`158`
`159`		`-int lua_wrapper_expire_output::schema() const`
	`159`	`+int lua_wrapper_expire_output::schema() const noexcept`
`160`	`160`	`{`
`161`	`161`	`luaX_pushstring(lua_state(), self().schema());`
`162`	`162`	`return 1;`
`163`	`163`	`}`
`164`	`164`
`165`		`-int lua_wrapper_expire_output::table() const`
	`165`	`+int lua_wrapper_expire_output::table() const noexcept`
`166`	`166`	`{`
`167`	`167`	`luaX_pushstring(lua_state(), self().table());`
`168`	`168`	`return 1;`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ int lua_wrapper_locator::tostring() const`
`104`	`104`	`return 1;`
`105`	`105`	`}`
`106`	`106`
`107`		`-int lua_wrapper_locator::name() const`
	`107`	`+int lua_wrapper_locator::name() const noexcept`
`108`	`108`	`{`
`109`	`109`	`luaX_pushstring(lua_state(), self().name());`
`110`	`110`	`return 1;`
`@@ -158,7 +158,7 @@ int lua_wrapper_locator::all_intersecting()`
`158`	`158`	`int n = 0;`
`159`	`159`	`for (auto const& name : names) {`
`160`	`160`	`lua_pushinteger(lua_state(), ++n);`
`161`		`- lua_pushstring(lua_state(), name.c_str());`
	`161`	`+ luaX_pushstring(lua_state(), name);`
`162`	`162`	`lua_rawset(lua_state(), -3);`
`163`	`163`	`}`
`164`	`164`
`@@ -182,7 +182,7 @@ int lua_wrapper_locator::first_intersecting()`
`182`	`182`	`return 0;`
`183`	`183`	`}`
`184`	`184`
`185`		`- lua_pushstring(lua_state(), name.c_str());`
	`185`	`+ luaX_pushstring(lua_state(), name);`
`186`	`186`
`187`	`187`	`return 1;`
`188`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class lua_wrapper_locator : public lua_wrapper_base<locator_t>`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`int tostring() const;`
`42`		`- int name() const;`
	`42`	`+ int name() const noexcept;`
`43`	`43`	`int add_bbox();`
`44`	`44`	`int add_from_db();`
`45`	`45`	`int all_intersecting();`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ void setup_lua_environment(lua_State *lua_state, std::string const &filename,`
`33`	`33`	`if (!dir_path.empty()) {`
`34`	`34`	`dir_path += std::filesystem::path::preferred_separator;`
`35`	`35`	`}`
`36`		`- luaX_add_table_str(lua_state, "config_dir", dir_path.c_str());`
	`36`	`+ luaX_add_table_str(lua_state, "config_dir", dir_path);`
`37`	`37`
`38`	`38`	`luaX_add_table_str(lua_state, "mode", append_mode ? "append" : "create");`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,10 @@ void luaX_add_table_str(lua_State lua_state, char const key,`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`void luaX_add_table_str(lua_State lua_state, char const key,`
`79`		`- char const *value, std::size_t size) noexcept`
	`79`	`+ std::string_view value) noexcept`
`80`	`80`	`{`
`81`	`81`	`lua_pushstring(lua_state, key);`
`82`		`- lua_pushlstring(lua_state, value, size);`
	`82`	`+ luaX_pushstring(lua_state, value);`
`83`	`83`	`lua_rawset(lua_state, -3);`
`84`	`84`	`}`
`85`	`85`