diff options
Diffstat (limited to 'src/lanes.cpp')
| -rw-r--r-- | src/lanes.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lanes.cpp b/src/lanes.cpp index 5d40ed4..8b693c3 100644 --- a/src/lanes.cpp +++ b/src/lanes.cpp | |||
| @@ -400,9 +400,9 @@ LUAG_FUNC(lane_new) | |||
| 400 | if (_package_idx != 0) { | 400 | if (_package_idx != 0) { |
| 401 | DEBUGSPEW_CODE(DebugSpew(_U) << "lane_new: update 'package'" << std::endl); | 401 | DEBUGSPEW_CODE(DebugSpew(_U) << "lane_new: update 'package'" << std::endl); |
| 402 | // when copying with mode LookupMode::LaneBody, should raise an error in case of problem, not leave it one the stack | 402 | // when copying with mode LookupMode::LaneBody, should raise an error in case of problem, not leave it one the stack |
| 403 | InterCopyContext c{ _U, DestState{ _L2 }, SourceState{ L_ }, {}, SourceIndex{ _package_idx }, {}, {}, {} }; | 403 | InterCopyContext _c{ _U, DestState{ _L2 }, SourceState{ L_ }, {}, SourceIndex{ _package_idx }, {}, {}, {} }; |
| 404 | [[maybe_unused]] InterCopyResult const ret{ c.inter_copy_package() }; | 404 | [[maybe_unused]] InterCopyResult const _ret{ _c.interCopyPackage() }; |
| 405 | LUA_ASSERT(L_, ret == InterCopyResult::Success); // either all went well, or we should not even get here | 405 | LUA_ASSERT(L_, _ret == InterCopyResult::Success); // either all went well, or we should not even get here |
| 406 | } | 406 | } |
| 407 | 407 | ||
| 408 | // modules to require in the target lane *before* the function is transfered! | 408 | // modules to require in the target lane *before* the function is transfered! |
| @@ -436,7 +436,7 @@ LUAG_FUNC(lane_new) | |||
| 436 | if (_rc != LuaError::OK) { | 436 | if (_rc != LuaError::OK) { |
| 437 | // propagate error to main state if any | 437 | // propagate error to main state if any |
| 438 | InterCopyContext _c{ _U, DestState{ L_ }, SourceState{ _L2 }, {}, {}, {}, {}, {} }; | 438 | InterCopyContext _c{ _U, DestState{ L_ }, SourceState{ _L2 }, {}, {}, {}, {}, {} }; |
| 439 | std::ignore = _c.inter_move(1); // L_: [fixed] args... n "modname" error L2: | 439 | std::ignore = _c.interMove(1); // L_: [fixed] args... n "modname" error L2: |
| 440 | raise_lua_error(L_); | 440 | raise_lua_error(L_); |
| 441 | } | 441 | } |
| 442 | // here the module was successfully required // L_: [fixed] args... n "modname" L2: ret | 442 | // here the module was successfully required // L_: [fixed] args... n "modname" L2: ret |
| @@ -468,7 +468,7 @@ LUAG_FUNC(lane_new) | |||
| 468 | InterCopyContext _c{ _U, DestState{ _L2 }, SourceState{ L_ }, {}, {}, {}, {}, {} }; | 468 | InterCopyContext _c{ _U, DestState{ _L2 }, SourceState{ L_ }, {}, {}, {}, {}, {} }; |
| 469 | luaG_pushglobaltable(_L2); // L_: [fixed] args... nil L2: _G | 469 | luaG_pushglobaltable(_L2); // L_: [fixed] args... nil L2: _G |
| 470 | while (lua_next(L_, _globals_idx)) { // L_: [fixed] args... k v L2: _G | 470 | while (lua_next(L_, _globals_idx)) { // L_: [fixed] args... k v L2: _G |
| 471 | std::ignore = _c.inter_copy(2); // L_: [fixed] args... k v L2: _G k v | 471 | std::ignore = _c.interCopy(2); // L_: [fixed] args... k v L2: _G k v |
| 472 | // assign it in L2's globals table | 472 | // assign it in L2's globals table |
| 473 | lua_rawset(_L2, -3); // L_: [fixed] args... k v L2: _G | 473 | lua_rawset(_L2, -3); // L_: [fixed] args... k v L2: _G |
| 474 | lua_pop(L_, 1); // L_: [fixed] args... k | 474 | lua_pop(L_, 1); // L_: [fixed] args... k |
| @@ -486,7 +486,7 @@ LUAG_FUNC(lane_new) | |||
| 486 | DEBUGSPEW_CODE(DebugSpewIndentScope _scope{ _U }); | 486 | DEBUGSPEW_CODE(DebugSpewIndentScope _scope{ _U }); |
| 487 | lua_pushvalue(L_, kFuncIdx); // L_: [fixed] args... func L2: eh? | 487 | lua_pushvalue(L_, kFuncIdx); // L_: [fixed] args... func L2: eh? |
| 488 | InterCopyContext _c{ _U, DestState{ _L2 }, SourceState{ L_ }, {}, {}, {}, {}, {} }; | 488 | InterCopyContext _c{ _U, DestState{ _L2 }, SourceState{ L_ }, {}, {}, {}, {}, {} }; |
| 489 | InterCopyResult const _res{ _c.inter_move(1) }; // L_: [fixed] args... L2: eh? func | 489 | InterCopyResult const _res{ _c.interMove(1) }; // L_: [fixed] args... L2: eh? func |
| 490 | if (_res != InterCopyResult::Success) { | 490 | if (_res != InterCopyResult::Success) { |
| 491 | raise_luaL_error(L_, "tried to copy unsupported types"); | 491 | raise_luaL_error(L_, "tried to copy unsupported types"); |
| 492 | } | 492 | } |
| @@ -508,7 +508,7 @@ LUAG_FUNC(lane_new) | |||
| 508 | DEBUGSPEW_CODE(DebugSpew(_U) << "lane_new: transfer lane arguments" << std::endl); | 508 | DEBUGSPEW_CODE(DebugSpew(_U) << "lane_new: transfer lane arguments" << std::endl); |
| 509 | DEBUGSPEW_CODE(DebugSpewIndentScope _scope{ _U }); | 509 | DEBUGSPEW_CODE(DebugSpewIndentScope _scope{ _U }); |
| 510 | InterCopyContext _c{ _U, DestState{ _L2 }, SourceState{ L_ }, {}, {}, {}, {}, {} }; | 510 | InterCopyContext _c{ _U, DestState{ _L2 }, SourceState{ L_ }, {}, {}, {}, {}, {} }; |
| 511 | InterCopyResult const res{ _c.inter_move(_nargs) }; // L_: [fixed] L2: eh? func args... | 511 | InterCopyResult const res{ _c.interMove(_nargs) }; // L_: [fixed] L2: eh? func args... |
| 512 | if (res != InterCopyResult::Success) { | 512 | if (res != InterCopyResult::Success) { |
| 513 | raise_luaL_error(L_, "tried to copy unsupported types"); | 513 | raise_luaL_error(L_, "tried to copy unsupported types"); |
| 514 | } | 514 | } |