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

patch 8.2.1490: Vim9: using /= with float and number doesn't work

Browse Source 
Problem:    Vim9: using /= with float and number doesn't work.
Solution:   Better support assignment with operator. (closes #6742)
This commit is contained in:
Bram Moolenaar
2020-08-19 22:02:41 +02:00
parent 191929b182
commit 93ad14710b
3 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/testdir/test_vim9_script.vim
View File

@@ -90,6 +90,18 @@ def Test_assignment()
&ts %= 4 &ts %= 4
assert_equal(2, &ts) assert_equal(2, &ts)
if has('float')
let f100: float = 100.0
f100 /= 5
assert_equal(20.0, f100)
let f200: float = 200.0
f200 /= 5.0
assert_equal(40.0, f200)
CheckDefFailure(['let nr: number = 200', 'nr /= 5.0'], 'E1012:')
endif
lines =<< trim END lines =<< trim END
vim9script vim9script
&ts = 6 &ts = 6

2
src/version.c
View File

@@ -754,6 +754,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 */
/**/
1490,
/**/ /**/
1489, 1489,
/**/ /**/

31
src/vim9compile.c
View File

@@ -4923,10 +4923,11 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
lvar->lv_type = stacktype; lvar->lv_type = stacktype;
} }
} }
else else if (*op == '=')
{ {
type_T *use_type = lvar->lv_type; type_T *use_type = lvar->lv_type;
// without operator type is here, otherwise below
if (has_index) if (has_index)
{ {
use_type = use_type->tt_member; use_type = use_type->tt_member;
@@ -5008,18 +5009,20 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
if (oplen > 0 && *op != '=') if (oplen > 0 && *op != '=')
{ {
type_T *expected = &t_number; type_T *expected;
type_T *stacktype; type_T *stacktype;
// TODO: if type is known use float or any operation
// TODO: check operator matches variable type
if (*op == '.') if (*op == '.')
expected = &t_string; expected = &t_string;
else if (*op == '+') else
expected = member_type; expected = member_type;
stacktype = ((type_T **)stack->ga_data)[stack->ga_len - 1]; stacktype = ((type_T **)stack->ga_data)[stack->ga_len - 1];
if (need_type(stacktype, expected, -1, cctx, FALSE) == FAIL) if (
#ifdef FEAT_FLOAT
// If variable is float operation with number is OK.
!(expected == &t_float && stacktype == &t_number) &&
#endif
need_type(stacktype, expected, -1, cctx, FALSE) == FAIL)
goto theend; goto theend;
if (*op == '.') if (*op == '.')
@@ -5034,20 +5037,8 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
member_type, stacktype) == FAIL) member_type, stacktype) == FAIL)
goto theend; goto theend;
} }
else else if (generate_two_op(cctx, op) == FAIL)
{
isn_T *isn = generate_instr_drop(cctx, ISN_OPNR, 1);
if (isn == NULL)
goto theend; goto theend;
switch (*op)
{
case '-': isn->isn_arg.op.op_type = EXPR_SUB; break;
case '*': isn->isn_arg.op.op_type = EXPR_MULT; break;
case '/': isn->isn_arg.op.op_type = EXPR_DIV; break;
case '%': isn->isn_arg.op.op_type = EXPR_REM; break;
}
}
} }
if (has_index) if (has_index)