mirror of
https://github.com/vim/vim.git
synced 2025-09-26 04:04:07 -04:00
patch 8.2.1145: Vim9: "for" only accepts a list at compile time
Problem: Vim9: "for" only accepts a list at compile time. Solution: Also accept a list at runtime.
This commit is contained in:
@@ -727,6 +727,43 @@ def Test_disassemble_for_loop()
|
|||||||
instr)
|
instr)
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
|
def ForLoopEval(): string
|
||||||
|
let res = ""
|
||||||
|
for str in eval('["one", "two"]')
|
||||||
|
res ..= str
|
||||||
|
endfor
|
||||||
|
return res
|
||||||
|
enddef
|
||||||
|
|
||||||
|
def Test_disassemble_for_loop_eval()
|
||||||
|
assert_equal('onetwo', ForLoopEval())
|
||||||
|
let instr = execute('disassemble ForLoopEval')
|
||||||
|
assert_match('ForLoopEval\_s*' ..
|
||||||
|
'let res = ""\_s*' ..
|
||||||
|
'\d PUSHS ""\_s*' ..
|
||||||
|
'\d STORE $0\_s*' ..
|
||||||
|
'for str in eval(''\["one", "two"\]'')\_s*' ..
|
||||||
|
'\d STORE -1 in $1\_s*' ..
|
||||||
|
'\d PUSHS "\["one", "two"\]"\_s*' ..
|
||||||
|
'\d BCALL eval(argc 1)\_s*' ..
|
||||||
|
'\d CHECKTYPE list stack\[-1\]\_s*' ..
|
||||||
|
'\d FOR $1 -> \d\+\_s*' ..
|
||||||
|
'\d STORE $2\_s*' ..
|
||||||
|
'res ..= str\_s*' ..
|
||||||
|
'\d\+ LOAD $0\_s*' ..
|
||||||
|
'\d\+ LOAD $2\_s*' ..
|
||||||
|
'\d\+ CHECKTYPE string stack\[-1\]\_s*' ..
|
||||||
|
'\d\+ CONCAT\_s*' ..
|
||||||
|
'\d\+ STORE $0\_s*' ..
|
||||||
|
'endfor\_s*' ..
|
||||||
|
'\d\+ JUMP -> 6\_s*' ..
|
||||||
|
'\d\+ DROP\_s*' ..
|
||||||
|
'return res\_s*' ..
|
||||||
|
'\d\+ LOAD $0\_s*' ..
|
||||||
|
'\d\+ RETURN',
|
||||||
|
instr)
|
||||||
|
enddef
|
||||||
|
|
||||||
let g:number = 42
|
let g:number = 42
|
||||||
|
|
||||||
def Computing()
|
def Computing()
|
||||||
|
@@ -1440,6 +1440,12 @@ def Test_for_loop()
|
|||||||
result ..= cnt .. '_'
|
result ..= cnt .. '_'
|
||||||
endfor
|
endfor
|
||||||
assert_equal('0_1_3_', result)
|
assert_equal('0_1_3_', result)
|
||||||
|
|
||||||
|
let concat = ''
|
||||||
|
for str in eval('["one", "two"]')
|
||||||
|
concat ..= str
|
||||||
|
endfor
|
||||||
|
assert_equal('onetwo', concat)
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
def Test_for_loop_fails()
|
def Test_for_loop_fails()
|
||||||
@@ -1447,7 +1453,7 @@ def Test_for_loop_fails()
|
|||||||
CheckDefFailure(['for i In range(5)'], 'E690:')
|
CheckDefFailure(['for i In range(5)'], 'E690:')
|
||||||
CheckDefFailure(['let x = 5', 'for x in range(5)'], 'E1023:')
|
CheckDefFailure(['let x = 5', 'for x in range(5)'], 'E1023:')
|
||||||
CheckScriptFailure(['def Func(arg: any)', 'for arg in range(5)', 'enddef', 'defcompile'], 'E1006:')
|
CheckScriptFailure(['def Func(arg: any)', 'for arg in range(5)', 'enddef', 'defcompile'], 'E1006:')
|
||||||
CheckDefFailure(['for i in "text"'], 'E1024:')
|
CheckDefFailure(['for i in "text"'], 'E1013:')
|
||||||
CheckDefFailure(['for i in xxx'], 'E1001:')
|
CheckDefFailure(['for i in xxx'], 'E1001:')
|
||||||
CheckDefFailure(['endfor'], 'E588:')
|
CheckDefFailure(['endfor'], 'E588:')
|
||||||
CheckDefFailure(['for i in range(3)', 'echo 3'], 'E170:')
|
CheckDefFailure(['for i in range(3)', 'echo 3'], 'E170:')
|
||||||
|
@@ -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 */
|
||||||
|
/**/
|
||||||
|
1145,
|
||||||
/**/
|
/**/
|
||||||
1144,
|
1144,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -6062,15 +6062,15 @@ compile_for(char_u *arg, cctx_T *cctx)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// now we know the type of "var"
|
// Now that we know the type of "var", check that it is a list, now or at
|
||||||
|
// runtime.
|
||||||
vartype = ((type_T **)stack->ga_data)[stack->ga_len - 1];
|
vartype = ((type_T **)stack->ga_data)[stack->ga_len - 1];
|
||||||
if (vartype->tt_type != VAR_LIST)
|
if (need_type(vartype, &t_list_any, -1, cctx) == FAIL)
|
||||||
{
|
{
|
||||||
emsg(_("E1024: need a List to iterate over"));
|
|
||||||
drop_scope(cctx);
|
drop_scope(cctx);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (vartype->tt_member->tt_type != VAR_ANY)
|
if (vartype->tt_type == VAR_LIST && vartype->tt_member->tt_type != VAR_ANY)
|
||||||
var_lvar->lv_type = vartype->tt_member;
|
var_lvar->lv_type = vartype->tt_member;
|
||||||
|
|
||||||
// "for_end" is set when ":endfor" is found
|
// "for_end" is set when ":endfor" is found
|
||||||
|
Reference in New Issue
Block a user