Use the new luaX_for_each() function in more places

Author: joto

src/flex-write.cpp

@@ -11,6 +11,7 @@
 #include "flex-write.hpp"
 #include "geom-functions.hpp"
 #include "json-writer.hpp"
+#include "lua-utils.hpp"
 #include "wkb.hpp"
 
 #include <algorithm>
@@ -188,17 +189,14 @@ static void write_json_table(json_writer_t *writer, lua_State *lua_state,
 
     if (is_lua_array(lua_state)) {
         writer->start_array();
-        lua_pushnil(lua_state);
-        while (lua_next(lua_state, -2) != 0) {
+        luaX_for_each(lua_state, [&]() {
             write_json(writer, lua_state, tables);
             writer->next();
-            lua_pop(lua_state, 1);
-        }
+        });
         writer->end_array();
     } else {
         writer->start_object();
-        lua_pushnil(lua_state);
-        while (lua_next(lua_state, -2) != 0) {
+        luaX_for_each(lua_state, [&]() {
             int const ltype_key = lua_type(lua_state, -2);
             if (ltype_key != LUA_TSTRING) {
                 throw fmt_error("Incorrect data type '{}' as key.",
@@ -208,8 +206,7 @@ static void write_json_table(json_writer_t *writer, lua_State *lua_state,
             writer->key(key);
             write_json(writer, lua_state, tables);
             writer->next();
-            lua_pop(lua_state, 1);
-        }
+        });
         writer->end_object();
     }
 }
@@ -403,8 +400,7 @@ void flex_write_column(lua_State *lua_state,
         if (ltype == LUA_TTABLE) {
             copy_mgr->new_hash();
 
-            lua_pushnil(lua_state);
-            while (lua_next(lua_state, -2) != 0) {
+            luaX_for_each(lua_state, [&]() {
                 char const *const key = lua_tostring(lua_state, -2);
                 char const *const val = lua_tostring(lua_state, -1);
                 if (key == nullptr) {
@@ -422,8 +418,7 @@ void flex_write_column(lua_State *lua_state,
                         lua_typename(lua_state, ltype_value), key);
                 }
                 copy_mgr->add_hash_elem(key, val);
-                lua_pop(lua_state, 1);
-            }
+            });
 
             copy_mgr->finish_hash();
         } else {

src/geom-transform.cpp

@@ -11,6 +11,7 @@
 #include "geom-functions.hpp"
 #include "geom-transform.hpp"
 #include "logging.hpp"
+#include "lua-utils.hpp"
 
 #include <osmium/osm.hpp>
 
@@ -153,8 +154,7 @@ void init_geom_transform(geom_transform_t *transform, lua_State *lua_state)
     assert(transform);
     assert(lua_state);
 
-    lua_pushnil(lua_state);
-    while (lua_next(lua_state, -2) != 0) {
+    luaX_for_each(lua_state, [&]() {
         char const *const field = lua_tostring(lua_state, -2);
         if (field == nullptr) {
             throw std::runtime_error{"All fields in geometry transformation "
@@ -169,9 +169,7 @@ void init_geom_transform(geom_transform_t *transform, lua_State *lua_state)
                 show_warning = false;
             }
         }
-
-        lua_pop(lua_state, 1);
-    }
+    });
 }
 
 std::unique_ptr<geom_transform_t>

src/tagtransform-lua.cpp

@@ -14,6 +14,7 @@ extern "C"
 }
 
 #include "format.hpp"
+#include "lua-utils.hpp"
 #include "tagtransform-lua.hpp"
 
 #include <stdexcept>
@@ -55,11 +56,10 @@ void lua_tagtransform_t::check_lua_function_exists(char const *func_name)
  */
 static void get_out_tags(lua_State *lua_state, taglist_t *out_tags)
 {
-    lua_pushnil(lua_state);
-    while (lua_next(lua_state, -2) != 0) {
+    luaX_for_each(lua_state, [&]() {
         auto const key_type = lua_type(lua_state, -2);
         // They key must be a string, otherwise the lua_tostring() function
-        // below will change it to a string and the lua_next() iteration will
+        // below will change it to a string and the Lua array iteration will
         // break.
         if (key_type != LUA_TSTRING) {
             throw fmt_error("Basic tag processing found incorrect data type"
@@ -79,8 +79,7 @@ static void get_out_tags(lua_State *lua_state, taglist_t *out_tags)
         char const *const key = lua_tostring(lua_state, -2);
         char const *const value = lua_tostring(lua_state, -1);
         out_tags->add_tag(key, value);
-        lua_pop(lua_state, 1);
-    }
+    });
     lua_pop(lua_state, 1);
 }