Mercurial > vim

comparison src/vim9execute.c @ 26672:3516017e5f54 v8.2.3865

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3865: Vim9: compiler complains about using "try" as a struct member Commit: https://github.com/vim/vim/commit/0d807107b66e0d30d4f338c272962af5714c400e Author: Bram Moolenaar <Bram@vim.org> Date: Tue Dec 21 09:42:09 2021 +0000 patch 8.2.3865: Vim9: compiler complains about using "try" as a struct member Problem: Vim9: compiler complains about using "try" as a struct member. Solution: Rename "try" to "tryref".
author Bram Moolenaar <Bram@vim.org>
date Tue, 21 Dec 2021 10:45:04 +0100
parents 4b23672d1f0e
children 254fffd11fda
comparison
equal deleted inserted replaced
26671:914e38eb405c 26672:3516017e5f54
3515 ++trylevel; 3515 ++trylevel;
3516 CLEAR_POINTER(trycmd); 3516 CLEAR_POINTER(trycmd);
3517 trycmd->tcd_frame_idx = ectx->ec_frame_idx; 3517 trycmd->tcd_frame_idx = ectx->ec_frame_idx;
3518 trycmd->tcd_stack_len = ectx->ec_stack.ga_len; 3518 trycmd->tcd_stack_len = ectx->ec_stack.ga_len;
3519 trycmd->tcd_catch_idx = 3519 trycmd->tcd_catch_idx =
3520 iptr->isn_arg.try.try_ref->try_catch; 3520 iptr->isn_arg.tryref.try_ref->try_catch;
3521 trycmd->tcd_finally_idx = 3521 trycmd->tcd_finally_idx =
3522 iptr->isn_arg.try.try_ref->try_finally; 3522 iptr->isn_arg.tryref.try_ref->try_finally;
3523 trycmd->tcd_endtry_idx = 3523 trycmd->tcd_endtry_idx =
3524 iptr->isn_arg.try.try_ref->try_endtry; 3524 iptr->isn_arg.tryref.try_ref->try_endtry;
3525 } 3525 }
3526 break; 3526 break;
3527 3527
3528 case ISN_PUSHEXC: 3528 case ISN_PUSHEXC:
3529 if (current_exception == NULL) 3529 if (current_exception == NULL)
5668 } 5668 }
5669 break; 5669 break;
5670 5670
5671 case ISN_TRY: 5671 case ISN_TRY:
5672 { 5672 {
5673 try_T *try = &iptr->isn_arg.try; 5673 try_T *try = &iptr->isn_arg.tryref;
5674 5674
5675 if (try->try_ref->try_finally == 0) 5675 if (try->try_ref->try_finally == 0)
5676 smsg("%s%4d TRY catch -> %d, endtry -> %d", 5676 smsg("%s%4d TRY catch -> %d, endtry -> %d",
5677 pfx, current, 5677 pfx, current,
5678 try->try_ref->try_catch, 5678 try->try_ref->try_catch,