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

patch 8.2.0226: compiling for loop not tested

Browse Source 
Problem:    Compiling for loop not tested.
Solution:   Add a test.  Make variable initialization work for more types.
This commit is contained in:
Bram Moolenaar
2020-02-06 22:06:54 +01:00
parent 777770fbb0
commit 04d0522046
3 changed files with 77 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/testdir/test_vim9_disassemble.vim
View File

@@ -325,5 +325,37 @@ def Test_compile_and_or()
\, instr)
enddef
def ForLoop(): list<number>
let res: list<number>
for i in range(3)
res->add(i)
endfor
return res
enddef
def Test_compile_for_loop()
assert_equal([0, 1, 2], ForLoop())
let instr = execute('disassemble ForLoop')
assert_match('ForLoop.*'
\ .. 'let res: list<number>.*'
\ .. ' NEWLIST size 0.*'
\ .. '\d STORE $0.*'
\ .. 'for i in range(3).*'
\ .. '\d STORE -1 in $1.*'
\ .. '\d PUSHNR 3.*'
\ .. '\d BCALL range(argc 1).*'
\ .. '\d FOR $1 -> \d\+.*'
\ .. '\d STORE $2.*'
\ .. 'res->add(i).*'
\ .. '\d LOAD $0.*'
\ .. '\d LOAD $2.*'
\ .. '\d BCALL add(argc 2).*'
\ .. '\d DROP.*'
\ .. 'endfor.*'
\ .. '\d JUMP -> \d\+.*'
\ .. '\d DROP.*'
\, instr)
enddef
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker

2
src/version.c
View File

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

46
src/vim9compile.c
View File

@@ -3427,13 +3427,51 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
else
{
// variables are always initialized
// TODO: support more types
if (ga_grow(instr, 1) == FAIL)
goto theend;
if (type->tt_type == VAR_STRING)
generate_PUSHS(cctx, vim_strsave((char_u *)""));
else
switch (type->tt_type)
{
case VAR_BOOL:
generate_PUSHBOOL(cctx, VVAL_FALSE);
break;
case VAR_SPECIAL:
generate_PUSHSPEC(cctx, VVAL_NONE);
break;
case VAR_FLOAT:
#ifdef FEAT_FLOAT
generate_PUSHF(cctx, 0.0);
#endif
break;
case VAR_STRING:
generate_PUSHS(cctx, NULL);
break;
case VAR_BLOB:
generate_PUSHBLOB(cctx, NULL);
break;
case VAR_FUNC:
// generate_PUSHS(cctx, NULL); TODO
break;
case VAR_PARTIAL:
// generate_PUSHS(cctx, NULL); TODO
break;
case VAR_LIST:
generate_NEWLIST(cctx, 0);
break;
case VAR_DICT:
generate_NEWDICT(cctx, 0);
break;
case VAR_JOB:
// generate_PUSHS(cctx, NULL); TODO
break;
case VAR_CHANNEL:
// generate_PUSHS(cctx, NULL); TODO
break;
case VAR_NUMBER:
case VAR_UNKNOWN:
case VAR_VOID:
generate_PUSHNR(cctx, 0);
break;
}
}
if (oplen > 0 && *op != '=')