mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
patch 8.2.2721: Vim9: cannot have a linebreak inside a lambda
Problem: Vim9: cannot have a linebreak inside a lambda. Solution: Compile the expression before the arguments.
This commit is contained in:
@@ -2075,16 +2075,14 @@ def Test_expr7_new_lambda()
|
|||||||
enddef
|
enddef
|
||||||
|
|
||||||
def Test_expr7_lambda_vim9script()
|
def Test_expr7_lambda_vim9script()
|
||||||
# TODO: make this work in a :def function
|
|
||||||
var lines =<< trim END
|
var lines =<< trim END
|
||||||
vim9script
|
|
||||||
var v = 10->((a) =>
|
var v = 10->((a) =>
|
||||||
a
|
a
|
||||||
+ 2
|
+ 2
|
||||||
)()
|
)()
|
||||||
assert_equal(12, v)
|
assert_equal(12, v)
|
||||||
END
|
END
|
||||||
CheckScriptSuccess(lines)
|
CheckDefAndScriptSuccess(lines)
|
||||||
|
|
||||||
# nested lambda with line breaks
|
# nested lambda with line breaks
|
||||||
lines =<< trim END
|
lines =<< trim END
|
||||||
|
@@ -750,6 +750,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 */
|
||||||
|
/**/
|
||||||
|
2721,
|
||||||
/**/
|
/**/
|
||||||
2720,
|
2720,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -3975,23 +3975,25 @@ compile_subscript(
|
|||||||
if (**arg == '(')
|
if (**arg == '(')
|
||||||
{
|
{
|
||||||
int argcount = 1;
|
int argcount = 1;
|
||||||
char_u *expr;
|
garray_T *stack = &cctx->ctx_type_stack;
|
||||||
garray_T *stack;
|
int type_idx_start = stack->ga_len;
|
||||||
type_T *type;
|
type_T *type;
|
||||||
|
int expr_isn_start = cctx->ctx_instr.ga_len;
|
||||||
|
int expr_isn_end;
|
||||||
|
int arg_isn_count;
|
||||||
|
|
||||||
// Funcref call: list->(Refs[2])(arg)
|
// Funcref call: list->(Refs[2])(arg)
|
||||||
// or lambda: list->((arg) => expr)(arg)
|
// or lambda: list->((arg) => expr)(arg)
|
||||||
// Fist compile the arguments.
|
//
|
||||||
expr = *arg;
|
// Fist compile the function expression.
|
||||||
*arg = skipwhite(*arg + 1);
|
if (compile_parenthesis(arg, cctx, ppconst) == FAIL)
|
||||||
skip_expr_cctx(arg, cctx);
|
|
||||||
*arg = skipwhite(*arg);
|
|
||||||
if (**arg != ')')
|
|
||||||
{
|
|
||||||
semsg(_(e_missing_paren), *arg);
|
|
||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
|
||||||
++*arg;
|
// Remember the next instruction index, where the instructions
|
||||||
|
// for arguments are being written.
|
||||||
|
expr_isn_end = cctx->ctx_instr.ga_len;
|
||||||
|
|
||||||
|
// Compile the arguments.
|
||||||
if (**arg != '(')
|
if (**arg != '(')
|
||||||
{
|
{
|
||||||
if (*skipwhite(*arg) == '(')
|
if (*skipwhite(*arg) == '(')
|
||||||
@@ -4000,16 +4002,43 @@ compile_subscript(
|
|||||||
semsg(_(e_missing_paren), *arg);
|
semsg(_(e_missing_paren), *arg);
|
||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
*arg = skipwhite(*arg + 1);
|
*arg = skipwhite(*arg + 1);
|
||||||
if (compile_arguments(arg, cctx, &argcount) == FAIL)
|
if (compile_arguments(arg, cctx, &argcount) == FAIL)
|
||||||
return FAIL;
|
return FAIL;
|
||||||
|
|
||||||
// Compile the function expression.
|
// Move the instructions for the arguments to before the
|
||||||
if (compile_parenthesis(&expr, cctx, ppconst) == FAIL)
|
// instructions of the expression and move the type of the
|
||||||
return FAIL;
|
// expression after the argument types. This is what ISN_PCALL
|
||||||
|
// expects.
|
||||||
stack = &cctx->ctx_type_stack;
|
stack = &cctx->ctx_type_stack;
|
||||||
|
arg_isn_count = cctx->ctx_instr.ga_len - expr_isn_end;
|
||||||
|
if (arg_isn_count > 0)
|
||||||
|
{
|
||||||
|
int expr_isn_count = expr_isn_end - expr_isn_start;
|
||||||
|
isn_T *isn = ALLOC_MULT(isn_T, expr_isn_count);
|
||||||
|
|
||||||
|
if (isn == NULL)
|
||||||
|
return FAIL;
|
||||||
|
mch_memmove(isn, ((isn_T *)cctx->ctx_instr.ga_data)
|
||||||
|
+ expr_isn_start,
|
||||||
|
sizeof(isn_T) * expr_isn_count);
|
||||||
|
mch_memmove(((isn_T *)cctx->ctx_instr.ga_data)
|
||||||
|
+ expr_isn_start,
|
||||||
|
((isn_T *)cctx->ctx_instr.ga_data) + expr_isn_end,
|
||||||
|
sizeof(isn_T) * arg_isn_count);
|
||||||
|
mch_memmove(((isn_T *)cctx->ctx_instr.ga_data)
|
||||||
|
+ expr_isn_start + arg_isn_count,
|
||||||
|
isn, sizeof(isn_T) * expr_isn_count);
|
||||||
|
vim_free(isn);
|
||||||
|
|
||||||
|
type = ((type_T **)stack->ga_data)[type_idx_start];
|
||||||
|
mch_memmove(((type_T **)stack->ga_data) + type_idx_start,
|
||||||
|
((type_T **)stack->ga_data) + type_idx_start + 1,
|
||||||
|
sizeof(type_T *)
|
||||||
|
* (stack->ga_len - type_idx_start - 1));
|
||||||
|
((type_T **)stack->ga_data)[stack->ga_len - 1] = type;
|
||||||
|
}
|
||||||
|
|
||||||
type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
|
type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
|
||||||
if (generate_PCALL(cctx, argcount,
|
if (generate_PCALL(cctx, argcount,
|
||||||
(char_u *)"[expression]", type, FALSE) == FAIL)
|
(char_u *)"[expression]", type, FALSE) == FAIL)
|
||||||
|
Reference in New Issue
Block a user