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.2262: Vim9: converting bool to string prefixes v:

Browse Source 
Problem:    Vim9: converting bool to string prefixes v:.
Solution:   Do not use the v: prefix.
This commit is contained in:
Bram Moolenaar 2021-01-01 15:11:04 +01:00
parent d5ea8f08f7
commit a8b8af19e4
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/evalvars.c
View File

@ -2068,8 +2068,8 @@ get_var_special_name(int nr)
{ {
switch (nr) switch (nr)
{ {
case VVAL_FALSE: return "v:false"; case VVAL_FALSE: return in_vim9script() ? "false" : "v:false";
case VVAL_TRUE: return "v:true"; case VVAL_TRUE: return in_vim9script() ? "true" : "v:true";
case VVAL_NONE: return "v:none"; case VVAL_NONE: return "v:none";
case VVAL_NULL: return "v:null"; case VVAL_NULL: return "v:null";
} }

4
src/testdir/test_vim9_disassemble.vim
View File

@ -182,7 +182,7 @@ def Test_disassemble_push()
var res = execute('disass s:ScriptFuncPush') var res = execute('disass s:ScriptFuncPush')
assert_match('<SNR>\d*_ScriptFuncPush.*' .. assert_match('<SNR>\d*_ScriptFuncPush.*' ..
'localbool = true.*' .. 'localbool = true.*' ..
' PUSH v:true.*' .. ' PUSH true.*' ..
'localspec = v:none.*' .. 'localspec = v:none.*' ..
' PUSH v:none.*' .. ' PUSH v:none.*' ..
'localblob = 0z1234.*' .. 'localblob = 0z1234.*' ..
@ -1461,7 +1461,7 @@ def Test_disassemble_invert_bool()
var instr = execute('disassemble InvertBool') var instr = execute('disassemble InvertBool')
assert_match('InvertBool\_s*' .. assert_match('InvertBool\_s*' ..
'var flag = true\_s*' .. 'var flag = true\_s*' ..
'\d PUSH v:true\_s*' .. '\d PUSH true\_s*' ..
'\d STORE $0\_s*' .. '\d STORE $0\_s*' ..
'var invert = !flag\_s*' .. 'var invert = !flag\_s*' ..
'\d LOAD $0\_s*' .. '\d LOAD $0\_s*' ..

9
src/testdir/test_vim9_expr.vim
View File

@ -1056,14 +1056,19 @@ def Test_expr5()
assert_equal('123 hello', 123 .. ' hello') assert_equal('123 hello', 123 .. ' hello')
assert_equal('123456', 123 .. 456) assert_equal('123456', 123 .. 456)
assert_equal('av:true', 'a' .. true) assert_equal('atrue', 'a' .. true)
assert_equal('av:false', 'a' .. false) assert_equal('afalse', 'a' .. false)
assert_equal('av:null', 'a' .. v:null) assert_equal('av:null', 'a' .. v:null)
assert_equal('av:none', 'a' .. v:none) assert_equal('av:none', 'a' .. v:none)
if has('float') if has('float')
assert_equal('a0.123', 'a' .. 0.123) assert_equal('a0.123', 'a' .. 0.123)
endif endif
set digraph
assert_equal('val: true', 'val: ' .. &digraph)
set nodigraph
assert_equal('val: false', 'val: ' .. &digraph)
assert_equal([1, 2, 3, 4], [1, 2] + [3, 4]) assert_equal([1, 2, 3, 4], [1, 2] + [3, 4])
assert_equal(0z11223344, 0z1122 + 0z3344) assert_equal(0z11223344, 0z1122 + 0z3344)
assert_equal(0z112201ab, 0z1122 assert_equal(0z112201ab, 0z1122

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 */
/**/
2262,
/**/ /**/
2261, 2261,
/**/ /**/