aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 9.0.1357: using null_object results in an internal error

Browse Source 
Problem:    Using null_object results in an internal error. (Ernie Rael)
Solution:   Add instructions for pushing an object and class. (closes #12044)
This commit is contained in:
Bram Moolenaar
2023-02-26 18:58:23 +00:00
parent 4f026ea9f1
commit c4e1b86cb0
6 changed files with 92 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/vim9execute.c
View File

@@ -1944,8 +1944,7 @@ exec_command(isn_T *iptr)
source_cookie_T cookie;
SOURCING_LNUM = iptr->isn_lnum;
// Pass getsourceline to get an error for a missing ":end"
// command.
// Pass getsourceline to get an error for a missing ":end" command.
CLEAR_FIELD(cookie);
cookie.sourcing_lnum = iptr->isn_lnum - 1;
if (do_cmdline(iptr->isn_arg.string,
@@ -4018,6 +4017,8 @@ exec_instructions(ectx_T *ectx)
case ISN_PUSHFUNC:
case ISN_PUSHCHANNEL:
case ISN_PUSHJOB:
case ISN_PUSHOBJ:
case ISN_PUSHCLASS:
if (GA_GROW_FAILS(&ectx->ec_stack, 1))
goto theend;
tv = STACK_TV_BOT(0);
@@ -4064,6 +4065,14 @@ exec_instructions(ectx_T *ectx)
tv->vval.v_job = NULL;
#endif
break;
case ISN_PUSHOBJ:
tv->v_type = VAR_OBJECT;
tv->vval.v_object = NULL;
break;
case ISN_PUSHCLASS:
tv->v_type = VAR_CLASS;
tv->vval.v_class = iptr->isn_arg.class;
break;
default:
tv->v_type = VAR_STRING;
tv->vval.v_string = iptr->isn_arg.string == NULL
@@ -6662,6 +6671,14 @@ list_instructions(char *pfx, isn_T *instr, int instr_count, ufunc_T *ufunc)
smsg("%s%4d PUSHJOB \"no process\"", pfx, current);
#endif
break;
case ISN_PUSHOBJ:
smsg("%s%4d PUSHOBJ null", pfx, current);
break;
case ISN_PUSHCLASS:
smsg("%s%4d PUSHCLASS %s", pfx, current,
iptr->isn_arg.class == NULL ? "null"
: (char *)iptr->isn_arg.class->class_name);
break;
case ISN_PUSHEXC:
smsg("%s%4d PUSH v:exception", pfx, current);
break;