1
0
forked from aniani/vim

patch 8.1.1878: negative float before method not parsed correctly

Problem:    Negative float before method not parsed correctly.
Solution:   Apply "!" and "-" in front of expression before using ->.
This commit is contained in:
Bram Moolenaar 2019-08-17 21:04:16 +02:00
parent ffc0716af8
commit 9cfe8f6e68
5 changed files with 92 additions and 61 deletions

View File

@ -241,6 +241,7 @@ static int eval4(char_u **arg, typval_T *rettv, int evaluate);
static int eval5(char_u **arg, typval_T *rettv, int evaluate);
static int eval6(char_u **arg, typval_T *rettv, int evaluate, int want_string);
static int eval7(char_u **arg, typval_T *rettv, int evaluate, int want_string);
static int eval7_leader(typval_T *rettv, char_u *start_leader, char_u **end_leaderp);
static int get_string_tv(char_u **arg, typval_T *rettv, int evaluate);
static int get_lit_string_tv(char_u **arg, typval_T *rettv, int evaluate);
@ -1810,7 +1811,8 @@ list_arg_vars(exarg_T *eap, char_u *arg, int *first)
{
/* handle d.key, l[idx], f(expr) */
arg_subsc = arg;
if (handle_subscript(&arg, &tv, TRUE, TRUE) == FAIL)
if (handle_subscript(&arg, &tv, TRUE, TRUE,
name, &name) == FAIL)
error = TRUE;
else
{
@ -4756,13 +4758,26 @@ eval7(
/* Handle following '[', '(' and '.' for expr[expr], expr.name,
* expr(expr), expr->name(expr) */
if (ret == OK)
ret = handle_subscript(arg, rettv, evaluate, TRUE);
ret = handle_subscript(arg, rettv, evaluate, TRUE,
start_leader, &end_leader);
/*
* Apply logical NOT and unary '-', from right to left, ignore '+'.
*/
if (ret == OK && evaluate && end_leader > start_leader)
ret = eval7_leader(rettv, start_leader, &end_leader);
return ret;
}
/*
* Apply the leading "!" and "-" before an eval7 expression to "rettv".
* Adjusts "end_leaderp" until it is at "start_leader".
*/
static int
eval7_leader(typval_T *rettv, char_u *start_leader, char_u **end_leaderp)
{
char_u *end_leader = *end_leaderp;
int ret = OK;
int error = FALSE;
varnumber_T val = 0;
#ifdef FEAT_FLOAT
@ -4816,8 +4831,7 @@ eval7(
rettv->vval.v_number = val;
}
}
}
*end_leaderp = end_leader;
return ret;
}
@ -7539,8 +7553,10 @@ check_vars(char_u *name, int len)
handle_subscript(
char_u **arg,
typval_T *rettv,
int evaluate, /* do more than finding the end */
int verbose) /* give error messages */
int evaluate, // do more than finding the end
int verbose, // give error messages
char_u *start_leader, // start of '!' and '-' prefixes
char_u **end_leaderp) // end of '!' and '-' prefixes
{
int ret = OK;
dict_T *selfdict = NULL;
@ -7575,6 +7591,12 @@ handle_subscript(
selfdict = NULL;
}
else if (**arg == '-')
{
// Expression "-1.0->method()" applies the leader "-" before
// applying ->.
if (evaluate && *end_leaderp > start_leader)
ret = eval7_leader(rettv, start_leader, end_leaderp);
if (ret == OK)
{
if ((*arg)[2] == '{')
// expr->{lambda}()
@ -7583,6 +7605,7 @@ handle_subscript(
// expr->name()
ret = eval_method(arg, rettv, evaluate, verbose);
}
}
else /* **arg == '[' || **arg == '.' */
{
dict_unref(selfdict);
@ -9803,7 +9826,7 @@ var_exists(char_u *var)
if (n)
{
/* handle d.key, l[idx], f(expr) */
n = (handle_subscript(&var, &tv, TRUE, FALSE) == OK);
n = (handle_subscript(&var, &tv, TRUE, FALSE, name, &name) == OK);
if (n)
clear_tv(&tv);
}

View File

@ -85,7 +85,7 @@ char_u *v_exception(char_u *oldval);
char_u *v_throwpoint(char_u *oldval);
char_u *set_cmdarg(exarg_T *eap, char_u *oldarg);
int get_var_tv(char_u *name, int len, typval_T *rettv, dictitem_T **dip, int verbose, int no_autoload);
int handle_subscript(char_u **arg, typval_T *rettv, int evaluate, int verbose);
int handle_subscript(char_u **arg, typval_T *rettv, int evaluate, int verbose, char_u *start_leader, char_u **end_leaderp);
typval_T *alloc_tv(void);
void free_tv(typval_T *varp);
void clear_tv(typval_T *varp);

View File

@ -115,6 +115,11 @@ func Test_method_funcref()
delfunc Concat
endfunc
func Test_method_float()
eval 1.234->string()->assert_equal('1.234')
eval -1.234->string()->assert_equal('-1.234')
endfunc
func Test_method_syntax()
eval [1, 2, 3] ->sort( )
eval [1, 2, 3]

View File

@ -3165,8 +3165,9 @@ ex_call(exarg_T *eap)
if (has_watchexpr())
dbg_check_breakpoint(eap);
/* Handle a function returning a Funcref, Dictionary or List. */
if (handle_subscript(&arg, &rettv, !eap->skip, TRUE) == FAIL)
// Handle a function returning a Funcref, Dictionary or List.
if (handle_subscript(&arg, &rettv, !eap->skip, TRUE,
name, &name) == FAIL)
{
failed = TRUE;
break;

View File

@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1878,
/**/
1877,
/**/