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

patch 8.2.0355: Vim9: str_val is confusing, it's a number

Browse Source 
Problem:    Vim9: str_val is confusing, it's a number
Solution:   Rename to stnr_val.
This commit is contained in:
Bram Moolenaar 2020-03-04 22:20:26 +01:00
parent a65bb53514
commit a471eeae75
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@ -738,6 +738,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 */
/**/
355,
/**/ /**/
354, 354,
/**/ /**/

6
src/vim9.h
View File

@ -36,7 +36,7 @@ typedef enum {
ISN_STOREREG, // pop into register isn_arg.number ISN_STOREREG, // pop into register isn_arg.number
// ISN_STOREOTHER, // pop into other script variable isn_arg.other. // ISN_STOREOTHER, // pop into other script variable isn_arg.other.
ISN_STORENR, // store number into local variable isn_arg.storenr.str_idx ISN_STORENR, // store number into local variable isn_arg.storenr.stnr_idx
// constants // constants
ISN_PUSHNR, // push number isn_arg.number ISN_PUSHNR, // push number isn_arg.number
@ -178,8 +178,8 @@ typedef struct {
// arguments to ISN_STORENR // arguments to ISN_STORENR
typedef struct { typedef struct {
int str_idx; int stnr_idx;
varnumber_T str_val; varnumber_T stnr_val;
} storenr_T; } storenr_T;
// arguments to ISN_STOREOPT // arguments to ISN_STOREOPT

8
src/vim9compile.c
View File

@ -773,8 +773,8 @@ generate_STORENR(cctx_T *cctx, int idx, varnumber_T value)
RETURN_OK_IF_SKIP(cctx); RETURN_OK_IF_SKIP(cctx);
if ((isn = generate_instr(cctx, ISN_STORENR)) == NULL) if ((isn = generate_instr(cctx, ISN_STORENR)) == NULL)
return FAIL; return FAIL;
isn->isn_arg.storenr.str_idx = idx; isn->isn_arg.storenr.stnr_idx = idx;
isn->isn_arg.storenr.str_val = value; isn->isn_arg.storenr.stnr_val = value;
return OK; return OK;
} }
@ -3789,8 +3789,8 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
garray_T *stack = &cctx->ctx_type_stack; garray_T *stack = &cctx->ctx_type_stack;
isn->isn_type = ISN_STORENR; isn->isn_type = ISN_STORENR;
isn->isn_arg.storenr.str_idx = idx; isn->isn_arg.storenr.stnr_idx = idx;
isn->isn_arg.storenr.str_val = val; isn->isn_arg.storenr.stnr_val = val;
if (stack->ga_len > 0) if (stack->ga_len > 0)
--stack->ga_len; --stack->ga_len;
} }

8
src/vim9execute.c
View File

@ -827,10 +827,10 @@ call_def_function(
// store number in local variable // store number in local variable
case ISN_STORENR: case ISN_STORENR:
tv = STACK_TV_VAR(iptr->isn_arg.storenr.str_idx); tv = STACK_TV_VAR(iptr->isn_arg.storenr.stnr_idx);
clear_tv(tv); clear_tv(tv);
tv->v_type = VAR_NUMBER; tv->v_type = VAR_NUMBER;
tv->vval.v_number = iptr->isn_arg.storenr.str_val; tv->vval.v_number = iptr->isn_arg.storenr.stnr_val;
break; break;
// push constant // push constant
@ -1848,8 +1848,8 @@ ex_disassemble(exarg_T *eap)
break; break;
case ISN_STORENR: case ISN_STORENR:
smsg("%4d STORE %lld in $%d", current, smsg("%4d STORE %lld in $%d", current,
iptr->isn_arg.storenr.str_val, iptr->isn_arg.storenr.stnr_val,
iptr->isn_arg.storenr.str_idx); iptr->isn_arg.storenr.stnr_idx);
break; break;
// constants // constants