aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.3305: Vim9: :finally in skipped block not handled correctly

Browse Source 
Problem:    Vim9: :finally in skipped block not handled correctly.
Solution:   Check whether :finally is in a skipped block. (Naruhiko Nishino,
            closes #8724)
This commit is contained in:
rbtnn
2021-08-07 13:26:53 +02:00
committed by Bram Moolenaar
parent c611941c60
commit 8493499880
4 changed files with 56 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ex_eval.c
View File

@@ -2018,7 +2018,8 @@ ex_endtry(exarg_T *eap)
{ {
idx = cstack->cs_idx; idx = cstack->cs_idx;
if (in_vim9script() // Check the flags only when not in a skipped block.
if (!skip && in_vim9script()
&& (cstack->cs_flags[idx] & (CSF_CATCH|CSF_FINALLY)) == 0) && (cstack->cs_flags[idx] & (CSF_CATCH|CSF_FINALLY)) == 0)
{ {
// try/endtry without any catch or finally: give an error and // try/endtry without any catch or finally: give an error and

14
src/testdir/test_vim9_script.vim
View File

@@ -641,6 +641,20 @@ def Test_try_catch_throw()
endtry endtry
END END
CheckScriptFailure(lines, 'E1032:') CheckScriptFailure(lines, 'E1032:')
# skipping try-finally-endtry when try-finally-endtry is used in another block
lines =<< trim END
if v:true
try
finally
endtry
else
try
finally
endtry
endif
END
CheckDefAndScriptSuccess(lines)
enddef enddef
def Test_try_in_catch() def Test_try_in_catch()

2
src/version.c
View File

@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3305,
/**/ /**/
3304, 3304,
/**/ /**/

73
src/vim9compile.c
View File

@@ -8569,49 +8569,52 @@ compile_finally(char_u *arg, cctx_T *cctx)
return NULL; return NULL;
} }
// End :catch or :finally scope: set value in ISN_TRY instruction if (cctx->ctx_skip != SKIP_YES)
isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_try_label;
if (isn->isn_arg.try.try_ref->try_finally != 0)
{ {
emsg(_(e_finally_dup)); // End :catch or :finally scope: set value in ISN_TRY instruction
return NULL; isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_try_label;
} if (isn->isn_arg.try.try_ref->try_finally != 0)
{
emsg(_(e_finally_dup));
return NULL;
}
this_instr = instr->ga_len; this_instr = instr->ga_len;
#ifdef FEAT_PROFILE #ifdef FEAT_PROFILE
if (cctx->ctx_compile_type == CT_PROFILE if (cctx->ctx_compile_type == CT_PROFILE
&& ((isn_T *)instr->ga_data)[this_instr - 1] && ((isn_T *)instr->ga_data)[this_instr - 1]
.isn_type == ISN_PROF_START) .isn_type == ISN_PROF_START)
{ {
// jump to the profile start of the "finally" // jump to the profile start of the "finally"
--this_instr;
// jump to the profile end above it
if (this_instr > 0 && ((isn_T *)instr->ga_data)[this_instr - 1]
.isn_type == ISN_PROF_END)
--this_instr; --this_instr;
}
// jump to the profile end above it
if (this_instr > 0 && ((isn_T *)instr->ga_data)[this_instr - 1]
.isn_type == ISN_PROF_END)
--this_instr;
}
#endif #endif
// Fill in the "end" label in jumps at the end of the blocks. // Fill in the "end" label in jumps at the end of the blocks.
compile_fill_jump_to_end(&scope->se_u.se_try.ts_end_label, compile_fill_jump_to_end(&scope->se_u.se_try.ts_end_label,
this_instr, cctx); this_instr, cctx);
// If there is no :catch then an exception jumps to :finally. // If there is no :catch then an exception jumps to :finally.
if (isn->isn_arg.try.try_ref->try_catch == 0) 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_catch = this_instr;
isn->isn_arg.try.try_ref->try_finally = this_instr; isn->isn_arg.try.try_ref->try_finally = this_instr;
if (scope->se_u.se_try.ts_catch_label != 0) if (scope->se_u.se_try.ts_catch_label != 0)
{ {
// Previous catch without match jumps here // Previous catch without match jumps here
isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_catch_label; isn = ((isn_T *)instr->ga_data) + scope->se_u.se_try.ts_catch_label;
isn->isn_arg.jump.jump_where = this_instr; isn->isn_arg.jump.jump_where = this_instr;
scope->se_u.se_try.ts_catch_label = 0; scope->se_u.se_try.ts_catch_label = 0;
}
if (generate_instr(cctx, ISN_FINALLY) == NULL)
return NULL;
// TODO: set index in ts_finally_label jumps
} }
if (generate_instr(cctx, ISN_FINALLY) == NULL)
return NULL;
// TODO: set index in ts_finally_label jumps
return arg; return arg;
} }