diff options
Diffstat (limited to 'src/lane.cpp')
-rw-r--r-- | src/lane.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lane.cpp b/src/lane.cpp index a03412d..bc82291 100644 --- a/src/lane.cpp +++ b/src/lane.cpp | |||
@@ -630,7 +630,7 @@ static void lane_main(Lane* lane_) | |||
630 | if (lane_->status == Lane::Pending) { // nothing wrong happened during preparation, we can work | 630 | if (lane_->status == Lane::Pending) { // nothing wrong happened during preparation, we can work |
631 | // At this point, the lane function and arguments are on the stack | 631 | // At this point, the lane function and arguments are on the stack |
632 | int const nargs{ lua_gettop(_L) - 1 }; | 632 | int const nargs{ lua_gettop(_L) - 1 }; |
633 | DEBUGSPEW_CODE(Universe* U = universe_get(_L)); | 633 | DEBUGSPEW_CODE(Universe* _U = universe_get(_L)); |
634 | lane_->status = Lane::Running; // Pending -> Running | 634 | lane_->status = Lane::Running; // Pending -> Running |
635 | 635 | ||
636 | // Tie "set_finalizer()" to the state | 636 | // Tie "set_finalizer()" to the state |
@@ -670,11 +670,11 @@ static void lane_main(Lane* lane_) | |||
670 | // in case of error and if it exists, fetch stack trace from registry and push it | 670 | // in case of error and if it exists, fetch stack trace from registry and push it |
671 | push_stack_trace(_L, _rc, 1); // L: retvals|error [trace] | 671 | push_stack_trace(_L, _rc, 1); // L: retvals|error [trace] |
672 | 672 | ||
673 | DEBUGSPEW_CODE(fprintf(stderr, INDENT_BEGIN "Lane %p body: %s (%s)\n" INDENT_END(U), _L, get_errcode_name(_rc), kCancelError.equals(_L, 1) ? "cancelled" : lua_typename(_L, lua_type(_L, 1)))); | 673 | DEBUGSPEW_CODE(fprintf(stderr, INDENT_BEGIN "Lane %p body: %s (%s)\n" INDENT_END(_U), _L, get_errcode_name(_rc), kCancelError.equals(_L, 1) ? "cancelled" : lua_typename(_L, lua_type(_L, 1)))); |
674 | // Call finalizers, if the script has set them up. | 674 | // Call finalizers, if the script has set them up. |
675 | // | 675 | // |
676 | int _rc2{ run_finalizers(_L, _rc) }; | 676 | int _rc2{ run_finalizers(_L, _rc) }; |
677 | DEBUGSPEW_CODE(fprintf(stderr, INDENT_BEGIN "Lane %p finalizer: %s\n" INDENT_END(U), _L, get_errcode_name(_rc2))); | 677 | DEBUGSPEW_CODE(fprintf(stderr, INDENT_BEGIN "Lane %p finalizer: %s\n" INDENT_END(_U), _L, get_errcode_name(_rc2))); |
678 | if (_rc2 != LUA_OK) { // Error within a finalizer! | 678 | if (_rc2 != LUA_OK) { // Error within a finalizer! |
679 | // the finalizer generated an error, and left its own error message [and stack trace] on the stack | 679 | // the finalizer generated an error, and left its own error message [and stack trace] on the stack |
680 | _rc = _rc2; // we're overruling the earlier script error or normal return | 680 | _rc = _rc2; // we're overruling the earlier script error or normal return |