diff options
Diffstat (limited to 'src/lane.cpp')
| -rw-r--r-- | src/lane.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lane.cpp b/src/lane.cpp index 1a01a24..5e018a4 100644 --- a/src/lane.cpp +++ b/src/lane.cpp | |||
| @@ -142,7 +142,7 @@ static LUAG_FUNC(thread_join) | |||
| 142 | } | 142 | } |
| 143 | if ( | 143 | if ( |
| 144 | (_n > 0) && | 144 | (_n > 0) && |
| 145 | (InterCopyContext{ _lane->U, DestState{ L_ }, SourceState{ _L2 }, {}, {}, {}, {}, {} }.inter_move(_n) != InterCopyResult::Success) | 145 | (InterCopyContext{ _lane->U, DestState{ L_ }, SourceState{ _L2 }, {}, {}, {}, {}, {} }.interMove(_n) != InterCopyResult::Success) |
| 146 | ) { // L_: lane results L2: | 146 | ) { // L_: lane results L2: |
| 147 | raise_luaL_error(L_, "tried to copy unsupported types"); | 147 | raise_luaL_error(L_, "tried to copy unsupported types"); |
| 148 | } | 148 | } |
| @@ -157,7 +157,7 @@ static LUAG_FUNC(thread_join) | |||
| 157 | lua_pushnil(L_); // L_: lane nil | 157 | lua_pushnil(L_); // L_: lane nil |
| 158 | // even when _lane->errorTraceLevel != Minimal, if the error is not LUA_ERRRUN, the handler wasn't called, and we only have 1 error message on the stack ... | 158 | // even when _lane->errorTraceLevel != Minimal, if the error is not LUA_ERRRUN, the handler wasn't called, and we only have 1 error message on the stack ... |
| 159 | InterCopyContext _c{ _lane->U, DestState{ L_ }, SourceState{ _L2 }, {}, {}, {}, {}, {} }; | 159 | InterCopyContext _c{ _lane->U, DestState{ L_ }, SourceState{ _L2 }, {}, {}, {}, {}, {} }; |
| 160 | if (_c.inter_move(_n) != InterCopyResult::Success) { // L_: lane nil "err" [trace] L2: | 160 | if (_c.interMove(_n) != InterCopyResult::Success) { // L_: lane nil "err" [trace] L2: |
| 161 | raise_luaL_error(L_, "tried to copy unsupported types: %s", lua_tostring(L_, -_n)); | 161 | raise_luaL_error(L_, "tried to copy unsupported types: %s", lua_tostring(L_, -_n)); |
| 162 | } | 162 | } |
| 163 | _ret = 1 + _n; | 163 | _ret = 1 + _n; |