Skip to content

Commit

Permalink
patch 8.2.3865: Vim9: compiler complains about using "try" as a struc…
Browse files Browse the repository at this point in the history 
…t member

Problem:    Vim9: compiler complains about using "try" as a struct member.
Solution:   Rename "try" to "tryref".
  • Loading branch information
@brammool
brammool committed Dec 21, 2021
1 parent 6f79e61 commit 0d80710
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 18 deletions.
2 changes: 2 additions & 0 deletions src/version.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3865,
/**/
3864,
/**/
Expand Down
4 changes: 2 additions & 2 deletions src/vim9.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ typedef enum {
// loop
ISN_FOR, // get next item from a list, uses isn_arg.forloop

ISN_TRY, // add entry to ec_trystack, uses isn_arg.try
ISN_TRY, // add entry to ec_trystack, uses isn_arg.tryref
ISN_THROW, // pop value of stack, store in v:exception
ISN_PUSHEXC, // push v:exception
ISN_CATCH, // drop v:exception
Expand Down Expand Up @@ -429,7 +429,7 @@ struct isn_S {
jump_T jump;
jumparg_T jumparg;
forloop_T forloop;
try_T try;
try_T tryref;
trycont_T trycont;
cbfunc_T bfunc;
cdfunc_T dfunc;
Expand Down
22 changes: 11 additions & 11 deletions src/vim9cmds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1290,8 +1290,8 @@ compile_try(char_u *arg, cctx_T *cctx)
try_scope->se_u.se_try.ts_try_label = instr->ga_len;
if ((isn = generate_instr(cctx, ISN_TRY)) == NULL)
return NULL;
isn->isn_arg.try.try_ref = ALLOC_CLEAR_ONE(tryref_T);
if (isn->isn_arg.try.try_ref == NULL)
isn->isn_arg.tryref.try_ref = ALLOC_CLEAR_ONE(tryref_T);
if (isn->isn_arg.tryref.try_ref == NULL)
return NULL;
}

Expand Down Expand Up @@ -1352,8 +1352,8 @@ compile_catch(char_u *arg, cctx_T *cctx UNUSED)

// End :try or :catch scope: set value in ISN_TRY instruction
isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_try_label;
if (isn->isn_arg.try.try_ref->try_catch == 0)
isn->isn_arg.try.try_ref->try_catch = instr->ga_len;
if (isn->isn_arg.tryref.try_ref->try_catch == 0)
isn->isn_arg.tryref.try_ref->try_catch = instr->ga_len;
if (scope->se_u.se_try.ts_catch_label != 0)
{
// Previous catch without match jumps here
Expand Down Expand Up @@ -1452,7 +1452,7 @@ compile_finally(char_u *arg, cctx_T *cctx)
{
// End :catch or :finally scope: set value in ISN_TRY instruction
isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_try_label;
if (isn->isn_arg.try.try_ref->try_finally != 0)
if (isn->isn_arg.tryref.try_ref->try_finally != 0)
{
emsg(_(e_finally_dup));
return NULL;
Expand All @@ -1479,9 +1479,9 @@ compile_finally(char_u *arg, cctx_T *cctx)
this_instr, cctx);

// If there is no :catch then an exception jumps to :finally.
if (isn->isn_arg.try.try_ref->try_catch == 0)
isn->isn_arg.try.try_ref->try_catch = this_instr;
isn->isn_arg.try.try_ref->try_finally = this_instr;
if (isn->isn_arg.tryref.try_ref->try_catch == 0)
isn->isn_arg.tryref.try_ref->try_catch = this_instr;
isn->isn_arg.tryref.try_ref->try_finally = this_instr;
if (scope->se_u.se_try.ts_catch_label != 0)
{
// Previous catch without match jumps here
Expand Down Expand Up @@ -1528,8 +1528,8 @@ compile_endtry(char_u *arg, cctx_T *cctx)
try_isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_try_label;
if (cctx->ctx_skip != SKIP_YES)
{
if (try_isn->isn_arg.try.try_ref->try_catch == 0
&& try_isn->isn_arg.try.try_ref->try_finally == 0)
if (try_isn->isn_arg.tryref.try_ref->try_catch == 0
&& try_isn->isn_arg.tryref.try_ref->try_finally == 0)
{
emsg(_(e_missing_catch_or_finally));
return NULL;
Expand Down Expand Up @@ -1564,7 +1564,7 @@ compile_endtry(char_u *arg, cctx_T *cctx)
{
// End :catch or :finally scope: set instruction index in ISN_TRY
// instruction
try_isn->isn_arg.try.try_ref->try_endtry = instr->ga_len;
try_isn->isn_arg.tryref.try_ref->try_endtry = instr->ga_len;
if (cctx->ctx_skip != SKIP_YES
&& generate_instr(cctx, ISN_ENDTRY) == NULL)
return NULL;
Expand Down
8 changes: 4 additions & 4 deletions src/vim9execute.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3517,11 +3517,11 @@ exec_instructions(ectx_T *ectx)
trycmd->tcd_frame_idx = ectx->ec_frame_idx;
trycmd->tcd_stack_len = ectx->ec_stack.ga_len;
trycmd->tcd_catch_idx =
iptr->isn_arg.try.try_ref->try_catch;
iptr->isn_arg.tryref.try_ref->try_catch;
trycmd->tcd_finally_idx =
iptr->isn_arg.try.try_ref->try_finally;
iptr->isn_arg.tryref.try_ref->try_finally;
trycmd->tcd_endtry_idx =
iptr->isn_arg.try.try_ref->try_endtry;
iptr->isn_arg.tryref.try_ref->try_endtry;
}
break;

Expand Down Expand Up @@ -5670,7 +5670,7 @@ list_instructions(char *pfx, isn_T *instr, int instr_count, ufunc_T *ufunc)

case ISN_TRY:
{
try_T *try = &iptr->isn_arg.try;
try_T *try = &iptr->isn_arg.tryref;

if (try->try_ref->try_finally == 0)
smsg("%s%4d TRY catch -> %d, endtry -> %d",
Expand Down
2 changes: 1 addition & 1 deletion src/vim9instr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2088,7 +2088,7 @@ delete_instr(isn_T *isn)
break;

case ISN_TRY:
vim_free(isn->isn_arg.try.try_ref);
vim_free(isn->isn_arg.tryref.try_ref);
break;

case ISN_CEXPR_CORE:
Expand Down

0 comments on commit 0d80710

Please sign in to comment.