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.3011: Vim9: cannot get argument values during debugging

Browse Source 
Problem:    Vim9: cannot get argument values during debugging.
Solution:   Lookup names in the list of arguments.  Put debug instruction
            halfway for command.
This commit is contained in:
Bram Moolenaar
2021-06-16 19:19:55 +02:00
parent 41a7f82dea
commit 6bc30b05e6
4 changed files with 71 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/vim9execute.c
View File

@@ -1394,7 +1394,7 @@ typedef struct subs_expr_S {
// Set when calling do_debug().
static ectx_T *debug_context = NULL;
static int debug_arg_count;
static int debug_var_count;
/*
* When debugging lookup "name" and return the typeval.
@@ -1405,20 +1405,31 @@ lookup_debug_var(char_u *name)
{
int idx;
dfunc_T *dfunc;
ufunc_T *ufunc;
ectx_T *ectx = debug_context;
int varargs_off;
if (ectx == NULL)
return NULL;
dfunc = ((dfunc_T *)def_functions.ga_data) + ectx->ec_dfunc_idx;
// Go through the local variable names, from last to first.
for (idx = debug_arg_count - 1; idx >= 0; --idx)
for (idx = debug_var_count - 1; idx >= 0; --idx)
{
char_u *s = ((char_u **)dfunc->df_var_names.ga_data)[idx];
if (STRCMP(s, name) == 0)
if (STRCMP(((char_u **)dfunc->df_var_names.ga_data)[idx], name) == 0)
return STACK_TV_VAR(idx);
}
// Go through argument names.
ufunc = dfunc->df_ufunc;
varargs_off = ufunc->uf_va_name == NULL ? 0 : 1;
for (idx = 0; idx < ufunc->uf_args.ga_len; ++idx)
if (STRCMP(((char_u **)(ufunc->uf_args.ga_data))[idx], name) == 0)
return STACK_TV(ectx->ec_frame_idx - ufunc->uf_args.ga_len
- varargs_off + idx);
if (ufunc->uf_va_name != NULL && STRCMP(ufunc->uf_va_name, name) == 0)
return STACK_TV(ectx->ec_frame_idx - 1);
return NULL;
}
@@ -4152,7 +4163,7 @@ exec_instructions(ectx_T *ectx)
SOURCING_LNUM = iptr->isn_lnum;
debug_context = ectx;
debug_arg_count = iptr->isn_arg.number;
debug_var_count = iptr->isn_arg.number;
line = ((char_u **)ufunc->uf_lines.ga_data)[
iptr->isn_lnum - 1];
if (line == NULL)