Miscellaneous refactorings

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)
     {

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;

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
 

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;
 }

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();

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;

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
 

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");
 }

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);
 }
 

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,

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);
 

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);
     }