runtime(vim): Update base syntax, fix incorrect function error

Don't match lower-case function names as errors when the qualifier
includes a dict/list accessor.

This is a less than perfect fix until qualified function call matching
is reworked.

fixes: #17766
closes: #17780

Signed-off-by: Doug Kearns <dougkearns@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/syntax/generator/vim.vim.base b/runtime/syntax/generator/vim.vim.base
index a32de1e69def0beb258b1efc35af1ddeed4d961f..03cee12567ef87e5b0a5312a6644861df6acbada 100644 (file)
--- a/runtime/syntax/generator/vim.vim.base
+++ b/runtime/syntax/generator/vim.vim.base
@@ -291,7 +291,7 @@ syn keyword vimBehaveModel  contained       mswin   xterm
 
 " Call {{{2
 " ====
-syn match vimCall      "\<call\=\>"    skipwhite nextgroup=@vimFunc
+syn match vimCall      "\<call\=\>"    skipwhite nextgroup=vimVar,@vimFunc
 
 " Debuggreedy {{{2
 " ===========
@@ -2065,6 +2065,7 @@ unlet s:interfaces
 " (following Gautam Iyer's suggestion)
 " ==========================
 syn match      vimFunc contained       "\<\l\w*\ze\s*("                                skipwhite nextgroup=vimOperParen contains=vimFuncName
+syn match      vimUserFunc     contained       "\.\@1<=\l\w*\ze\s*("                   skipwhite nextgroup=vimOperParen contains=vimFuncName
 syn match      vimUserFunc     contained       "\<\%([[:upper:]_]\|\%(\h\w*\.\)\+\h\)\w*\ze\s*("               skipwhite nextgroup=vimOperParen contains=vim9MethodName,vim9Super,vim9This
 syn match      vimUserFunc     contained       "\<\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze\s*("          skipwhite nextgroup=vimOperParen contains=vimVarScope
 syn match      vimUserFunc     contained       "\%(\<[sgbwtlav]:\|<[sS][iI][dD]>\)\%(\h\w*\.\)*\h\w*\ze\s*("   skipwhite nextgroup=vimOperParen contains=vimVarScope,vimNotation

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_00.dump b/runtime/syntax/testdir/dumps/vim9_function_call_00.dump
index c90f2fa1c6d14c1d3ddcac1ee44c1511cfd46108..5fec8133b2692b0da87d34d927bdc41ac3d6962d 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_00.dump
@@ -1,7 +1,7 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
 |#+0#0000e05&| |V|i|m| |f|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@54
-|#+0#0000e05&| |V|I|M|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|U|s|e|r|F|u|n|c| |T|o|d|o| +0#0000000&@31
-|#+0#0000e05&| |V|I|M|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|9|U|s|e|r|F|u|n|c| |T|o|d|o| +0#0000000&@30
+|#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|U|s|e|r|F|u|n|c| |T|o|d|o| +0#0000000&@26
+|#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|9|U|s|e|r|F|u|n|c| |T|o|d|o| +0#0000000&@25
 @75
 @75
 |c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|b|s|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@62

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_02.dump b/runtime/syntax/testdir/dumps/vim9_function_call_02.dump
index c669eaf7bd4c04d247026f0ff0c89028aa5dd12f..0f8d7a44baccfc8b7595824a2343ac3c164183e6 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_02.dump
@@ -17,4 +17,4 @@
 |#+0#0000e05&| |c|o|m@1|a|n|d| +0#0000000&@65
 |c+0#af5f00255&|o|n|f|i|r|m| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@62
 @75
-@57|3|7|,|1| @9|1@1|%| 
+@57|3|7|,|1| @9|1|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_03.dump b/runtime/syntax/testdir/dumps/vim9_function_call_03.dump
index 4876999438fe6e170c374b7c00cd6f44b34a794c..fae788c085feb4ced6e1ff73272253b046364dfa 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_03.dump
@@ -17,4 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|e+0#00e0e07&|v|a|l|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@61
 |#+0#0000e05&| |f|u|n|c|t|i|o|n| +0#0000000&@64
 |e+0#00e0e07&|v|a|l|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@66
-@57|5@1|,|1| @9|1|7|%| 
+@57|5@1|,|1| @9|1|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_04.dump b/runtime/syntax/testdir/dumps/vim9_function_call_04.dump
index 9bc1fb7b483b9302261ce93f08e9879fb0fdda1e..0fbf9c339cb8c2f2f87cdbc6a1eb1a63aa140ec4 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_04.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_04.dump
@@ -17,4 +17,4 @@
 |f+0#af5f00255&|i|l|t|e|r| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@63
 @75
 |v+0#af5f00255&|a|r| +0#0000000&|f|u|n|c|t|i|o|n| |=+0#af5f00255&| +0#0000000&|f+0#00e0e07&|u|n|c|t|i|o|n|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@47
-@57|7|3|,|1| @9|2|4|%| 
+@57|7|3|,|1| @9|2@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_05.dump b/runtime/syntax/testdir/dumps/vim9_function_call_05.dump
index a8f4970cf14ba9ff99a0802f164c8683d1851591..bc258f6aeef969c06e7ad5e970c9e1bdba514238 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_05.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_05.dump
@@ -17,4 +17,4 @@
 |#+0#0000e05&| |f|u|n|c|t|i|o|n| +0#0000000&@64
 |j+0#00e0e07&|o|i|n|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@66
 |#+0#0000e05&| |c|o|m@1|a|n|d| +0#0000000&@65
-@57|9|1|,|1| @9|3|0|%| 
+@57|9|1|,|1| @9|2|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_06.dump b/runtime/syntax/testdir/dumps/vim9_function_call_06.dump
index c8c8f387f815e7ce4cfa98eca745778e8733c1dd..e26a13a6ae10456598d6a445d40c0e56a1cce3f8 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_06.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_06.dump
@@ -17,4 +17,4 @@
 @75
 |v+0#af5f00255&|a|r| +0#0000000&|s|o|r|t| |=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|o|r|t|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|o|r|t|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@61
-@57|1|0|9|,|1| @8|3|7|%| 
+@57|1|0|9|,|1| @8|3|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_07.dump b/runtime/syntax/testdir/dumps/vim9_function_call_07.dump
index a41ea00f023ffc6341b628ea1c49866988dc2821..c61c89a2c49ac32c988eb852d38d9ffa0927c59c 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_07.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_07.dump
@@ -17,4 +17,4 @@
 |s+0#00e0e07&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 |#+0#0000e05&| |c|o|m@1|a|n|d| +0#0000000&@65
 |s+0#af5f00255&|u|b|s|t|i|t|u|t|e| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@59
-@57|1|2|7|,|0|-|1| @6|4|3|%| 
+@57|1|2|7|,|0|-|1| @6|4|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_08.dump b/runtime/syntax/testdir/dumps/vim9_function_call_08.dump
index 3f365bb3297f537466139a998f4205e365b9563d..657983f01c593d6b60645f5f741fa39b204c6c57 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_08.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_08.dump
@@ -17,4 +17,4 @@
 |v+0#af5f00255&|a|r| +0#0000000&|u|n|i|q| |=+0#af5f00255&| +0#0000000&|u+0#00e0e07&|n|i|q|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|u+0#00e0e07&|n|i|q|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@61
 |#+0#0000e05&| |f|u|n|c|t|i|o|n| +0#0000000&@64
-@57|1|4|5|,|1| @8|5|0|%| 
+@57|1|4|5|,|1| @8|4|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_09.dump b/runtime/syntax/testdir/dumps/vim9_function_call_09.dump
index 23b5f1d2e7fef187c968ed996d1809ee4fe85c27..a1e218e781866658ace58ae6dc97e0fb4b4223c3 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_09.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_09.dump
@@ -17,4 +17,4 @@
 |#+0#0000e05&| |c|o|m@1|a|n|d| +0#0000000&@65
 |i+0#af5f00255&|f| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&||| |.+0#af5f00255&@1| +0#0000000&||| |e+0#af5f00255&|n|d|i|f| +0#0000000&@54
 @75
-@57|1|6|3|,|0|-|1| @6|5|6|%| 
+@57|1|6|3|,|0|-|1| @6|5|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_10.dump b/runtime/syntax/testdir/dumps/vim9_function_call_10.dump
index 1030aec6c00551c6d838dbf40f7aecec0c54d8be..96d1d23f02d06481e2ef8c33a4da523788098956 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_10.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_10.dump
@@ -17,4 +17,4 @@
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|a+0#00e0e07&|b|s|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@62
 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|a+0#00e0e07&|b|s|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&@1| +0#0000000&@60
-@57|1|8|1|,|1| @8|6|3|%| 
+@57|1|8|1|,|1| @8|5|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_11.dump b/runtime/syntax/testdir/dumps/vim9_function_call_11.dump
index 3cb73d12290df663438b72d71bec53df7af197a8..fbf9a33b5e319fd0f6a18300d643035af7c26e2d 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_11.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_11.dump
@@ -2,19 +2,19 @@
 |e+0#af5f00255&|c|h|o| +0#0000000&|a+0#00e0e07&|b|s|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&|++0#af5f00255&| +0#0000000&|f|o@1| @56
 |e+0#af5f00255&|c|h|o| +0#0000000&|f|o@1| |++0#af5f00255&| +0#0000000&|a+0#00e0e07&|b|s|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@56
 @75
-|F|o@1|(+0#e000e06&|)| +0#0000000&@69
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@64
-|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |F|o@1|(+0#e000e06&|)| +0#0000000&@56
+|F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@69
+>c+0#af5f00255&|a|l@1| +0#0000000&|F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@64
+|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@56
 @75
-|e+0#af5f00255&|c|h|o| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@64
-|e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|F+0#0000000&|o@1|(+0#e000e06&|)@1| +0#0000000&@62
-|e+0#af5f00255&|c|h|o| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&|++0#af5f00255&| +0#0000000&|b|a|r| @58
-|e+0#af5f00255&|c|h|o| +0#0000000&|b|a|r| |++0#af5f00255&| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@58
+|e+0#af5f00255&|c|h|o| +0#0000000&|F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@64
+|e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)@1| +0#0000000&@62
+|e+0#af5f00255&|c|h|o| +0#0000000&|F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&|++0#af5f00255&| +0#0000000&|b|a|r| @58
+|e+0#af5f00255&|c|h|o| +0#0000000&|b|a|r| |++0#af5f00255&| +0#0000000&|F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@58
 @75
 @75
 |#+0#0000e05&| |s|c|o|p|e| |m|o|d|i|f|i|e|r|s| |a|n|d| |q|u|a|l|i|f|i|e|d| |n|a|m|e|s| +0#0000000&@37
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
-@57|1|9@1|,|1| @8|6|9|%| 
+@57|1|9@1|,|1| @8|6|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_12.dump b/runtime/syntax/testdir/dumps/vim9_function_call_12.dump
index 73b5a53018aae3206f334146c7a360d12bac74ac..4600baba1d796ca8c634a011c24e4a54c13bcc44 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_12.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_12.dump
@@ -1,20 +1,20 @@
 | +0&#ffffff0@74
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|b+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|b+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|w+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
->c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|w+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+>c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|m|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@50
-|c+0#af5f00255&|a|l@1| +0#0000000&|m|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
-|m|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-@57|2|1|7|,|1| @8|7|6|%| 
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+@57|2|1|7|,|1| @8|7|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_13.dump b/runtime/syntax/testdir/dumps/vim9_function_call_13.dump
index 79e893aaa86970d44e5c22bf742d9df15eabb450..f7a451b14fb7a6f8eb782526b6cb7e7d5f7f3dcb 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_13.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_13.dump
@@ -1,20 +1,20 @@
-|v+0#af5f00255#ffffff0|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
-|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
+|v+0#af5f00255#ffffff0|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|b+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
->c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
-|b+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|b+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+>c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|b+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|w+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
-|w+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|w+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|w+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
-|t+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|t+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
-|v+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
-@57|2|3|5|,|1| @8|8|2|%| 
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|v+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
+@57|2|3|5|,|1| @8|7@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_14.dump b/runtime/syntax/testdir/dumps/vim9_function_call_14.dump
index 6115b40011ba6543824232feadf5d1d77b4cf0bb..bcc576ad02315e53e3179ca5c270bbc8f78ff2fe 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_14.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_14.dump
@@ -1,20 +1,20 @@
-|v+0#00e0e07#ffffff0|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
+|v+0#00e0e07#ffffff0|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
 @75
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|m|o|d|u|l|e|#|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@50
-|c+0#af5f00255&|a|l@1| +0#0000000&|m|o|d|u|l|e|#|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
->m|o|d|u|l|e|#|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|#|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|#|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+>m+0#0000001#ffff4012|o|d|u|l|e|#|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|#|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|#|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
-|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|#|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|#|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|#|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|#|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
 @75
 @75
 |#+0#0000e05&| |n|o|t| |b|u|i|l|t|i|n| |f|u|n|c|t|i|o|n|s| +0#0000000&@51
 @75
-|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@55
-@57|2|5|3|,|1| @8|8|9|%| 
+|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
+@57|2|5|3|,|1| @8|8|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_15.dump b/runtime/syntax/testdir/dumps/vim9_function_call_15.dump
index 2b15d1e2adb9b89ab9460d12a6c6a821dee742f3..187a9bf265656b999a3b561ce768336249ea5cf1 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_15.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_15.dump
@@ -1,20 +1,20 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|v+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@55
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|v+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
 @75
-|c+0#af5f00255&|a|l@1| +0#0000000&|<+0#e000e06&|S|I|D|>|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|<+0#e000e06&|S|I|D|>|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@52
 @75
-|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@44
->c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+>c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
 @75
-|c+0#af5f00255&|a|l@1| +0#0000000&|s|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@46
-|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@46
+|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
 @75
-|g+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@60
-|b+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@60
-|w+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@60
-|t+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@60
-|v+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@60
+|g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@60
+|b+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@60
+|w+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@60
+|t+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@60
+|v+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@60
 @75
-@57|2|7|1|,|1| @8|9|6|%| 
+@57|2|7|1|,|1| @8|8|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_16.dump b/runtime/syntax/testdir/dumps/vim9_function_call_16.dump
index d8cee2c8056d6f46c50cfbfb293671ea7dfa0063..5659a7c251d6cce382be1920df24a844a291b80b 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_16.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_16.dump
@@ -1,20 +1,20 @@
 | +0&#ffffff0@74
-|<+0#e000e06&|S|I|D|>|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@57
+|<+0#e000e06&|S|I|D|>|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@57
 @75
-|g+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@49
-|b+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@49
->w+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@49
-|t+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@49
-|v+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@49
+|g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
+|b+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
+>w+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
+|t+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
+|v+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
 @75
-|s|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@51
-|g+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@49
+|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@51
+|g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
 @75
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|2|8|9|,|1| @8|B|o|t| 
+@75
+|#+0#0000e05&| |c|h|a|i|n|e|d| |f|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@50
+@75
+|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|)|.+0#af5f00255&|b+0#0000001#ffff4012|a|r|(+0#e000e06#ffffff0|)| +0#0000000&@56
+@75
+@75
+|#+0#0000e05&| |I|s@1|u|e| |1|6|7|2|1| |(|V|i|m| |s|c|r|i|p|t| |h|i|g|h|l|i|g|h|t| |o|f| |b|u|i|l|t|i|n| |f|u|n|c|t|i|o|n| |a|f|t|e|r| |||)| +0#0000000&@10
+@57|2|8|9|,|1| @8|9|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_function_calls_00.dump b/runtime/syntax/testdir/dumps/vim9_function_call_17.dump
similarity index 67%
rename from runtime/syntax/testdir/dumps/vim9_function_calls_00.dump
rename to runtime/syntax/testdir/dumps/vim9_function_call_17.dump
index 752da8196440031171d002574ab2d7290dbf825f..596b388eb7240efdb513252df721cdbbf8b22c4a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_calls_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_call_17.dump
@@ -1,20 +1,20 @@
->v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
-@75
-|#+0#0000e05&| |V|i|m|9| |f|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@53
-@75
-|c+0#00e0e07&|l|e|a|r|m|a|t|c|h|e|s|(+0#e000e06&|)| +0#0000000&@60
-|:|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|l|e|a|r|m|a|t|c|h|e|s|(+0#e000e06&|)| +0#0000000&@54
-|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |c+0#00e0e07&|l|e|a|r|m|a|t|c|h|e|s|(+0#e000e06&|)| +0#0000000&@47
-@75
-@75
-|#+0#0000e05&| |I|s@1|u|e| |1|6|7|2|1| |(|V|i|m| |s|c|r|i|p|t| |h|i|g|h|l|i|g|h|t| |o|f| |b|u|i|l|t|i|n| |f|u|n|c|t|i|o|n| |a|f|t|e|r| |||)| +0#0000000&@10
+|#+0#0000e05#ffffff0| |I|s@1|u|e| |1|6|7|2|1| |(|V|i|m| |s|c|r|i|p|t| |h|i|g|h|l|i|g|h|t| |o|f| |b|u|i|l|t|i|n| |f|u|n|c|t|i|o|n| |a|f|t|e|r| |||)| +0#0000000&@10
 @75
 |&+0#00e0e07&|d|i|r|e|c|t|o|r|y| +0#0000000&|=+0#af5f00255&| +0#0000000&|$+0#e000002&|'|{+0#e000e06&|$|M|Y|V|I|M|D|I|R|}|/+0#e000002&|.|d|a|t|a|/|s|w|a|p|/|'| +0#0000000&@35
 |&+0#00e0e07&|b|a|c|k|u|p|d|i|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|$+0#e000002&|'|{+0#e000e06&|$|M|Y|V|I|M|D|I|R|}|/+0#e000002&|.|d|a|t|a|/|b|a|c|k|u|p|/@1|'| +0#0000000&@32
 |&+0#00e0e07&|u|n|d|o|d|i|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|$+0#e000002&|'|{+0#e000e06&|$|M|Y|V|I|M|D|I|R|}|/+0#e000002&|.|d|a|t|a|/|u|n|d|o|/@1|'| +0#0000000&@36
-|i+0#af5f00255&|f| +0#0000000&|!+0#af5f00255&|i+0#00e0e07&|s|d|i|r|e|c|t|o|r|y|(+0#e000e06&|&+0#00e0e07&|u|n|d|o|d|i|r|)+0#e000e06&| +0#0000000&@2||| |m+0#00e0e07&|k|d|i|r|(+0#e000e06&|&+0#00e0e07&|u|n|d|o|d|i|r|,+0#0000000&| |"+0#e000002&|p|"|)+0#e000e06&| +0#0000000&@2||| |e+0#af5f00255&|n|d|i|f| +0#0000000&@14
+>i+0#af5f00255&|f| +0#0000000&|!+0#af5f00255&|i+0#00e0e07&|s|d|i|r|e|c|t|o|r|y|(+0#e000e06&|&+0#00e0e07&|u|n|d|o|d|i|r|)+0#e000e06&| +0#0000000&@2||| |m+0#00e0e07&|k|d|i|r|(+0#e000e06&|&+0#00e0e07&|u|n|d|o|d|i|r|,+0#0000000&| |"+0#e000002&|p|"|)+0#e000e06&| +0#0000000&@2||| |e+0#af5f00255&|n|d|i|f| +0#0000000&@14
 |i+0#af5f00255&|f| +0#0000000&|!+0#af5f00255&|i+0#00e0e07&|s|d|i|r|e|c|t|o|r|y|(+0#e000e06&|&+0#00e0e07&|b|a|c|k|u|p|d|i|r|)+0#e000e06&| +0#0000000&||| |m+0#00e0e07&|k|d|i|r|(+0#e000e06&|&+0#00e0e07&|b|a|c|k|u|p|d|i|r|,+0#0000000&| |"+0#e000002&|p|"|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|n|d|i|f| +0#0000000&@14
 |i+0#af5f00255&|f| +0#0000000&|!+0#af5f00255&|i+0#00e0e07&|s|d|i|r|e|c|t|o|r|y|(+0#e000e06&|&+0#00e0e07&|d|i|r|e|c|t|o|r|y|)+0#e000e06&| +0#0000000&||| |m+0#00e0e07&|k|d|i|r|(+0#e000e06&|&+0#00e0e07&|d|i|r|e|c|t|o|r|y|,+0#0000000&| |"+0#e000002&|p|"|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|n|d|i|f| +0#0000000&@14
 @75
+@75
+|#+0#0000e05&| |I|s@1|u|e| |#|1|7@1|6@1| |(|v|a|l|i|d| |f|u|n|c|t|i|o|n| |c|a|l@1| |h|i|g|h|l|i|g|h|t|e|d| |a|s| |e|r@1|o|r|)| +0#0000000&@17
+|| @73
+|m|o|d|u|l|e|[|0+0#e000002&|]+0#0000000&|.+0#af5f00255&|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@59
+@75
 |~+0#4040ff13&| @73
-| +0#0000000&@56|1|,|1| @10|A|l@1| 
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|3|0|7|,|1| @8|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_00.dump b/runtime/syntax/testdir/dumps/vim_function_call_00.dump
index a0bae076ce19d7d06bf55ce4df635502e523998d..538215dfff4821f3688714203e02b72672ddee3c 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_call_00.dump
@@ -1,5 +1,5 @@
 >"+0#0000e05#ffffff0| |V|i|m| |f|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@54
-|"+0#0000e05&| |V|I|M|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|U|s|e|r|F|u|n|c| |T|o|d|o| +0#0000000&@31
+|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |l|i|n|k| |v|i|m|U|s|e|r|F|u|n|c| |T|o|d|o| +0#0000000&@26
 @75
 @75
 |c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|b|s|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@62

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_04.dump b/runtime/syntax/testdir/dumps/vim_function_call_04.dump
index e2442e8dcc7e857772a13c2e83148a2fafe92fae..421d045729c54ddb4485b87981f68c128f9ee1cf 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_call_04.dump
@@ -17,4 +17,4 @@
 |"+0#0000e05&| |c|o|m@1|a|n|d| +0#0000000&@65
 |i+0#af5f00255&|n|s|e|r|t| +0#0000000&@68
 |.+0#af5f00255&| +0#0000000&@73
-@57|7|3|,|1| @9|2|7|%| 
+@57|7|3|,|1| @9|2|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_05.dump b/runtime/syntax/testdir/dumps/vim_function_call_05.dump
index af7ffb025858a74caaea5c094d5d7207fb0d465f..e72eb390f54d0df86cdf67ffe0f90a140e8b0823 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_05.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_call_05.dump
@@ -17,4 +17,4 @@
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|m|a|t|c|h| |=+0#af5f00255&| +0#0000000&|m+0#00e0e07&|a|t|c|h|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|a|t|c|h|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
-@57|9|1|,|1| @9|3|4|%| 
+@57|9|1|,|1| @9|3@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_06.dump b/runtime/syntax/testdir/dumps/vim_function_call_06.dump
index a28560b8d253848e00acad00cfdbbd757bbe2767..7a1a7c3cd5d2ac3efdd9779e0fa9b29c549c223c 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_call_06.dump
@@ -17,4 +17,4 @@
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|s|u|b|s|t|i|t|u|t|e| |=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@43
 |c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
-@57|1|0|9|,|1| @8|4|1|%| 
+@57|1|0|9|,|1| @8|4|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_07.dump b/runtime/syntax/testdir/dumps/vim_function_call_07.dump
index cf67e25f6eb7cb7202d604808d787b8b2369882f..e5699bfcdd3c878a120bdbb279ed6b36f321b7b1 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_07.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_call_07.dump
@@ -17,4 +17,4 @@
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|u|n|i|q| |=+0#af5f00255&| +0#0000000&|u+0#00e0e07&|n|i|q|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|u+0#00e0e07&|n|i|q|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@61
-@57|1|2|7|,|1| @8|4|9|%| 
+@57|1|2|7|,|1| @8|4|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_08.dump b/runtime/syntax/testdir/dumps/vim_function_call_08.dump
index f671ae5d828e615da9c4e9347ff59e748f86a04b..a79ec4a29bef8da2330ad0e72a47957b2bd18fc5 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_08.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_call_08.dump
@@ -17,4 +17,4 @@
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|e|c|h|o| |=+0#af5f00255&| +0#0000000&|e+0#ffffff16#ff404010|c|h|o|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|e+0#ffffff16#ff404010|c|h|o|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@61
-@57|1|4|5|,|0|-|1| @6|5|6|%| 
+@57|1|4|5|,|0|-|1| @6|5|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_09.dump b/runtime/syntax/testdir/dumps/vim_function_call_09.dump
index 239b5fc7283372510d563eb0c2c7289276725458..51c26b1ef80df093359373b9c974e023cfe8102a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_09.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_call_09.dump
@@ -13,8 +13,8 @@
 |e+0#af5f00255&|c|h|o| +0#0000000&|a+0#00e0e07&|b|s|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&|++0#af5f00255&| +0#0000000&|f|o@1| @56
 |e+0#af5f00255&|c|h|o| +0#0000000&|f|o@1| |++0#af5f00255&| +0#0000000&|a+0#00e0e07&|b|s|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@56
 @75
-|e+0#af5f00255&|c|h|o| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@64
-|e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|F+0#0000000&|o@1|(+0#e000e06&|)@1| +0#0000000&@62
-|e+0#af5f00255&|c|h|o| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&|++0#af5f00255&| +0#0000000&|b|a|r| @58
-|e+0#af5f00255&|c|h|o| +0#0000000&|b|a|r| |++0#af5f00255&| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@58
-@57|1|6|3|,|0|-|1| @6|6|3|%| 
+|e+0#af5f00255&|c|h|o| +0#0000000&|F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@64
+|e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)@1| +0#0000000&@62
+|e+0#af5f00255&|c|h|o| +0#0000000&|F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&|++0#af5f00255&| +0#0000000&|b|a|r| @58
+|e+0#af5f00255&|c|h|o| +0#0000000&|b|a|r| |++0#af5f00255&| +0#0000000&|F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@58
+@57|1|6|3|,|0|-|1| @6|6|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_10.dump b/runtime/syntax/testdir/dumps/vim_function_call_10.dump
index 9929799b08c90ab6bc8ab509714fd0c0998c235f..d03cba26d6a6f15a8461deda4d2a0c1294d8dc39 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_10.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_call_10.dump
@@ -1,20 +1,20 @@
-|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|b|a|r| |++0#af5f00255&| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@58
+|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|b|a|r| |++0#af5f00255&| +0#0000000&|F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@58
 @75
 @75
 |"+0#0000e05&| |s|c|o|p|e| |m|o|d|i|f|i|e|r|s| |a|n|d| |q|u|a|l|i|f|i|e|d| |n|a|m|e|s| +0#0000000&@37
 @75
->l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+>l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|b+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|b+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|w+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|w+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
-@57|1|8|1|,|1| @8|7|1|%| 
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+@57|1|8|1|,|1| @8|6|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_11.dump b/runtime/syntax/testdir/dumps/vim_function_call_11.dump
index 7215a0180d4ef3927c00c31e3766ff69b3e3fa8b..129481a6260abd06ce2e579e65937aa3fc062288 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_11.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_call_11.dump
@@ -1,20 +1,20 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|t+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|t+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|l+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|l+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|l+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|l+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
->l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|a+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+>l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|a+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|f+0#0000000&|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|m|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@50
-|c+0#af5f00255&|a|l@1| +0#0000000&|m|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|m|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-@57|1|9@1|,|1| @8|7|8|%| 
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+@57|1|9@1|,|1| @8|7|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_12.dump b/runtime/syntax/testdir/dumps/vim_function_call_12.dump
index 891bc7689650615310a1401a5275a9503f3f6be5..e1eca5369359400c007ee4b7b0b700187dd645c8 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_12.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_call_12.dump
@@ -1,20 +1,20 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|l+0#af5f00255#ffffff0|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|b+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|b+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 > @74
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|w+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|w+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|l+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|l+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|l+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|l+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|a+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|a+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-@57|2|1|7|,|0|-|1| @6|8|5|%| 
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+@57|2|1|7|,|0|-|1| @6|8|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_13.dump b/runtime/syntax/testdir/dumps/vim_function_call_13.dump
index 44366445342030e4cec4d1a25473e6bb44a5245a..93b8786bb18ffedef814ab0b6f4ea554db5f3ade 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_13.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_call_13.dump
@@ -1,20 +1,20 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|l+0#af5f00255#ffffff0|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 @75
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|m|o|d|u|l|e|#|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@50
->c+0#af5f00255&|a|l@1| +0#0000000&|m|o|d|u|l|e|#|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|#|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@50
+>c+0#af5f00255&|a|l@1| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|#|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|#|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|#|f|o@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|#|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|#|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 @75
 @75
 |"+0#0000e05&| |n|o|t| |b|u|i|l|t|i|n| |f|u|n|c|t|i|o|n|s| +0#0000000&@51
 @75
-|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|l+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@55
-@57|2|3|5|,|1| @8|9|3|%| 
+|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|l+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
+@57|2|3|5|,|1| @8|8|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_14.dump b/runtime/syntax/testdir/dumps/vim_function_call_14.dump
index 376b2ac5b0cf2451361eb88b0f4d3c7f24fc23d2..0bd6a01dc65859c549d71422e74fab2a49e0ccb4 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_14.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_call_14.dump
@@ -1,20 +1,20 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|l+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@55
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|l+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
 @75
-|c+0#af5f00255&|a|l@1| +0#0000000&|<+0#e000e06&|S|I|D|>|s+0#0000000&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|<+0#e000e06&|S|I|D|>|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@52
 > @74
-|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|l+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|l+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
 @75
-|c+0#af5f00255&|a|l@1| +0#0000000&|s|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@46
-|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06&|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@46
+|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
 @75
-|~+0#4040ff13&| @73
-| +0#0000000&@56|2|5|3|,|0|-|1| @6|B|o|t| 
+@75
+@57|2|5|3|,|0|-|1| @6|9|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_15.dump b/runtime/syntax/testdir/dumps/vim_function_call_15.dump
new file mode 100644 (file)
index 0000000..58b6f9c
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_function_call_15.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@74
+|"+0#0000e05&| |c|h|a|i|n|e|d| |f|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@50
+@75
+|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|)|.+0#af5f00255&|b+0#0000001#ffff4012|a|r|(+0#e000e06#ffffff0|)| +0#0000000&@51
+@75
+> @74
+|"+0#0000e05&| |I|s@1|u|e| |#|1|7@1|6@1| |(|v|a|l|i|d| |f|u|n|c|t|i|o|n| |c|a|l@1| |h|i|g|h|l|i|g|h|t|e|d| |a|s| |e|r@1|o|r|)| +0#0000000&@17
+|| @73
+|c+0#af5f00255&|a|l@1| +0#0000000&|m|o|d|u|l|e|[|0+0#e000002&|]+0#0000000&|.+0#af5f00255&|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@54
+@75
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|2|7|1|,|0|-|1| @6|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_00.dump b/runtime/syntax/testdir/dumps/vim_function_calls_00.dump
deleted file mode 100644 (file)
index df0a3cd..0000000
--- a/runtime/syntax/testdir/dumps/vim_function_calls_00.dump
+++ /dev/null
@@ -1,20 +0,0 @@
->"+0#0000e05#ffffff0| |V|i|m| |f|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@54
-@75
-|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|l|e|a|r|m|a|t|c|h|e|s|(+0#e000e06&|)| +0#0000000&@55
-|:|c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|l|e|a|r|m|a|t|c|h|e|s|(+0#e000e06&|)| +0#0000000&@54
-|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|l|e|a|r|m|a|t|c|h|e|s|(+0#e000e06&|)| +0#0000000&@42
-@75
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|,|1| @10|A|l@1| 

diff --git a/runtime/syntax/testdir/input/vim9_function_call.vim b/runtime/syntax/testdir/input/vim9_function_call.vim
index 9de6f398a9e99eb8d0d0844d5a240da58c791a7c..b70f58da082de8b2d4e81e41bffa7acc0a248dbf 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_function_call.vim
+++ b/runtime/syntax/testdir/input/vim9_function_call.vim
@@ -1,7 +1,7 @@
 vim9script
 # Vim function calls
-# VIM_SETUP highlight link vimUserFunc Todo
-# VIM_SETUP highlight link vim9UserFunc Todo
+# VIM_TEST_SETUP highlight link vimUserFunc Todo
+# VIM_TEST_SETUP highlight link vim9UserFunc Todo
 
 
 call abs(42)
@@ -293,3 +293,23 @@ v:substitute.substitute()
 substitute#substitute()
 g:substitute#substitute()
 
+
+# chained function calls
+
+module.foo().bar()
+
+
+# Issue 16721 (Vim script highlight of builtin function after |)
+
+&directory = $'{$MYVIMDIR}/.data/swap/'
+&backupdir = $'{$MYVIMDIR}/.data/backup//'
+&undodir = $'{$MYVIMDIR}/.data/undo//'
+if !isdirectory(&undodir)   | mkdir(&undodir, "p")   | endif
+if !isdirectory(&backupdir) | mkdir(&backupdir, "p") | endif
+if !isdirectory(&directory) | mkdir(&directory, "p") | endif
+
+
+# Issue #17766 (valid function call highlighted as error)
+
+module[0].foo()
+

diff --git a/runtime/syntax/testdir/input/vim9_function_calls.vim b/runtime/syntax/testdir/input/vim9_function_calls.vim
deleted file mode 100644 (file)
index 0b9f4c2..0000000
--- a/runtime/syntax/testdir/input/vim9_function_calls.vim
+++ /dev/null
@@ -1,18 +0,0 @@
-vim9script
-
-# Vim9 function calls
-
-clearmatches()
-:call clearmatches()
-echo "Foo" | clearmatches()
-
-
-# Issue 16721 (Vim script highlight of builtin function after |)
-
-&directory = $'{$MYVIMDIR}/.data/swap/'
-&backupdir = $'{$MYVIMDIR}/.data/backup//'
-&undodir = $'{$MYVIMDIR}/.data/undo//'
-if !isdirectory(&undodir)   | mkdir(&undodir, "p")   | endif
-if !isdirectory(&backupdir) | mkdir(&backupdir, "p") | endif
-if !isdirectory(&directory) | mkdir(&directory, "p") | endif
-

diff --git a/runtime/syntax/testdir/input/vim_function_call.vim b/runtime/syntax/testdir/input/vim_function_call.vim
index b94a898b7d989cd6eef3baab8c98420fbc24e591..f2e2d8b7bf5a64e35dfd9a0915598717080e703b 100644 (file)
--- a/runtime/syntax/testdir/input/vim_function_call.vim
+++ b/runtime/syntax/testdir/input/vim_function_call.vim
@@ -1,5 +1,5 @@
 " Vim function calls
-" VIM_SETUP highlight link vimUserFunc Todo
+" VIM_TEST_SETUP highlight link vimUserFunc Todo
 
 
 call abs(42)
@@ -263,3 +263,13 @@ call v:substitute.substitute()
 call substitute#substitute()
 call g:substitute#substitute()
 
+
+" chained function calls
+
+call module.foo().bar()
+
+
+" Issue #17766 (valid function call highlighted as error)
+
+call module[0].foo()
+

diff --git a/runtime/syntax/testdir/input/vim_function_calls.vim b/runtime/syntax/testdir/input/vim_function_calls.vim
deleted file mode 100644 (file)
index 5401f6e..0000000
--- a/runtime/syntax/testdir/input/vim_function_calls.vim
+++ /dev/null
@@ -1,6 +0,0 @@
-" Vim function calls
-
-call clearmatches()
-:call clearmatches()
-echo "Foo" | call clearmatches()
-

diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 2adffe9c410c06bf470a645ccea28924b9a728d4..4b73b9d6da2b4591a3cd8dcddc216552152ba6ee 100644 (file)
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -345,7 +345,7 @@ syn keyword vimBehaveModel  contained       mswin   xterm
 
 " Call {{{2
 " ====
-syn match vimCall      "\<call\=\>"    skipwhite nextgroup=@vimFunc
+syn match vimCall      "\<call\=\>"    skipwhite nextgroup=vimVar,@vimFunc
 
 " Debuggreedy {{{2
 " ===========
@@ -2127,6 +2127,7 @@ unlet s:interfaces
 " (following Gautam Iyer's suggestion)
 " ==========================
 syn match      vimFunc contained       "\<\l\w*\ze\s*("                                skipwhite nextgroup=vimOperParen contains=vimFuncName
+syn match      vimUserFunc     contained       "\.\@1<=\l\w*\ze\s*("                   skipwhite nextgroup=vimOperParen contains=vimFuncName
 syn match      vimUserFunc     contained       "\<\%([[:upper:]_]\|\%(\h\w*\.\)\+\h\)\w*\ze\s*("               skipwhite nextgroup=vimOperParen contains=vim9MethodName,vim9Super,vim9This
 syn match      vimUserFunc     contained       "\<\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze\s*("          skipwhite nextgroup=vimOperParen contains=vimVarScope
 syn match      vimUserFunc     contained       "\%(\<[sgbwtlav]:\|<[sS][iI][dD]>\)\%(\h\w*\.\)*\h\w*\ze\s*("   skipwhite nextgroup=vimOperParen contains=vimVarScope,vimNotation