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.1.1114: confusing overloaded operator "." for string concatenation

Browse Source 
Problem:    Confusing overloaded operator "." for string concatenation.
Solution:   Add ".." for string concatenation.  Also "let a ..= b".
This commit is contained in:
Bram Moolenaar
2019-04-04 15:36:05 +02:00
parent eb93f3f0e2
commit 0f248b006c
4 changed files with 59 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/eval.c
View File

@@ -1234,6 +1234,7 @@ eval_foldexpr(char_u *arg, int *cp)
* ":let var /= expr" assignment command.
* ":let var %= expr" assignment command.
* ":let var .= expr" assignment command.
* ":let var ..= expr" assignment command.
* ":let [var1, var2] = expr" unpack list.
*/
void
@@ -1255,8 +1256,8 @@ ex_let(exarg_T *eap)
if (argend > arg && argend[-1] == '.') // for var.='str'
--argend;
expr = skipwhite(argend);
if (*expr != '=' && !(vim_strchr((char_u *)"+-*/%.", *expr) != NULL
&& expr[1] == '='))
if (*expr != '=' && !((vim_strchr((char_u *)"+-*/%.", *expr) != NULL
&& expr[1] == '=') || STRNCMP(expr, "..=", 3) == 0))
{
/*
* ":let" without "=": list variables
@@ -1286,7 +1287,11 @@ ex_let(exarg_T *eap)
if (*expr != '=')
{
if (vim_strchr((char_u *)"+-*/%.", *expr) != NULL)
{
op[0] = *expr; // +=, -=, *=, /=, %= or .=
if (expr[0] == '.' && expr[1] == '.') // ..=
++expr;
}
expr = skipwhite(expr + 2);
}
else
@@ -3813,6 +3818,7 @@ eval4(char_u **arg, typval_T *rettv, int evaluate)
* + number addition
* - number subtraction
* . string concatenation
* .. string concatenation
*
* "arg" must point to the first non-white of the expression.
* "arg" is advanced to the next non-white after the recognized expression.
@@ -3872,6 +3878,8 @@ eval5(char_u **arg, typval_T *rettv, int evaluate)
/*
* Get the second variable.
*/
if (op == '.' && *(*arg + 1) == '.') // .. string concatenation
++*arg;
*arg = skipwhite(*arg + 1);
if (eval6(arg, &var2, evaluate, op == '.') == FAIL)
{