C++ migration: more conversion to InterCopyContext. debugspew indentation is managed by a scope object

1 files changed, 7 insertions, 5 deletions

diff --git a/src/tools.h b/src/tools.h
index e14ac65..06646d3 100644
--- a/src/tools.h
+++ b/src/tools.h
@@ -19,7 +19,7 @@ void push_registry_subtable(lua_State* L, UniqueKey key_);
 
 enum class VT
 {
-    NORMAL,
+    NORMAL, // keep this one first so that it's the value we get when we default-construct
     KEY,
     METATABLE
 };
@@ -60,14 +60,16 @@ struct InterCopyContext
     void copy_func() const;
     void copy_cached_func() const;
     void inter_copy_keyvaluepair() const;
+
+    public:
+
+    [[nodiscard]] InterCopyResult inter_copy_package() const;
+    [[nodiscard]] InterCopyResult inter_copy(int n_) const;
+    [[nodiscard]] InterCopyResult inter_move(int n_) const;
 };
 
 // ################################################################################################
 
-[[nodiscard]] InterCopyResult luaG_inter_copy_package(Universe* U, Source L, Dest L2, int package_idx_, LookupMode mode_);
-[[nodiscard]] InterCopyResult luaG_inter_copy(Universe* U, Source L, Dest L2, int n, LookupMode mode_);
-[[nodiscard]] InterCopyResult luaG_inter_move(Universe* U, Source L, Dest L2, int n, LookupMode mode_);
-
 [[nodiscard]] int luaG_nameof(lua_State* L);
 
 void populate_func_lookup_table(lua_State* L, int _i, char const* _name);