runtime(vim): Update base-syntax, match quote separated numbers
Commit:
https://github.com/vim/vim/commit/e957cba081d75bc9054230a26ebeeb0f43d901bd
Author: Doug Kearns <dougkea...@gmail.com>
Date: Sun May 4 21:01:18 2025 +0200
runtime(vim): Update base-syntax, match quote separated numbers
closes: https://github.com/vim/vim/issues/17250
Signed-off-by: Doug Kearns <dougkea...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/runtime/syntax/generator/vim.vim.base
b/runtime/syntax/generator/vim.vim.base
index 650f2b8a4..7acda408d 100644
--- a/runtime/syntax/generator/vim.vim.base
+++ b/runtime/syntax/generator/vim.vim.base
@@ -2,7 +2,7 @@
" Language: Vim script
" Maintainer: Hirohito Higashi <h.east.727 ATMARK gmail.com>
" Doug Kearns <dougkea...@gmail.com>
-" Last Change: 2025 May 01
+" Last Change: 2025 May 04
" Former Maintainer: Charles E. Campbell
" DO NOT CHANGE DIRECTLY.
@@ -223,13 +223,13 @@ Vim9 syn keyword vim9Boolean true false
" Numbers {{{2
" =======
syn case ignore
-syn match vimNumber '\<\d\+' skipwhite
nextgroup=vimGlobal,vimSubst1,@vimComment,vimSubscript
-syn match vimNumber '\<\d\+\.\d\+\%(e[+-]\=\d\+\)\='
skipwhite nextgroup=vimGlobal,vimSubst1,@vimComment
-syn match vimNumber '\<0b[01]\+' skipwhite
nextgroup=vimGlobal,vimSubst1,@vimComment,vimSubscript
-syn match vimNumber '\<0o\=\o\+' skipwhite
nextgroup=vimGlobal,vimSubst1,@vimComment,vimSubscript
-syn match vimNumber '\<0x\x\+' skipwhite
nextgroup=vimGlobal,vimSubst1,@vimComment,vimSubscript
-syn match vimNumber '\<0z\>' skipwhite
nextgroup=vimGlobal,vimSubst1,@vimComment
-syn match vimNumber '\<0z\%(\x\x\)\+\%(\.\%(\x\x\)\+\)*'
skipwhite nextgroup=vimGlobal,vimSubst1,@vimComment,vimSubscript
+syn match vimNumber "\<\d\+\%('\d\+\)*" skipwhite
nextgroup=@vimComment,vimSubscript,vimGlobal,vimSubst1
+syn match vimNumber "\<\d\+\%('\d\+\)*\.\d\+\%(e[+-]\=\d\+\)\="
skipwhite nextgroup=@vimComment
+syn match vimNumber "\<0b[01]\+\%('[01]\+\)*"
skipwhite nextgroup=@vimComment,vimSubscript
+syn match vimNumber "\<0o\=\o\+\%('\o\+\)*" skipwhite
nextgroup=@vimComment,vimSubscript
+syn match vimNumber "\<0x\x\+\%('\x\+\)*" skipwhite
nextgroup=@vimComment,vimSubscript
+syn match vimNumber '\<0z\>' skipwhite
nextgroup=@vimComment
+syn match vimNumber '\<0z\%(\x\x\)\+\%(\.\%(\x\x\)\+\)*'
skipwhite nextgroup=@vimComment,vimSubscript
syn case match
" All vimCommands are contained by vimIsCommand. {{{2
diff --git a/runtime/syntax/testdir/dumps/vim9_expr_00.dump
b/runtime/syntax/testdir/dumps/vim9_expr_00.dump
index e8fe31860..92bad1ab7 100644
--- a/runtime/syntax/testdir/dumps/vim9_expr_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_expr_00.dump
@@ -2,19 +2,19 @@
|#+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&| |D|i|c|t|i|o|n|a|r|y| +0#0000000&@62
+|#+0#0000e05&| |N|u|m|b|e|r| +0#0000000&@66
@75
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|}| +0#0000000&@67
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&@2|f+0#00e0e07&|o@1|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&@52
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&|
|2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&|
+0#0000000&|}+0#e000e06&| +0#0000000&@52
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&@52
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&@52
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|"+0#e000002&|f|o@1|"|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&@52
+|#+0#0000e05&| |'| |s|e|p|a|r|a|t|e|d| +0#0000000&@61
@75
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@43
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|b+0#00e0e07&|a|r|-+0#af5f00255&|:+0#0000000&|
|2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&|
+0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@43
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@43
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@43
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@43
+|e+0#af5f00255&|c|h|o| +0#0000000&@2|1+0#e000002&|'|0@2|'|0@2| +0#0000000&@58
+|e+0#af5f00255&|c|h|o| +0#0000000&@2|1+0#e000002&|'|0@2|'|0@2|.|0@1|
+0#0000000&@55
+|e+0#af5f00255&|c|h|o| +0#0000000&@1|-+0#af5f00255&|1+0#e000002&|'|0@2|'|0@2|
+0#0000000&@58
+|e+0#af5f00255&|c|h|o|
+0#0000000&@1|-+0#af5f00255&|1+0#e000002&|'|0@2|'|0@2|.|0@1| +0#0000000&@55
@75
+|e+0#af5f00255&|c|h|o| +0#0000000&@2|0+0#e000002&|b|1|0@2|'|0@3| +0#0000000&@56
+|e+0#af5f00255&|c|h|o| +0#0000000&@2|0+0#e000002&|o|1|0@2|'|0@3| +0#0000000&@56
+|e+0#af5f00255&|c|h|o| +0#0000000&@2|0+0#e000002&|x|1|0@2|'|0@3| +0#0000000&@56
+|e+0#af5f00255&|c|h|o|
+0#0000000&@1|-+0#af5f00255&|0+0#e000002&|b|1|0@2|'|0@3| +0#0000000&@56
+|e+0#af5f00255&|c|h|o|
+0#0000000&@1|-+0#af5f00255&|0+0#e000002&|o|1|0@2|'|0@3| +0#0000000&@56
+|e+0#af5f00255&|c|h|o|
+0#0000000&@1|-+0#af5f00255&|0+0#e000002&|x|1|0@2|'|0@3| +0#0000000&@56
@57|1|,|1| @10|T|o|p|
diff --git a/runtime/syntax/testdir/dumps/vim9_expr_01.dump
b/runtime/syntax/testdir/dumps/vim9_expr_01.dump
index f31e777ee..2b7cc6f8e 100644
--- a/runtime/syntax/testdir/dumps/vim9_expr_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_expr_01.dump
@@ -1,20 +1,20 @@
-|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@43
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|b+0#00e0e07&|a|r|-+0#af5f00255&|:+0#0000000&|
|2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&|
+0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@43
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@43
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@43
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@43
-> @74
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&|
|{+0#e000e06&| +0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&|
|{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|b+0#00e0e07&|a|r|-+0#af5f00255&|:+0#0000000&|
|2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&|
+0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@41
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&|
|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&|
|{+0#e000e06&| +0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&|
|{+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
+|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&@2|0+0#e000002&|b|1|0@2|'|0@3|
+0#0000000&@56
+|e+0#af5f00255&|c|h|o| +0#0000000&@2|0+0#e000002&|o|1|0@2|'|0@3| +0#0000000&@56
+|e+0#af5f00255&|c|h|o| +0#0000000&@2|0+0#e000002&|x|1|0@2|'|0@3| +0#0000000&@56
+|e+0#af5f00255&|c|h|o|
+0#0000000&@1|-+0#af5f00255&|0+0#e000002&|b|1|0@2|'|0@3| +0#0000000&@56
+|e+0#af5f00255&|c|h|o|
+0#0000000&@1|-+0#af5f00255&|0+0#e000002&|o|1|0@2|'|0@3| +0#0000000&@56
+>e+0#af5f00255&|c|h|o|
+0#0000000&@1|-+0#af5f00255&|0+0#e000002&|x|1|0@2|'|0@3| +0#0000000&@56
+@75
+|#+0#0000e05&| |D|i|c|t|i|o|n|a|r|y| +0#0000000&@62
@75
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|4+0#e000002&|2|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@44
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|4+0#e000002&|2|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|b+0#00e0e07&|a|r|-+0#af5f00255&|:+0#0000000&|
|2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&|
+0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@44
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|4+0#e000002&|2|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@44
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|4+0#e000002&|2|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@44
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|4+0#e000002&|2|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@44
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|}| +0#0000000&@67
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&@2|f+0#00e0e07&|o@1|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&@52
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&|
|2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&|
+0#0000000&|}+0#e000e06&| +0#0000000&@52
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&@52
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&@52
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|"+0#e000002&|f|o@1|"|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&@52
@75
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
-@57|1|9|,|0|-|1| @8|9|%|
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@43
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|b+0#00e0e07&|a|r|-+0#af5f00255&|:+0#0000000&|
|2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&|
+0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@43
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@43
+@57|1|9|,|1| @10|8|%|
diff --git a/runtime/syntax/testdir/dumps/vim9_expr_02.dump
b/runtime/syntax/testdir/dumps/vim9_expr_02.dump
index 484ff4d6c..9ef64ac09 100644
--- a/runtime/syntax/testdir/dumps/vim9_expr_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_expr_02.dump
@@ -1,20 +1,20 @@
-|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|b+0#00e0e07&|a|r|-+0#af5f00255&|:+0#0000000&|
|2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&|
+0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@41
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
-> @74
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|"+0#e000002&|f|o@1|"|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|"+0#e000002&|f|o@1|"|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|b+0#00e0e07&|a|r|-+0#af5f00255&|:+0#0000000&|
|2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&|
+0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@41
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|"+0#e000002&|f|o@1|"|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|"+0#e000002&|f|o@1|"|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|"+0#e000002&|f|o@1|"|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
+|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@43
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@43
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@43
+@75
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&|
|{+0#e000e06&| +0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
+>e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&|
|{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|b+0#00e0e07&|a|r|-+0#af5f00255&|:+0#0000000&|
|2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&|
+0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@41
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&|
|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&|
|{+0#e000e06&| +0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&|
|{+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
@75
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&@68
-@2|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63
-@2|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&| +0#0000000&@66
-@4|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&|
+0#0000000&|2+0#e000002&| +0#0000000&@59
-@2|}+0#e000e06&| +0#0000000&@71
-|}+0#e000e06&| +0#0000000&@73
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|4+0#e000002&|2|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@44
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|4+0#e000002&|2|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|b+0#00e0e07&|a|r|-+0#af5f00255&|:+0#0000000&|
|2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&|
+0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@44
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|4+0#e000002&|2|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@44
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|4+0#e000002&|2|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@44
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|4+0#e000002&|2|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@44
@75
-@57|3|7|,|0|-|1| @7|2|1|%|
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|b+0#00e0e07&|a|r|-+0#af5f00255&|:+0#0000000&|
|2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&|
+0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@41
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
+@57|3|7|,|1| @9|1|9|%|
diff --git a/runtime/syntax/testdir/dumps/vim9_expr_03.dump
b/runtime/syntax/testdir/dumps/vim9_expr_03.dump
index 1b6b63476..2995ab301 100644
--- a/runtime/syntax/testdir/dumps/vim9_expr_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_expr_03.dump
@@ -1,20 +1,20 @@
-| +0&#ffffff0@74
-|#+0#0000e05&| |m|a|t|c|h| |a|s| |k|e|y|s| |n|o|t| |s|c|o|p|e|
|d|i|c|t|i|o|n|a|r|i|e|s| +0#0000000&@36
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|b+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |w+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |t+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |g+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |l+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |s+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |a+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |v+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2| +0#0000000&@1|}+0#e000e06&| +0#0000000&@10
-@75
-|#+0#0000e05&| |O|p|e|r|a|t|o|r|s| +0#0000000&@63
-> @74
-|#+0#0000e05&| |T|e|r|n|a|r|y| +0#0000000&@65
+|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
@75
-|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r|
+0#0000000&|?+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r|
+0#0000000&|:+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|"+0#e000002&|f|o@1|"|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@2|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
+>e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|"+0#e000002&|f|o@1|"|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|-+0#af5f00255&|b+0#00e0e07&|a|r|-+0#af5f00255&|:+0#0000000&|
|2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&|
+0#0000000&|}+0#e000e06&| +0#0000000&|}+0#e000e06&| +0#0000000&@41
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|"+0#e000002&|f|o@1|"|:+0#0000000&| |{+0#e000e06&|
+0#0000000&@3|4+0#e000002&|2|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|"+0#e000002&|f|o@1|"|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|'+0#e000002&|b|a|r|'|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|"+0#e000002&|f|o@1|"|:+0#0000000&| |{+0#e000e06&|
+0#0000000&|"+0#e000002&|b|a|r|"|:+0#0000000&| |2+0#e000002&|1|
+0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|}+0#e000e06&|
+0#0000000&|}+0#e000e06&| +0#0000000&@41
@75
-|e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|n|u|m|
+0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&|
+0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|t|o|p|"|
+0#0000000&|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&@45
-|e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|n|u|m|
+0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&|
+0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|t|o|p|"|
+0#0000000&|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m|
+0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&|0@2|
+0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|l|a|s|t|"|
+0#0000000&|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&@21
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&@68
+@2|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63
+@2|f+0#00e0e07&|o@1|:+0#0000000&| |{+0#e000e06&| +0#0000000&@66
+@4|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&|
+0#0000000&|2+0#e000002&| +0#0000000&@59
+@2|}+0#e000e06&| +0#0000000&@71
+|}+0#e000e06&| +0#0000000&@73
@75
-|e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|n|u|m|
+0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&| +0#0000000&@60
-@8|?+0#af5f00255&| +0#0000000&|"+0#e000002&|t|o|p|"| +0#0000000&@59
-@8|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m|
+0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&|0@2| +0#0000000&@52
-@16|?+0#af5f00255&| +0#0000000&|"+0#e000002&|l|a|s|t|"| +0#0000000&@50
-@16|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&@52
-|e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|n|u|m|
+0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&|
+0#0000000&|?+0#af5f00255&| +0#0000000&@58
-@57|5@1|,|0|-|1| @7|3|4|%|
+|#+0#0000e05&| |m|a|t|c|h| |a|s| |k|e|y|s| |n|o|t| |s|c|o|p|e|
|d|i|c|t|i|o|n|a|r|i|e|s| +0#0000000&@36
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|b+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |w+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |t+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |g+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |l+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |s+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |a+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |v+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2| +0#0000000&@1|}+0#e000e06&| +0#0000000&@10
+@57|5@1|,|1| @9|3|0|%|
diff --git a/runtime/syntax/testdir/dumps/vim9_expr_04.dump
b/runtime/syntax/testdir/dumps/vim9_expr_04.dump
index 47754a0ba..f7d5310ea 100644
--- a/runtime/syntax/testdir/dumps/vim9_expr_04.dump
+++ b/runtime/syntax/testdir/dumps/vim9_expr_04.dump
@@ -1,20 +1,20 @@
-|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l+0#00e0e07&|n|u|m|
+0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&|
+0#0000000&|?+0#af5f00255&| +0#0000000&@58
-@8|"+0#e000002&|t|o|p|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@59
-@8|l+0#00e0e07&|n|u|m| +0#0000000&|=+0#af5f00255&@1|
+0#0000000&|1+0#e000002&|0@2| +0#0000000&|?+0#af5f00255&| +0#0000000&@52
-@16|"+0#e000002&|l|a|s|t|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@50
-@16|l+0#00e0e07&|n|u|m| +0#0000000&@54
+|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|{+0#e000e06&|
+0#0000000&|b+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2|,+0#0000000&|
|w+0#00e0e07&|:| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |t+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |g+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |l+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |s+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |a+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2|,+0#0000000&| |v+0#00e0e07&|:|
+0#0000000&|4+0#e000002&|2| +0#0000000&@1|}+0#e000e06&| +0#0000000&@10
+@75
+|#+0#0000e05&| |O|p|e|r|a|t|o|r|s| +0#0000000&@63
+@75
+|#+0#0000e05&| |T|e|r|n|a|r|y| +0#0000000&@65
> @74
-|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#e000002&|r|u|e|
+0#0000000&|?+0#af5f00255&| +0#0000000&|t+0#e000002&|r|u|e|
+0#0000000&|:+0#af5f00255&| +0#0000000&|f+0#e000002&|a|l|s|e| +0#0000000&@50
-|e+0#af5f00255&|c|h|o| +0#0000000&|1+0#e000002&| +0#0000000&|?+0#af5f00255&|
+0#0000000&|1+0#e000002&| +0#0000000&|:+0#af5f00255&| +0#0000000&|0+0#e000002&|
+0#0000000&@60
-|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|f|o@1|"|
+0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"|
+0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|"| +0#0000000&@48
-|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1|
+0#0000000&|?+0#af5f00255&| +0#0000000&|f+0#00e0e07&|o@1|
+0#0000000&|:+0#af5f00255&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@54
-|e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|:|f|o@1|
+0#0000000&|?+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|f|o@1|
+0#0000000&|:+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|b|a|r| +0#0000000&@48
-|e+0#af5f00255&|c|h|o| +0#0000000&|$+0#e000e06&|F|O@1|
+0#0000000&|?+0#af5f00255&| +0#0000000&|$+0#e000e06&|F|O@1|
+0#0000000&|:+0#af5f00255&| +0#0000000&|$+0#e000e06&|B|A|R| +0#0000000&@51
-|e+0#af5f00255&|c|h|o| +0#0000000&|T|r|u|e|(+0#e000e06&|)|
+0#0000000&|?+0#af5f00255&| +0#0000000&|T|r|u|e|(+0#e000e06&|)|
+0#0000000&|:+0#af5f00255&| +0#0000000&|F|a|l|s|e|(+0#e000e06&|)| +0#0000000&@44
-|e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|a| +0#0000000&|?+0#af5f00255&|
+0#0000000&|@+0#e000e06&|a| +0#0000000&|:+0#af5f00255&|
+0#0000000&|@+0#e000e06&|b| +0#0000000&@57
-|e+0#af5f00255&|c|h|o|
+0#0000000&|(+0#e000e06&|t+0#e000002&|r|u|e|)+0#e000e06&|
+0#0000000&|?+0#af5f00255&|
+0#0000000&|(+0#e000e06&|t+0#e000002&|r|u|e|)+0#e000e06&|
+0#0000000&|:+0#af5f00255&|
+0#0000000&|(+0#e000e06&|f+0#e000002&|a|l|s|e|)+0#e000e06&| +0#0000000&@44
-|e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&|
+0#0000000&|?+0#af5f00255&| +0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&|
+0#0000000&|:+0#af5f00255&| +0#0000000&|(+0#e000e06&|0+0#e000002&|)+0#e000e06&|
+0#0000000&@54
+|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r|
+0#0000000&|?+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r|
+0#0000000&|:+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
@75
-|#+0#0000e05&| |F|a|l|s|y| +0#0000000&@67
+|e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|n|u|m|
+0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&|
+0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|t|o|p|"|
+0#0000000&|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&@45
+|e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|n|u|m|
+0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&|
+0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|t|o|p|"|
+0#0000000&|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m|
+0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&|0@2|
+0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|l|a|s|t|"|
+0#0000000&|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&@21
@75
-@57|7|3|,|0|-|1| @7|4|6|%|
+|e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|n|u|m|
+0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&| +0#0000000&@60
+@8|?+0#af5f00255&| +0#0000000&|"+0#e000002&|t|o|p|"| +0#0000000&@59
+@8|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m|
+0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&|0@2| +0#0000000&@52
+@16|?+0#af5f00255&| +0#0000000&|"+0#e000002&|l|a|s|t|"| +0#0000000&@50
+@16|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&@52
+|e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|n|u|m|
+0#0000000&|=+0#af5f00255&@1| +0#0000000&|1+0#e000002&|
+0#0000000&|?+0#af5f00255&| +0#0000000&@58
+@8|"+0#e000002&|t|o|p|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@59
+@8|l+0#00e0e07&|n|u|m| +0#0000000&|=+0#af5f00255&@1|
+0#0000000&|1+0#e000002&|0@2| +0#0000000&|?+0#af5f00255&| +0#0000000&@52
+@57|7|3|,|0|-|1| @7|4|1|%|
diff --git a/runtime/syntax/testdir/dumps/vim9_expr_05.dump
b/runtime/syntax/testdir/dumps/vim9_expr_05.dump
index 753d3279e..dd431b92b 100644
--- a/runtime/syntax/testdir/dumps/vim9_expr_05.dump
+++ b/runtime/syntax/testdir/dumps/vim9_expr_05.dump
@@ -1,20 +1,20 @@
-| +0&#ffffff0@74
-|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
+| +0&#ffffff0@7|l+0#00e0e07&|n|u|m| +0#0000000&|=+0#af5f00255&@1|
+0#0000000&|1+0#e000002&|0@2| +0#0000000&|?+0#af5f00255&| +0#0000000&@52
+@16|"+0#e000002&|l|a|s|t|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@50
+@16|l+0#00e0e07&|n|u|m| +0#0000000&@54
+@75
+|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#e000002&|r|u|e|
+0#0000000&|?+0#af5f00255&| +0#0000000&|t+0#e000002&|r|u|e|
+0#0000000&|:+0#af5f00255&| +0#0000000&|f+0#e000002&|a|l|s|e| +0#0000000&@50
+>e+0#af5f00255&|c|h|o| +0#0000000&|1+0#e000002&| +0#0000000&|?+0#af5f00255&|
+0#0000000&|1+0#e000002&| +0#0000000&|:+0#af5f00255&| +0#0000000&|0+0#e000002&|
+0#0000000&@60
+|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|f|o@1|"|
+0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"|
+0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|b|a|r|"| +0#0000000&@48
+|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1|
+0#0000000&|?+0#af5f00255&| +0#0000000&|f+0#00e0e07&|o@1|
+0#0000000&|:+0#af5f00255&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@54
+|e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|:|f|o@1|
+0#0000000&|?+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|f|o@1|
+0#0000000&|:+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|b|a|r| +0#0000000&@48
+|e+0#af5f00255&|c|h|o| +0#0000000&|$+0#e000e06&|F|O@1|
+0#0000000&|?+0#af5f00255&| +0#0000000&|$+0#e000e06&|F|O@1|
+0#0000000&|:+0#af5f00255&| +0#0000000&|$+0#e000e06&|B|A|R| +0#0000000&@51
+|e+0#af5f00255&|c|h|o| +0#0000000&|T|r|u|e|(+0#e000e06&|)|
+0#0000000&|?+0#af5f00255&| +0#0000000&|T|r|u|e|(+0#e000e06&|)|
+0#0000000&|:+0#af5f00255&| +0#0000000&|F|a|l|s|e|(+0#e000e06&|)| +0#0000000&@44
+|e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|a| +0#0000000&|?+0#af5f00255&|
+0#0000000&|@+0#e000e06&|a| +0#0000000&|:+0#af5f00255&|
+0#0000000&|@+0#e000e06&|b| +0#0000000&@57
+|e+0#af5f00255&|c|h|o|
+0#0000000&|(+0#e000e06&|t+0#e000002&|r|u|e|)+0#e000e06&|
+0#0000000&|?+0#af5f00255&|
+0#0000000&|(+0#e000e06&|t+0#e000002&|r|u|e|)+0#e000e06&|
+0#0000000&|:+0#af5f00255&|
+0#0000000&|(+0#e000e06&|f+0#e000002&|a|l|s|e|)+0#e000e06&| +0#0000000&@44
+|e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&|
+0#0000000&|?+0#af5f00255&| +0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&|
+0#0000000&|:+0#af5f00255&| +0#0000000&|(+0#e000e06&|0+0#e000002&|)+0#e000e06&|
+0#0000000&@54
@75
-|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|h|e|L|i|s|t|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|'+0#e000002&|l|i|s|t| |i|s|
|e|m|p|t|y|'| +0#0000000&@43
-|e+0#af5f00255&|c|h|o| +0#0000000&|G|e|t|N|a|m|e|(+0#e000e06&|)|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|'+0#e000002&|u|n|k|n|o|w|n|'|
+0#0000000&@47
-> @74
-|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|h|e|L|i|s|t| +0#0000000&@62
-@6|\+0#e000e06&| +0#0000000&|?+0#af5f00255&@1|
+0#0000000&|'+0#e000002&|l|i|s|t| |i|s| |e|m|p|t|y|'| +0#0000000&@48
-|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|h|e|L|i|s|t|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&@59
-@6|\+0#e000e06&| +0#0000000&|'+0#e000002&|l|i|s|t| |i|s| |e|m|p|t|y|'|
+0#0000000&@51
+|#+0#0000e05&| |F|a|l|s|y| +0#0000000&@67
+@75
+|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
@75
-|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#e000002&|r|u|e|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@57
-|e+0#af5f00255&|c|h|o| +0#0000000&|1+0#e000002&| +0#0000000&|?+0#af5f00255&@1|
+0#0000000&|1+0#e000002&| +0#0000000&@63
-|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|f|o@1|"|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@55
-|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59
-|e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|:|f|o@1|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|g+0#00e0e07&|:|f|o@1| +0#0000000&@55
-|e+0#af5f00255&|c|h|o| +0#0000000&|$+0#e000e06&|F|O@1|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@57
-|e+0#af5f00255&|c|h|o| +0#0000000&|T|r|u|e|(+0#e000e06&|)|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|T|r|u|e|(+0#e000e06&|)| +0#0000000&@53
-|e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|a|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|@+0#e000e06&|a| +0#0000000&@61
-@57|9|1|,|0|-|1| @7|5|9|%|
+@57|9|1|,|1| @9|5|3|%|
diff --git a/runtime/syntax/testdir/dumps/vim9_expr_06.dump
b/runtime/syntax/testdir/dumps/vim9_expr_06.dump
index d8b69bc1d..0ec0e8739 100644
--- a/runtime/syntax/testdir/dumps/vim9_expr_06.dump
+++ b/runtime/syntax/testdir/dumps/vim9_expr_06.dump
@@ -1,20 +1,20 @@
-|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|@+0#e000e06&|a|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|@+0#e000e06&|a| +0#0000000&@61
-|e+0#af5f00255&|c|h|o|
+0#0000000&|(+0#e000e06&|t+0#e000002&|r|u|e|)+0#e000e06&|
+0#0000000&|?+0#af5f00255&@1|
+0#0000000&|(+0#e000e06&|t+0#e000002&|r|u|e|)+0#e000e06&| +0#0000000&@53
-|e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&|
+0#0000000&|?+0#af5f00255&@1|
+0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&| +0#0000000&@59
-@75
-@75
->#+0#0000e05&| |F|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@58
-@75
-|F|o@1|(+0#e000e06&|t+0#e000002&|r|u|e|,+0#0000000&|
|f+0#e000002&|a|l|s|e|,+0#0000000&| |n+0#e000002&|u|l@1|)+0#e000e06&|
+0#0000000&@52
+| +0&#ffffff0@74
+|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|h|e|L|i|s|t|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|'+0#e000002&|l|i|s|t| |i|s|
|e|m|p|t|y|'| +0#0000000&@43
+|e+0#af5f00255&|c|h|o| +0#0000000&|G|e|t|N|a|m|e|(+0#e000e06&|)|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|'+0#e000002&|u|n|k|n|o|w|n|'|
+0#0000000&@47
@75
+|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|h|e|L|i|s|t| +0#0000000&@62
+@6>\+0#e000e06&| +0#0000000&|?+0#af5f00255&@1|
+0#0000000&|'+0#e000002&|l|i|s|t| |i|s| |e|m|p|t|y|'| +0#0000000&@48
+|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|h|e|L|i|s|t|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&@59
+@6|\+0#e000e06&| +0#0000000&|'+0#e000002&|l|i|s|t| |i|s| |e|m|p|t|y|'|
+0#0000000&@51
@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
-@57|1|0|9|,|1| @8|7|1|%|
+|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#e000002&|r|u|e|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@57
+|e+0#af5f00255&|c|h|o| +0#0000000&|1+0#e000002&| +0#0000000&|?+0#af5f00255&@1|
+0#0000000&|1+0#e000002&| +0#0000000&@63
+|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|f|o@1|"|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@55
+|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59
+|e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|:|f|o@1|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|g+0#00e0e07&|:|f|o@1| +0#0000000&@55
+|e+0#af5f00255&|c|h|o| +0#0000000&|$+0#e000e06&|F|O@1|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@57
+|e+0#af5f00255&|c|h|o| +0#0000000&|T|r|u|e|(+0#e000e06&|)|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|T|r|u|e|(+0#e000e06&|)| +0#0000000&@53
+|e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|a|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|@+0#e000e06&|a| +0#0000000&@61
+|e+0#af5f00255&|c|h|o|
+0#0000000&|(+0#e000e06&|t+0#e000002&|r|u|e|)+0#e000e06&|
+0#0000000&|?+0#af5f00255&@1|
+0#0000000&|(+0#e000e06&|t+0#e000002&|r|u|e|)+0#e000e06&| +0#0000000&@53
+|e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&|
+0#0000000&|?+0#af5f00255&@1|
+0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&| +0#0000000&@59
+@57|1|0|9|,|7| @8|6|4|%|
diff --git a/runtime/syntax/testdir/dumps/vim9_expr_07.dump
b/runtime/syntax/testdir/dumps/vim9_expr_07.dump
index 22c0e01e2..607561b4b 100644
--- a/runtime/syntax/testdir/dumps/vim9_expr_07.dump
+++ b/runtime/syntax/testdir/dumps/vim9_expr_07.dump
@@ -1,20 +1,20 @@
-|w+0#af5f00255#ffffff0|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
+|e+0#af5f00255#ffffff0|c|h|o|
+0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&|
+0#0000000&|?+0#af5f00255&@1|
+0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&| +0#0000000&@59
+@75
@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
+|#+0#0000e05&| |F|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@58
@75
+>F|o@1|(+0#e000e06&|t+0#e000002&|r|u|e|,+0#0000000&|
|f+0#e000002&|a|l|s|e|,+0#0000000&| |n+0#e000002&|u|l@1|)+0#e000e06&|
+0#0000000&@52
@75
-|#+0#0000e05&| |I|s@1|u|e| |#|1|4@1|2|3| |(|v|i|m|.|v|i|m|:| |O|p|t| |o|u|t|
|o|f| |v|i|m|S|e|a|r|c|h|*|)| +0#0000000&@27
@75
-|:|?+0#e000e06&|t+0#e000002&|r|u|t|h|y| +0#0000000&@66
-|c+0#af5f00255&|o|n|s|t| +0#0000000&|t+0#00e0e07&|r|u|t|h|y|:+0#0000000&|
|n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&|
+0#0000000&|f+0#e000002&|a|l|s|e| +0#0000000&@46
-@4|?+0#af5f00255&| +0#0000000&|(+0#e000e06&|0+0#e000002&| +0#0000000&@66
-@4|)+0#e000e06&| +0#0000000&@69
-@4|:+0#af5f00255&| +0#0000000&|(+0#e000e06&|1+0#e000002&| +0#0000000&@66
-@4|)+0#e000e06&| +0#0000000&@69
-|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|r|u|t|h|y| +0#0000000&@63
+|#+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
-@57|1|2|7|,|3| @8|8|4|%|
+|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
+@57|1|2|7|,|1| @8|7|5|%|
diff --git a/runtime/syntax/testdir/dumps/vim9_expr_08.dump
b/runtime/syntax/testdir/dumps/vim9_expr_08.dump
index 4ec97dd62..217a65e77 100644
--- a/runtime/syntax/testdir/dumps/vim9_expr_08.dump
+++ b/runtime/syntax/testdir/dumps/vim9_expr_08.dump
@@ -1,20 +1,20 @@
-| +0&#ffffff0@74
-|d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@65
-| +0#e000002&@1|:+0#0000000&|?+0#e000e06&|t+0#e000002&|r|u|t|h|y|
+0#0000000&@64
-@2|c+0#af5f00255&|o|n|s|t| +0#0000000&|t+0#00e0e07&|r|u|t|h|y|:+0#0000000&|
|n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&|
+0#0000000&|f+0#e000002&|a|l|s|e| +0#0000000&@44
-@6|?+0#af5f00255&| +0#0000000&|(+0#e000e06&|0+0#e000002&| +0#0000000&@64
-@6>)+0#e000e06&| +0#0000000&@67
-@6|:+0#af5f00255&| +0#0000000&|(+0#e000e06&|1+0#e000002&| +0#0000000&@64
-@6|)+0#e000e06&| +0#0000000&@67
-@2|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|r|u|t|h|y| +0#0000000&@61
+|e+0#af5f00255#ffffff0|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
+> @74
@75
+|#+0#0000e05&| |I|s@1|u|e| |#|1|4@1|2|3| |(|v|i|m|.|v|i|m|:| |O|p|t| |o|u|t|
|o|f| |v|i|m|S|e|a|r|c|h|*|)| +0#0000000&@27
@75
-|#+0#0000e05&| |I|s@1|u|e| |#|1|6|2@1|7| |(|V|i|m| |s|c|r|i|p|t|
|t|e|r|n|a|r|y| |e|x|p|r|e|s@1|i|o|n| |h|i|g|h|l|i|g|h|t|i|n|g|)| +0#0000000&@15
+|:|?+0#e000e06&|t+0#e000002&|r|u|t|h|y| +0#0000000&@66
+|c+0#af5f00255&|o|n|s|t| +0#0000000&|t+0#00e0e07&|r|u|t|h|y|:+0#0000000&|
|n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&|
+0#0000000&|f+0#e000002&|a|l|s|e| +0#0000000&@46
+@4|?+0#af5f00255&| +0#0000000&|(+0#e000e06&|0+0#e000002&| +0#0000000&@66
+@4|)+0#e000e06&| +0#0000000&@69
+@4|:+0#af5f00255&| +0#0000000&|(+0#e000e06&|1+0#e000002&| +0#0000000&@66
+@4|)+0#e000e06&| +0#0000000&@69
+|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|r|u|t|h|y| +0#0000000&@63
@75
-|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&|
+0#0000000&|'+0#e000002&|f|o@1|'| +0#0000000&@24|#+0#0000e05&| |c|o|m@1|e|n|t|
+0#0000000&@25
-|v+0#af5f00255&|a|r| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|=+0#af5f00255&|
+0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&@1|
+0#0000000&|'+0#e000002&|f|o@1|'| +0#0000000&|?+0#af5f00255&|
+0#0000000&|'+0#e000002&|b|a|r|'| +0#0000000&|:+0#af5f00255&|
+0#0000000&|'+0#e000002&|b|a|z|'| +0#0000000&@36
-|v+0#af5f00255&|a|r| +0#0000000&|b+0#00e0e07&|a|z| +0#0000000&|=+0#af5f00255&|
+0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&@1|
+0#0000000&|'+0#e000002&|f|o@1|'| +0#0000000&@52
-@12|\+0#e000e06&| +0#0000000&|?+0#af5f00255&|
+0#0000000&|'+0#e000002&|b|a|z|'| +0#0000000&@53
-@12|\+0#e000e06&| +0#0000000&|:+0#af5f00255&|
+0#0000000&|'+0#e000002&|b|a|r|'| +0#0000000&@53
-@57|1|4|5|,|7| @8|9|6|%|
+|d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@65
+| +0#e000002&@1|:+0#0000000&|?+0#e000e06&|t+0#e000002&|r|u|t|h|y|
+0#0000000&@64
+@57|1|4|5|,|0|-|1| @6|8|6|%|
diff --git a/runtime/syntax/testdir/dumps/vim9_expr_09.dump
b/runtime/syntax/testdir/dumps/vim9_expr_09.dump
index ce5416a63..09e437890 100644
--- a/runtime/syntax/testdir/dumps/vim9_expr_09.dump
+++ b/runtime/syntax/testdir/dumps/vim9_expr_09.dump
@@ -1,20 +1,20 @@
-| +0&#ffffff0@11|\+0#e000e06&| +0#0000000&|:+0#af5f00255&|
+0#0000000&|'+0#e000002&|b|a|r|'| +0#0000000&@53
+| +0#e000002#ffffff0@1|:+0#0000000&|?+0#e000e06&|t+0#e000002&|r|u|t|h|y|
+0#0000000&@64
+@2|c+0#af5f00255&|o|n|s|t| +0#0000000&|t+0#00e0e07&|r|u|t|h|y|:+0#0000000&|
|n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&|
+0#0000000&|f+0#e000002&|a|l|s|e| +0#0000000&@44
+@6|?+0#af5f00255&| +0#0000000&|(+0#e000e06&|0+0#e000002&| +0#0000000&@64
+@6|)+0#e000e06&| +0#0000000&@67
+@6|:+0#af5f00255&| +0#0000000&|(+0#e000e06&|1+0#e000002&| +0#0000000&@64
+@6>)+0#e000e06&| +0#0000000&@67
+@2|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|r|u|t|h|y| +0#0000000&@61
+|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
+@75
+@75
+|#+0#0000e05&| |I|s@1|u|e| |#|1|6|2@1|7| |(|V|i|m| |s|c|r|i|p|t|
|t|e|r|n|a|r|y| |e|x|p|r|e|s@1|i|o|n| |h|i|g|h|l|i|g|h|t|i|n|g|)| +0#0000000&@15
+@75
+|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&|
+0#0000000&|'+0#e000002&|f|o@1|'| +0#0000000&@24|#+0#0000e05&| |c|o|m@1|e|n|t|
+0#0000000&@25
+|v+0#af5f00255&|a|r| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|=+0#af5f00255&|
+0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&@1|
+0#0000000&|'+0#e000002&|f|o@1|'| +0#0000000&|?+0#af5f00255&|
+0#0000000&|'+0#e000002&|b|a|r|'| +0#0000000&|:+0#af5f00255&|
+0#0000000&|'+0#e000002&|b|a|z|'| +0#0000000&@36
+|v+0#af5f00255&|a|r| +0#0000000&|b+0#00e0e07&|a|z| +0#0000000&|=+0#af5f00255&|
+0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&@1|
+0#0000000&|'+0#e000002&|f|o@1|'| +0#0000000&@52
+@12|\+0#e000e06&| +0#0000000&|?+0#af5f00255&|
+0#0000000&|'+0#e000002&|b|a|z|'| +0#0000000&@53
+@12|\+0#e000e06&| +0#0000000&|:+0#af5f00255&|
+0#0000000&|'+0#e000002&|b|a|r|'| +0#0000000&@53
|v+0#af5f00255&|a|r| +0#0000000&|q+0#00e0e07&|u|x| +0#0000000&|=+0#af5f00255&|
+0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&@1|
+0#0000000&|'+0#e000002&|f|o@1|'| +0#0000000&@52
@12|?+0#af5f00255&| +0#0000000&|'+0#e000002&|q|u|x|'|
+0#0000000&@20|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@25
-@12|:+0#af5f00255&| +0#0000000&|'+0#e000002&|q|u|x|'|
+0#0000000&@20|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@25
-|e+0#af5f00255&|c|h|o| +0#0000000&|q+0#00e0e07&|u|x|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|'+0#e000002&|q|u@1|x|'| +0#0000000&@56
-> @74
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|6|3|,|0|-|1| @6|B|o|t|
+@57|1|6|3|,|7| @8|9|8|%|
diff --git a/runtime/syntax/testdir/dumps/vim9_expr_10.dump
b/runtime/syntax/testdir/dumps/vim9_expr_10.dump
new file mode 100644
index 000000000..9d0232e1e
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim9_expr_10.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@11|?+0#af5f00255&| +0#0000000&|'+0#e000002&|q|u|x|'|
+0#0000000&@20|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@25
+@12|:+0#af5f00255&| +0#0000000&|'+0#e000002&|q|u|x|'|
+0#0000000&@20|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@25
+|e+0#af5f00255&|c|h|o| +0#0000000&|q+0#00e0e07&|u|x|
+0#0000000&|?+0#af5f00255&@1| +0#0000000&|'+0#e000002&|q|u@1|x|'| +0#0000000&@56
+> @74
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|7|9|,|0|-|1| @6|B|o|t|
diff --git a/runtime/syntax/testdir/input/vim9_expr.vim
b/runtime/syntax/testdir/input/vim9_expr.vim
index 592acadc0..e291309e4 100644
--- a/runtime/syntax/testdir/input/vim9_expr.vim
+++ b/runtime/syntax/testdir/input/vim9_expr.vim
@@ -2,6 +2,22 @@ vim9script
# Vim9-script expressions
+# Number
+
+# ' separated
+
+echo 1'000'000
+echo 1'000'000.00
+echo -1'000'000
+echo -1'000'000.00
+
+echo 0b1000'0000
+echo 0o1000'0000
+echo 0x1000'0000
+echo -0b1000'0000
+echo -0o1000'0000
+echo -0x1000'0000
+
# Dictionary
echo {}
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 5b8a5baa7..e144a9f26 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -2,7 +2,7 @@
" Language: Vim script
" Maintainer: Hirohito Higashi <h.east.727 ATMARK gmail.com>
" Doug Kearns <dougkea...@gmail.com>
-" Last Change: 2025 May 01
+" Last Change: 2025 May 04
" Former Maintainer: Charles E. Campbell
" DO NOT CHANGE DIRECTLY.
@@ -275,13 +275,13 @@ Vim9 syn keyword vim9Boolean true false
" Numbers {{{2
" =======
syn case ignore
-syn match vimNumber '\<\d\+' skipwhite
nextgroup=vimGlobal,vimSubst1,@vimComment,vimSubscript
-syn match vimNumber '\<\d\+\.\d\+\%(e[+-]\=\d\+\)\='
skipwhite nextgroup=vimGlobal,vimSubst1,@vimComment
-syn match vimNumber '\<0b[01]\+' skipwhite
nextgroup=vimGlobal,vimSubst1,@vimComment,vimSubscript
-syn match vimNumber '\<0o\=\o\+' skipwhite
nextgroup=vimGlobal,vimSubst1,@vimComment,vimSubscript
-syn match vimNumber '\<0x\x\+' skipwhite
nextgroup=vimGlobal,vimSubst1,@vimComment,vimSubscript
-syn match vimNumber '\<0z\>' skipwhite
nextgroup=vimGlobal,vimSubst1,@vimComment
-syn match vimNumber '\<0z\%(\x\x\)\+\%(\.\%(\x\x\)\+\)*'
skipwhite nextgroup=vimGlobal,vimSubst1,@vimComment,vimSubscript
+syn match vimNumber "\<\d\+\%('\d\+\)*" skipwhite
nextgroup=@vimComment,vimSubscript,vimGlobal,vimSubst1
+syn match vimNumber "\<\d\+\%('\d\+\)*\.\d\+\%(e[+-]\=\d\+\)\="
skipwhite nextgroup=@vimComment
+syn match vimNumber "\<0b[01]\+\%('[01]\+\)*"
skipwhite nextgroup=@vimComment,vimSubscript
+syn match vimNumber "\<0o\=\o\+\%('\o\+\)*" skipwhite
nextgroup=@vimComment,vimSubscript
+syn match vimNumber "\<0x\x\+\%('\x\+\)*" skipwhite
nextgroup=@vimComment,vimSubscript
+syn match vimNumber '\<0z\>' skipwhite
nextgroup=@vimComment
+syn match vimNumber '\<0z\%(\x\x\)\+\%(\.\%(\x\x\)\+\)*'
skipwhite nextgroup=@vimComment,vimSubscript
syn case match
" All vimCommands are contained by vimIsCommand. {{{2
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1uBeoV-007xwh-ST%40256bit.org.
