mirror of
https://github.com/vim/vim.git
synced 2025-10-07 05:54:16 -04:00
runtime(vim): Update base-syntax, match Vim9 bool/null literal args to :if/:while/:return
Match Vim9 boolean and null literals in expression arguments of :if, :elseif, :while and :return. closes: #15684 Signed-off-by: Doug Kearns <dougkearns@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
0f5effbd1f
commit
4d427d4cab
20
runtime/syntax/testdir/dumps/vim9_expr_00.dump
Normal file
20
runtime/syntax/testdir/dumps/vim9_expr_00.dump
Normal file
@@ -0,0 +1,20 @@
|
||||
>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
|
||||
|#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@49
|
||||
@75
|
||||
@75
|
||||
|#+0#0000e05&| |C|o|m@1|a|n|d| |{|e|x|p|r|}| |a|r|g|u|m|e|n|t|s| +0#0000000&@48
|
||||
@75
|
||||
|i+0#af5f00255&|f| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@67
|
||||
@2|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@63
|
||||
|e+0#af5f00255&|l|s|e|i|f| +0#0000000&|f+0#e000002&|a|l|s|e| +0#0000000&@62
|
||||
@2|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#e000002&|a|l|s|e| +0#0000000&@62
|
||||
|e+0#af5f00255&|n|d|i|f| +0#0000000&@69
|
||||
@75
|
||||
|w+0#af5f00255&|h|i|l|e| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@64
|
||||
@2|b+0#af5f00255&|r|e|a|k| +0#0000000&@67
|
||||
|e+0#af5f00255&|n|d|w|h|i|l|e| +0#0000000&@66
|
||||
@75
|
||||
|d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@59
|
||||
@2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@61
|
||||
|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
|
||||
@57|1|,|1| @10|T|o|p|
|
20
runtime/syntax/testdir/dumps/vim9_expr_01.dump
Normal file
20
runtime/syntax/testdir/dumps/vim9_expr_01.dump
Normal file
@@ -0,0 +1,20 @@
|
||||
| +0&#ffffff0@1|b+0#af5f00255&|r|e|a|k| +0#0000000&@67
|
||||
|e+0#af5f00255&|n|d|w|h|i|l|e| +0#0000000&@66
|
||||
@75
|
||||
|d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@59
|
||||
@2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@61
|
||||
>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
|
||||
@75
|
||||
|~+0#4040ff13&| @73
|
||||
|~| @73
|
||||
|~| @73
|
||||
|~| @73
|
||||
|~| @73
|
||||
|~| @73
|
||||
|~| @73
|
||||
|~| @73
|
||||
|~| @73
|
||||
|~| @73
|
||||
|~| @73
|
||||
|~| @73
|
||||
| +0#0000000&@56|1|9|,|1| @9|B|o|t|
|
@@ -13,7 +13,7 @@
|
||||
@8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
|
||||
@75
|
||||
@8|d+0#af5f00255&|e|f| +0#0000000&|e+0#0000001#ffff4012|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@49
|
||||
@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|f+0#00e0e07&|a|l|s|e| +0#0000000&@46
|
||||
@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|f+0#e000002&|a|l|s|e| +0#0000000&@46
|
||||
@8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
|
||||
@8|d+0#af5f00255&|e|f| +0#0000000&|l+0#0000001#ffff4012|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@49
|
||||
@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|2+0#e000002&| +0#0000000&@50
|
||||
|
@@ -1,6 +1,6 @@
|
||||
| +0&#ffffff0@74
|
||||
@8|d+0#af5f00255&|e|f| +0#0000000&|e+0#0000001#ffff4012|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@49
|
||||
@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|f+0#00e0e07&|a|l|s|e| +0#0000000&@46
|
||||
@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|f+0#e000002&|a|l|s|e| +0#0000000&@46
|
||||
@8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
|
||||
@8|d+0#af5f00255&|e|f| +0#0000000&|l+0#0000001#ffff4012|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@49
|
||||
@16>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|2+0#e000002&| +0#0000000&@50
|
||||
|
@@ -1,5 +1,5 @@
|
||||
| +0&#ffffff0@7|d+0#af5f00255&|e|f| +0#0000000&|e+0#0000001#ffff4012|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@49
|
||||
@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|r|u|e| +0#0000000&@47
|
||||
@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@47
|
||||
@8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
|
||||
@8|d+0#af5f00255&|e|f| +0#0000000&|l+0#0000001#ffff4012|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@49
|
||||
@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@50
|
||||
|
20
runtime/syntax/testdir/input/vim9_expr.vim
Normal file
20
runtime/syntax/testdir/input/vim9_expr.vim
Normal file
@@ -0,0 +1,20 @@
|
||||
vim9script
|
||||
# Vim9-script expressions
|
||||
|
||||
|
||||
# Command {expr} arguments
|
||||
|
||||
if true
|
||||
echo true
|
||||
elseif false
|
||||
echo false
|
||||
endif
|
||||
|
||||
while true
|
||||
break
|
||||
endwhile
|
||||
|
||||
def Foo(): bool
|
||||
return true
|
||||
enddef
|
||||
|
Reference in New Issue
Block a user