aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.2314: Vim9: returning zero takes two instructions

Browse Source 
Problem:    Vim9: returning zero takes two instructions.
Solution:   Add ISN_RETURN_ZERO.
This commit is contained in:
Bram Moolenaar 2021-01-08 20:53:09 +01:00
parent ece0b87c0f
commit 299f3036ec
5 changed files with 42 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/testdir/test_vim9_disassemble.vim
View File

@ -117,8 +117,7 @@ def Test_disassemble_exec_expr()
'\d 2STRING stack\[-1\]\_s*' .. '\d 2STRING stack\[-1\]\_s*' ..
'\d\+ PUSHS ".txt"\_s*' .. '\d\+ PUSHS ".txt"\_s*' ..
'\d\+ EXECCONCAT 4\_s*' .. '\d\+ EXECCONCAT 4\_s*' ..
'\d\+ PUSHNR 0\_s*' .. '\d\+ RETURN 0',
'\d\+ RETURN',
res) res)
enddef enddef
@ -134,8 +133,7 @@ def Test_disassemble_yank_range()
'\d EXEC norm! m\[jjm\]\_s*' .. '\d EXEC norm! m\[jjm\]\_s*' ..
' :''\[,''\]yank\_s*' .. ' :''\[,''\]yank\_s*' ..
'\d EXEC :''\[,''\]yank\_s*' .. '\d EXEC :''\[,''\]yank\_s*' ..
'\d PUSHNR 0\_s*' .. '\d RETURN 0',
'\d RETURN',
res) res)
enddef enddef
@ -149,8 +147,7 @@ def Test_disassemble_put_expr()
' :3put ="text"\_s*' .. ' :3put ="text"\_s*' ..
'\d PUSHS "text"\_s*' .. '\d PUSHS "text"\_s*' ..
'\d PUT = 3\_s*' .. '\d PUT = 3\_s*' ..
'\d PUSHNR 0\_s*' .. '\d RETURN 0',
'\d RETURN',
res) res)
enddef enddef
@ -164,8 +161,7 @@ def Test_disassemble_put_range()
' :$-2put a\_s*' .. ' :$-2put a\_s*' ..
'\d RANGE $-2\_s*' .. '\d RANGE $-2\_s*' ..
'\d PUT a range\_s*' .. '\d PUT a range\_s*' ..
'\d PUSHNR 0\_s*' .. '\d RETURN 0',
'\d RETURN',
res) res)
enddef enddef
@ -273,8 +269,7 @@ def Test_disassemble_store_member()
'\d\+ PUSHS "a"\_s*' .. '\d\+ PUSHS "a"\_s*' ..
'\d\+ LOAD $1\_s*' .. '\d\+ LOAD $1\_s*' ..
'\d\+ STOREDICT\_s*' .. '\d\+ STOREDICT\_s*' ..
'\d\+ PUSHNR 0\_s*' .. '\d\+ RETURN 0',
'\d\+ RETURN',
res) res)
enddef enddef
@ -297,8 +292,7 @@ def Test_disassemble_store_index()
'\d LOAD $0\_s*' .. '\d LOAD $0\_s*' ..
'\d MEMBER dd\_s*' .. '\d MEMBER dd\_s*' ..
'\d STOREINDEX\_s*' .. '\d STOREINDEX\_s*' ..
'\d\+ PUSHNR 0\_s*' .. '\d\+ RETURN 0',
'\d\+ RETURN',
res) res)
enddef enddef
@ -333,8 +327,7 @@ def Test_disassemble_list_assign()
'\d\+ STORE $1\_s*' .. '\d\+ STORE $1\_s*' ..
'\d\+ SLICE 2\_s*' .. '\d\+ SLICE 2\_s*' ..
'\d\+ STORE $2\_s*' .. '\d\+ STORE $2\_s*' ..
'\d\+ PUSHNR 0\_s*' .. '\d\+ RETURN 0',
'\d\+ RETURN',
res) res)
enddef enddef
@ -362,8 +355,7 @@ def Test_disassemble_list_add()
'\d\+ CHECKTYPE number stack\[-1\]\_s*' .. '\d\+ CHECKTYPE number stack\[-1\]\_s*' ..
'\d\+ LISTAPPEND\_s*' .. '\d\+ LISTAPPEND\_s*' ..
'\d\+ DROP\_s*' .. '\d\+ DROP\_s*' ..
'\d\+ PUSHNR 0\_s*' .. '\d\+ RETURN 0',
'\d\+ RETURN',
res) res)
enddef enddef
@ -390,8 +382,7 @@ def Test_disassemble_blob_add()
'\d\+ CHECKTYPE number stack\[-1\]\_s*' .. '\d\+ CHECKTYPE number stack\[-1\]\_s*' ..
'\d\+ BLOBAPPEND\_s*' .. '\d\+ BLOBAPPEND\_s*' ..
'\d\+ DROP\_s*' .. '\d\+ DROP\_s*' ..
'\d\+ PUSHNR 0\_s*' .. '\d\+ RETURN 0',
'\d\+ RETURN',
res) res)
enddef enddef
@ -580,8 +571,7 @@ def Test_disassemble_closure()
'\d LOAD arg\[-1\]\_s*' .. '\d LOAD arg\[-1\]\_s*' ..
'\d CONCAT\_s*' .. '\d CONCAT\_s*' ..
'\d STOREOUTER $0\_s*' .. '\d STOREOUTER $0\_s*' ..
'\d PUSHNR 0\_s*' .. '\d RETURN 0',
'\d RETURN',
res) res)
res = execute('disass g:Get') res = execute('disass g:Get')
@ -615,8 +605,7 @@ def Test_disassemble_pcall()
'\d PCALL top (argc 1)\_s*' .. '\d PCALL top (argc 1)\_s*' ..
'\d PCALL end\_s*' .. '\d PCALL end\_s*' ..
'\d DROP\_s*' .. '\d DROP\_s*' ..
'\d PUSHNR 0\_s*' .. '\d RETURN 0',
'\d RETURN',
res) res)
enddef enddef
@ -865,8 +854,7 @@ def Test_disassemble_function()
'\d PUSHS "UserFunc"\_s*' .. '\d PUSHS "UserFunc"\_s*' ..
'\d BCALL funcref(argc 1)\_s*' .. '\d BCALL funcref(argc 1)\_s*' ..
'\d STORE $2\_s*' .. '\d STORE $2\_s*' ..
'\d PUSHNR 0\_s*' .. '\d RETURN 0',
'\d RETURN',
instr) instr)
enddef enddef
@ -893,8 +881,7 @@ def Test_disassemble_channel()
'var chan1: channel\_s*' .. 'var chan1: channel\_s*' ..
'\d PUSHCHANNEL 0\_s*' .. '\d PUSHCHANNEL 0\_s*' ..
'\d STORE $2\_s*' .. '\d STORE $2\_s*' ..
'\d PUSHNR 0\_s*' .. '\d RETURN 0',
'\d RETURN',
instr) instr)
enddef enddef
@ -966,8 +953,7 @@ def Test_nested_func()
'echomsg "inner"\_s*' .. 'echomsg "inner"\_s*' ..
'enddef\_s*' .. 'enddef\_s*' ..
'\d NEWFUNC <lambda>\d\+ Inner\_s*' .. '\d NEWFUNC <lambda>\d\+ Inner\_s*' ..
'\d PUSHNR 0\_s*' .. '\d RETURN 0',
'\d RETURN',
instr) instr)
enddef enddef
@ -989,8 +975,7 @@ def Test_nested_def_list()
'\d DEF /Info\_s*' .. '\d DEF /Info\_s*' ..
'def /Info/\_s*' .. 'def /Info/\_s*' ..
'\d DEF /Info/\_s*' .. '\d DEF /Info/\_s*' ..
'\d PUSHNR 0\_s*' .. '\d RETURN 0',
'\d RETURN',
instr) instr)
enddef enddef
@ -1122,8 +1107,7 @@ def Test_disassemble_for_loop_unpack()
'endfor\_s*' .. 'endfor\_s*' ..
'\d\+ JUMP -> 8\_s*' .. '\d\+ JUMP -> 8\_s*' ..
'\d\+ DROP\_s*' .. '\d\+ DROP\_s*' ..
'\d\+ PUSHNR 0\_s*' .. '\d\+ RETURN 0',
'\d\+ RETURN',
instr) instr)
enddef enddef
@ -1143,8 +1127,7 @@ def Test_disassemble_typecast()
'\d NEWLIST size 2\_s*' .. '\d NEWLIST size 2\_s*' ..
'\d SETTYPE list<number>\_s*' .. '\d SETTYPE list<number>\_s*' ..
'\d STORE $0\_s*' .. '\d STORE $0\_s*' ..
'\d PUSHNR 0\_s*' .. '\d RETURN 0\_s*',
'\d RETURN\_s*',
instr) instr)
enddef enddef
@ -1631,8 +1614,7 @@ def Test_dsassemble_falsy_op()
'echo "" ?? "empty string"\_s*' .. 'echo "" ?? "empty string"\_s*' ..
'\d\+ PUSHS "empty string"\_s*' .. '\d\+ PUSHS "empty string"\_s*' ..
'\d\+ ECHO 1\_s*' .. '\d\+ ECHO 1\_s*' ..
'\d\+ PUSHNR 0\_s*' .. '\d\+ RETURN 0',
'\d\+ RETURN',
res) res)
enddef enddef
@ -1659,8 +1641,7 @@ def Test_disassemble_compare_const()
'if ' .. substitute(case[0], '[[~]', '\\\0', 'g') .. '.*' .. 'if ' .. substitute(case[0], '[[~]', '\\\0', 'g') .. '.*' ..
'\d PUSHNR 42.*' .. '\d PUSHNR 42.*' ..
'\d ECHO 1.*' .. '\d ECHO 1.*' ..
'\d PUSHNR 0.*' .. '\d RETURN 0',
'\d RETURN.*',
instr) instr)
else else
# condition false, function just returns # condition false, function just returns
@ -1668,8 +1649,7 @@ def Test_disassemble_compare_const()
'if ' .. substitute(case[0], '[[~]', '\\\0', 'g') .. '[ \n]*' .. 'if ' .. substitute(case[0], '[[~]', '\\\0', 'g') .. '[ \n]*' ..
'echo 42[ \n]*' .. 'echo 42[ \n]*' ..
'endif[ \n]*' .. 'endif[ \n]*' ..
'\s*\d PUSHNR 0.*' .. '\d RETURN 0',
'\d RETURN.*',
instr) instr)
endif endif
@ -1707,8 +1687,7 @@ def Test_disassemble_execute()
'\d\+ LOAD $1\_s*' .. '\d\+ LOAD $1\_s*' ..
'\d\+ CONCAT\_s*' .. '\d\+ CONCAT\_s*' ..
'\d\+ EXECUTE 1\_s*' .. '\d\+ EXECUTE 1\_s*' ..
'\d\+ PUSHNR 0\_s*' .. '\d\+ RETURN 0',
'\d\+ RETURN',
res) res)
enddef enddef
@ -1727,8 +1706,7 @@ def Test_disassemble_echomsg()
"echoerr 'went' .. 'wrong'\\_s*" .. "echoerr 'went' .. 'wrong'\\_s*" ..
'\d PUSHS "wentwrong"\_s*' .. '\d PUSHS "wentwrong"\_s*' ..
'\d ECHOERR 1\_s*' .. '\d ECHOERR 1\_s*' ..
'\d PUSHNR 0\_s*' .. '\d RETURN 0',
'\d RETURN',
res) res)
enddef enddef
@ -1837,8 +1815,7 @@ def Test_shuffle()
'\d SHUFFLE 2 up 1\_s*' .. '\d SHUFFLE 2 up 1\_s*' ..
'\d BCALL append(argc 2)\_s*' .. '\d BCALL append(argc 2)\_s*' ..
'\d DROP\_s*' .. '\d DROP\_s*' ..
'\d PUSHNR 0\_s*' .. '\d RETURN 0',
'\d RETURN',
res) res)
enddef enddef
@ -1861,8 +1838,7 @@ def Test_silent()
'\d PUSHS "error"\_s*' .. '\d PUSHS "error"\_s*' ..
'\d ECHOERR 1\_s*' .. '\d ECHOERR 1\_s*' ..
'\d CMDMOD_REV\_s*' .. '\d CMDMOD_REV\_s*' ..
'\d PUSHNR 0\_s*' .. '\d RETURN 0',
'\d RETURN',
res) res)
enddef enddef

2
src/version.c
View File

@ -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 */
/**/
2314,
/**/ /**/
2313, 2313,
/**/ /**/

1
src/vim9.h
View File

@ -84,6 +84,7 @@ typedef enum {
ISN_PCALL, // call partial, use isn_arg.pfunc ISN_PCALL, // call partial, use isn_arg.pfunc
ISN_PCALL_END, // cleanup after ISN_PCALL with cpf_top set ISN_PCALL_END, // cleanup after ISN_PCALL with cpf_top set
ISN_RETURN, // return, result is on top of stack ISN_RETURN, // return, result is on top of stack
ISN_RETURN_ZERO, // Push zero, then return
ISN_FUNCREF, // push a function ref to dfunc isn_arg.funcref ISN_FUNCREF, // push a function ref to dfunc isn_arg.funcref
ISN_NEWFUNC, // create a global function from a lambda function ISN_NEWFUNC, // create a global function from a lambda function
ISN_DEF, // list functions ISN_DEF, // list functions

4
src/vim9compile.c
View File

@ -8190,8 +8190,7 @@ nextline:
} }
// Return zero if there is no return at the end. // Return zero if there is no return at the end.
generate_PUSHNR(&cctx, 0); generate_instr(&cctx, ISN_RETURN_ZERO);
generate_instr(&cctx, ISN_RETURN);
} }
{ {
@ -8483,6 +8482,7 @@ delete_instr(isn_T *isn)
case ISN_PUSHSPEC: case ISN_PUSHSPEC:
case ISN_PUT: case ISN_PUT:
case ISN_RETURN: case ISN_RETURN:
case ISN_RETURN_ZERO:
case ISN_SHUFFLE: case ISN_SHUFFLE:
case ISN_SLICE: case ISN_SLICE:
case ISN_STORE: case ISN_STORE:

13
src/vim9execute.c
View File

@ -2205,6 +2205,16 @@ call_def_function(
break; break;
// return from a :def function call // return from a :def function call
case ISN_RETURN_ZERO:
if (GA_GROW(&ectx.ec_stack, 1) == FAIL)
goto failed;
tv = STACK_TV_BOT(0);
++ectx.ec_stack.ga_len;
tv->v_type = VAR_NUMBER;
tv->vval.v_number = 0;
tv->v_lock = 0;
// FALLTHROUGH
case ISN_RETURN: case ISN_RETURN:
{ {
garray_T *trystack = &ectx.ec_trystack; garray_T *trystack = &ectx.ec_trystack;
@ -3804,6 +3814,9 @@ ex_disassemble(exarg_T *eap)
case ISN_RETURN: case ISN_RETURN:
smsg("%4d RETURN", current); smsg("%4d RETURN", current);
break; break;
case ISN_RETURN_ZERO:
smsg("%4d RETURN 0", current);
break;
case ISN_FUNCREF: case ISN_FUNCREF:
{ {
funcref_T *funcref = &iptr->isn_arg.funcref; funcref_T *funcref = &iptr->isn_arg.funcref;