thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.0248: duplicate code in finding a script in the execution stack

Browse Source 
Problem:    Duplicate code in finding a script in the execution stack.
Solution:   Reduce duplicate code. (closes #10961)
This commit is contained in:
zeertzjq
2022-08-23 19:26:05 +01:00
committed by Bram Moolenaar
parent f396ce83ee
commit a247142ae4
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/scriptfile.c
View File

@@ -162,32 +162,21 @@ estack_sfile(estack_arg_T which UNUSED)
// instead. // instead.
if (which == ESTACK_SCRIPT) if (which == ESTACK_SCRIPT)
{ {
entry = ((estack_T *)exestack.ga_data) + exestack.ga_len - 1;
// Walk the stack backwards, starting from the current frame. // Walk the stack backwards, starting from the current frame.
for (idx = exestack.ga_len - 1; idx >= 0; --idx, --entry) for (idx = exestack.ga_len - 1; idx >= 0; --idx, --entry)
{ {
if (entry->es_type == ETYPE_UFUNC) if (entry->es_type == ETYPE_UFUNC || entry->es_type == ETYPE_AUCMD)
{ {
sctx_T *def_ctx = &entry->es_info.ufunc->uf_script_ctx; sctx_T *def_ctx = entry->es_type == ETYPE_UFUNC
? &entry->es_info.ufunc->uf_script_ctx
: acp_script_ctx(entry->es_info.aucmd);
if (def_ctx->sc_sid > 0) return def_ctx->sc_sid > 0
return vim_strsave(SCRIPT_ITEM(def_ctx->sc_sid)->sn_name); ? vim_strsave(SCRIPT_ITEM(def_ctx->sc_sid)->sn_name)
else : NULL;
return NULL;
}
else if (entry->es_type == ETYPE_AUCMD)
{
sctx_T *def_ctx = acp_script_ctx(entry->es_info.aucmd);
if (def_ctx->sc_sid > 0)
return vim_strsave(SCRIPT_ITEM(def_ctx->sc_sid)->sn_name);
else
return NULL;
} }
else if (entry->es_type == ETYPE_SCRIPT) else if (entry->es_type == ETYPE_SCRIPT)
{
return vim_strsave(entry->es_name); return vim_strsave(entry->es_name);
}
} }
return NULL; return NULL;
} }

2
src/version.c
View File

@@ -731,6 +731,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 */
/**/
248,
/**/ /**/
247, 247,
/**/ /**/