aboutsummaryrefslogtreecommitdiff
path: root/src/intercopycontext.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/intercopycontext.cpp')
-rw-r--r--src/intercopycontext.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/intercopycontext.cpp b/src/intercopycontext.cpp
index 8dd914c..6e5d1d8 100644
--- a/src/intercopycontext.cpp
+++ b/src/intercopycontext.cpp
@@ -96,8 +96,8 @@ THE SOFTWARE.
96 lua_rawget(L_, -2); // L_: ... v ... {} "f.q.n" 96 lua_rawget(L_, -2); // L_: ... v ... {} "f.q.n"
97 } 97 }
98 char const* _fqn{ lua_tolstring(L_, -1, len_) }; 98 char const* _fqn{ lua_tolstring(L_, -1, len_) };
99 DEBUGSPEW_CODE(Universe* const U = universe_get(L_)); 99 DEBUGSPEW_CODE(Universe* const _U = universe_get(L_));
100 DEBUGSPEW_CODE(fprintf(stderr, INDENT_BEGIN "function [C] %s \n" INDENT_END(U), _fqn)); 100 DEBUGSPEW_CODE(fprintf(stderr, INDENT_BEGIN "function [C] %s \n" INDENT_END(_U), _fqn));
101 // popping doesn't invalidate the pointer since this is an interned string gotten from the lookup database 101 // popping doesn't invalidate the pointer since this is an interned string gotten from the lookup database
102 lua_pop(L_, (mode_ == LookupMode::FromKeeper) ? 1 : 2); // L_: ... v ... 102 lua_pop(L_, (mode_ == LookupMode::FromKeeper) ? 1 : 2); // L_: ... v ...
103 STACK_CHECK(L_, 0); 103 STACK_CHECK(L_, 0);
@@ -878,7 +878,7 @@ void InterCopyContext::inter_copy_keyvaluepair() const
878 lua_call(L2, 3, 0); // L2: ... u 878 lua_call(L2, 3, 0); // L2: ... u
879 } else { // regular function 879 } else { // regular function
880 DEBUGSPEW_CODE(fprintf(stderr, "FUNCTION %s\n", name)); 880 DEBUGSPEW_CODE(fprintf(stderr, "FUNCTION %s\n", name));
881 DEBUGSPEW_CODE(DebugSpewIndentScope scope{ U }); 881 DEBUGSPEW_CODE(DebugSpewIndentScope _scope{ U });
882 copy_cached_func(); // L2: ... f 882 copy_cached_func(); // L2: ... f
883 } 883 }
884 STACK_CHECK(L2, 1); 884 STACK_CHECK(L2, 1);
@@ -1080,7 +1080,7 @@ static char const* vt_names[] = {
1080 STACK_CHECK_START_REL(L2, 0); 1080 STACK_CHECK_START_REL(L2, 0);
1081 1081
1082 DEBUGSPEW_CODE(fprintf(stderr, INDENT_BEGIN "inter_copy_one()\n" INDENT_END(U))); 1082 DEBUGSPEW_CODE(fprintf(stderr, INDENT_BEGIN "inter_copy_one()\n" INDENT_END(U)));
1083 DEBUGSPEW_CODE(DebugSpewIndentScope scope{ U }); 1083 DEBUGSPEW_CODE(DebugSpewIndentScope _scope{ U });
1084 1084
1085 LuaType _val_type{ lua_type_as_enum(L1, L1_i) }; 1085 LuaType _val_type{ lua_type_as_enum(L1, L1_i) };
1086 DEBUGSPEW_CODE(fprintf(stderr, INDENT_BEGIN "%s %s: " INDENT_END(U), lua_type_names[static_cast<int>(_val_type)], vt_names[static_cast<int>(vt)])); 1086 DEBUGSPEW_CODE(fprintf(stderr, INDENT_BEGIN "%s %s: " INDENT_END(U), lua_type_names[static_cast<int>(_val_type)], vt_names[static_cast<int>(vt)]));
@@ -1205,7 +1205,7 @@ static char const* vt_names[] = {
1205 lua_pop(L1, 1); 1205 lua_pop(L1, 1);
1206 } else { 1206 } else {
1207 { 1207 {
1208 DEBUGSPEW_CODE(DebugSpewIndentScope scope{ U }); 1208 DEBUGSPEW_CODE(DebugSpewIndentScope _scope{ U });
1209 _result = inter_move(1); // moves the entry to L2 1209 _result = inter_move(1); // moves the entry to L2
1210 STACK_CHECK(L1, 0); 1210 STACK_CHECK(L1, 0);
1211 } 1211 }
@@ -1235,7 +1235,7 @@ static char const* vt_names[] = {
1235 LUA_ASSERT(L1, vt == VT::NORMAL); 1235 LUA_ASSERT(L1, vt == VT::NORMAL);
1236 1236
1237 DEBUGSPEW_CODE(fprintf(stderr, INDENT_BEGIN "InterCopyContext::inter_copy()\n" INDENT_END(U))); 1237 DEBUGSPEW_CODE(fprintf(stderr, INDENT_BEGIN "InterCopyContext::inter_copy()\n" INDENT_END(U)));
1238 DEBUGSPEW_CODE(DebugSpewIndentScope scope{ U }); 1238 DEBUGSPEW_CODE(DebugSpewIndentScope _scope{ U });
1239 1239
1240 int const _top_L1{ lua_gettop(L1) }; 1240 int const _top_L1{ lua_gettop(L1) };
1241 if (n_ > _top_L1) { 1241 if (n_ > _top_L1) {