runtime(vim): Cleanup syntax tests

Improve formatting and naming consistency of the syntax tests.

closes: #17850

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

diff --git a/runtime/syntax/testdir/dumps/vim9_block_00.dump b/runtime/syntax/testdir/dumps/vim9_blocks_00.dump
similarity index 82%
rename from runtime/syntax/testdir/dumps/vim9_block_00.dump
rename to runtime/syntax/testdir/dumps/vim9_blocks_00.dump
index dfabed45ab63a746848b316e3f0461612475caf7..4b65f164babc09b18513a03454411262597af774 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_block_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_blocks_00.dump
@@ -1,7 +1,6 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
 |#+0#0000e05&| |V|i|m|9| |b|l|o|c|k|s| +0#0000000&@61
-|#+0#0000e05&| |V|I|M|_|T|E|S|T|S|E|T|U|P| |s|e|t| |l|i|s|t| |l|i|s|t|c|h|a|r|s|=|t|a|b|:|>| |,|t|r|a|i|l|:|-|,|e|x|t|e|n|d|s|:|>|,|p|r|e|c|e|d|e|s|:|<|,|n|b|s|p
-|:|+| +0#0000000&@72
+|#+0#0000e05&| |V|I|M|_|T|E|S|T|S|E|T|U|P| |s|e|t| |l|i|s|t| |l|i|s|t|c|h|a|r|s|=|t|r|a|i|l|:|-| +0#0000000&@32
 @75
 @75
 |{+0#e000e06&| +0#0000000&@73
@@ -17,4 +16,5 @@
 @6|}+0#e000e06&| +0#0000000&@67
 @6|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@56
 @4|}+0#e000e06&| +0#0000000&@69
+@4|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@58
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim9_block_01.dump b/runtime/syntax/testdir/dumps/vim9_blocks_01.dump
similarity index 82%
rename from runtime/syntax/testdir/dumps/vim9_block_01.dump
rename to runtime/syntax/testdir/dumps/vim9_blocks_01.dump
index 533eb912033c583c98e622dca51e7bc953f28a48..7eb90cc02973598a3964b44524a8ab4108c5262f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_block_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_blocks_01.dump
@@ -1,10 +1,9 @@
-| +0&#ffffff0@3|{+0#e000e06&| +0#0000000&@69
-@6|{+0#e000e06&| +0#0000000&@67
+| +0&#ffffff0@5|{+0#e000e06&| +0#0000000&@67
 @8|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@54
 @6|}+0#e000e06&| +0#0000000&@67
 @6|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@56
-@4>}+0#e000e06&| +0#0000000&@69
-@4|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@58
+@4|}+0#e000e06&| +0#0000000&@69
+@4>v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@58
 @2|}+0#e000e06&| +0#0000000&@71
 @2|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@60
 |}+0#e000e06&| +0#0000000&@73
@@ -17,4 +16,5 @@
 @2|}+0#e000e06&| +0#0000000&@71
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
 @75
-@57|1|8|,|5| @9|4|0|%| 
+@75
+@57|1|9|,|5| @9|4|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_block_02.dump b/runtime/syntax/testdir/dumps/vim9_blocks_02.dump
similarity index 86%
rename from runtime/syntax/testdir/dumps/vim9_block_02.dump
rename to runtime/syntax/testdir/dumps/vim9_blocks_02.dump
index c91074ada1120e4edb2c90ae4d8fa6f69b3c7117..df9b1f78f3b8e57797f7d9a7d38ac5c20a9bb94f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_block_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_blocks_02.dump
@@ -1,10 +1,9 @@
 | +0&#ffffff0@74
-@75
 |#+0#0000e05&| |s|t|a|r|t|/|e|n|d| |p|a|t@1|e|r|n|s| +0#0000000&@54
 @75
 |{+0#e000e06&| +0#0000000&@73
-@2>v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@60
-|}+0#e000e06&| +0#0000000&@73
+@2|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@60
+>}+0#e000e06&| +0#0000000&@73
 @75
 |{+0#e000e06&| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63
 @2|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@60
@@ -17,4 +16,5 @@
 |#+0#0000e05&| |d|i|c|t|i|o|n|a|r|y| +0#0000000&@62
 |{+0#e000e06&|}|-+0#af5f00255&|>|i+0#00e0e07&|t|e|m|s|(+0#e000e06&|)| +0#0000000&@63
 @75
-@57|3|6|,|3| @9|B|o|t| 
+|~+0#4040ff13&| @73
+| +0#0000000&@56|3|7|,|1| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_object_methods_00.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_00.dump
similarity index 92%
rename from runtime/syntax/testdir/dumps/vim_object_methods_00.dump
rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_00.dump
index 8ac6f214507f9ec455485d0656849d33d20b83c4..39857166da68f4c5eba887b6f51b07970bf067fd 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_object_methods_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_00.dump
@@ -1,10 +1,9 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
-@75
+|#+0#0000e05&| |V|i|m| |||b|u|i|l|t|i|n|-|o|b|j|e|c|t|-|m|e|t|h|o|d|s||| |a|n|d| |n|a|m|e|s|a|k|e| |b|u|i|l|t|i|n| |f|u|n|c|t|i|o|n|s| +0#0000000&@13
 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|M|e|t|h|o|d|N|a|m|e| |S|p|e|c|i|a|l| +0#0000000&@27
 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|T|h|i|s| |T|o|d|o| +0#0000000&@36
 @75
 @75
-|#+0#0000e05&| |V|i|m| |||b|u|i|l|t|i|n|-|o|b|j|e|c|t|-|m|e|t|h|o|d|s||| |a|n|d| |n|a|m|e|s|a|k|e| |b|u|i|l|t|i|n| |f|u|n|c|t|i|o|n|s|.| +0#0000000&@12
 |c+0#af5f00255&|l|a|s@1| +0#0000000&|P|a|i|r|C|l|a|s@1|T|e|s|t| @55
 @8|p+0#af5f00255&|u|b|l|i|c| +0#0000000&|c+0#af5f00255&|o|n|s|t| +0#0000000&|a+0#00e0e07&|:+0#0000000&| |a+0#00e0003&|n|y| +0#0000000&@47
 @8|p+0#af5f00255&|u|b|l|i|c| +0#0000000&|c+0#af5f00255&|o|n|s|t| +0#0000000&|b+0#00e0e07&|:+0#0000000&| |a+0#00e0003&|n|y| +0#0000000&@47
@@ -17,4 +16,5 @@
 @8|d+0#af5f00255&|e|f| +0#0000000&|e+0#e000e06&|m|p|t|y|(|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@49
 @16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|f+0#e000002&|a|l|s|e| +0#0000000&@46
 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
+@8|d+0#af5f00255&|e|f| +0#0000000&|l+0#e000e06&|e|n|(|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@49
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_object_methods_01.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_01.dump
similarity index 80%
rename from runtime/syntax/testdir/dumps/vim_object_methods_01.dump
rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_01.dump
index 9af5000bf5beca56c78fb4dff4c77e6abb680a90..ff3e810322fbee7cc22d86f5437dceaa28b89561 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_object_methods_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_01.dump
@@ -1,10 +1,9 @@
-| +0&#ffffff0@7| +0#00e0e07&@7|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|b+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|b+0#00e0e07&| +0#0000000&@48
-@8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
+| +0&#ffffff0@7|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
 @75
 @8|d+0#af5f00255&|e|f| +0#0000000&|e+0#e000e06&|m|p|t|y|(|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@49
 @16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|f+0#e000002&|a|l|s|e| +0#0000000&@46
-@8>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
-@8|d+0#af5f00255&|e|f| +0#0000000&|l+0#e000e06&|e|n|(|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@49
+@8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
+@8>d+0#af5f00255&|e|f| +0#0000000&|l+0#e000e06&|e|n|(|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@49
 @16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|2+0#e000002&| +0#0000000&@50
 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
 @8|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|t|r|i|n|g|(|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@46
@@ -17,4 +16,5 @@
 @75
 @8|d+0#af5f00255&|e|f| +0#0000000&|N|o|O|p|(+0#e000e06&|)| +0#0000000&@56
 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
+@75
 @57|1|9|,|2|-|9| @7|3@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_object_methods_02.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_02.dump
similarity index 91%
rename from runtime/syntax/testdir/dumps/vim_object_methods_02.dump
rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_02.dump
index 4ecdffadbc28b25627e9dcc0783ec36bb33d5c60..22c31e20fe6b0d09915cdaac3bf365cab97773db 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_object_methods_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_02.dump
@@ -1,10 +1,9 @@
-| +0&#ffffff0@7|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
-@75
+| +0&#ffffff0@74
 @8|d+0#af5f00255&|e|f| +0#0000000&|e+0#e000e06&|m|p|t|y|(|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@49
 @16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@47
 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
-@8>d+0#af5f00255&|e|f| +0#0000000&|l+0#e000e06&|e|n|(|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@49
-@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@50
+@8|d+0#af5f00255&|e|f| +0#0000000&|l+0#e000e06&|e|n|(|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@49
+@16>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@50
 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
 @8|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|t|r|i|n|g|(|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@46
 @16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|n+0#00e0e07&|a|m|e| +0#0000000&@42
@@ -17,4 +16,5 @@
 |e+0#af5f00255&|c|h|o| +0#0000000&|b+0#00e0e07&|1| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|M|a|r|k|e|r|E|n|u|m|T|e|s|t|.|I|N|S|T|A|N|C|E|.|e+0#e000e06&|m|p|t|y|(|)| +0#0000000&@32
 |e+0#af5f00255&|c|h|o| +0#0000000&|n+0#00e0e07&|1| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|0+0#e000002&| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|M|a|r|k|e|r|E|n|u|m|T|e|s|t|.|I|N|S|T|A|N|C|E|.|l+0#e000e06&|e|n|(|)| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|0+0#e000002&| +0#0000000&@24
 |e+0#af5f00255&|c|h|o| +0#0000000&|s+0#00e0e07&|1| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|I|N|S|T|A|N|C|E|'| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|M|a|r|k|e|r|E|n|u|m|T|e|s|t|.|I|N|S|T|A|N|C|E|.|s+0#e000e06&|t|r|i|n|g|(|)| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|I|N|S|T|A|N|C|E|'| +0#0000000&@3
-@57|3|7|,|2|-|9| @7|7|9|%| 
+@75
+@57|3|7|,|3|-|1|7| @6|7|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_object_methods_03.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_03.dump
similarity index 77%
rename from runtime/syntax/testdir/dumps/vim_object_methods_03.dump
rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_03.dump
index 255c8b5571a5d1b8e30bb7731c285ef6cabd85fb..ed7c835e02a5f4942b62883c099cff591598a86f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_object_methods_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_03.dump
@@ -1,12 +1,12 @@
-|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|s+0#00e0e07&|1| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|I|N|S|T|A|N|C|E|'| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|M|a|r|k|e|r|E|n|u|m|T|e|s|t|.|I|N|S|T|A|N|C|E|.|s+0#e000e06&|t|r|i|n|g|(|)| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|I|N|S|T|A|N|C|E|'| +0#0000000&@3
-@75
+| +0&#ffffff0@74
 |c+0#af5f00255&|o|n|s|t| +0#0000000&|p+0#00e0e07&|a|i|r|:+0#0000000&| |P|a|i|r|C|l|a|s@1|T|e|s|t| |=+0#af5f00255&| +0#0000000&|P|a|i|r|C|l|a|s@1|T|e|s|t|.|n+0#e000e06&|e|w|(|0+0#e000002&|,+0#0000000&| |1+0#e000002&|)+0#e000e06&| +0#0000000&@23
 |c+0#af5f00255&|o|n|s|t| +0#0000000&|b+0#00e0e07&|2|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&|=+0#af5f00255&| +0#0000000&|!+0#af5f00255&|p+0#0000000&|a|i|r|.|e+0#e000e06&|m|p|t|y|(|)| +0#0000000&@44
 |c+0#af5f00255&|o|n|s|t| +0#0000000&|n+0#00e0e07&|2|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|p|a|i|r|.|l+0#e000e06&|e|n|(|)| +0#0000000&@45
->c+0#af5f00255&|o|n|s|t| +0#0000000&|s+0#00e0e07&|2|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|p|a|i|r|.|s+0#e000e06&|t|r|i|n|g|(|)| +0#0000000&@42
-|e+0#af5f00255&|c|h|o| +0#0000000&|b+0#00e0e07&|2| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|!+0#af5f00255&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|p+0#00e0e07&|a|i|r|)+0#e000e06&| +0#0000000&@51
+|c+0#af5f00255&|o|n|s|t| +0#0000000&|s+0#00e0e07&|2|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|p|a|i|r|.|s+0#e000e06&|t|r|i|n|g|(|)| +0#0000000&@42
+>e+0#af5f00255&|c|h|o| +0#0000000&|b+0#00e0e07&|2| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|!+0#af5f00255&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|p+0#00e0e07&|a|i|r|)+0#e000e06&| +0#0000000&@51
 |e+0#af5f00255&|c|h|o| +0#0000000&|n+0#00e0e07&|2| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|2+0#e000002&| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|p+0#00e0e07&|a|i|r|)+0#e000e06&| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|2+0#e000002&| +0#0000000&@44
 |e+0#af5f00255&|c|h|o| +0#0000000&|s+0#00e0e07&|2| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|(|0|,| |1|)|'| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|p+0#00e0e07&|a|i|r|)+0#e000e06&| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|(|0|,| |1|)|'| +0#0000000&@27
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_00.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_00.dump
similarity index 84%
rename from runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_00.dump
rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods_00.dump
index 4a9295ff63cabe556be7192b60f1dcbbe4cb6d0a..a2168b590df1d933f7598f06180a02b41ed6401f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_00.dump
@@ -1,5 +1,6 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
-|#+0#0000e05&| |V|i|m|9| |s|p|e|c|i|a|l| |m|e|t|h|o|d|s| |n|e|w|*|(|)|,| |e|m|p|t|y|(|)|,| |l|e|n|(|)|,| |s|t|r|i|n|g|(|)| +0#0000000&@19
+|#+0#0000e05&| |V|i|m|9| |s|p|e|c|i|a|l| |m|e|t|h|o|d|s| |-| |n|e|w|*|(|)|,| |e|m|p|t|y|(|)|,| |l|e|n|(|)|,| |s|t|r|i|n|g|(|)| +0#0000000&@17
+@75
 @75
 |d+0#af5f00255&|e|f| +0#0000000&|n+0#ffffff16#ff404010|e|w|(+0#e000e06#ffffff0|)| +0#0000000&@65
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
@@ -16,5 +17,4 @@
 @75
 |d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@57
 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@64
-|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_01.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_01.dump
similarity index 73%
rename from runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_01.dump
rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods_01.dump
index eef981d2b678e259fb00270f1c6e2b1c538dd8b4..360e0e356a255888c5db22eb52600ff4e8e7f9d4 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_01.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@61
+|d+0#af5f00255#ffffff0|e|f| +0#0000000&|e+0#ffffff16#ff404010|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@57
+@2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@61
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
 @75
 |d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@57
-@2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@64
->e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
+@2>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@64
+|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
 @75
 |d+0#af5f00255&|e|f| +0#0000000&|s+0#ffffff16#ff404010|t|r|i|n|g|(+0#e000e06#ffffff0|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@54
 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@63
@@ -16,5 +17,4 @@
 @4|d+0#af5f00255&|e|f| +0#0000000&|e+0#ffffff16#ff404010|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@53
 @6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@57
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
-@4|d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53
-@57|1|9|,|1| @9|1|3|%| 
+@57|1|9|,|3| @9|1|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_02.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_02.dump
similarity index 77%
rename from runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_02.dump
rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods_02.dump
index ef8e3f5f3a2da28b9dc10aa167b9a66043efbf8e..b2848bc9a77e7cdf530d12c70c598e9f09e92745 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_02.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53
+| +0&#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
+@4|d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53
 @6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@60
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 @4|d+0#af5f00255&|e|f| +0#0000000&|s+0#ffffff16#ff404010|t|r|i|n|g|(+0#e000e06#ffffff0|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@50
-@6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@59
-@4>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
+@6>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@59
+@4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @75
 @2|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|O|t|h|e|r|(+0#e000e06&|)| +0#0000000&@58
@@ -16,5 +17,4 @@
 @6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@60
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 @4|d+0#af5f00255&|e|f| +0#0000000&|s+0#ffffff16#ff404010|t|r|i|n|g|(+0#e000e06#ffffff0|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@50
-@6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@59
-@57|3|7|,|5| @9|3|2|%| 
+@57|3|7|,|7| @9|3|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_03.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_03.dump
similarity index 73%
rename from runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_03.dump
rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods_03.dump
index 84a201c3d4c49dbeabc262fa81c7a12590bceea3..f71c49c3d81bee13d519184e536bbcb39856ef95 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_03.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@5|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@59
+| +0&#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#ffffff16#ff404010|t|r|i|n|g|(+0#e000e06#ffffff0|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@50
+@6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@59
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @75
-@2|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|y|e|t|a|n|o|t|h|e|r|(+0#e000e06&|)| +0#0000000&@53
-@4>d+0#af5f00255&|e|f| +0#0000000&|n+0#ffffff16#ff404010|e|w|N|e|s|t|e|d|(+0#e000e06#ffffff0|)| +0#0000000&@55
+@2>d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|y|e|t|a|n|o|t|h|e|r|(+0#e000e06&|)| +0#0000000&@53
+@4|d+0#af5f00255&|e|f| +0#0000000&|n+0#ffffff16#ff404010|e|w|N|e|s|t|e|d|(+0#e000e06#ffffff0|)| +0#0000000&@55
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 @4|d+0#af5f00255&|e|f| +0#0000000&|e+0#ffffff16#ff404010|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@53
 @6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@57
@@ -16,5 +17,4 @@
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @75
-@2|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@55
-@57|5@1|,|5| @9|5|2|%| 
+@57|5@1|,|3| @9|5|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_04.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_04.dump
similarity index 75%
rename from runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_04.dump
rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods_04.dump
index 552804510980349cd6b624ae66148497e64ff9e3..0fd7af7c585c09b8e5d8c7da2e6fd0d778d6f93d 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_04.dump
+++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_04.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@55
+| +0&#ffffff0@74
+@2|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@55
 @4|d+0#af5f00255&|e|f| +0#0000000&|n+0#ffffff16#ff404010|e|w|N|e|s|t|e|d|(+0#e000e06#ffffff0|)| +0#0000000&@55
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 @4|d+0#af5f00255&|e|f| +0#0000000&|e+0#ffffff16#ff404010|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@53
-@6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@57
-@4>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
+@6>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@57
+@4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 @4|d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53
 @6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@60
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
@@ -16,5 +17,4 @@
 @2|d+0#af5f00255&|e|f| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@55
 @4|d+0#af5f00255&|e|f| +0#0000000&|n+0#ffffff16#ff404010|e|w|N|e|s|t|e|d|(+0#e000e06#ffffff0|)| +0#0000000&@55
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
-@4|d+0#af5f00255&|e|f| +0#0000000&|e+0#ffffff16#ff404010|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@53
-@57|7|3|,|5| @9|7|1|%| 
+@57|7|3|,|7| @9|7|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_05.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_05.dump
similarity index 74%
rename from runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_05.dump
rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods_05.dump
index 0e5727f2db8cd520a90981ab8e8946985a2db599..69721afafcb91885341e8d6980d3229fabaedfe0 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_05.dump
+++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_05.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|e+0#ffffff16#ff404010|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@53
+| +0&#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
+@4|d+0#af5f00255&|e|f| +0#0000000&|e+0#ffffff16#ff404010|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@53
 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@55
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 @4|d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53
-@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@58
-@4>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
+@8>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@58
+@4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 @4|d+0#af5f00255&|e|f| +0#0000000&|s+0#ffffff16#ff404010|t|r|i|n|g|(+0#e000e06#ffffff0|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@50
 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@57
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
@@ -16,5 +17,4 @@
 @4|d+0#af5f00255&|e|f| +0#0000000&|e+0#ffffff16#ff404010|m|p|t|y|(+0#e000e06#ffffff0|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@53
 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#e000002&|r|u|e| +0#0000000&@55
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
-@4|d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53
-@57|9|1|,|5| @9|9|0|%| 
+@57|9|1|,|2|-|9| @7|8|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_06.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_06.dump
similarity index 59%
rename from runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_06.dump
rename to runtime/syntax/testdir/dumps/vim9_builtin_object_methods_06.dump
index 479163b5ae62df6562a942abb4a4f683f154b547..b9436311baded795f20da1de41a568424979a962 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_special_method_definitions_06.dump
+++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods_06.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53
+| +0&#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
+@4|d+0#af5f00255&|e|f| +0#0000000&|l+0#ffffff16#ff404010|e|n|(+0#e000e06#ffffff0|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53
 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@58
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 @4|d+0#af5f00255&|e|f| +0#0000000&|s+0#ffffff16#ff404010|t|r|i|n|g|(+0#e000e06#ffffff0|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@50
-@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@57
-@4>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
+@8>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@57
+@4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&@1| +0#0000000&@61
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 |e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66
@@ -16,5 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-| +0#0000000&@56|1|0|9|,|5| @8|B|o|t| 
+| +0#0000000&@56|1|0|9|,|2|-|9| @6|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_comment_strings_00.dump b/runtime/syntax/testdir/dumps/vim9_comment_strings_00.dump
similarity index 92%
rename from runtime/syntax/testdir/dumps/vim9_ex_comment_strings_00.dump
rename to runtime/syntax/testdir/dumps/vim9_comment_strings_00.dump
index ef9f580d95101b02de6ed92b470e9a43c422e5ef..e310e47c52211c074b3afd4e09ecf351df6a1a7a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_comment_strings_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_comment_strings_00.dump
@@ -1,8 +1,8 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
-@75
-|#+0#0000e05&| |V|i|m| |c|o|m@1|e|n|t| |s|t|r|i|n|g|s| +0#0000000&@53
+|#+0#0000e05&| |V|i|m|9| |c|o|m@1|e|n|t| |s|t|r|i|n|g|s| +0#0000000&@52
 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|c|o|m@1|e|n|t|_|s|t|r|i|n|g|s| |=| |v|:|t|r|u|e| +0#0000000&@20
 @75
+@75
 |#+0#0000e05&| |p|r|e| |"+0#e000002&|s|t|r|i|n|g|"| +0#0000e05&|p|o|s|t| +0#0000000&@55
 @75
 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_comment_strings_01.dump b/runtime/syntax/testdir/dumps/vim9_comment_strings_01.dump
similarity index 79%
rename from runtime/syntax/testdir/dumps/vim9_ex_comment_strings_01.dump
rename to runtime/syntax/testdir/dumps/vim9_comment_strings_01.dump
index 6e0399127daa0ba3a07154d9dd70a3e3e61ab8e6..9ed03150e57882420726c46fc7484ad7c07b8503 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_comment_strings_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_comment_strings_01.dump
@@ -7,14 +7,14 @@
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52
 @2|#+0#0000e05&| |p|r|e| |"+0#e000002&|s|t|r|i|n|g|"| +0#0000e05&|p|o|s|t| +0#0000000&@53
 |}+0#e000e06&| +0#0000000&@73
+@75
+|{+0#e000e06&| +0#0000000&@73
+@2|#+0#0000e05&| |p|r|e| |"+0#e000002&|s|t|r|i|n|g|"| +0#0000e05&|p|o|s|t| +0#0000000&@53
+|}+0#e000e06&| +0#0000000&@73
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
 | +0#0000000&@56|1|9|,|0|-|1| @7|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim9_comment_00.dump b/runtime/syntax/testdir/dumps/vim9_comments_00.dump
similarity index 94%
rename from runtime/syntax/testdir/dumps/vim9_comment_00.dump
rename to runtime/syntax/testdir/dumps/vim9_comments_00.dump
index 46d283f6ee464fd019e8bc351e38ac4971961dab..dc43347b0bba59fa774cf6d0643d2afe147c5975 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_comment_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_comments_00.dump
@@ -1,6 +1,6 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
+|#+0#0000e05&| |V|i|m|9| |c|o|m@1|e|n|t|s| +0#0000000&@59
 @75
-|#+0#0000e05&| |V|i|m| |c|o|m@1|e|n|t|s| +0#0000000&@60
 @75
 |#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@53
 @75

diff --git a/runtime/syntax/testdir/dumps/vim9_comment_01.dump b/runtime/syntax/testdir/dumps/vim9_comments_01.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_comment_01.dump
rename to runtime/syntax/testdir/dumps/vim9_comments_01.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_comment_02.dump b/runtime/syntax/testdir/dumps/vim9_comments_02.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_comment_02.dump
rename to runtime/syntax/testdir/dumps/vim9_comments_02.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_comment_03.dump b/runtime/syntax/testdir/dumps/vim9_comments_03.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_comment_03.dump
rename to runtime/syntax/testdir/dumps/vim9_comments_03.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_comment_04.dump b/runtime/syntax/testdir/dumps/vim9_comments_04.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_comment_04.dump
rename to runtime/syntax/testdir/dumps/vim9_comments_04.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_comment_05.dump b/runtime/syntax/testdir/dumps/vim9_comments_05.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_comment_05.dump
rename to runtime/syntax/testdir/dumps/vim9_comments_05.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_constructor_00.dump b/runtime/syntax/testdir/dumps/vim9_constructors_00.dump
similarity index 90%
rename from runtime/syntax/testdir/dumps/vim9_constructor_00.dump
rename to runtime/syntax/testdir/dumps/vim9_constructors_00.dump
index 1b30c562dee13b1f713684a363aa5323b5ca81f8..6aa0cba8d81640f01c3a583a44809840a155de44 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_constructor_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_constructors_00.dump
@@ -1,6 +1,5 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
-@75
-|#+0#0000e05&| |V|i|m|9| |c|o|n|s|t|r|u|c|t|o|r| +0#0000000&@56
+|#+0#0000e05&| |V|i|m|9| |c|o|n|s|t|r|u|c|t|o|r|s| +0#0000000&@55
 @75
 @75
 |c+0#af5f00255&|l|a|s@1| +0#0000000&|A| @67
@@ -17,4 +16,5 @@
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 |e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66
 @75
-@57|1|,|1| @10|A|l@1| 
+|~+0#4040ff13&| @73
+| +0#0000000&@56|1|,|1| @10|A|l@1| 

diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_00.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_00.dump
index 82b97648bd5df7767aa28e6282a30494d7958203..6c01f4271b0b42270ae6e21d64b3fc75b5395b7e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_def_variables_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_def_variables_00.dump
@@ -1,8 +1,9 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
+|#+0#0000e05&| |V|i|m|9| |f|u|n|c|t|i|o|n| |v|a|r|i|a|b|l|e|s| +0#0000000&@49
 @75
-|#+0#0000e05&| |V|i|m|9| |f|u|n|c|t|i|o|n| |v|a|r|i|a|b|l|e| |h|i|g|h|l|i|g|h|t|i|n|g| +0#0000000&@37
 @75
 |d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@65
+@75
 @2|#+0#0000e05&| |D|e|c|l|a|r|a|t|i|o|n|s| +0#0000000&@58
 @75
 @2|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
@@ -16,5 +17,4 @@
 @75
 @2|$+0#e000e06&|F|O@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61
 @75
-@2|v+0#af5f00255&|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_01.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_01.dump
index d5511cad47fe2e63fa475f05662e29f639b07470..e16bd69e59e9e1e975f94b6dabc98bc16c98790c 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_def_variables_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_def_variables_01.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+| +0&#ffffff0@1|w+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60
+@75
 @2|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
 @75
 @2|$+0#e000e06&|F|O@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61
-@75
-@2>v+0#af5f00255&|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
+> @74
+@2|v+0#af5f00255&|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 @2|v+0#af5f00255&|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @63
 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @2|v+0#af5f00255&|a|r| +0#0000000&|[|$+0#e000e06&|f|o@1|,+0#0000000&| |$+0#e000e06&|b|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
@@ -16,5 +17,4 @@
 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @2|v+0#af5f00255&|a|r| +0#0000000&|[|$+0#e000e06&|f|o@1|,+0#0000000&| |$+0#e000e06&|b|a|r|;+0#0000000&| |$+0#e000e06&|b|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@43
 @2|v+0#af5f00255&|a|r| +0#0000000&|[|$+0#e000e06&|f|o@1|,+0#0000000&| @62
-@8|\+0#e000e06&| +0#0000000&|$+0#e000e06&|b|a|r|;+0#0000000&| @59
-@57|1|9|,|3| @10|6|%| 
+@57|1|9|,|0|-|1| @8|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_02.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_02.dump
index 9bb006ed6a9850fc37aad28394d8fd0de21d9b2b..891384240a215c43c7a616eb6dc26f0951d4e9e2 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_def_variables_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_def_variables_02.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&|$+0#e000e06&|b|a|r|;+0#0000000&| @59
+| +0&#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|[|$+0#e000e06&|f|o@1|,+0#0000000&| @62
+@8|\+0#e000e06&| +0#0000000&|$+0#e000e06&|b|a|r|;+0#0000000&| @59
 @8|\+0#e000e06&| +0#0000000&|$+0#e000e06&|b|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 @75
 @2|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@57
-|.+0#e000002&@2| +0#0000000&@71
->E+0#e000e06&|N|D| +0#0000000&@71
+>.+0#e000002&@2| +0#0000000&@71
+|E+0#e000e06&|N|D| +0#0000000&@71
 @2|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52
 | +0#e000002&@1|.@2| +0#0000000&@69
 | +0#e000e06&@1|E|N|D| +0#0000000&@69
@@ -16,5 +17,4 @@
 @2|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |t|r|i|m| |E|N|D| +0#0000000&@47
 | +0#e000002&@3|.@2| +0#0000000&@67
 | +0#e000e06&@1|E|N|D| +0#0000000&@69
-@75
-@57|3|7|,|1| @9|1|5|%| 
+@57|3|7|,|1| @9|1|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_03.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_03.dump
index 938b20eb1faff96491aba88ed4dbce6790bb7284..48f1253284c45f55b5e4e07f12a69e0cc1d4c1df 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_def_variables_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_def_variables_03.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+| +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@69
+@75
 @2|#+0#0000e05&| |A|s@1|i|g|n|m|e|n|t|s| +0#0000000&@59
 @75
 @1| +0#00e0e07&|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@62
-@75
-@1| +0#00e0e07&>f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
+> @74
+@1| +0#00e0e07&|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
 @75
 @1| +0#00e0e07&|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 @1| +0#00e0e07&|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
@@ -16,5 +17,4 @@
 @1| +0#00e0e07&|f|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61
 @1| +0#00e0e07&|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61
 @1| +0#00e0e07&|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61
-@1| +0#00e0e07&|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61
-@57|5@1|,|3| @9|2|3|%| 
+@57|5@1|,|0|-|1| @7|2|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_04.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_04.dump
index 7d28f18c7f55185fdcfee880a15d8deb10628d61..2c507e1ed0aedcc9844b0c71354d5b880c6a068c 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_def_variables_04.dump
+++ b/runtime/syntax/testdir/dumps/vim9_def_variables_04.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0| +0#00e0e07&|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61
+| +0&#ffffff0| +0#00e0e07&|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61
+@1| +0#00e0e07&|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61
 @1| +0#00e0e07&|f|o@1| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61
 @1| +0#00e0e07&|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60
 @75
-@2|b+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60
-@2>g+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60
+@2>b+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60
+@2|g+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60
 @2|t+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60
 @2|w+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60
 @75
@@ -16,5 +17,4 @@
 @2|g+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
 @2|t+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
 @2|w+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
-@75
 @57|7|3|,|3| @9|3|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_05.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_05.dump
index 57bb62f8463480e270cd20625eaf8ce926f9f73d..abf71b017ebb3692b66d1cf39ae86b84ef86e41f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_def_variables_05.dump
+++ b/runtime/syntax/testdir/dumps/vim9_def_variables_05.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+| +0&#ffffff0@1|w+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
+@75
 @2|b+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
 @2|g+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
 @2|t+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
-@2|w+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
-> @74
+@2>w+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
+@75
 @2|b+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
 @2|g+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
 @2|t+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
@@ -16,5 +17,4 @@
 @75
 @2|b+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
 @2|g+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
-@2|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
-@57|9|1|,|0|-|1| @7|4|1|%| 
+@57|9|1|,|3| @9|4|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_06.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_06.dump
index a0ab49421bc06cfe49061ad32206fbd2f3e5c4b8..85c8000a8c301d9a8b184b0e050b27344a907a0e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_def_variables_06.dump
+++ b/runtime/syntax/testdir/dumps/vim9_def_variables_06.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
+| +0&#ffffff0@1|g+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
+@2|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
 @2|w+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
 @75
 @2|$+0#e000e06&|F|O@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61
-@2|$+0#e000e06&|F|O@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
-> @74
+@2>$+0#e000e06&|F|O@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
+@75
 @2|@+0#e000e06&|f| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@63
 @2|@+0#e000e06&|f| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@61
 @75
@@ -16,5 +17,4 @@
 @2|&+0#00e0e07&|a|r|i| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60
 @2|&+0#00e0e07&|a|r|i| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60
 @75
-@2|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
-@57|1|0|9|,|0|-|1| @6|5|0|%| 
+@57|1|0|9|,|3| @8|4|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_07.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_07.dump
index 6d92e190c961d8f0fd389e09156444447e23f499..928fc56aa94bfd3089077c3910dd657527e50cef 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_def_variables_07.dump
+++ b/runtime/syntax/testdir/dumps/vim9_def_variables_07.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
+| +0&#ffffff0@74
+@2|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 @75
 @2|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @2|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
-@2|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
-> @74
+@2>&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
+@75
 @2|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 @75
 @2|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
@@ -16,5 +17,4 @@
 @2|[+0#e000e06&|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| |v+0#00e0e07&|:|f|a|l|s|e|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@48
 @2|[+0#e000e06&|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| @64
 @8|\+0#e000e06&| +0#0000000&|v+0#00e0e07&|:|f|a|l|s|e|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
-@2|[+0#e000e06&|&+0#00e0e07&|a|r|i|,+0#0000000&| |&+0#00e0e07&|b|k|c|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
-@57|1|2|7|,|0|-|1| @6|5|8|%| 
+@57|1|2|7|,|3| @8|5|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_08.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_08.dump
index 33dddb64e92838ff7d9e6ba531109cf0ce4d3b75..22c33e877ce9401d038dbe9e92ada19fd208cf13 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_def_variables_08.dump
+++ b/runtime/syntax/testdir/dumps/vim9_def_variables_08.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|[+0#e000e06&|&+0#00e0e07&|a|r|i|,+0#0000000&| |&+0#00e0e07&|b|k|c|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
+| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&|v+0#00e0e07&|:|f|a|l|s|e|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
+@2|[+0#e000e06&|&+0#00e0e07&|a|r|i|,+0#0000000&| |&+0#00e0e07&|b|k|c|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @2|[+0#e000e06&|&+0#00e0e07&|a|r|i|,+0#0000000&| @66
 @8|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|b|k|c|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 @2|[+0#e000e06&|$|f|o@1|,+0#0000000&| |$+0#e000e06&|b|a|r|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
-@2|[+0#e000e06&|$|f|o@1|,+0#0000000&| @66
-@8>\+0#e000e06&| +0#0000000&@1|$+0#e000e06&|b|a|r|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
+@2>[+0#e000e06&|$|f|o@1|,+0#0000000&| @66
+@8|\+0#e000e06&| +0#0000000&@1|$+0#e000e06&|b|a|r|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 @2|[+0#e000e06&|@|a|,+0#0000000&| |@+0#e000e06&|b|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 @2|[+0#e000e06&|@|a|,+0#0000000&| @68
 @8|\+0#e000e06&| +0#0000000&@1|@+0#e000e06&|a|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
@@ -16,5 +17,4 @@
 @2|[+0#e000e06&|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#e000e06&| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 @75
 @2|[+0#e000e06&|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50
-@2|[+0#e000e06&|f+0#00e0e07&|o@1|,+0#0000000&| @67
-@57|1|4|5|,|2|-|9| @6|6|7|%| 
+@57|1|4|5|,|3| @8|6|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_09.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_09.dump
index 4cdfb12457521b9f399bc701c9eead5eb11bbf76..a8db5cd3eeb51c5d4d4d474929047e22e5ba996b 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_def_variables_09.dump
+++ b/runtime/syntax/testdir/dumps/vim9_def_variables_09.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|[+0#e000e06&|f+0#00e0e07&|o@1|,+0#0000000&| @67
+| +0&#ffffff0@1|[+0#e000e06&|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50
+@2|[+0#e000e06&|f+0#00e0e07&|o@1|,+0#0000000&| @67
 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r|;+0#0000000&| @60
 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|z|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @2|[+0#e000e06&|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| |v+0#00e0e07&|:|f|a|l|s|e|;+0#0000000&| |v+0#00e0e07&|:|n|o|n|e|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@40
-@2|[+0#e000e06&|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| @64
-@8>\+0#e000e06&| +0#0000000&|v+0#00e0e07&|:|f|a|l|s|e|;+0#0000000&| @56
+@2>[+0#e000e06&|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| @64
+@8|\+0#e000e06&| +0#0000000&|v+0#00e0e07&|:|f|a|l|s|e|;+0#0000000&| @56
 @8|\+0#e000e06&| +0#0000000&|v+0#00e0e07&|:|n|o|n|e|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50
 @2|[+0#e000e06&|$|f|o@1|,+0#0000000&| |$+0#e000e06&|b|a|r|;+0#0000000&| |$+0#e000e06&|b|a|z|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@47
 @2|[+0#e000e06&|$|f|o@1|,+0#0000000&| @66
@@ -16,5 +17,4 @@
 @2|[+0#e000e06&|@|a|,+0#0000000&| |@+0#e000e06&|b|;+0#0000000&| |@+0#e000e06&|c|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @2|[+0#e000e06&|@|a|,+0#0000000&| @68
 @8|\+0#e000e06&| +0#0000000&|@+0#e000e06&|b|;+0#0000000&| @61
-@8|\+0#e000e06&| +0#0000000&|@+0#e000e06&|c|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
-@57|1|6|3|,|2|-|9| @6|7|6|%| 
+@57|1|6|3|,|3| @8|7|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_10.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_10.dump
index c802c88d319caf13a8e68c78a256cea95ec7fc33..6d359140b53399188e78312cfb156ff84b62ecb5 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_def_variables_10.dump
+++ b/runtime/syntax/testdir/dumps/vim9_def_variables_10.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&|@+0#e000e06&|c|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
+| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&|@+0#e000e06&|b|;+0#0000000&| @61
+@8|\+0#e000e06&| +0#0000000&|@+0#e000e06&|c|]| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 @75
 @1| +0#00e0e07&|f|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@61
 |.+0#e000002&@2| +0#0000000&@71
-|E+0#e000e06&|N|D| +0#0000000&@71
-@1| +0#00e0e07&>f|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@56
+>E+0#e000e06&|N|D| +0#0000000&@71
+@1| +0#00e0e07&|f|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@56
 | +0#e000002&@1|.@2| +0#0000000&@69
 | +0#e000e06&@1|E|N|D| +0#0000000&@69
 @1| +0#00e0e07&|f|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |E|N|D| +0#0000000&@56
@@ -16,5 +17,4 @@
 | +0#e000002&@3|.@2| +0#0000000&@67
 | +0#e000e06&@1|E|N|D| +0#0000000&@69
 @75
-@2|#+0#0000e05&| |:|f|o|r| +0#0000000&@66
-@57|1|8|1|,|3| @8|8|4|%| 
+@57|1|8|1|,|1| @8|8|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_11.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_11.dump
index 496b3ed150ab7cb70b2f46639a1fa98fd1be5eff..b416e9150180db15ed939451c20834cfb6e24002 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_def_variables_11.dump
+++ b/runtime/syntax/testdir/dumps/vim9_def_variables_11.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|#+0#0000e05&| |:|f|o|r| +0#0000000&@66
+| +0&#ffffff0@74
+@2|#+0#0000e05&| |:|f|o|r| +0#0000000&@66
 @75
 @2|f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 @2|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@66
-@75
-@2>f+0#af5f00255&|o|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50
+> @74
+@2|f+0#af5f00255&|o|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50
 @2|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@66
 @75
 |#+0#0000e05&| |S|c|o|p|e| |d|i|c|t|i|o|n|a|r|i|e|s| +0#0000000&@54
@@ -16,5 +17,4 @@
 @75
 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|b+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|b+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|w+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|w+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
-|f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
-@57|1|9@1|,|3| @8|9|3|%| 
+@57|1|9@1|,|0|-|1| @6|9|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_def_variables_12.dump b/runtime/syntax/testdir/dumps/vim9_def_variables_12.dump
index ea9b184ae80ff7688df55f66a5b191fa89e217b1..e2b3f2d6f48b3cfb1d4694fbfd856614a447e877 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_def_variables_12.dump
+++ b/runtime/syntax/testdir/dumps/vim9_def_variables_12.dump
@@ -1,9 +1,10 @@
-|f+0#af5f00255#ffffff0|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
+|f+0#af5f00255#ffffff0|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|w+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|w+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
+|f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|g+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|v+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|v+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
 @75
-|#+0#0000e05&| |N|e|o|v|i|m|-|s|p|e|c|i|f|i|c| |v|a|r|i|a|b|l|e|s| |(|n|o|t| |h|i|g|h|l|i|g|h|t|e|d| |b|y| |d|e|f|a|u|l|t|)| +0#0000000&@18
-> @74
+>#+0#0000e05&| |N|e|o|v|i|m|-|s|p|e|c|i|f|i|c| |v|a|r|i|a|b|l|e|s| |(|n|o|t| |h|i|g|h|l|i|g|h|t|e|d| |b|y| |d|e|f|a|u|l|t|)| +0#0000000&@18
+@75
 |e+0#af5f00255&|c|h|o| +0#0000000&|v+0#00e0e07&|:|l+0#0000000&|u|a| |v+0#00e0e07&|:|m+0#0000000&|s|g|p|a|c|k|_|t|y|p|e|s| |v+0#00e0e07&|:|r+0#0000000&|e|l|n|u|m| |v+0#00e0e07&|:|s+0#0000000&|t|d|e|r@1| |v+0#00e0e07&|:|t+0#0000000&|e|r|m|r|e|q|u|e|s|t| |v+0#00e0e07&|:|v+0#0000000&|i|r|t|n|u|m| @6
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|c+0#0000000&|h|a|n@1|e|l| |&+0#00e0e07&|i+0#0000000&|n|c@1|o|m@1|a|n|d| |&+0#00e0e07&|m+0#0000000&|o|u|s|e|s|c|r|o|l@1| |&+0#00e0e07&|p+0#0000000&|u|m|b|l|e|n|d| |&+0#00e0e07&|r+0#0000000&|e|d|r|a|w|d|e|b|u|g| |&+0#00e0e07&|s+0#0000000&|c|r|o|l@1|b|a|c|k| @1
@@ -16,5 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-| +0#0000000&@56|2|1|7|,|0|-|1| @6|B|o|t| 
+| +0#0000000&@56|2|1|7|,|1| @8|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_00.dump
index 6d431a6b74eb062ce12618d030f913509679053e..a370779d19fa42536049da53518c6923e0b59048 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_00.dump
@@ -1,12 +1,13 @@
 | +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|i|m|9| |:|c|l|a|s@1| |c|o|m@1|a|n|d| +0#0000000&@51
-| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |'|c|f|'| +0#0000000&@28
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |'|c|f|i|'| +0#0000000&@27
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|1| @52
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
-| +0#0000e05#a8a8a8255@1|i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|2| @52
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|1| @52
+||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
+|-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|2| @52
+||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|C|l|a|s@1|1| @60
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
@@ -16,5 +17,4 @@
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |a+0#af5f00255#ffffff0|b|s|t|r|a|c|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|C|l|a|s@1|3| @51
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_01.dump
index 7dd62c8bdf86e2333b5cc291f7439aefb3eafb5f..eb4ae910ee4f68823ff99d54c10927c935c6009e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_01.dump
@@ -1,9 +1,10 @@
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|C|l|a|s@1|2| @53
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |a+0#af5f00255#ffffff0|b|s|t|r|a|c|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|C|l|a|s@1|3| @51
-||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
-| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
+||+0#0000e05#a8a8a8255| >e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|C|l|a|s@1|4| @44
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
@@ -16,5 +17,4 @@
 |-+0#0000e05#a8a8a8255| |c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|C|l|a|s@1|7| |i+0#af5f00255&|m|p|l|e|m|e|n|t|s| +0#0000000&|I|n|t|e|r|f|a|c|e|1|,| |I|n|t|e|r|f|a|c|e|2| @26
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-|-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|C|l|a|s@1|8| |i+0#af5f00255&|m|p|l|e|m|e|n|t|s| +0#0000000&|I|n|t|e|r|f|a|c|e|1|,| |I|n|t|e|r|f|a|c|e|2| @19
-@57|1|9|,|0|-|1| @7|2|5|%| 
+@57|1|9|,|1| @9|2|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_02.dump b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_02.dump
index 0c4b0c200661c98ea73893e8e7b0dd0312724fcd..31ab784ce105b636ba4eb485498215a66958970d 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_02.dump
@@ -1,9 +1,10 @@
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|C|l|a|s@1|8| |i+0#af5f00255&|m|p|l|e|m|e|n|t|s| +0#0000000&|I|n|t|e|r|f|a|c|e|1|,| |I|n|t|e|r|f|a|c|e|2| @19
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|C|l|a|s@1|9| @60
-|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@61
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
+|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1>d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@61
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|o|d|1|(+0#e000e06&|)|:+0#0000000&| |v+0#00e0003&|o|i|d| +0#0000000&@51
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|N|e|s|t|e|d|1|(+0#e000e06&|)|:+0#0000000&| |v+0#00e0003&|o|i|d| +0#0000000&@49
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@5|d+0#af5f00255&|e|f| +0#0000000&|N|e|s|t|e|d|2|(+0#e000e06&|)|:+0#0000000&| |v+0#00e0003&|o|i|d| +0#0000000&@47
@@ -16,5 +17,4 @@
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-|-+0#0000e05#a8a8a8255| |a+0#af5f00255#ffffff0|b|s|t|r|a|c|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|C|l|a|s@1|1|0| @50
-@57|3|7|,|3| @9|6|0|%| 
+@57|3|7|,|3| @9|5|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_03.dump b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_03.dump
index 7b7b8eac0aee42460e10e55c49392a1a4816cc01..97457ba72e978d0f7e74ce57767c8b642ba60681 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_03.dump
@@ -1,20 +1,20 @@
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |a+0#af5f00255#ffffff0|b|s|t|r|a|c|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|C|l|a|s@1|1|0| @50
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|o|d|1|(+0#e000e06&|)|:+0#0000000&| |v+0#00e0003&|o|i|d| +0#0000000&@42
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@41
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| +0#0000000&|I+0#e000e06&|s@1|u|e|:| +0#0000e05&|#|1|4|3|9|3| +0#0000000&@57
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|T|e|s|t|a|b|l|e| @54
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|e|t|U|p|(+0#e000e06&|)| +0#0000000&@57
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|T|e|a|r|D|o|w|n|(+0#e000e06&|)| +0#0000000&@54
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
+|-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|T|e|s|t|a|b|l|e| @54
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|e|t|U|p|(+0#e000e06&|)| +0#0000000&@57
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|T|e|a|r|D|o|w|n|(+0#e000e06&|)| +0#0000000&@54
+||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |a+0#af5f00255#ffffff0|b|s|t|r|a|c|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|T|e|s|t|T|e|m|p|l|a|t|e| |i+0#af5f00255&|m|p|l|e|m|e|n|t|s| +0#0000000&|T|e|s|t|a|b|l|e| @25
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|a|i|l|e|d|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@50
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|p+0#00e0e07&|a|s@1|e|d|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@50
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|S|e|t|U|p|(+0#e000e06&|)| +0#0000000&@48
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|T|e|a|r|D|o|w|n|(+0#e000e06&|)| +0#0000000&@45
-@57|5@1|,|0|-|1| @7|9|6|%| 
+@57|5@1|,|0|-|1| @7|9|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_04.dump b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_04.dump
index dbda81a26cd8cbc5c0b5b1a0644aa77e7b0c10dd..a7fcfe7daf36215e3c4f3083a4b2cfd85caba7aa 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_class_fold_04.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_class_fold_04.dump
@@ -1,3 +1,4 @@
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|S|e|t|U|p|(+0#e000e06&|)| +0#0000000&@48
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|a+0#af5f00255&|b|s|t|r|a|c|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|T|e|a|r|D|o|w|n|(+0#e000e06&|)| +0#0000000&@45
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
@@ -16,5 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-| +0#0000000&@56|7|0|,|0|-|1| @7|B|o|t| 
+| +0#0000000&@56|7|1|,|0|-|1| @7|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump
index af3fcfa0f366f4cc792cc052b40c07b58194a1ed..6da90f8216327d21a3fa854b583879534a2a5b01 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_commands_00.dump
@@ -1,7 +1,7 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
-@75
 |#+0#0000e05&| |V|i|m|9| |E|x| |c|o|m@1|a|n|d|s| +0#0000000&@56
 @75
+@75
 |#+0#0000e05&| |S|T|A|R|T| |N|O|T| |M|A|T|C|H|E|D| +0#0000000&@55
 |:|@| @72
 |:|@+0#e000e06&@1| +0#0000000&@71

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_enum2_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_enum2_00.dump
index 9e3d0b0599924c6f0f7985bf75650e12d326a281..fa28754896cd3a758ee34a672f8fd1702a7b8eee 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_enum2_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_enum2_00.dump
@@ -1,10 +1,9 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
-|#+0#0000e05&| |V|i|m| |:|e|n|u|m| |c|o|m@1|a|n|d| +0#0000000&@55
+|#+0#0000e05&| |V|i|m|9| |:|e|n|u|m| |c|o|m@1|a|n|d| +0#0000000&@54
 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|E|n|u|m|V|a|l|u|e| |T|o|d|o| +0#0000000&@31
-@75
-@75
 |#+0#0000e05&| +0#0000000&|S+0#e000e06&|e@1|:| +0#0000e05&|h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|6|3|6|5|#|i|s@1|u|e|c|o|m@1|e|n|t|-|2|5|7|1|4|2|0|5@1|1| +0#0000000&@6
 @75
+@75
 |e+0#af5f00255&|n|u|m| +0#0000000&|L|e|t@1|e|r| @63
 @4|#+0#0000e05&| +0#0000000&@69
 @4|#+0#0000e05&@40| +0#0000000&@29
@@ -17,4 +16,5 @@
 @4|)+0#e000e06&|,+0#0000000&| |G+0#0000001#ffff4012| +0#0000000#ffffff0@66
 @4|#+0#0000e05&|e|n|u|m| |N|o|t|S|u|p@1|o|r|t|e|d| +0#0000000&@52
 @4|#+0#0000e05&|e|n|d|e|n|u|m| +0#0000000&@62
+@75
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_enum2_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_enum2_01.dump
index 17e107e1d8a04c1196fce0ad55ba645c17b92242..2b47e5723eb983500e00fd935393dd2a7323cbfc 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_enum2_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_enum2_01.dump
@@ -1,10 +1,9 @@
-| +0&#ffffff0@3|F+0#0000001#ffff4012|(+0#e000e06#ffffff0| +0#0000000&@68
-@4|"+0#e000002&|)|"| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|#+0#0000e05&| |F|A|,| +0#0000000&@58
+| +0&#ffffff0@3|"+0#e000002&|)|"| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|#+0#0000e05&| |F|A|,| +0#0000000&@58
 @4|"+0#e000002&|(|"| +0#0000000&|#+0#0000e05&| |F|B|,| +0#0000000&@61
 @4|)+0#e000e06&|,+0#0000000&| |G+0#0000001#ffff4012| +0#0000000#ffffff0@66
 @4|#+0#0000e05&|e|n|u|m| |N|o|t|S|u|p@1|o|r|t|e|d| +0#0000000&@52
-@4>#+0#0000e05&|e|n|d|e|n|u|m| +0#0000000&@62
-@75
+@4|#+0#0000e05&|e|n|d|e|n|u|m| +0#0000000&@62
+> @74
 @4|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|v+0#00e0e07&|a|l|u|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|n|o|n|e|)+0#e000e06&| +0#0000000&@42
 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@60
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
@@ -17,4 +16,5 @@
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|L+0#00e0e07&|e|t@1|e|r|.+0#af5f00255&|D+0#00e0e07&| +0#0000000&@61
 @75
-@57|1|9|,|5| @9|B|o|t| 
+|~+0#4040ff13&| @73
+| +0#0000000&@56|1|9|,|0|-|1| @7|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_00.dump
index 706820bec78ce47ebad6dbd4e7521cf6eaa33c14..5842cffa2f107090f92fc55f4985960a163f8167 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_enum_fold_00.dump
@@ -1,14 +1,14 @@
 | +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|i|m| |:|e|n|u|m| |c|o|m@1|a|n|d| +0#0000000&@53
-| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |'|e|f|'| +0#0000000&@28
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|i|m|9| |:|e|n|u|m| |c|o|m@1|a|n|d| +0#0000000&@52
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |'|e|f|i|'| +0#0000000&@27
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|E|n|u|m|V|a|l|u|e| |T|o|d|o| +0#0000000&@29
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|1| @52
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
-| +0#0000e05#a8a8a8255@1|i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|2| @52
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
+|-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|1| @52
+||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
+|-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|2| @52
+||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|u|m| +0#0000000&|E|n|u|m|1| @62
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|e|n|u|m| +0#0000000&@65

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_for_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_for_00.dump
index 3d1d628df64d3ca52b7fa19ec03cc522fdd8a1a7..5d5b08fedb80610b756d35d222278b770d21715c 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_for_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_for_00.dump
@@ -1,5 +1,4 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
-@75
 |#+0#0000e05&| |V|i|m|9| |:|f|o|r| |c|o|m@1|a|n|d| +0#0000000&@55
 @75
 @75
@@ -17,4 +16,5 @@
 @75
 |f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&@64
 @6|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@59
+@6|e+0#00e0e07&|x|p|r| +0#0000000&@64
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_for_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_for_01.dump
index 600b850631ebb6b6ae8db52b2656759941a2fc05..5cf763707c0690f0e669833bb9d52611e743a5f1 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_for_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_for_01.dump
@@ -1,10 +1,9 @@
-|f+0#af5f00255#ffffff0|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@49
-@2|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@64
+| +0&#ffffff0@1|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@64
 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68
 @75
 |f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&@64
-@6>#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@59
-@6|e+0#00e0e07&|x|p|r| +0#0000000&@64
+@6|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@59
+@6>e+0#00e0e07&|x|p|r| +0#0000000&@64
 @2|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@64
 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68
 @75
@@ -17,4 +16,5 @@
 |f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|[+0#e000e06&|4+0#e000002&|2|]+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@39
 @75
 |f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |n+0#00e0e07&|u|m|b|e|r| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|[+0#e000e06&|4+0#e000002&|2|]+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@31
-@57|1|9|,|7| @9|2|6|%| 
+@75
+@57|1|9|,|7| @9|2|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_for_02.dump b/runtime/syntax/testdir/dumps/vim9_ex_for_02.dump
index 5560a5b7b99c3e9e2a8f2f116d8f2c796d476d35..9e60ec45ba1ee96c3b0d99ba4a80865e3ad9e967 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_for_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_for_02.dump
@@ -1,10 +1,9 @@
-|f+0#af5f00255#ffffff0|o|r| +0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |n+0#00e0e07&|u|m|b|e|r| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|[+0#e000e06&|4+0#e000002&|2|]+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@31
-@75
+| +0&#ffffff0@74
 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&||| |f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@46
 @2|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@64
 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68
-> @74
 @75
+> @74
 |#+0#0000e05&| |:|f|o|r| |[|{|v|a|r|1|}|,| |{|v|a|r|2|}|,| |.@2|]| |i|n| |{|l|i|s|t|l|i|s|t|}| +0#0000000&@32
 @75
 |v+0#af5f00255&|a|r| +0#0000000&|e+0#00e0e07&|x|p|r|2| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&@1|4+0#e000002&|2|,+0#0000000&| |8+0#e000002&|3|]+0#e000e06&@1| +0#0000000&@52
@@ -17,4 +16,5 @@
 @2|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@60
 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68
 @75
-@57|3|7|,|0|-|1| @7|6|3|%| 
+|f+0#af5f00255&|o|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |i+0#af5f00255&|n| +0#0000000&@57
+@57|3|7|,|0|-|1| @7|6|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_for_03.dump b/runtime/syntax/testdir/dumps/vim9_ex_for_03.dump
index 8f16b2b524d1a33a4a62a997cfa92116e4382959..1aecb92bbbaa6c7ee8f3a8aff26b9691747ffb02 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_for_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_for_03.dump
@@ -1,10 +1,9 @@
-| +0&#ffffff0@74
-|f+0#af5f00255&|o|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |i+0#af5f00255&|n| +0#0000000&@57
+|f+0#af5f00255#ffffff0|o|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |i+0#af5f00255&|n| +0#0000000&@57
 @6|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@59
 @6|e+0#00e0e07&|x|p|r|2| +0#0000000&@63
 @2|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@60
->e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68
-@75
+|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68
+> @74
 |f+0#af5f00255&|o|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r|2| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@27
 @75
 |f+0#af5f00255&|o|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |i+0#af5f00255&|n| +0#0000000&|[+0#e000e06&@1|4+0#e000002&|2|,+0#0000000&| |8+0#e000002&|3|]+0#e000e06&@1| +0#0000000&@46
@@ -17,4 +16,5 @@
 @2|e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@60
 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68
 @75
-@57|5@1|,|1| @9|B|o|t| 
+|~+0#4040ff13&| @73
+| +0#0000000&@56|5@1|,|0|-|1| @7|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_00.dump
index b9b219e2d6e4936d1fbdca0cb55fd899b42011ec..b3a368d48d7ae2ab48e0b39f6b7358716d0ff8b2 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_00.dump
@@ -1,8 +1,8 @@
 >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| |a|n|d| |:|d|e|f| |t|a|i|l| |c|o|m@1|e|n|t| |e|r@1|o|r|s| +0#0000000&@29
 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |u|n|l|e|t|!| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| +0#0000000&@34
 @75
+@75
 |f+0#af5f00255&|u|n| +0#0000000&|T|e|s|t|1|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@14|#+0#ffffff16#ff404010| |f|u|n| +0#0000000#ffffff0@37
 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|1+0#e000002&| +0#0000000&@64
 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_01.dump
index 896ab615c74f0d5cc0f7220f55f6a7fda1433da7..bfc9103cdbc6bfc8090a2a8d3360c62b8410a502 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_01.dump
@@ -17,4 +17,4 @@
 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|5+0#e000002&| +0#0000000&@62
 @2|e+0#af5f00255&|n|d|f|u|n| +0#0000000&@23|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34
 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|T|e|s|t|5|(+0#e000e06&|)| +0#0000000&@56
-@57|1|9|,|1| @9|5|2|%| 
+@57|1|9|,|1| @9|5|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_02.dump b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_02.dump
index 71c31bf92902d4488663ee888aa4ce09e51d589c..b7d3c83310aab8dbd9728b711977d8a97baa90b4 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comment_errors_02.dump
@@ -11,10 +11,10 @@
 |f+0#af5f00255&|o|r| +0#0000000&|d+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|r+0#00e0e07&|a|n|g|e|(+0#e000e06&|1+0#e000002&|,+0#0000000&| |6+0#e000002&|)+0#e000e06&| +0#0000000&@54
 @2|e+0#af5f00255&|x|e|c| +0#0000000&|$+0#e000002&|'|e|c|h|o| |T|e|s|t|{+0#e000e06&|d+0#00e0e07&|}+0#e000e06&|(+0#e000002&|)|'| +0#0000000&@50
 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
 |~| @73
 |~| @73
-|~| @73
 | +0#0000000&@56|3|7|,|5| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_00.dump
index 081c0a3edc5a01c96e927743d52f288283541b66..f50d4a5055ff652523bf9bbb65f43a3a6024899e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_00.dump
@@ -1,8 +1,8 @@
 >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| |a|n|d| |:|d|e|f| |t|a|i|l| |c|o|m@1|e|n|t|s| +0#0000000&@35
 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |u|n|l|e|t|!| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| +0#0000000&@34
 @75
+@75
 |f+0#af5f00255&|u|n| +0#0000000&|T|e|s|t|1|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@14|"+0#0000e05&| |f|u|n| +0#0000000&@37
 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|1+0#e000002&| +0#0000000&@64
 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|"+0#0000e05&| |e|n|d|f|u|n| +0#0000000&@34

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_01.dump
index 30083bd4d0dd2c2aff9d2fa8277c8a35a0eb1134..5498379d35254e3c717ebc9c8f256ddf7a38647d 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_01.dump
@@ -17,4 +17,4 @@
 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|5+0#e000002&| +0#0000000&@62
 @2|e+0#af5f00255&|n|d|f|u|n| +0#0000000&@23|"+0#0000e05&| |e|n|d|f|u|n| +0#0000000&@34
 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|T|e|s|t|5|(+0#e000e06&|)| +0#0000000&@56
-@57|1|9|,|1| @9|5|2|%| 
+@57|1|9|,|1| @9|5|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_02.dump b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_02.dump
index e9e8022b94b01a44eccbbd8ead703534e342bd7e..daaca61419df8f46340177fad716797da8c913a1 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_function_def_tail_comments_02.dump
@@ -11,10 +11,10 @@
 |f+0#af5f00255&|o|r| +0#0000000&|d+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|r+0#00e0e07&|a|n|g|e|(+0#e000e06&|1+0#e000002&|,+0#0000000&| |6+0#e000002&|)+0#e000e06&| +0#0000000&@54
 @2|e+0#af5f00255&|x|e|c| +0#0000000&|$+0#e000002&|'|e|c|h|o| |T|e|s|t|{+0#e000e06&|d+0#00e0e07&|}+0#e000e06&|(+0#e000002&|)|'| +0#0000000&@50
 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
 |~| @73
 |~| @73
-|~| @73
 | +0#0000000&@56|3|7|,|5| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_00.dump
index 6e9dde7d1a40f8715a4b378e97bd00545575c5ae..39aa281414e94e4a94a6631d39f1f7a3bb4ea3ab 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_00.dump
@@ -1,8 +1,9 @@
 | +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|i|m| |:|i|n|t|e|r|f|a|c|e| |c|o|m@1|a|n|d| +0#0000000&@48
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|i|m|9| |:|i|n|t|e|r|f|a|c|e| |c|o|m@1|a|n|d| +0#0000000&@47
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |'|i|'| +0#0000000&@29
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|1| @52
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
@@ -16,5 +17,4 @@
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|3| @52
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@61
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|1|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_01.dump
index 543ad01e36343e9f4625dc251802a30670560f81..9d89454adaec76b85dde44127d36671b9d96cbf3 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_01.dump
@@ -1,9 +1,10 @@
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@61
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|v+0#00e0e07&|a|r|1|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@54
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|3| @52
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@61
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1>d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|1|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1>#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@61
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|1|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|4| @52
@@ -16,5 +17,4 @@
 |-+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|n|t|e|r|f|a|c|e| +0#0000000&|I|n|t|e|r|f|a|c|e|5| @52
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@61
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|v+0#00e0e07&|a|r|1|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@54
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|v+0#00e0e07&|a|r|2|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@54
-@57|1|9|,|3| @9|7|6|%| 
+@57|1|9|,|3| @9|6|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_02.dump b/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_02.dump
index 06b0359b67655bd745a3ca3111640e28147a7c8f..ea070ef8acbb1d3dee6157df29555d02879a1475 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_interface_fold_02.dump
@@ -1,8 +1,10 @@
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|v+0#00e0e07&|a|r|1|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@54
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|v+0#00e0e07&|a|r|2|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@54
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@61
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|1|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|2|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51
 ||+0#0000e05#a8a8a8255| >e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
@@ -15,6 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|3|6|,|1| @9|B|o|t| 
+| +0#0000000&@56|3|7|,|1| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_00.dump
index 2901ba96e0274096ecfd5e9c942657eb2005c8f0..6694ed71941d1707b342bfb66dc3e8ab9c4c42b7 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_00.dump
@@ -1,4 +1,5 @@
 | +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|i|m|9| |h|e|r|e|d|o|c| +0#0000000&@58
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"+0#e000002&|h|"| +0#0000000&@29
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
@@ -16,5 +17,4 @@
 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#e000e06&|<@1| |E|O|S| +0#0000000&@50
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
-||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_01.dump
index 7531031632cfc1d2265a4e708e543d86a610af05..e4881b8ee45886996c8c034a7685ae39757f1735 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_01.dump
@@ -1,9 +1,10 @@
+||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#e000e06&|<@1| |E|O|S| +0#0000000&@50
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67
-||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
-||+0#0000e05#a8a8a8255| >E+0#e000e06#ffffff0|O|S| +0#0000000&@69
+||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
+||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#e000e06&|<@1| |E|O|S| +0#0000000&@48
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67
@@ -16,5 +17,4 @@
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @61
 @57|1|9|,|1| @10|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_02.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_02.dump
index d4012e70dee258aac3723a8c7fcde03c135988c5..aa40a19db3dd9f253d966d31c468f6d632c22ac6 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_02.dump
@@ -1,9 +1,10 @@
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @61
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r|]+0#0000000&| |=+0#e000e06&|<@1| |E|O|S| +0#0000000&@50
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
-||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69
-| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
+||+0#0000e05#a8a8a8255| >E+0#e000e06#ffffff0|O|S| +0#0000000&@69
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |a|s@1|i|g|n|m|e|n|t| +0#0000000&@60
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |f+0#00e0e07#ffffff0|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@61
@@ -16,5 +17,4 @@
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-|-+0#0000e05#a8a8a8255| |g+0#00e0e07#ffffff0|:|f|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@59
-@57|3|7|,|0|-|1| @7|1@1|%| 
+@57|3|7|,|1| @9|1@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_03.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_03.dump
index 63446dd91d94a2532cc3629327351e869457faaf..9f70a8ce56934995643a8629f08a1a6460352c05 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_03.dump
@@ -1,9 +1,10 @@
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |g+0#00e0e07#ffffff0|:|f|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@59
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0| +0#00e0e07&>g|:|f|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@57
+| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0| +0#00e0e07&|g|:|f|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@57
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
@@ -16,5 +17,4 @@
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#e000e06&|<@1| |E|O|S| +0#0000000&@52
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
-||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69
-@57|5@1|,|3| @9|1|7|%| 
+@57|5@1|,|0|-|1| @7|1|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_04.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_04.dump
index 579e5a606719f7a8f8f598d826b09b9964a9d3c6..71897e5037b29a59cac84b78445b7bdd631b69c5 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_04.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_04.dump
@@ -1,9 +1,10 @@
+||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|[+0#0000000#ffffff0|f+0#00e0e07&|o@1|,+0#0000000&| @67
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@5|\| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#e000e06&|<@1| |E|O|S| +0#0000000&@52
-||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67
-||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
+||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67
+||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|[|f+0#00e0e07&|o@1|,+0#0000000&| @65
@@ -16,5 +17,4 @@
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-@57|7|3|,|1| @9|2|4|%| 
+@57|7|3|,|1| @9|2|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_05.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_05.dump
index 18924f8954c041e3774de256f1c05ae3399f0a14..d1a98e75533316f6a0ac3e114303fde21d22d36c 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_05.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_05.dump
@@ -1,9 +1,10 @@
+||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|[|g+0#00e0e07&|:|f|o@1|,+0#0000000&| |g+0#00e0e07&|:|b|a|r|]+0#0000000&| |=+0#e000e06&|<@1| |E|O|S| +0#0000000&@48
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
-||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69
-| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
+||+0#0000e05#a8a8a8255| >E+0#e000e06#ffffff0|O|S| +0#0000000&@69
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|[+0#0000000#ffffff0|g+0#00e0e07&|:|f|o@1|,+0#0000000&| @65
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@5|\| |g+0#00e0e07&|:|b|a|r|]+0#0000000&| |=+0#e000e06&|<@1| |E|O|S| +0#0000000&@50
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67
@@ -16,5 +17,4 @@
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-@57|9|1|,|0|-|1| @7|3|0|%| 
+@57|9|1|,|1| @9|3|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_06.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_06.dump
index 1ed846b53c97989b9731cb7df99e9053c70f62dc..0af6e896db91b0cb50065cfd38deb6cac73b10bc 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_06.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_06.dump
@@ -1,9 +1,10 @@
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |t|y|p|e|d| +0#0000000&@65
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1|:+0#0000000&| |l+0#00e0003&|i|s|t|<|s|t|r|i|n|g|>| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@43
-||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67
-||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
+||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67
+||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|[|f+0#00e0e07&|o@1|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| |b+0#00e0e07&|a|r|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|]+0#0000000&| |=+0#e000e06&|<@1| |E|N|D| +0#0000000&@34
@@ -16,5 +17,4 @@
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |t|r|i|m| +0#0000000&@66
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52
-||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|l|i|n|e|1| +0#0000000&@65
 @57|1|0|9|,|1| @8|3|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_07.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_07.dump
index 0e8fac14950498bf59b2755dc96595b5100d789c..72e34392be0e2d3f0024c21196ad9687ea3d1d71 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_07.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_07.dump
@@ -1,9 +1,10 @@
+|-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|l|i|n|e|1| +0#0000000&@65
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|l|i|n|e|2| +0#0000000&@65
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50
-||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3>l|i|n|e|1| +0#0000000&@63
+|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1>v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50
+||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|l|i|n|e|1| +0#0000000&@63
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|l|i|n|e|2| +0#0000000&@63
 ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
@@ -16,5 +17,4 @@
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |E|N|D| +0#0000000&@50
-||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&|1+0#e000002&| +0#0000000&|++0#af5f00255&| +0#0000000&|0+0#e000002&|}+0#e000e06&| +0#0000000&@61
-@57|1|2|7|,|5| @8|4|3|%| 
+@57|1|2|7|,|3| @8|4|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_08.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_08.dump
index b0423b32d8436814594d05ece0ea6fff4de49edd..423442388919031cb2132f1213606d13d68eb940 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_08.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_08.dump
@@ -1,9 +1,10 @@
+|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |E|N|D| +0#0000000&@50
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&|1+0#e000002&| +0#0000000&|++0#af5f00255&| +0#0000000&|0+0#e000002&|}+0#e000e06&| +0#0000000&@61
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&|1+0#e000002&| +0#0000000&|++0#af5f00255&| +0#0000000&|1+0#e000002&|}+0#e000e06&| +0#0000000&@61
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-|-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |e|v|a|l| |E|N|D| +0#0000000&@47
-||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1>l|i|n|e|{+0#e000e06&|1+0#e000002&| +0#0000000&|++0#af5f00255&| +0#0000000&|0+0#e000002&|}+0#e000e06&| +0#0000000&@59
+|-+0#0000e05#a8a8a8255| >v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |e|v|a|l| |E|N|D| +0#0000000&@47
+||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|l|i|n|e|{+0#e000e06&|1+0#e000002&| +0#0000000&|++0#af5f00255&| +0#0000000&|0+0#e000002&|}+0#e000e06&| +0#0000000&@59
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|l|i|n|e|{+0#e000e06&|1+0#e000002&| +0#0000000&|++0#af5f00255&| +0#0000000&|1+0#e000002&|}+0#e000e06&| +0#0000000&@59
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
@@ -16,5 +17,4 @@
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |E|N|D| +0#0000000&@52
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |0|}+0#e000e06&@1| +0#0000000&@59
-||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |1|}+0#e000e06&@1| +0#0000000&@59
-@57|1|4|5|,|3| @8|4|9|%| 
+@57|1|4|5|,|1| @8|4|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_09.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_09.dump
index 937493194fecf023d36ab7631d435554c558126d..52af3d8259f03331ee418458a6f641a96c13160d 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_09.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_09.dump
@@ -1,9 +1,10 @@
+||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |0|}+0#e000e06&@1| +0#0000000&@59
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |1|}+0#e000e06&@1| +0#0000000&@59
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |E|N|D| +0#0000000&@50
-||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |0|}+0#e000e06&@1| +0#0000000&@59
-||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |1|}+0#e000e06&@1| +0#0000000&@59
+||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |0|}+0#e000e06&@1| +0#0000000&@59
+||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |1|}+0#e000e06&@1| +0#0000000&@59
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |e|v|a|l| |E|N|D| +0#0000000&@47
@@ -16,5 +17,4 @@
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|l|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |1|}+0#e000e06&@1| +0#0000000&@55
 ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 @57|1|6|3|,|1| @8|5|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_10.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_10.dump
index 3ab0bf7312bb31a8d844362b21f4c1d51dcc2d71..c2158724cee38272fc622b6296886f46b3233a47 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_10.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_10.dump
@@ -1,9 +1,10 @@
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |n|o| |i|n|t|e|r|p|o|l|a|t|i|o|n| +0#0000000&@54
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@57
-||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{|1| |+| |0|}| +0#0000000&@61
-||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|{|1| |+| |1|}| +0#0000000&@61
+||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|{|1| |+| |0|}| +0#0000000&@61
+||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{|1| |+| |1|}| +0#0000000&@61
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@55
@@ -16,5 +17,4 @@
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|l|i|n|e|{|1| |+| |1|}| +0#0000000&@59
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50
 @57|1|8|1|,|1| @8|6|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_11.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_11.dump
index 65d18b6d1ac220c6c541d8373edfd1d2c5981424..c29d680cd2cd8aeef4ba5150a8e94f84719d51d8 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_11.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_11.dump
@@ -1,9 +1,10 @@
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|l|i|n|e|{|1| |+| |0|}| +0#0000000&@57
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|l|i|n|e|{|1| |+| |1|}| +0#0000000&@57
 ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |e|n|d| |m|a|r|k|e|r| |m|u|s|t| |n|o|t| |b|e| |f|o|l@1|o|w|e|d| |b|y| |w|h|i|t|e|s|p|a|c|e| +0#0000000&@25
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@43
@@ -16,5 +17,4 @@
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0|E|N|D| | +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@43
-@57|1|9@1|,|0|-|1| @6|6|9|%| 
+@57|1|9@1|,|0|-|1| @6|6|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_12.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_12.dump
index fe42476c9c2691bff0d4c31cfa93d92cf8933b8a..b1bc7cdbfa28c9c8b328f29e60f568382aab1f98 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_12.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_12.dump
@@ -1,9 +1,10 @@
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@43
 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|E|N|D| | +0#0000000&@66
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1>#+0&#ffffff0| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@43
+| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@43
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|E|N|D| | +0#0000000&@64
 ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67
@@ -16,5 +17,4 @@
 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|E|N|D| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-@57|2|1|7|,|1| @8|7|5|%| 
+@57|2|1|7|,|0|-|1| @6|7|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_13.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_13.dump
index 4456c104b6060659214f7236edb8b20f412acc6a..b41c983297ec997dbbadf0cd01cfb8c5f7371eb0 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_13.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_13.dump
@@ -1,9 +1,10 @@
+||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|#+0#0000e05&| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D|"|]|)| +0#0000000&@42
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|E|N|D| +0#0000000&@65
-||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67
-| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
+||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1>E|N|D| +0#0000000&@67
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@43
 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52
 ||+0#0000e05#a8a8a8255| |E+0#e000002#ffffff0|N|D| | +0#0000000&@68
@@ -16,5 +17,4 @@
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|#+0#0000e05&| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@41
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50
-||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|E|N|D| | +0#0000000&@64
-@57|2|3|4|,|0|-|1| @6|8|1|%| 
+@57|2|3|4|,|3| @8|8|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_14.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_14.dump
index f8547b1855dfac0741ff2bc1bc12fb3b2c129ec7..6c0659877c09cc56d1182025d053c40cf0b982a8 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_14.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_14.dump
@@ -1,9 +1,10 @@
+|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@3|E|N|D| | +0#0000000&@64
 ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|#+0#0000e05&| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D|"|]|)| +0#0000000&@42
-|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50
-||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@4>E|N|D| +0#0000000&@64
+|-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1>v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50
+||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@4|E|N|D| +0#0000000&@64
 ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|#+0#0000e05&| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@41
@@ -16,5 +17,4 @@
 ||+0#0000e05#a8a8a8255| |E+0#e000002#ffffff0|N|D| | +0#0000000&@68
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|#+0#0000e05&| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D|"|]|)| +0#0000000&@42
-@57|2|5|2|,|6| @8|8@1|%| 
+@57|2|5|2|,|3| @8|8|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_15.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_15.dump
index 7260f7eba248ce363c92f0cba0721fbe6b25032e..383207f7eaa1e763c84751cec8ae7e756b47544f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_15.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_15.dump
@@ -1,9 +1,10 @@
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|#+0#0000e05&| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D|"|]|)| +0#0000000&@42
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0|E|N|D| +0#0000000&@68
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1>#+0#0000e05&| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D|"|]|)| +0#0000000&@42
+| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@1|#+0#0000e05&| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D|"|]|)| +0#0000000&@42
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@2|E|N|D| +0#0000000&@66
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
@@ -16,5 +17,4 @@
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |!+0#e000e06#ffffff0|@|#|$|%|^|&|*|(|)|_|+| +0#0000000&@60
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-|-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |0|!|@|#|$|%|^|&|*|(|)|_|+| +0#0000000&@47
-@57|2|7|0|,|3| @8|9|4|%| 
+@57|2|7|0|,|0|-|1| @6|9|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_16.dump b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_16.dump
index 66baedcd094f02b1a0cf05c6d90ff35c199ea1a5..80f70dd58902efbcb73df911ef5be51763def9a8 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_16.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_let_heredoc_16.dump
@@ -1,9 +1,10 @@
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |0|!|@|#|$|%|^|&|*|(|)|_|+| +0#0000000&@47
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |0+0#e000e06#ffffff0|!|@|#|$|%|^|&|*|(|)|_|+| +0#0000000&@59
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-|-+0#0000e05#a8a8a8255| >v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |A|!|@|#|$|%|^|&|*|(|)|_|+| +0#0000000&@47
+| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |v+0#af5f00255#ffffff0|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |A|!|@|#|$|%|^|&|*|(|)|_|+| +0#0000000&@47
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|2| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| |A+0#e000e06#ffffff0|!|@|#|$|%|^|&|*|(|)|_|+| +0#0000000&@59
@@ -16,5 +17,4 @@
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |~+0#4040ff13&| @73
 |~| @73
-|~| @73
-| +0#0000000&@56|2|8@1|,|1| @8|B|o|t| 
+| +0#0000000&@56|2|8@1|,|0|-|1| @6|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump
index 9e6247a6c1c03931b3df96f681718b854d63580d..ac066ec60be875bc8b00dca1108575eaa4aa75d8 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_00.dump
@@ -1,6 +1,6 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
+|#+0#0000e05&| |V|i|m|9| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d| +0#0000000&@48
 @75
-|#+0#0000e05&| |V|i|m| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d| +0#0000000&@49
 @75
 |s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&|u|t|f|-+0#af5f00255&|8+0#e000002&| +0#0000000&@54
 @75

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump
index 1d0823fe614f8cd674c29934275046964b0669b2..4c68fac986d6889d4cf49dcf6408752651362e38 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump
@@ -15,6 +15,6 @@
 @1|e|n|t| +0#0000000&@70
 |:| |#| @27|L+0#0000e05&|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e
 |n|t| +0#0000000&@72
+@75
 |~+0#4040ff13&| @73
-|~| @73
 | +0#0000000&@56|1|9|,|1| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_type_00.dump b/runtime/syntax/testdir/dumps/vim9_ex_type_00.dump
index b52cb37a83e38e958219ae7f565384932d867376..c5fa4c94e54d0c9ffdd6713783d4b000fbbef7f4 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_type_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_type_00.dump
@@ -1,5 +1,6 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
-|#+0#0000e05&| |V|i|m| |:|t|y|p|e| |c|o|m@1|a|n|d| +0#0000000&@55
+|#+0#0000e05&| |V|i|m|9| |:|t|y|p|e| |c|o|m@1|a|n|d| +0#0000000&@54
+@75
 @75
 |t+0#af5f00255&|y|p|e| +0#0000000&|F|o@1| |=+0#af5f00255&| +0#0000000&|s+0#00e0003&|t|r|i|n|g| +0#0000000&@57
 |t+0#af5f00255&|y|p|e| +0#0000000&|B|a|r| |=+0#af5f00255&| +0#0000000&|l+0#00e0003&|i|s|t|<|s|t|r|i|n|g|>| +0#0000000&@51
@@ -16,5 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
 | +0#0000000&@56|1|,|1| @10|A|l@1| 

diff --git a/runtime/syntax/testdir/dumps/vim9_expr_00.dump b/runtime/syntax/testdir/dumps/vim9_expressions_00.dump
similarity index 93%
rename from runtime/syntax/testdir/dumps/vim9_expr_00.dump
rename to runtime/syntax/testdir/dumps/vim9_expressions_00.dump
index 92bad1ab7c07c2fe60755081c98352edfc10bd9e..f0683ccae4d962cc46ca7efc38e026a633ad8ecf 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_expr_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_expressions_00.dump
@@ -1,5 +1,5 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
-|#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@49
+|#+0#0000e05&| |V|i|m|9| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@56
 @75
 @75
 |#+0#0000e05&| |N|u|m|b|e|r| +0#0000000&@66

diff --git a/runtime/syntax/testdir/dumps/vim9_expr_01.dump b/runtime/syntax/testdir/dumps/vim9_expressions_01.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_expr_01.dump
rename to runtime/syntax/testdir/dumps/vim9_expressions_01.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_expr_02.dump b/runtime/syntax/testdir/dumps/vim9_expressions_02.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_expr_02.dump
rename to runtime/syntax/testdir/dumps/vim9_expressions_02.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_expr_03.dump b/runtime/syntax/testdir/dumps/vim9_expressions_03.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_expr_03.dump
rename to runtime/syntax/testdir/dumps/vim9_expressions_03.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_expr_04.dump b/runtime/syntax/testdir/dumps/vim9_expressions_04.dump
similarity index 98%
rename from runtime/syntax/testdir/dumps/vim9_expr_04.dump
rename to runtime/syntax/testdir/dumps/vim9_expressions_04.dump
index ffce205d7b8d6d22a2c074e68f6589bdb97a8b59..0d8becb495a2ffab642822a3b57b0e1372db1566 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_expr_04.dump
+++ b/runtime/syntax/testdir/dumps/vim9_expressions_04.dump
@@ -1,6 +1,6 @@
 |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
-|"| |R|e|g|i|s|t|e|r| @64
+|#+0#0000e05&| |R|e|g|i|s|t|e|r| +0#0000000&@64
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|"| +0#0000000&|@+0#e000e06&@1| +0#0000000&@64
 >e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|0| +0#0000000&|@+0#e000e06&|1| +0#0000000&|@+0#e000e06&|2| +0#0000000&|@+0#e000e06&|3| +0#0000000&|@+0#e000e06&|4| +0#0000000&|@+0#e000e06&|5| +0#0000000&|@+0#e000e06&|6| +0#0000000&|@+0#e000e06&|7| +0#0000000&|@+0#e000e06&|8| +0#0000000&|@+0#e000e06&|9| +0#0000000&@40

diff --git a/runtime/syntax/testdir/dumps/vim9_expr_05.dump b/runtime/syntax/testdir/dumps/vim9_expressions_05.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_expr_05.dump
rename to runtime/syntax/testdir/dumps/vim9_expressions_05.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_expr_06.dump b/runtime/syntax/testdir/dumps/vim9_expressions_06.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_expr_06.dump
rename to runtime/syntax/testdir/dumps/vim9_expressions_06.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_expr_07.dump b/runtime/syntax/testdir/dumps/vim9_expressions_07.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_expr_07.dump
rename to runtime/syntax/testdir/dumps/vim9_expressions_07.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_expr_08.dump b/runtime/syntax/testdir/dumps/vim9_expressions_08.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_expr_08.dump
rename to runtime/syntax/testdir/dumps/vim9_expressions_08.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_expr_09.dump b/runtime/syntax/testdir/dumps/vim9_expressions_09.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_expr_09.dump
rename to runtime/syntax/testdir/dumps/vim9_expressions_09.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_expr_10.dump b/runtime/syntax/testdir/dumps/vim9_expressions_10.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_expr_10.dump
rename to runtime/syntax/testdir/dumps/vim9_expressions_10.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_expr_11.dump b/runtime/syntax/testdir/dumps/vim9_expressions_11.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_expr_11.dump
rename to runtime/syntax/testdir/dumps/vim9_expressions_11.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_00.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_00.dump
similarity index 72%
rename from runtime/syntax/testdir/dumps/vim9_function_call_00.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_00.dump
index 5fec8133b2692b0da87d34d927bdc41ac3d6962d..8ca5f8b7f1d816ca5499089722bf8469b3505948 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_calls_00.dump
@@ -1,14 +1,14 @@
 >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|_|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
+|#+0#0000e05&| |V|i|m|9| |f|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@53
+|#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|U|s|e|r|F|u|n|c| |T|o|d|o| +0#0000000&@33
+|#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|U|s|e|r|F|u|n|c| |T|o|d|o| +0#0000000&@32
 @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
 |a+0#00e0e07&|b|s|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@67
 @75
 @75
-|#+0#0000e05&| |c|o|m@1|a|n|d|/|f|u|n|c|t|i|o|n| |d|i|s|t|i|n|c|t|i|o|n| +0#0000000&@44
+|#+0#0000e05&| |C|o|m@1|a|n|d|/|f|u|n|c|t|i|o|n| |d|i|s|t|i|n|c|t|i|o|n| +0#0000000&@44
 @75
 |#+0#0000e05&| |a|p@1|e|n|d| |b|r|o|w|s|e| |c|a|l@1| |c|h|d|i|r| |c|o|n|f|i|r|m| |c|o|p|y| |d|e|l|e|t|e| |e|v|a|l| |e|x|e|c|u|t|e| |f|i|l|t|e|r| |f|u|n|c|t|i|o|n
 |#| |i|n|s|e|r|t| |j|o|i|n| |m|a|p| |m|a|t|c|h| |m|o|d|e| |s|o|r|t| |s|p|l|i|t| |s|u|b|s|t|i|t|u|t|e| |s|w|a|p|n|a|m|e| |t|y|p|e| +0#0000000&@10

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_01.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_01.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_function_call_01.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_01.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_02.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_02.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_function_call_02.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_02.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_03.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_03.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_function_call_03.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_03.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_04.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_04.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_function_call_04.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_04.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_05.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_05.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_function_call_05.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_05.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_06.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_06.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_function_call_06.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_06.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_07.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_07.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_function_call_07.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_07.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_08.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_08.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_function_call_08.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_08.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_09.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_09.dump
similarity index 96%
rename from runtime/syntax/testdir/dumps/vim9_function_call_09.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_09.dump
index 48d93d7f2f2ead9d774bebdd9a4645273a76cab4..9e02888b210f724ed5ee802c86a27018463dbdb1 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_09.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_calls_09.dump
@@ -4,7 +4,7 @@
 |u+0#af5f00255&|n|i|q| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@65
 @75
 > @74
-|#+0#0000e05&| |e|r@1|o|r|s| +0#0000000&@66
+|#+0#0000e05&| |E|r@1|o|r|s| +0#0000000&@66
 @75
 |v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|f+0#ffffff16#ff404010|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|f+0#ffffff16#ff404010|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@62

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_10.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_10.dump
similarity index 96%
rename from runtime/syntax/testdir/dumps/vim9_function_call_10.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_10.dump
index 26450a3a65c9904ee1b73ff418103cdc85499c09..6624a78c2bf372ac61760c5dcc2822039d9bfd1f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_10.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_calls_10.dump
@@ -7,7 +7,7 @@
 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@65
 @75
 @75
-|#+0#0000e05&| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@61
+|#+0#0000e05&| |E|x|p|r|e|s@1|i|o|n|s| +0#0000000&@61
 @75
 |v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|a+0#00e0e07&|b|s|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@57
 @75

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_11.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_11.dump
similarity index 96%
rename from runtime/syntax/testdir/dumps/vim9_function_call_11.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_11.dump
index a54617ec37ba5e693797be95adf28b3860c4e4d9..53e8445e1fb56b48b93126205e12289975f5491b 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_11.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_calls_11.dump
@@ -12,7 +12,7 @@
 |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
+|#+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#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

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_12.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_12.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_function_call_12.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_12.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_13.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_13.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_function_call_13.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_13.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_14.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_14.dump
similarity index 95%
rename from runtime/syntax/testdir/dumps/vim9_function_call_14.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_14.dump
index 3c8c1470328aef50b84edc6ec34fb52aadc2af29..8511d6fe38d3fe9afeb9dd6ec275555e89151ef7 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_14.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_calls_14.dump
@@ -10,7 +10,7 @@
 |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
+|#+0#0000e05&| |U|s|e|r|,| |n|o|t| |b|u|i|l|t|i|n|,| |f|u|n|c|t|i|o|n|s| +0#0000000&@44
 @75
 |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

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_15.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_15.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_function_call_15.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_15.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_16.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_16.dump
similarity index 95%
rename from runtime/syntax/testdir/dumps/vim9_function_call_16.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_16.dump
index bbfe7516ce533ce8b3601d24c23abcb141cdc2af..31a186f2510025e8c557a745f6f271237c141a6e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_function_call_16.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_calls_16.dump
@@ -11,7 +11,7 @@
 |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
 @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
+|#+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
 |m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|)|.+0#af5f00255&|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49

diff --git a/runtime/syntax/testdir/dumps/vim9_function_call_17.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_17.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim9_function_call_17.dump
rename to runtime/syntax/testdir/dumps/vim9_function_calls_17.dump

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_00.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_00.dump
index 644b3e5e9221c9f0bf2aba947bbe6352ba0b189c..875858659ce3f3bf120bbfb2dfecc555c923a33d 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_00.dump
@@ -1,20 +1,20 @@
 | +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |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|D|e|f|T|y|p|e|P|a|r|a|m| |T|o|d|o| +0#0000000&@19
-| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"+0#e000002&|f|"| +0#0000000&@29
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"+0#e000002&|c|f|i|"| +0#0000000&@27
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|D|e|f|T|y|p|e|P|a|r|a|m| |T|o|d|o| +0#0000000&@26
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| +0#0000000&|S+0#e000e06&|e@1|:| +0#0000e05&|h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|7|3|1|3|#|i|s@1|u|e|c|o|m@1|e|n|t|-|3|0|4|6@1|9|6|8|2|0| |(|A|l|i
 | +0&#a8a8a8255@1|a+0&#ffffff0|k|s|e|i| |B|u|d|a|v|e|i|)| +0#0000000&@58
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |S|e@1| |h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|6@1|0|4|#|i|s@1|u|e|c|o|m@1|e|n|t|-|2|6|5|2|0|2|8|4|5| |.| +0#0000000&@4
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|i+0#af5f00255&|n|t|e|r|f|a|c|e| +0#0000000&|L|i|s|t|a|b|l|e| @47
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|C|o|n|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|_+0#0000000&|:| |E|)+0#e000e06&|:+0#0000000&| |L|i|s|t|a|b|l|e| @41
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|R|e|v|e|r|s|e|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @42
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|R|e|s|t|(+0#e000e06&|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @48
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|F|i|r|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |E| @51
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@51
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@48
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
+|-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|i+0#af5f00255&|n|t|e|r|f|a|c|e| +0#0000000&|L|i|s|t|a|b|l|e| @47
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|C|o|n|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|_+0#0000000&|:| |E|)+0#e000e06&|:+0#0000000&| |L|i|s|t|a|b|l|e| @41
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|R|e|v|e|r|s|e|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @42
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|R|e|s|t|(+0#e000e06&|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @48
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|F|i|r|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |E| @51
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@51
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@48
+||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_01.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_01.dump
index 40b7f99da38488a65cc734b69c824abc5cf2c3bf..fb51a8e22ffbdff45702652759a77672ae45e271 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_01.dump
@@ -1,8 +1,8 @@
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|F|i|r|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |E| @51
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@51
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@48
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|F|i|r|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |E| @51
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@51
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@48
+||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|n|t|e|r|f|a|c|e| +0#0000000&@60
 | +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|u|m| +0#0000000&|E|m|p|t|y|L|i|s|t| |i+0#af5f00255&|m|p|l|e|m|e|n|t|s| +0#0000000&|L|i|s|t|a|b|l|e| @38
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|I|N|S|T|A|N|C|E| @60

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_03.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_03.dump
index 48b0229fd36d59fa14f3a4f668ba2f38dd2dc064..2fc1beb437007632aad9fba3182c47836286b96a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_03.dump
@@ -1,20 +1,20 @@
 | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|e|n|u|m| +0#0000000&@65
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|L|i|s|t| |i+0#af5f00255&|m|p|l|e|m|e|n|t|s| +0#0000000&|L|i|s|t|a|b|l|e| @42
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|_|v|a|l|u|e|:| |a+0#00e0003&|n|y| +0#0000000&@51
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|_|s|i|z|e|:| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@49
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3>v+0#af5f00255&|a|r| +0#0000000&|_|n|e|x|t|:| |L|i|s|t|a|b|l|e| @49
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|L|i|s|t| |i+0#af5f00255&|m|p|l|e|m|e|n|t|s| +0#0000000&|L|i|s|t|a|b|l|e| @42
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|_|v|a|l|u|e|:| |a+0#00e0003&|n|y| +0#0000000&@51
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|_|s|i|z|e|:| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@49
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3>v+0#af5f00255&|a|r| +0#0000000&|_|n|e|x|t|:| |L|i|s|t|a|b|l|e| @49
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|v+0#0000000&|a|l|u|e|:| |E|)+0#e000e06&| +0#0000000&@48
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|v|a|l|u|e| |=+0#af5f00255&| +0#0000000&|v|a|l|u|e| @45
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| |=+0#af5f00255&| +0#0000000&|1+0#e000002&| +0#0000000&@50
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|n|e|x|t| |=+0#af5f00255&| +0#0000000&|E|m|p|t|y|L|i|s|t|.+0#af5f00255&|I+0#0000000&|N|S|T|A|N|C|E| @33
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|v|a|l|u|e| |=+0#af5f00255&| +0#0000000&|v|a|l|u|e| @45
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| |=+0#af5f00255&| +0#0000000&|1+0#e000002&| +0#0000000&@50
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|n|e|x|t| |=+0#af5f00255&| +0#0000000&|E|m|p|t|y|L|i|s|t|.+0#af5f00255&|I+0#0000000&|N|S|T|A|N|C|E| @33
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|_+0#00e0e07&|n|e|w|C|o|n|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|v+0#0000000&|a|l|u|e|:| |E|,| |s|i|z|e|:| |n+0#00e0003&|u|m|b|e|r|)+0#e000e06&| +0#0000000&@29
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|v|a|l|u|e| |=+0#af5f00255&| +0#0000000&|v|a|l|u|e| @45
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| |=+0#af5f00255&| +0#0000000&|s|i|z|e| @47
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|v|a|l|u|e| |=+0#af5f00255&| +0#0000000&|v|a|l|u|e| @45
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| |=+0#af5f00255&| +0#0000000&|s|i|z|e| @47
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|C|o|n|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|v+0#0000000&|a|l|u|e|:| |E|)+0#e000e06&|:+0#0000000&| |L|i|s|t|a|b|l|e| @37
 @57|5|4|,|5| @9|2|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_04.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_04.dump
index 7f11c19d852c436a3ad9ec5e550fa2c6aca27a72..b8b324cefef30f0398a9552eb86dd8326eab16ec 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_04.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_04.dump
@@ -1,20 +1,20 @@
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|C|o|n|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|v+0#0000000&|a|l|u|e|:| |E|)+0#e000e06&|:+0#0000000&| |L|i|s|t|a|b|l|e| @37
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|c+0#af5f00255&|o|n|s|t| +0#0000000&|l|i|s|t|:| |L|i|s|t| |=+0#af5f00255&| +0#0000000&|L|i|s|t|.|_+0#00e0e07&|n|e|w|C|o|n|s|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|v+0#0000000&|a|l|u|e|,| |(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| |++0#af5f00255&| +0#0000000&|1+0#e000002&|)+0#e000e06&@1| +0#0000000&@4
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|l|i|s|t|.+0#af5f00255&|_+0#0000000&|n|e|x|t| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s| +0#0000000&@47
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|l|i|s|t| @53
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|c+0#af5f00255&|o|n|s|t| +0#0000000&|l|i|s|t|:| |L|i|s|t| |=+0#af5f00255&| +0#0000000&|L|i|s|t|.|_+0#00e0e07&|n|e|w|C|o|n|s|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|v+0#0000000&|a|l|u|e|,| |(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| |++0#af5f00255&| +0#0000000&|1+0#e000002&|)+0#e000e06&@1| +0#0000000&@4
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|l|i|s|t|.+0#af5f00255&|_+0#0000000&|n|e|x|t| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s| +0#0000000&@47
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|l|i|s|t| @53
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| > +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|R|e|v|e|r|s|e|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @42
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|v+0#af5f00255&|a|r| +0#0000000&|r|e|s|u|l|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|L|i|s|t|.|n+0#00e0e07&|e|w|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|t+0#00e0e07&|h|i|s|.+0#0000000&|F|i|r|s|t|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|)@1| +0#0000000&@13
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|v+0#af5f00255&|a|r| +0#0000000&|l|i|s|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|R|e|s|t|(+0#e000e06&|)| +0#0000000&@32
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|v+0#af5f00255&|a|r| +0#0000000&|r|e|s|u|l|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|L|i|s|t|.|n+0#00e0e07&|e|w|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|t+0#00e0e07&|h|i|s|.+0#0000000&|F|i|r|s|t|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|)@1| +0#0000000&@13
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|v+0#af5f00255&|a|r| +0#0000000&|l|i|s|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|R|e|s|t|(+0#e000e06&|)| +0#0000000&@32
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|w+0#af5f00255&|h|i|l|e| +0#0000000&|!+0#af5f00255&|l+0#0000000&|i|s|t|.|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@45
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|r|e|s|u|l|t| |=+0#af5f00255&| +0#0000000&|r|e|s|u|l|t|.|C|o|n|s|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|l+0#0000000&|i|s|t|.|F|i|r|s|t|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|)@1| +0#0000000&@20
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|l|i|s|t| |=+0#af5f00255&| +0#0000000&|l|i|s|t|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@42
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|e+0#af5f00255&|n|d|w|h|i|l|e| +0#0000000&@56
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|r|e|s|u|l|t| @51
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|w+0#af5f00255&|h|i|l|e| +0#0000000&|!+0#af5f00255&|l+0#0000000&|i|s|t|.|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@45
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|r|e|s|u|l|t| |=+0#af5f00255&| +0#0000000&|r|e|s|u|l|t|.|C|o|n|s|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|l+0#0000000&|i|s|t|.|F|i|r|s|t|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|)@1| +0#0000000&@20
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|l|i|s|t| |=+0#af5f00255&| +0#0000000&|l|i|s|t|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@42
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|e+0#af5f00255&|n|d|w|h|i|l|e| +0#0000000&@56
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|r|e|s|u|l|t| @51
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|R|e|s|t|(+0#e000e06&|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @48
 @57|7|2|,|0|-|1| @7|3@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_05.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_05.dump
index 369255c0542e4240197268b1ca982b53c28a3330..2269292539828f496e5a9032d1c5c70ff84e9bc6 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_05.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_05.dump
@@ -1,20 +1,20 @@
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|R|e|s|t|(+0#e000e06&|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @48
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|n|e|x|t| @47
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|n|e|x|t| @47
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|F|i|r|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |E| @51
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|v|a|l|u|e| @46
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|v|a|l|u|e| @46
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@51
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| |=+0#af5f00255&@1| +0#0000000&|0+0#e000002&|)+0#e000e06&| +0#0000000&@40
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| |=+0#af5f00255&@1| +0#0000000&|0+0#e000002&|)+0#e000e06&| +0#0000000&@40
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| @47
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| @47
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@48
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|i+0#af5f00255&|f| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@49
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|'+0#e000002&|[|]|'| +0#0000000&@49
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|i+0#af5f00255&|f| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@49
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|'+0#e000002&|[|]|'| +0#0000000&@49
 @57|9|0|,|2|-|9| @7|4|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_06.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_06.dump
index 2736cf138573ea9a2113f0d29c7df38941805870..508abd90d47f9b2c14e7ac60c1588a4eb97e9d4b 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_06.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_06.dump
@@ -1,17 +1,17 @@
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|'+0#e000002&|[|]|'| +0#0000000&@49
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|e+0#af5f00255&|n|d|i|f| +0#0000000&@59
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|v+0#af5f00255&|a|r| +0#0000000&|t|e|x|t|:| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|'+0#e000002&|[|'| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|F|i|r|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|)@1| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|'+0#e000002&|,| |'| +0#0000000&@5
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|v+0#af5f00255&|a|r| +0#0000000&|l|i|s|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|R|e|s|t|(+0#e000e06&|)| +0#0000000&@32
-||+0#0000e05#a8a8a8255| > +0#0000000#ffffff0@72
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|w+0#af5f00255&|h|i|l|e| +0#0000000&|!+0#af5f00255&|l+0#0000000&|i|s|t|.|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@45
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|t|e|x|t| |.+0#af5f00255&@1|=| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|l+0#0000000&|i|s|t|.|F|i|r|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|)@1| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|'+0#e000002&|,| |'| +0#0000000&@18
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|l|i|s|t| |=+0#af5f00255&| +0#0000000&|l|i|s|t|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@42
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|e+0#af5f00255&|n|d|w|h|i|l|e| +0#0000000&@56
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|t|r|p|a|r|t|(+0#e000e06&|t+0#0000000&|e|x|t|,| |0+0#e000002&|,+0#0000000&| |(+0#e000e06&|s+0#00e0e07&|t|r|l|e|n|(+0#e000e06&|t+0#0000000&|e|x|t|)+0#e000e06&| +0#0000000&|-+0#af5f00255&| +0#0000000&|2+0#e000002&|)+0#e000e06&@1| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|'+0#e000002&|]|'| +0#0000000&@14
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|'+0#e000002&|[|]|'| +0#0000000&@49
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|e+0#af5f00255&|n|d|i|f| +0#0000000&@59
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|v+0#af5f00255&|a|r| +0#0000000&|t|e|x|t|:| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|'+0#e000002&|[|'| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|F|i|r|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|)@1| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|'+0#e000002&|,| |'| +0#0000000&@5
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|v+0#af5f00255&|a|r| +0#0000000&|l|i|s|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|R|e|s|t|(+0#e000e06&|)| +0#0000000&@32
+|2+0#0000e05#a8a8a8255| > +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|w+0#af5f00255&|h|i|l|e| +0#0000000&|!+0#af5f00255&|l+0#0000000&|i|s|t|.|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@45
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|t|e|x|t| |.+0#af5f00255&@1|=| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|l+0#0000000&|i|s|t|.|F|i|r|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|)@1| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|'+0#e000002&|,| |'| +0#0000000&@18
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|l|i|s|t| |=+0#af5f00255&| +0#0000000&|l|i|s|t|.|R|e|s|t|(+0#e000e06&|)| +0#0000000&@42
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|e+0#af5f00255&|n|d|w|h|i|l|e| +0#0000000&@56
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|t|r|p|a|r|t|(+0#e000e06&|t+0#0000000&|e|x|t|,| |0+0#e000002&|,+0#0000000&| |(+0#e000e06&|s+0#00e0e07&|t|r|l|e|n|(+0#e000e06&|t+0#0000000&|e|x|t|)+0#e000e06&| +0#0000000&|-+0#af5f00255&| +0#0000000&|2+0#e000002&|)+0#e000e06&@1| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|'+0#e000002&|]|'| +0#0000000&@14
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|M|a|k|e|E|m|p|t|y|L|i|s|t|(+0#e000e06&|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @36
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|E|m|p|t|y|L|i|s|t|.+0#af5f00255&|I+0#0000000&|N|S|T|A|N|C|E| @43

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_00.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_00.dump
index 0098b225153cc82a0b46e78545149b22c8d0372f..ef792b5b3a0a213545bc2f6b1fac3477640b85b7 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_00.dump
@@ -1,20 +1,20 @@
 | +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |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|D|e|f|T|y|p|e|P|a|r|a|m| |T|o|d|o| +0#0000000&@19
-| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"+0#e000002&|f|"| +0#0000000&@29
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"+0#e000002&|c|f|"| +0#0000000&@28
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|D|e|f|T|y|p|e|P|a|r|a|m| |T|o|d|o| +0#0000000&@26
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| +0#0000000&|S+0#e000e06&|e@1|:| +0#0000e05&|h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|7|3|1|3|#|i|s@1|u|e|c|o|m@1|e|n|t|-|3|0|4|6@1|9|6|8|2|0| |(|A|l|i
 | +0&#a8a8a8255@1|a+0&#ffffff0|k|s|e|i| |B|u|d|a|v|e|i|)| +0#0000000&@58
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |S|e@1| |h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|i|s@1|u|e|s|/|1|4|3@1|0|#|i|s@1|u|e|c|o|m@1|e|n|t|-|2|0|2|8|9|3|8|5|1|5| |.| +0#0000000&@1
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|S|e|t| @56
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f+0#af5f00255&|i|n|a|l| +0#0000000&|_|e|l|e|m|e|n|t|s|:| |d+0#00e0003&|i|c|t|<|n|u|m|b|e|r|>| +0#0000000&@39
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|_|M|a|p@1|e|r|:| |f+0#00e0003&|u|n|c|(|n|u|m|b|e|r|,+0#0000000&| |s+0#00e0003&|t|r|i|n|g|)|:+0#0000000&| |a+0#00e0003&|n|y| +0#0000000&@28
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|T|o|S|t|r|i|n|g|e|r|:| |f+0#00e0003&|u|n|c|(|a|n|y|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@33
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|F|r|o|m|S|t|r|i|n|g|e|r|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |a+0#00e0003&|n|y| +0#0000000&@31
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|c+0#af5f00255&|l|a|s@1| +0#0000000&|S|e|t| @56
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|f+0#af5f00255&|i|n|a|l| +0#0000000&|_|e|l|e|m|e|n|t|s|:| |d+0#00e0003&|i|c|t|<|n|u|m|b|e|r|>| +0#0000000&@39
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|_|M|a|p@1|e|r|:| |f+0#00e0003&|u|n|c|(|n|u|m|b|e|r|,+0#0000000&| |s+0#00e0003&|t|r|i|n|g|)|:+0#0000000&| |a+0#00e0003&|n|y| +0#0000000&@28
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|T|o|S|t|r|i|n|g|e|r|:| |f+0#00e0003&|u|n|c|(|a|n|y|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@33
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|F|r|o|m|S|t|r|i|n|g|e|r|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |a+0#00e0003&|n|y| +0#0000000&@31
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|s+0#af5f00255&|t|a|t|i|c| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|_|M|a|p@1|e|r|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|F+0#0000000&|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |E|)+0#e000e06&|:+0#0000000&| |f+0#00e0003&|u|n|c|(|n|u|m|b|e|r|,+0#0000000&| |s+0#00e0003&|t|r|i|n|g|)|:+0#0000000&| |E| @2
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&@1|G+0#0000000&|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |E|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |E| |=+0#af5f00255&|>| +0#0000000&|G|(+0#e000e06&|v+0#0000000&|)+0#e000e06&
-||+0#0000e05#a8a8a8255| |)+0#e000e06#ffffff0|(|F+0#0000000&|)+0#e000e06&| +0#0000000&@68
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&@1|G+0#0000000&|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |E|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |E| |=+0#af5f00255&|>| +0#0000000&|G|(+0#e000e06&|v+0#0000000&|)+0#e000e06&
+|2+0#0000e05#a8a8a8255| |)+0#e000e06#ffffff0|(|F+0#0000000&|)+0#e000e06&| +0#0000000&@68
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_01.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_01.dump
index 3702406196f73e33a71168e4d26cde08d634c086..d68c0a2ad376ab0fba4eeea8688b2fff1e14b97c 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_01.dump
@@ -1,20 +1,20 @@
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|s+0#af5f00255&|t|a|t|i|c| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|_|M|a|p@1|e|r|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|F+0#0000000&|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |E|)+0#e000e06&|:+0#0000000&| |f+0#00e0003&|u|n|c|(|n|u|m|b|e|r|,+0#0000000&| |s+0#00e0003&|t|r|i|n|g|)|:+0#0000000&| |E| @2
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&@1|G+0#0000000&|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |E|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |E| |=+0#af5f00255&|>| +0#0000000&|G|(+0#e000e06&|v+0#0000000&|)+0#e000e06&
-||+0#0000e05#a8a8a8255| |)+0#e000e06#ffffff0|(|F+0#0000000&|)+0#e000e06&| +0#0000000&@68
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&@1|G+0#0000000&|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |E|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |E| |=+0#af5f00255&|>| +0#0000000&|G|(+0#e000e06&|v+0#0000000&|)+0#e000e06&
+|2+0#0000e05#a8a8a8255| |)+0#e000e06#ffffff0|(|F+0#0000000&|)+0#e000e06&| +0#0000000&@68
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| > +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)| +0#0000000&@56
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s| |=+0#af5f00255&| +0#0000000&|{+0#e000e06&|}| +0#0000000&@45
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r| |=+0#af5f00255&| +0#0000000&|_|M|a|p@1|e|r|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(@1|s+0#0000000&|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |E| |=+0#af5f00255&|>| +0#0000000&|e+0#00e0e07&|v|a|l|(+0#e000e06&|s+0#0000000&|)+0#e000e06&@1| +0#0000000&@12
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|T+0#0000000&|o|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|(+0#e000e06&|a+0#0000000&|:| |E|)+0#e000e06&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|a+0#0000000&|)+0#e000e06&| +0#0000000&@19
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|F+0#0000000&|r|o|m|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|(+0#e000e06&|s+0#0000000&|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |E| |=+0#af5f00255&|>| +0#0000000&|e+0#00e0e07&|v|a|l|(+0#e000e06&|s+0#0000000&|)+0#e000e06&| +0#0000000&@19
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s| |=+0#af5f00255&| +0#0000000&|{+0#e000e06&|}| +0#0000000&@45
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r| |=+0#af5f00255&| +0#0000000&|_|M|a|p@1|e|r|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(@1|s+0#0000000&|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |E| |=+0#af5f00255&|>| +0#0000000&|e+0#00e0e07&|v|a|l|(+0#e000e06&|s+0#0000000&|)+0#e000e06&@1| +0#0000000&@12
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|T+0#0000000&|o|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|(+0#e000e06&|a+0#0000000&|:| |E|)+0#e000e06&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|a+0#0000000&|)+0#e000e06&| +0#0000000&@19
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|F+0#0000000&|r|o|m|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|(+0#e000e06&|s+0#0000000&|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |E| |=+0#af5f00255&|>| +0#0000000&|e+0#00e0e07&|v|a|l|(+0#e000e06&|s+0#0000000&|)+0#e000e06&| +0#0000000&@19
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|e+0#0000000&|l|e|m|e|n|t|s|:| |l+0#00e0003&|i|s|t|<|E+0#0000000&|>+0#00e0003&|,+0#0000000&| |T|o|S|t|r|i|n|g|e|r|:| |f+0#00e0003&|u|n|c|(|E+0#0000000&|)+0#00e0003&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @2
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@39|F|r|o|m|S|t|r|i|n|g|e|r|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |E|)+0#e000e06&| +0#0000000&@2
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s| |=+0#af5f00255&| +0#0000000&|e|l|e|m|e|n|t|s| @39
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|r+0#00e0e07&|e|d|u|c|e|(+0#e000e06&@2|F+0#0000000&|:| |f+0#00e0003&|u|n|c|(|E+0#0000000&|)+0#00e0003&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|d+0#0000000&|:| |d+0#00e0003&|i|c|t|<|n|u|m|b|e|r|>|,+0#0000000&| |v|:| |E|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|{|[|F+0#0000000&|(+0#e000e06&|v+0#0000000&|)+0#e000e06&|]|:+0#0000000&| |1+0#e000002&|}+0#e000e06&|,+0#0000000&| |d|)+0#e000e06&@1|(|T+0#0000000&|o|S|t|r|i|n|g|e|r|)+0#e000e06&|,+0#0000000&| @20
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|{+0#e000e06&|}|)| +0#0000000&@53
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@39|F|r|o|m|S|t|r|i|n|g|e|r|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |E|)+0#e000e06&| +0#0000000&@2
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s| |=+0#af5f00255&| +0#0000000&|e|l|e|m|e|n|t|s| @39
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|r+0#00e0e07&|e|d|u|c|e|(+0#e000e06&@2|F+0#0000000&|:| |f+0#00e0003&|u|n|c|(|E+0#0000000&|)+0#00e0003&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|d+0#0000000&|:| |d+0#00e0003&|i|c|t|<|n|u|m|b|e|r|>|,+0#0000000&| |v|:| |E|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|{|[|F+0#0000000&|(+0#e000e06&|v+0#0000000&|)+0#e000e06&|]|:+0#0000000&| |1+0#e000002&|}+0#e000e06&|,+0#0000000&| |d|)+0#e000e06&@1|(|T+0#0000000&|o|S|t|r|i|n|g|e|r|)+0#e000e06&|,+0#0000000&| @20
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|{+0#e000e06&|}|)| +0#0000000&@53
 @57|1|7|,|0|-|1| @8|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_02.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_02.dump
index 75211124bd109a60ae002afb242b4b850b41c1aa..c9388ef44b4e869eea9812911b84de8223cd5186 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_02.dump
@@ -1,20 +1,20 @@
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|{+0#e000e06&|}|)| +0#0000000&@53
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r| |=+0#af5f00255&| +0#0000000&|_|M|a|p@1|e|r|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|F+0#0000000&|r|o|m|S|t|r|i|n|g|e|r|)+0#e000e06&| +0#0000000&@25
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|T+0#0000000&|o|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|T|o|S|t|r|i|n|g|e|r| @36
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|F+0#0000000&|r|o|m|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|F|r|o|m|S|t|r|i|n|g|e|r| @32
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|{+0#e000e06&|}|)| +0#0000000&@53
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r| |=+0#af5f00255&| +0#0000000&|_|M|a|p@1|e|r|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|F+0#0000000&|r|o|m|S|t|r|i|n|g|e|r|)+0#e000e06&| +0#0000000&@25
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|T+0#0000000&|o|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|T|o|S|t|r|i|n|g|e|r| @36
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|F+0#0000000&|r|o|m|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|F|r|o|m|S|t|r|i|n|g|e|r| @32
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| > +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|e+0#0000000&|l|e|m|e|n|t|s|:| |l+0#00e0003&|i|s|t|<|E+0#0000000&|>+0#00e0003&|)+0#e000e06&|:+0#0000000&| |S|e|t| @28
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|e+0#0000000&|l|e|m|e|n|t|s|,| |t+0#00e0e07&|h|i|s|.+0#af5f00255&|T+0#0000000&|o|S|t|r|i|n|g|e|r|,| |t+0#00e0e07&|h|i|s|.+0#af5f00255&|F+0#0000000&|r|o|m|S|t|r
-||+0#0000e05#a8a8a8255| |i+0#0000000#ffffff0|n|g|e|r|)+0#e000e06&| +0#0000000&@66
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|e+0#0000000&|l|e|m|e|n|t|s|,| |t+0#00e0e07&|h|i|s|.+0#af5f00255&|T+0#0000000&|o|S|t|r|i|n|g|e|r|,| |t+0#00e0e07&|h|i|s|.+0#af5f00255&|F+0#0000000&|r|o|m|S|t|r
+|2+0#0000e05#a8a8a8255| |i+0#0000000#ffffff0|n|g|e|r|)+0#e000e06&| +0#0000000&@66
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|C|o|n|t|a|i|n|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|e+0#0000000&|l|e|m|e|n|t|:| |E|)+0#e000e06&|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@35
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|,| |t+0#00e0e07&|h|i|s|.+0#0000000&|T|o|S|t|r|i|n|g|e|r|(+0#e000e06&|e+0#0000000&|l|e|m|e|n|t|)+0#e000e06&@1| +0#0000000&@8
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|,| |t+0#00e0e07&|h|i|s|.+0#0000000&|T|o|S|t|r|i|n|g|e|r|(+0#e000e06&|e+0#0000000&|l|e|m|e|n|t|)+0#e000e06&@1| +0#0000000&@8
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|E|l|e|m|e|n|t|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |l+0#00e0003&|i|s|t|<|E+0#0000000&|>+0#00e0003&| +0#0000000&@42
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&|-+0#af5f00255&|>|m+0#00e0e07&|a|p|n|e|w|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r|)+0#e000e06&| +0#0000000&@15
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&|-+0#af5f00255&|>|m+0#00e0e07&|a|p|n|e|w|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r|)+0#e000e06&| +0#0000000&@15
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 @57|3|5|,|0|-|1| @7|1|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_03.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_03.dump
index 6ded4fe9d2afbf551670815b213f5c468433e356..84f58af60bdd6d9642db78ce05be1ba1f0a37eb2 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_03.dump
@@ -1,20 +1,20 @@
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@51
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3>d+0#af5f00255&|e|f| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@38
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@38
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@48
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&@1| +0#0000000&@29
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |⊇| |{|1|,| |2|}|.| +0#0000000&@47
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&@1| +0#0000000&@29
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |⊇| |{|1|,| |2|}|.| +0#0000000&@47
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|u|p|e|r|s|e|t|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@39
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&|>+0#af5f00255&|=| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#0000000&|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&@1| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|t|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m
-||+0#0000e05#a8a8a8255| |e+0#0000000#ffffff0|n|t|s| @68
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|i+0#00e0e07&|n|d|e|x|o|f|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.+0#af5f00255&|_+0#0000000&|e|@+0#4040ff13&@2
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&|>+0#af5f00255&|=| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#0000000&|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&@1| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|t|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m
+|2+0#0000e05#a8a8a8255| |e+0#0000000#ffffff0|n|t|s| @68
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|i+0#00e0e07&|n|d|e|x|o|f|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.+0#af5f00255&|_+0#0000000&|e|@+0#4040ff13&@2
 | +0#0000000&@56|5|2|,|5| @9|2|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_04.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_04.dump
index 7c473d89752c99c1dec93c2a27d9711ff3baaeb0..f0ef27db5558651c9ae2f37312790ab131a7fc12 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_04.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_04.dump
@@ -1,20 +1,20 @@
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|i+0#00e0e07&|n|d|e|x|o|f|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m
-||+0#0000e05#a8a8a8255| |e+0#0000000#ffffff0|n|t|s| @68
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|-+0#af5f00255&|>|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|v+0#0000000&|)+0#e000e06&@1|(|t+0#00e0e07&|h|i|s|)+0#e000e06&@1| +0#0000000&|<+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@32
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3>#+0#0000e05&| |{|1|,| |2|}| |⊆| |{|1|,| |2|,| |3|}|.| +0#0000000&@47
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|i+0#00e0e07&|n|d|e|x|o|f|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m
+|2+0#0000e05#a8a8a8255| |e+0#0000000#ffffff0|n|t|s| @68
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|-+0#af5f00255&|>|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|v+0#0000000&|)+0#e000e06&@1|(|t+0#00e0e07&|h|i|s|)+0#e000e06&@1| +0#0000000&|<+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@32
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3>#+0#0000e05&| |{|1|,| |2|}| |⊆| |{|1|,| |2|,| |3|}|.| +0#0000000&@47
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|u|b|s|e|t|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@41
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&|<+0#af5f00255&|=| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#0000000&|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&@1| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m
-||+0#0000e05#a8a8a8255| |e+0#0000000#ffffff0|n|t|s| @68
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|i+0#00e0e07&|n|d|e|x|o|f|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m
-||+0#0000e05#a8a8a8255| |e+0#0000000#ffffff0|n|t|s| @68
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|-+0#af5f00255&|>|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|v+0#0000000&|)+0#e000e06&@1|(|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&|<+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@32
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |∪| |{|2|,| |3|,| |4|}| |=| |{|1|,| |2|,| |3|,| |4|}|.| +0#0000000&@29
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&|<+0#af5f00255&|=| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#0000000&|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&@1| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m
+|2+0#0000e05#a8a8a8255| |e+0#0000000#ffffff0|n|t|s| @68
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|i+0#00e0e07&|n|d|e|x|o|f|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m
+|2+0#0000e05#a8a8a8255| |e+0#0000000#ffffff0|n|t|s| @68
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|-+0#af5f00255&|>|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|v+0#0000000&|)+0#e000e06&@1|(|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&|<+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@32
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |∪| |{|2|,| |3|,| |4|}| |=| |{|1|,| |2|,| |3|,| |4|}|.| +0#0000000&@29
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|U|n|i|o|n|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |S|e|t| @43
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|{|}| +0#0000000&@35
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|t+0#0000000&|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|{|}| +0#0000000&@35
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|t+0#0000000&|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36
 @57|6|8|,|5| @9|3|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_05.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_05.dump
index cd34d7443d0e0143cfb9c4ae409e8549af880fbc..32901e8ee4b7f7b32f06644b594ebb1efe5824b2 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_05.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_05.dump
@@ -1,20 +1,20 @@
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|t+0#0000000&|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|m+0#00e0e07&|a|p|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r|)+0#e000e06&@1| +0#0000000&@40
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |∩| |{|2|,| |3|,| |4|}| |=| |{|2|,| |3|}|.| +0#0000000&@35
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|t+0#0000000&|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|m+0#00e0e07&|a|p|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r|)+0#e000e06&@1| +0#0000000&@40
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| > +0#0000000#ffffff0@72
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |∩| |{|2|,| |3|,| |4|}| |=| |{|2|,| |3|}|.| +0#0000000&@35
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|I|n|t|e|r|s|e|c|t|i|o|n|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |S|e|t| @36
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s| @23
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|f+0#00e0e07&|i|l|t|e|r|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s|e|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n
-||+0#0000e05#a8a8a8255| |t+0#0000000#ffffff0|s| @70
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|-+0#af5f00255&|>|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|v+0#0000000&|)+0#e000e06&@1|(|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&@36
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|m+0#00e0e07&|a|p|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r|)+0#e000e06&@1| +0#0000000&@40
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |\| |{|2|,| |3|,| |4|}| |=| |{|1|}|.| +0#0000000&@38
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|#+0#0000e05&| |{|2|,| |3|,| |4|}| |\| |{|1|,| |2|,| |3|}| |=| |{|4|}|.| +0#0000000&@38
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s| @23
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|f+0#00e0e07&|i|l|t|e|r|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s|e|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n
+|2+0#0000e05#a8a8a8255| |t+0#0000000#ffffff0|s| @70
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|-+0#af5f00255&|>|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|v+0#0000000&|)+0#e000e06&@1|(|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&@36
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|m+0#00e0e07&|a|p|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r|)+0#e000e06&@1| +0#0000000&@40
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |\| |{|2|,| |3|,| |4|}| |=| |{|1|}|.| +0#0000000&@38
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|2|,| |3|,| |4|}| |\| |{|1|,| |2|,| |3|}| |=| |{|4|}|.| +0#0000000&@38
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|e|t|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |S|e|t| @35
 @57|8|4|,|0|-|1| @7|4|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_06.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_06.dump
index e647ceca4edb25342b6830ebb2984f778a10b8fe..c613084a977f6dc118d44bb0a5fb689df01da225 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_06.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_06.dump
@@ -1,17 +1,17 @@
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|e|t|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |S|e|t| @35
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s| @23
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|f+0#00e0e07&|i|l|t|e|r|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e
-||+0#0000e05#a8a8a8255| |n+0#0000000#ffffff0|t|s| @69
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15>-+0#af5f00255&|>|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|v+0#0000000&|)+0#e000e06&@1|(|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&@36
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|m+0#00e0e07&|a|p|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r|)+0#e000e06&@1| +0#0000000&@40
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |△| |{|2|,| |3|,| |4|}| |=| |{|1|,| |4|}|.| +0#0000000&@35
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s| @23
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|f+0#00e0e07&|i|l|t|e|r|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e
+|2+0#0000e05#a8a8a8255| |n+0#0000000#ffffff0|t|s| @69
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15>-+0#af5f00255&|>|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|v+0#0000000&|)+0#e000e06&@1|(|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&@36
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|m+0#00e0e07&|a|p|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r|)+0#e000e06&@1| +0#0000000&@40
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |△| |{|2|,| |3|,| |4|}| |=| |{|1|,| |4|}|.| +0#0000000&@35
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|y|m@1|e|t|r|i|c|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |S|e|t| @29
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|U|n|i|o|n|(+0#e000e06&|t+0#0000000&|h|a|t|)+0#e000e06&|.+0#af5f00255&|S+0#0000000&|e|t|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|I|n|t|e|r|s|e|c|t|i|o|n|(+0#e000e06&|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&@2
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|U|n|i|o|n|(+0#e000e06&|t+0#0000000&|h|a|t|)+0#e000e06&|.+0#af5f00255&|S+0#0000000&|e|t|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|I|n|t|e|r|s|e|c|t|i|o|n|(+0#e000e06&|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&@2
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0@59| +0#0000000&@12
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_functions_00.dump b/runtime/syntax/testdir/dumps/vim9_generic_functions_00.dump
index 54a81b44f7cb5ff0f7d3f7247f30319ac637a61d..41fc359fd5a0984fb940c33581b75920a31c1d47 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_functions_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_functions_00.dump
@@ -1,8 +1,8 @@
 | +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|i|m|9| |g|e|n|e|r|i|c| |f|u|n|c|t|i|o|n|s| +0#0000000&@48
-| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |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|D|e|f|T|y|p|e|P|a|r|a|m| |T|o|d|o| +0#0000000&@19
-| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"+0#e000002&|f|"| +0#0000000&@29
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"+0#e000002&|c|f|"| +0#0000000&@28
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|D|e|f|T|y|p|e|P|a|r|a|m| |T|o|d|o| +0#0000000&@26
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |:|h|e|l|p| |g|e|n|e|r|i|c|-|f|u|n|c|t|i|o|n|s| +0#0000000&@47

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_functions_01.dump b/runtime/syntax/testdir/dumps/vim9_generic_functions_01.dump
index c45db4e3e78b1c2d2b1d530788f60f3d7d956c88..15d655b6a7b6f3b1aa89332977ada59e67a2b6be 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_functions_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_functions_01.dump
@@ -14,7 +14,7 @@
 | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|F|l|a|t@1|e|n|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|[@1|1+0#e000002&|,+0#0000000&| |2+0#e000002&|]+0#e000e06&|,+0#0000000&| |[+0#e000e06&|3+0#e000002&|]+0#e000e06&@1|)| +0#0000000&@37
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|A| @65
+|-+0#0000e05#a8a8a8255| |c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|A| @65
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|F|o@1|<+0#e000e06&|X+0#0000001#ffff4012|,+0#0000000#ffffff0| |Y+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)| +0#0000000&@53
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 @57|1|9|,|1| @9|1|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_functions_02.dump b/runtime/syntax/testdir/dumps/vim9_generic_functions_02.dump
index 187c8f35ee7cd0da9ef9e610215a89a84927a21e..e0029f62627f643e57f58e9daf5e107e3e68c492 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_functions_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_functions_02.dump
@@ -1,5 +1,5 @@
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
+||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1|v+0#af5f00255#ffffff0|a|r| +0#0000000&|a| |=+0#af5f00255&| +0#0000000&|A|.|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@57
 | +0#0000e05#a8a8a8255@1|a+0#0000000#ffffff0|.|F|o@1|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |s+0#00e0003&|t|r|i|n|g|>+0#e000e06&|(|)| +0#0000000&@49
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_functions_03.dump b/runtime/syntax/testdir/dumps/vim9_generic_functions_03.dump
index 77bdec7d3188575ba807015e79ff7bc859ad7264..e38ebf06bbb848d6704dea8d991a16de2cf91071 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_functions_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_functions_03.dump
@@ -11,10 +11,10 @@
 | +0#0000e05#a8a8a8255@1|v+0#af5f00255#ffffff0|a|r| +0#0000000&|F|o@1| |=+0#af5f00255&| +0#0000000&|b|a|r|.+0#af5f00255&|B+0#0000000&|a|z|<+0#e000e06&|s+0#00e0003&|t|r|i|n|g|>+0#e000e06&| +0#0000000&@47
 | +0#0000e05#a8a8a8255@1|E+0#0000000#ffffff0|x|e|c|u|t|e|(+0#e000e06&|b+0#0000000&|a|r|.+0#af5f00255&|B+0#0000000&|a|z|<+0#e000e06&|s+0#00e0003&|t|r|i|n|g|>+0#e000e06&|)| +0#0000000&@48
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|F|o@1| @63
+|-+0#0000e05#a8a8a8255| |c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|F|o@1| @63
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|_|M|e|t|h|o|d|A|<+0#e000e06&|T+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|a+0#0000000&|r|g|:| |T|)+0#e000e06&| +0#0000000&@47
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|c|h|o| +0#0000000&|a|r|g| @60
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|c|h|o| +0#0000000&|a|r|g| @60
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|o|d|B|(+0#e000e06&|)| +0#0000000&@57
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|F| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|e|t|h|o|d|A|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@39
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|F| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|e|t|h|o|d|A|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@39
 @57|5@1|,|1| @9|6|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_generic_functions_04.dump b/runtime/syntax/testdir/dumps/vim9_generic_functions_04.dump
index e58e3bf35658df8a94367e269094fd1efb736b03..791efc23c9d6f6fdcef2ad61ff5c8580bd1035cf 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_generic_functions_04.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_functions_04.dump
@@ -1,14 +1,14 @@
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|F| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|e|t|h|o|d|A|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@39
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|F|(+0#e000e06&|"+0#e000002&|t|e|x|t|"|)+0#e000e06&| +0#0000000&@59
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|F| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|e|t|h|o|d|A|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@39
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|F|(+0#e000e06&|"+0#e000002&|t|e|x|t|"|)+0#e000e06&| +0#0000000&@59
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
+||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1>c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|B|a|r| |e+0#af5f00255&|x|t|e|n|d|s| +0#0000000&|F|o@1| @51
+|-+0#0000e05#a8a8a8255| >c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|B|a|r| |e+0#af5f00255&|x|t|e|n|d|s| +0#0000000&|F|o@1| @51
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|o|d|C|(+0#e000e06&|)| +0#0000000&@57
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|F| |=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|u|p|e|r|.+0#af5f00255&|_+0#0000000&|M|e|t|h|o|d|A|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@38
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|F|(+0#e000e06&|"+0#e000002&|t|e|x|t|"|)+0#e000e06&| +0#0000000&@59
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|F| |=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|u|p|e|r|.+0#af5f00255&|_+0#0000000&|M|e|t|h|o|d|A|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@38
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|F|(+0#e000e06&|"+0#e000002&|t|e|x|t|"|)+0#e000e06&| +0#0000000&@59
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
+||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| +0#0000000&|I+0#e000e06&|s@1|u|e|:| +0#0000e05&|h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|7@1|2@1|#|i|s@1|u|e|c|o|m@1|e|n|t|-|3|0|7|5@1|3|1|0|5|2| +0#0000000&@2

diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_00.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_00.dump
similarity index 96%
rename from runtime/syntax/testdir/dumps/vim9_lambda_00.dump
rename to runtime/syntax/testdir/dumps/vim9_lambdas_00.dump
index 6f552c2e7d0dc05d80825b8c3180421fa0e8412c..3f189294a2b6cae48e4d225f23cd4c2648187ca6 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_lambda_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_lambdas_00.dump
@@ -1,10 +1,9 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
+|#+0#0000e05&| |V|i|m|9| |l|a|m|b|d|a| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@49
 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|L|a|m|b|d|a|O|p|e|r|a|t|o|r| |T|o|d|o| +0#0000000&@26
 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|L|a|m|b|d|a|P|a|r|e|n| |T|o|d|o| +0#0000000&@29
 @75
 @75
-|#+0#0000e05&| |V|i|m| |9| |l|a|m|b|d|a| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@48
-@75
 |v+0#af5f00255&|a|r| +0#0000000&|F+0#00e0e07&|o@1|:+0#0000000&| |f+0#00e0003&|u|n|c| +0#0000000&@61
 |v+0#af5f00255&|a|r| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@62
 @75
@@ -17,4 +16,5 @@
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|.+0#0000000#ffffff0@2|y+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@54
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|,+0#0000000&| |.@2|y+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@51
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|,+0#0000000&| |.@2|y+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@51
+@75
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_01.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_01.dump
similarity index 90%
rename from runtime/syntax/testdir/dumps/vim9_lambda_01.dump
rename to runtime/syntax/testdir/dumps/vim9_lambdas_01.dump
index 2006c637342a1f79e5c2b39aab94ec01ffaa1f60..4481e4774a43cf7c1a30b95fdc8000d36b250d91 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_lambda_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_lambdas_01.dump
@@ -1,10 +1,9 @@
-|F+0#00e0e07#ffffff0|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@57
-|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@57
+|F+0#00e0e07#ffffff0|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@57
 @75
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|.+0#0000000#ffffff0@2|y+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@54
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|,+0#0000000&| |.@2|y+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@51
->F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|,+0#0000000&| |.@2|y+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@51
-@75
+|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|,+0#0000000&| |.@2|y+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@51
+> @74
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|,+0#0000000&| |y+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@54
 @75
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@49
@@ -17,4 +16,5 @@
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@38
 @75
 |#+0#0000e05&| |w|i|t|h| |r|e|t|u|r|n| |t|y|p|e| +0#0000000&@56
-@57|1|9|,|1| @10|9|%| 
+@75
+@57|1|9|,|0|-|1| @8|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_02.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_02.dump
similarity index 89%
rename from runtime/syntax/testdir/dumps/vim9_lambda_02.dump
rename to runtime/syntax/testdir/dumps/vim9_lambdas_02.dump
index 3c231f2ac9b1daf1a6f5a2fccbc97b84593b3c94..d3016acb91f67117166890b863f304dea8e677ad 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_lambda_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_lambdas_02.dump
@@ -1,10 +1,9 @@
-|#+0#0000e05#ffffff0| |w|i|t|h| |r|e|t|u|r|n| |t|y|p|e| +0#0000000&@56
-@75
+| +0&#ffffff0@74
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|)|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@50
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@49
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@49
-> @74
-|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|.+0#0000000#ffffff0@2|y+0#00e0e07&|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@46
+@75
+>F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|.+0#0000000#ffffff0@2|y+0#00e0e07&|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@46
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|,+0#0000000&| |.@2|y+0#00e0e07&|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@43
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|,+0#0000000&| |.@2|y+0#00e0e07&|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@43
 @75
@@ -17,4 +16,5 @@
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |.@2|y+0#00e0e07&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@21
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |.@2|y+0#00e0e07&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@21
 @75
-@57|3|7|,|0|-|1| @7|2|1|%| 
+|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@30
+@57|3|7|,|1| @9|2|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_03.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_03.dump
similarity index 81%
rename from runtime/syntax/testdir/dumps/vim9_lambda_03.dump
rename to runtime/syntax/testdir/dumps/vim9_lambdas_03.dump
index 63681bca4b7344cfde0b6a4b46fe5adc41686332..93d206708cb85edb3b4a10d9ac2434acdaaba490 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_lambda_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_lambdas_03.dump
@@ -1,10 +1,9 @@
-| +0&#ffffff0@74
-|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@30
+|F+0#00e0e07#ffffff0|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@30
 @75
 |#+0#0000e05&| |w|i|t|h| |c|o|m|p|o|u|n|d| |r|e|t|u|r|n| |t|y|p|e| +0#0000000&@47
 @75
->F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|)|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@44
-|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@43
+|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|)|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@44
+>F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@43
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@43
 @75
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|.+0#0000000#ffffff0@2|y+0#00e0e07&|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@40
@@ -17,4 +16,5 @@
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@35
 @75
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|.+0#0000000#ffffff0@2|y+0#00e0e07&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@26
+|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |.@2|y+0#00e0e07&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@15
 @57|5@1|,|1| @9|3|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_04.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_04.dump
similarity index 67%
rename from runtime/syntax/testdir/dumps/vim9_lambda_04.dump
rename to runtime/syntax/testdir/dumps/vim9_lambdas_04.dump
index d0d3af8cce7999e80dd6cd68310a57e3b7affe77..63ed50fe011ace73ed280636a614bf8e5f71b001 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_lambda_04.dump
+++ b/runtime/syntax/testdir/dumps/vim9_lambdas_04.dump
@@ -1,11 +1,10 @@
-|F+0#00e0e07#ffffff0|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|.+0#0000000#ffffff0@2|y+0#00e0e07&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@26
-|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |.@2|y+0#00e0e07&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@15
+|F+0#00e0e07#ffffff0|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |.@2|y+0#00e0e07&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@15
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |.@2|y+0#00e0e07&|:+0#0000000&| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@15
 @75
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |l+0#00e0003&|i|s|t|<|n|u|m|b|e|r|>| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@24
-> @74
 @75
-|#+0#0000e05&| |p|o|s|t| |o|p|e|r|a|t|o|r| |c|o|m@1|e|n|t|s| +0#0000000&@50
+> @74
+|#+0#0000e05&| |P|o|s|t|-|o|p|e|r|a|t|o|r| |c|o|m@1|e|n|t|s| +0#0000000&@50
 @75
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|)| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@53
 @2|e+0#00e0e07&|x|p|r| +0#0000000&@68
@@ -17,4 +16,5 @@
 @2|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@63
 @75
 @2|e+0#00e0e07&|x|p|r| +0#0000000&@68
-@57|7|3|,|0|-|1| @7|4|6|%| 
+@75
+@57|7|3|,|0|-|1| @7|4|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_05.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_05.dump
similarity index 85%
rename from runtime/syntax/testdir/dumps/vim9_lambda_05.dump
rename to runtime/syntax/testdir/dumps/vim9_lambdas_05.dump
index 946ab590afcd65851ecfb01d669356e947b21a7e..73e0237f4c1e5eb2de784fb2cc7be66b2137e423 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_lambda_05.dump
+++ b/runtime/syntax/testdir/dumps/vim9_lambdas_05.dump
@@ -1,10 +1,9 @@
-| +0&#ffffff0@1|e+0#00e0e07&|x|p|r| +0#0000000&@68
+| +0&#ffffff0@74
 @75
+|#+0#0000e05&| |L|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54
 @75
-|#+0#0000e05&| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54
-@75
->F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @57
-@6|\+0#e000e06&| +0#0000000&|y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| @56
+|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @57
+@6>\+0#e000e06&| +0#0000000&|y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| @56
 @6|\+0#e000e06&| +0#0000000&|z+0#00e0e07&|:+0#0000000&| |b+0#00e0003&|o@1|l|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@50
 @75
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @57
@@ -17,4 +16,5 @@
 @6|\+0#e000e06&| +0#0000000&|z+0#00e0e07&|:+0#0000000&| |b+0#00e0003&|o@1|l|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@42
 @75
 |F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @57
-@57|9|1|,|1| @9|5|9|%| 
+@6|\+0#e000e06&| +0#0000000&|y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| @56
+@57|9|1|,|7| @9|5|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_06.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_06.dump
similarity index 70%
rename from runtime/syntax/testdir/dumps/vim9_lambda_06.dump
rename to runtime/syntax/testdir/dumps/vim9_lambdas_06.dump
index 91109d694309fa11c113e3fa1b8c01b61f40cf20..fc7f19b874483ad93b6562ed519540d7de37d4d4 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_lambda_06.dump
+++ b/runtime/syntax/testdir/dumps/vim9_lambdas_06.dump
@@ -1,15 +1,14 @@
-|F+0#00e0e07#ffffff0|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @57
-@6|\+0#e000e06&| +0#0000000&|y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| @56
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| @56
 @6|\+0#e000e06&| +0#0000000&|z+0#00e0e07&|:+0#0000000&| |b+0#00e0003&|o@1|l|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@50
 @6|\+0#e000e06&| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@59
 @75
->F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @57
-@6|\+0#e000e06&| +0#0000000&|y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| @56
+|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @57
+@6>\+0#e000e06&| +0#0000000&|y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| @56
 @6|\+0#e000e06&| +0#0000000&|z+0#00e0e07&|:+0#0000000&| |b+0#00e0003&|o@1|l|)+0#0000001#ffff4012|:+0#0000000#ffffff0| @57
 @6|\+0#e000e06&| +0#0000000&|n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r| +0#0000000&@52
 @75
 @75
-|#+0#0000e05&| |f|u|n|c|r|e|f| |c|a|l@1| +0#0000000&@60
+|#+0#0000e05&| |F|u|n|c|r|e|f| |c|a|l@1| +0#0000000&@60
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|(+0#0000001#ffff4012|)| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|4+0#e000002&|2|)+0#e000e06&|(|)| +0#0000000&@57
 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|4+0#e000002&|2|)+0#e000e06&|(|"+0#e000002&|f|o@1|"|)+0#e000e06&| +0#0000000&@35
@@ -17,4 +16,5 @@
 @75
 |#+0#0000e05&| |:|h|e|l|p| |v|i|m|9|-|l|a|m|b|d|a| +0#0000000&@55
 @75
-@57|1|0|9|,|1| @8|7|2|%| 
+|v+0#af5f00255&|a|r| +0#0000000&|l+0#00e0e07&|i|s|t| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&| +0#0000000&@54
+@57|1|0|9|,|7| @8|7|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_07.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_07.dump
similarity index 80%
rename from runtime/syntax/testdir/dumps/vim9_lambda_07.dump
rename to runtime/syntax/testdir/dumps/vim9_lambdas_07.dump
index 066cfdefb7cda3716b45082e65b6ea71da328147..6b6e43d7d3f403db2f5310be8d29e15b316a9e69 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_lambda_07.dump
+++ b/runtime/syntax/testdir/dumps/vim9_lambdas_07.dump
@@ -1,10 +1,9 @@
-| +0&#ffffff0@74
-|v+0#af5f00255&|a|r| +0#0000000&|l+0#00e0e07&|i|s|t| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&| +0#0000000&@54
+|v+0#af5f00255#ffffff0|a|r| +0#0000000&|l+0#00e0e07&|i|s|t| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|]+0#e000e06&| +0#0000000&@54
 |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|i|l|t|e|r|(+0#e000e06&|l+0#00e0e07&|i|s|t|,+0#0000000&| |(+0#0000001#ffff4012|k+0#00e0e07#ffffff0|,+0#0000000&| |v+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0@47
 @16|v+0#00e0e07&| +0#0000000&|>+0#af5f00255&| +0#0000000&|0+0#e000002&|)+0#e000e06&| +0#0000000&@52
 |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|i|l|t|e|r|(+0#e000e06&|l+0#00e0e07&|i|s|t|,+0#0000000&| |(+0#0000001#ffff4012|k+0#00e0e07#ffffff0|,+0#0000000&| @53
-@6>\+0#e000e06&| +0#0000000&|v+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0@64
-@6|\+0#e000e06&| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|v+0#00e0e07&| +0#0000000&|>+0#af5f00255&| +0#0000000&|0+0#e000002&|)+0#e000e06&| +0#0000000&@57
+@6|\+0#e000e06&| +0#0000000&|v+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0@64
+@6>\+0#e000e06&| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|v+0#00e0e07&| +0#0000000&|>+0#af5f00255&| +0#0000000&|0+0#e000002&|)+0#e000e06&| +0#0000000&@57
 @75
 |v+0#af5f00255&|a|r| +0#0000000&|C+0#00e0e07&|a|l@1|b|a|c|k| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#0000001#ffff4012|.+0#0000000#ffffff0@2|_+0#00e0e07&|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|'+0#e000002&|a|n|y|t|h|i|n|g|'| +0#0000000&@39
 |e+0#af5f00255&|c|h|o| +0#0000000&|C|a|l@1|b|a|c|k|(+0#e000e06&|1+0#e000002&|,+0#0000000&| |2+0#e000002&|,+0#0000000&| |3+0#e000002&|)+0#e000e06&| +0#0000000&@1|#| |d+0#00e0e07&|i|s|p|l|a|y|s| +0#0000000&|"+0#e000002&|a|n|y|t|h|i|n|g|"| +0#0000000&@29
@@ -17,4 +16,5 @@
 |v+0#af5f00255&|a|r| +0#0000000&|c+0#00e0e07&|o|u|n|t| +0#0000000&|=+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@61
 |v+0#af5f00255&|a|r| +0#0000000&|t+0#00e0e07&|i|m|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|i|m|e|r|_|s|t|a|r|t|(+0#e000e06&|5+0#e000002&|0@1|,+0#0000000&| |(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|{+0#e000e06&| +0#0000000&@37
 @8| +0#00e0e07&|c|o|u|n|t| +0#0000000&|++0#af5f00255&|=| +0#0000000&|1+0#e000002&| +0#0000000&@55
-@57|1|2|7|,|7| @8|8|4|%| 
+@9|e+0#af5f00255&|c|h|o|m| +0#0000000&|'+0#e000002&|H|a|n|d|l|e|r| |c|a|l@1|e|d| |'| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|c+0#00e0e07&|o|u|n|t| +0#0000000&@33
+@57|1|2|7|,|7| @8|8|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_08.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_08.dump
similarity index 78%
rename from runtime/syntax/testdir/dumps/vim9_lambda_08.dump
rename to runtime/syntax/testdir/dumps/vim9_lambdas_08.dump
index 88f739a8bea6b70ef911a72d0f58d010ce037bc5..10fad7f49ffb52ee7add754a8a14ba0299ccc1a8 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_lambda_08.dump
+++ b/runtime/syntax/testdir/dumps/vim9_lambdas_08.dump
@@ -1,10 +1,9 @@
-| +0&#ffffff0@7| +0#00e0e07&|c|o|u|n|t| +0#0000000&|++0#af5f00255&|=| +0#0000000&|1+0#e000002&| +0#0000000&@55
-@9|e+0#af5f00255&|c|h|o|m| +0#0000000&|'+0#e000002&|H|a|n|d|l|e|r| |c|a|l@1|e|d| |'| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|c+0#00e0e07&|o|u|n|t| +0#0000000&@33
+| +0&#ffffff0@8|e+0#af5f00255&|c|h|o|m| +0#0000000&|'+0#e000002&|H|a|n|d|l|e|r| |c|a|l@1|e|d| |'| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|c+0#00e0e07&|o|u|n|t| +0#0000000&@33
 @5|}+0#e000e06&|,+0#0000000&| |{+0#e000e06&|r+0#00e0e07&|e|p|e|a|t|:+0#0000000&| |3+0#e000002&|}+0#e000e06&|)| +0#0000000&@54
 @75
 |v+0#af5f00255&|a|r| +0#0000000&|d+0#00e0e07&|i|c|t| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|}| +0#0000000&@61
->v+0#af5f00255&|a|r| +0#0000000&|d+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|m+0#00e0e07&|a|p|n|e|w|(+0#e000e06&|d+0#00e0e07&|i|c|t|,+0#0000000&| |(+0#0000001#ffff4012|k+0#00e0e07#ffffff0|,+0#0000000&| |v+0#00e0e07&|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|{+0#e000e06&| +0#0000000&@34
-@5|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|'+0#e000002&|v|a|l|u|e|'| +0#0000000&@55
+|v+0#af5f00255&|a|r| +0#0000000&|d+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|m+0#00e0e07&|a|p|n|e|w|(+0#e000e06&|d+0#00e0e07&|i|c|t|,+0#0000000&| |(+0#0000001#ffff4012|k+0#00e0e07#ffffff0|,+0#0000000&| |v+0#00e0e07&|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|{+0#e000e06&| +0#0000000&@34
+@5>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|'+0#e000002&|v|a|l|u|e|'| +0#0000000&@55
 @3|}+0#e000e06&|)| +0#0000000&@69
 @75
 @75
@@ -17,4 +16,5 @@
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&|#+0#0000e05&@22| |^| |v|i|m|C|o|m@1|a|n|d|?| +0#0000000&@30
 @75
 @75
-@57|1|4|5|,|1| @8|9|6|%| 
+|#+0#0000e05&| |I|s@1|u|e| |#|1|6|9|6|5| |(|v|i|m| |s|y|n|t|a|x|:| |w|r|o|n|g| |h|i|g|h|l|i|g|h|t| |w|i|t|h| |l|a|m|b|d|a|,| |a|u|t|o|l|o|a|d|,| |a|n|d| |f|@+0#4040ff13&@2
+| +0#0000000&@56|1|4|5|,|6| @8|9|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim9_lambda_09.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_09.dump
similarity index 67%
rename from runtime/syntax/testdir/dumps/vim9_lambda_09.dump
rename to runtime/syntax/testdir/dumps/vim9_lambdas_09.dump
index ea5823d2a0f6266647689bf9e751d500bab864b6..3dbfd3cefa0cf7b89fe7c241166b12f95f40688c 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_lambda_09.dump
+++ b/runtime/syntax/testdir/dumps/vim9_lambdas_09.dump
@@ -1,10 +1,9 @@
-| +0&#ffffff0@74
-|#+0#0000e05&| |I|s@1|u|e| |#|1|6|9|6|5| |(|v|i|m| |s|y|n|t|a|x|:| |w|r|o|n|g| |h|i|g|h|l|i|g|h|t| |w|i|t|h| |l|a|m|b|d|a|,| |a|u|t|o|l|o|a|d|,| |a|n|d| |f|a|l|s
+|#+0#0000e05#ffffff0| |I|s@1|u|e| |#|1|6|9|6|5| |(|v|i|m| |s|y|n|t|a|x|:| |w|r|o|n|g| |h|i|g|h|l|i|g|h|t| |w|i|t|h| |l|a|m|b|d|a|,| |a|u|t|o|l|o|a|d|,| |a|n|d| |f|a|l|s
 |e| |k|e|y|w|o|r|d|)| +0#0000000&@64
 @75
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&| +0#0000000&|t+0#00e0e07&|i|m|e|r|_|s|t|a|r|t|(+0#e000e06&|0+0#e000002&|,+0#0000000&| |(+0#0000001#ffff4012|_+0#00e0e07#ffffff0|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|f|#|a|(+0#e000e06&|f+0#e000002&|a|l|s|e|,+0#0000000&| |f+0#e000002&|a|l|s|e|)+0#e000e06&@1| +0#0000000&@16
->a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@67
-@75
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@67
+> @74
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
@@ -17,4 +16,5 @@
 |~| @73
 |~| @73
 |~| @73
-| +0#0000000&@56|1|6|1|,|1| @8|B|o|t| 
+|~| @73
+| +0#0000000&@56|1|6|1|,|0|-|1| @6|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim9_legacy_header_00.dump b/runtime/syntax/testdir/dumps/vim9_legacy_header_00.dump
index f9896e2a113a937105f39a0d3eb268d4ac6a5b6f..f01edc18fbbaed5fa5346ccc8ee45721b3cd92c8 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_legacy_header_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_legacy_header_00.dump
@@ -1,4 +1,7 @@
->"+0#0000e05#ffffff0| |c|o|m@1|e|n|t| +0#0000000&@65
+>"+0#0000e05#ffffff0| |V|i|m|9| |l|e|g|a|c|y| |s|c|r|i|p|t| |h|e|a|d|e|r| +0#0000000&@47
+@75
+@75
+|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@65
 @75
 |i+0#af5f00255&|f| +0#0000000&|!+0#af5f00255&|h+0#00e0e07&|a|s|(+0#e000e06&|'+0#e000002&|v|i|m|9|s|c|r|i|p|t|'|)+0#e000e06&| +0#0000000&@53
 @2|#| |4+0#e000002&|2| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@58
@@ -14,7 +17,4 @@
 @75
 @1|#+0#0000e05&| |s|t|r|i|n|g| |o|n|l|y| |r|e|c|o|g|n|i|s|e|d| |w|i|t|h| |l|e|a|d|i|n|g| |c|h|a|r| +0#0000000&@31
 @1|"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&@57
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|,|1| @10|A|l@1| 
+@57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim9_legacy_header_01.dump b/runtime/syntax/testdir/dumps/vim9_legacy_header_01.dump
new file mode 100644 (file)
index 0000000..8c1c39c
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim9_legacy_header_01.dump
@@ -0,0 +1,20 @@
+|v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&|n+0#e000e06&|o|c|l|e|a|r| +0#0000000&@56
+@75
+|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@65
+@75
+@1|#+0#0000e05&| |s|t|r|i|n|g| |o|n|l|y| |r|e|c|o|g|n|i|s|e|d| |w|i|t|h| |l|e|a|d|i|n|g| |c|h|a|r| +0#0000000&@31
+@1>"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&@57
+@75
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|9|,|2| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_00.dump b/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_00.dump
index fe8e737ae8a22f5cfbcada2163e6b9f74ed7bac5..89b32ceae05063e19ec4a8931d4c48af34c53aa4 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_00.dump
@@ -1,20 +1,20 @@
->++0#0000e05#a8a8a8255|-@1| |1@1| |l|i|n|e|s|:| |"| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"|H|"| ||| |s|e|t| |f|d|m|=|s|y|n|t|a|x|-
-|v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&|n+0#e000e06&|o|c|l|e|a|r| +0#0000000&@56
-@75
-|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@65
-@75
-@1|#+0#0000e05&| |s|t|r|i|n|g| |o|n|l|y| |r|e|c|o|g|n|i|s|e|d| |w|i|t|h| |l|e|a|d|i|n|g| |c|h|a|r| +0#0000000&@31
-@1|"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&@57
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|,|1| @10|A|l@1| 
+|-+0#0000e05#a8a8a8255| >"+0&#ffffff0| |V|i|m|9| |l|e|g|a|c|y| |s|c|r|i|p|t| |h|e|a|d|e|r| +0#0000000&@45
+||+0#0000e05#a8a8a8255| |"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"+0#e000002&|H|"| +0#0000000&@29
+||+0#0000e05#a8a8a8255| |"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@1| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@27
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
+||+0#0000e05#a8a8a8255| |"+0&#ffffff0| |c|o|m@1|e|n|t| +0#0000000&@63
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
+||+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|f| +0#0000000&|!+0#af5f00255&|h+0#00e0e07&|a|s|(+0#e000e06&|'+0#e000002&|v|i|m|9|s|c|r|i|p|t|'|)+0#e000e06&| +0#0000000&@51
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|#| |4+0#e000002&|2| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@56
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|s+0#af5f00255&|o|u|r|c|e| +0#0000000&|f|o@1|.+0#af5f00255&|v+0#0000000&|i|m| @56
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|f+0#af5f00255&|i|n|i|s|h| +0#0000000&@64
+||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|f| +0#0000000&@67
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
+||+0#0000e05#a8a8a8255| |"+0&#ffffff0| |c|o|m@1|e|n|t| +0#0000000&@63
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&|n+0#e000e06&|o|c|l|e|a|r| +0#0000000&@54
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |c|o|m@1|e|n|t| +0#0000000&@63
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+@57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_01.dump b/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_01.dump
new file mode 100644 (file)
index 0000000..55ff243
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_01.dump
@@ -0,0 +1,20 @@
+||+0#0000e05#a8a8a8255| |"+0&#ffffff0| |c|o|m@1|e|n|t| +0#0000000&@63
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&|n+0#e000e06&|o|c|l|e|a|r| +0#0000000&@54
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |c|o|m@1|e|n|t| +0#0000000&@63
+| +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0|#+0#0000e05&| |s|t|r|i|n|g| |o|n|l|y| |r|e|c|o|g|n|i|s|e|d| |w|i|t|h| |l|e|a|d|i|n|g| |c|h|a|r| +0#0000000&@29
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0|"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&@55
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|9|,|0|-|1| @7|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_no_comment_strings_00.dump b/runtime/syntax/testdir/dumps/vim9_no_comment_strings_00.dump
similarity index 91%
rename from runtime/syntax/testdir/dumps/vim9_ex_no_comment_strings_00.dump
rename to runtime/syntax/testdir/dumps/vim9_no_comment_strings_00.dump
index 191b9f22d66867ad4f24087d83ab6fc9ca052eff..ee6f101a548f5860e1c60b71e2dbe867f1329f94 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_no_comment_strings_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_no_comment_strings_00.dump
@@ -1,8 +1,8 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
-@75
-|#+0#0000e05&| |V|i|m| |c|o|m@1|e|n|t| |s|t|r|i|n|g|s| +0#0000000&@53
+|#+0#0000e05&| |V|i|m|9| |n|o| |c|o|m@1|e|n|t| |s|t|r|i|n|g|s| +0#0000000&@49
 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|c|o|m@1|e|n|t|_|s|t|r|i|n|g|s| |=| |v|:|f|a|l|s|e| +0#0000000&@19
 @75
+@75
 |#+0#0000e05&| |p|r|e| |"|s|t|r|i|n|g|"| |p|o|s|t| +0#0000000&@55
 @75
 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60

diff --git a/runtime/syntax/testdir/dumps/vim9_ex_no_comment_strings_01.dump b/runtime/syntax/testdir/dumps/vim9_no_comment_strings_01.dump
similarity index 80%
rename from runtime/syntax/testdir/dumps/vim9_ex_no_comment_strings_01.dump
rename to runtime/syntax/testdir/dumps/vim9_no_comment_strings_01.dump
index 2613567a756659ee0711866329ae0642ca26b52f..7ee5d5b85b6f4177fdec4a4521c55638b77a9142 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_ex_no_comment_strings_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_no_comment_strings_01.dump
@@ -7,14 +7,14 @@
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52
 @2|#+0#0000e05&| |p|r|e| |"|s|t|r|i|n|g|"| |p|o|s|t| +0#0000000&@53
 |}+0#e000e06&| +0#0000000&@73
+@75
+|{+0#e000e06&| +0#0000000&@73
+@2|#+0#0000e05&| |p|r|e| |"|s|t|r|i|n|g|"| |p|o|s|t| +0#0000000&@53
+|}+0#e000e06&| +0#0000000&@73
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
 | +0#0000000&@56|1|9|,|0|-|1| @7|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim9_shebang_00.dump b/runtime/syntax/testdir/dumps/vim9_shebang_00.dump
index 3f2818c8eea21eb0a2a2d3eced7d13aa7e4cbc09..c4f6f80902593670b8bd508f42c09b42681bfdaa 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_shebang_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_shebang_00.dump
@@ -1,10 +1,11 @@
 >#+0#e000e06#ffffff0|!|/|u|s|r|/|b|i|n|/|e|n|v| |v|i|m| |-|S| +0#0000000&@53
 |v+0#af5f00255&|i|m|9|s|c|r|i|p|t| +0#0000000&@64
+|#+0#0000e05&| |V|i|m|9| |s|h|e|b|a|n|g| |l|i|n|e| +0#0000000&@55
 @75
-|#+0#0000e05&| |V|i|m| |s|h|e|b|a|n|g| |l|i|n|e| +0#0000000&@56
 @75
 |#+0#0000e05&| |j|u|s|t| |a| |l|i|n|e| |c|o|m@1|e|n|t| +0#0000000&@53
 |#+0#0000e05&|!|/|u|s|r|/|b|i|n|/|e|n|v| |v|i|m| |-|S| +0#0000000&@53
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
@@ -16,5 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
 | +0#0000000&@56|1|,|1| @10|A|l@1| 

diff --git a/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_00.dump b/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_00.dump
index 054bba1472006c8f303a3e2c4a06b407f4c0e122..8a7d4edd9431db53baf71279cfe59708165d4c3b 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_00.dump
@@ -1,5 +1,5 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
-@75
+|#+0#0000e05&| |V|i|m|9| |t|h|i|s| |a|n|d| |s|u|p|e|r| |k|e|y|w|o|r|d|s| +0#0000000&@44
 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|S|u|p|e|r| |T|o|d|o| +0#0000000&@35
 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|T|h|i|s| |T|o|d|o| +0#0000000&@36
 |#+0#0000e05&| +0#0000000&|S+0#e000e06&|e@1|:| +0#0000e05&|h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|6|4|7|6|#|i|s@1|u|e|c|o|m@1|e|n|t|-|2|6|3|8|1|9|1@2|0| +0#0000000&@6

diff --git a/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_00.dump b/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_00.dump
index 7f5ddfd2a49bbf934cf6aca448f520c80459c842..aada2bbb4fda89809df30d645b0d2acb9ed16254 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_00.dump
@@ -1,5 +1,5 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
-@75
+|#+0#0000e05&| |V|i|m|9| |t|h|i|s| |a|n|d| |s|u|p|e|r| |k|e|y|w|o|r|d|s| +0#0000000&@44
 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|S|u|p|e|r| |T|o|d|o| +0#0000000&@35
 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|T|h|i|s| |T|o|d|o| +0#0000000&@36
 |#+0#0000e05&| +0#0000000&|S+0#e000e06&|e@1|:| +0#0000e05&|h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|6|4|7|6|#|i|s@1|u|e|c|o|m@1|e|n|t|-|2|6|3|5|1@1|9|4|7|8| +0#0000000&@6

diff --git a/runtime/syntax/testdir/dumps/vim9_super_this_keywords_00.dump b/runtime/syntax/testdir/dumps/vim9_super_this_keywords_00.dump
index f62ef1e7e203ed0a3c55bab4326f82e143243a81..ea8eaecb47ebfc8df5010b2c430b3480a6976f73 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_super_this_keywords_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_super_this_keywords_00.dump
@@ -1,9 +1,9 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
-@75
 |#+0#0000e05&| |V|i|m|9| |t|h|i|s| |a|n|d| |s|u|p|e|r| |k|e|y|w|o|r|d|s| +0#0000000&@44
 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|T|h|i|s| |T|o|d|o| +0#0000000&@36
 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|S|u|p|e|r| |T|o|d|o| +0#0000000&@35
 @75
+@75
 |d+0#af5f00255&|e|f| +0#0000000&|E|c|h|o|(+0#e000e06&|.+0#0000000&@2|a+0#00e0e07&|r|g|s|:+0#0000000&| |l+0#00e0003&|i|s|t|<|a|n|y|>|)+0#e000e06&| +0#0000000&@46
 @2|e+0#af5f00255&|c|h|o| +0#0000000&|a+0#00e0e07&|r|g|s| +0#0000000&@63
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68

diff --git a/runtime/syntax/testdir/dumps/vim9_tuple_00.dump b/runtime/syntax/testdir/dumps/vim9_tuples_00.dump
similarity index 86%
rename from runtime/syntax/testdir/dumps/vim9_tuple_00.dump
rename to runtime/syntax/testdir/dumps/vim9_tuples_00.dump
index 7f445931360a46b3a45d39d294c4dc14811d7b25..4467a67bbe127cbbfa5b34ab17824d40e525bfd3 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_tuple_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_tuples_00.dump
@@ -1,5 +1,4 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
-@75
 |#+0#0000e05&| |V|i|m|9| |t|u|p|l|e|s| +0#0000000&@61
 @75
 @75
@@ -17,4 +16,5 @@
 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|{|e+0#0000000&|1|_|,| |e|2|_| |-+0#af5f00255&|>| +0#0000000&|{+0#e000e06&|-+0#af5f00255&|>| +0#0000000&|[+0#e000e06&|e+0#0000000&|1|_|,| |e|2|_|]+0#e000e06&|}@1|(|a+0#00e0e07&|:|e+0#0000000&|1|,| |a+0#00e0e07&|:|e+0#0000000&|2|)+0#e000e06&@1| +0#0000000&@20
 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63
 @75
+|d+0#af5f00255&|e|f| +0#0000000&|M|a|k|e|L|a|z|y|L|i|s|t|(+0#e000e06&|e+0#0000000&|1|:| |a+0#00e0003&|n|y|,+0#0000000&| |e|2|:| |a+0#00e0003&|n|y|)+0#e000e06&|:+0#0000000&| |f+0#00e0003&|u|n|c|(|)|:+0#0000000&| |l+0#00e0003&|i|s|t|<|a|n|y|>| +0#0000000&@21
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim9_tuple_01.dump b/runtime/syntax/testdir/dumps/vim9_tuples_01.dump
similarity index 92%
rename from runtime/syntax/testdir/dumps/vim9_tuple_01.dump
rename to runtime/syntax/testdir/dumps/vim9_tuples_01.dump
index 0ce9c3a8cfea350cfaa182ce561de4ead804c8f9..0499393c994d98821ce2d247df8454523340ed98 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_tuple_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_tuples_01.dump
@@ -1,10 +1,9 @@
-|e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@68
-@75
+| +0&#ffffff0@74
 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|L|e|g|a|c|y|M|a|k|e|L|a|z|y|L|i|s|t|(+0#e000e06&|e+0#0000000&|1|,| |e|2|)+0#e000e06&| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@33
 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|{|e+0#0000000&|1|_|,| |e|2|_| |-+0#af5f00255&|>| +0#0000000&|{+0#e000e06&|-+0#af5f00255&|>| +0#0000000&|[+0#e000e06&|e+0#0000000&|1|_|,| |e|2|_|]+0#e000e06&|}@1|(|a+0#00e0e07&|:|e+0#0000000&|1|,| |a+0#00e0e07&|:|e+0#0000000&|2|)+0#e000e06&@1| +0#0000000&@20
 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63
-> @74
-|d+0#af5f00255&|e|f| +0#0000000&|M|a|k|e|L|a|z|y|L|i|s|t|(+0#e000e06&|e+0#0000000&|1|:| |a+0#00e0003&|n|y|,+0#0000000&| |e|2|:| |a+0#00e0003&|n|y|)+0#e000e06&|:+0#0000000&| |f+0#00e0003&|u|n|c|(|)|:+0#0000000&| |l+0#00e0003&|i|s|t|<|a|n|y|>| +0#0000000&@21
+@75
+>d+0#af5f00255&|e|f| +0#0000000&|M|a|k|e|L|a|z|y|L|i|s|t|(+0#e000e06&|e+0#0000000&|1|:| |a+0#00e0003&|n|y|,+0#0000000&| |e|2|:| |a+0#00e0003&|n|y|)+0#e000e06&|:+0#0000000&| |f+0#00e0003&|u|n|c|(|)|:+0#0000000&| |l+0#00e0003&|i|s|t|<|a|n|y|>| +0#0000000&@21
 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&@2|e+0#0000000&|1|_|:| |a+0#00e0003&|n|y|,+0#0000000&| |e|2|_|:| |a+0#00e0003&|n|y|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|)| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|[+0#e000e06&|e+0#0000000&|1|_|,| |e|2|_|]+0#e000e06&|)|(|e+0#0000000&|1|,| |e|2|)+0#e000e06&@1| +0#0000000&@11
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
 @75
@@ -17,4 +16,5 @@
 |~| @73
 |~| @73
 |~| @73
-| +0#0000000&@56|1|9|,|0|-|1| @7|B|o|t| 
+|~| @73
+| +0#0000000&@56|1|9|,|1| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim9_variables_00.dump b/runtime/syntax/testdir/dumps/vim9_variables_00.dump
index cd9f976c81032db1a57c122f32b9ef2d9e768d56..fea017b4926dd73350e7a48911ff5c68fb977527 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim9_variables_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_variables_00.dump
@@ -1,7 +1,7 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
-@75
 |#+0#0000e05&| |V|i|m|9| |v|a|r|i|a|b|l|e| |h|i|g|h|l|i|g|h|t|i|n|g| +0#0000000&@46
 @75
+@75
 |#+0#0000e05&| |D|e|c|l|a|r|a|t|i|o|n|s| +0#0000000&@60
 @75
 |v+0#af5f00255&|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60

diff --git a/runtime/syntax/testdir/dumps/vim_ex_comment_strings_00.dump b/runtime/syntax/testdir/dumps/vim_comment_strings_00.dump
similarity index 92%
rename from runtime/syntax/testdir/dumps/vim_ex_comment_strings_00.dump
rename to runtime/syntax/testdir/dumps/vim_comment_strings_00.dump
index df6e06c0ec03c2053b2cde2ace8241fed3fee786..7a1f9cbd6bfcba4e6d3bebc33b84288d60f4a330 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_comment_strings_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_comment_strings_00.dump
@@ -1,6 +1,7 @@
 >"+0#0000e05#ffffff0| |V|i|m| |c|o|m@1|e|n|t| |s|t|r|i|n|g|s| +0#0000000&@53
 |"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|c|o|m@1|e|n|t|_|s|t|r|i|n|g|s| |=| |v|:|t|r|u|e| +0#0000000&@20
 @75
+@75
 |"+0#0000e05&| |p|r|e| |"+0#e000002&|s|t|r|i|n|g|"| +0#0000e05&|p|o|s|t| +0#0000000&@55
 @75
 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60
@@ -16,5 +17,4 @@
 |}+0#e000e06&| +0#0000000&@73
 @75
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52
-@2|#+0#0000e05&| |p|r|e| |"+0#e000002&|s|t|r|i|n|g|"| +0#0000e05&|p|o|s|t| +0#0000000&@53
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_comment_strings_01.dump b/runtime/syntax/testdir/dumps/vim_comment_strings_01.dump
similarity index 56%
rename from runtime/syntax/testdir/dumps/vim_ex_comment_strings_01.dump
rename to runtime/syntax/testdir/dumps/vim_comment_strings_01.dump
index deebf69613eb5ddd8daf501ceceae8e8f82d0493..c44edc9b3ec02f9c08bef23b7fc1135c798c9634 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_comment_strings_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_comment_strings_01.dump
@@ -1,10 +1,12 @@
-|c+0#af5f00255#ffffff0|o|m@1|a|n|d| +0#0000000&|F|o@1| |{+0#e000e06&| +0#0000000&@61
+| +0&#ffffff0@74
+|c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|F|o@1| |{+0#e000e06&| +0#0000000&@61
 @2|#+0#0000e05&| |p|r|e| |"+0#e000002&|s|t|r|i|n|g|"| +0#0000e05&|p|o|s|t| +0#0000000&@53
 |}+0#e000e06&| +0#0000000&@73
 @75
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52
-@2>#+0#0000e05&| |p|r|e| |"+0#e000002&|s|t|r|i|n|g|"| +0#0000e05&|p|o|s|t| +0#0000000&@53
+>a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52
+@2|#+0#0000e05&| |p|r|e| |"+0#e000002&|s|t|r|i|n|g|"| +0#0000e05&|p|o|s|t| +0#0000000&@53
 |}+0#e000e06&| +0#0000000&@73
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
@@ -15,6 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|9|,|3| @9|B|o|t| 
+| +0#0000000&@56|1|9|,|1| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_comment_00.dump b/runtime/syntax/testdir/dumps/vim_comments_00.dump
similarity index 91%
rename from runtime/syntax/testdir/dumps/vim_comment_00.dump
rename to runtime/syntax/testdir/dumps/vim_comments_00.dump
index da4f490f4c94911c4a9f6d29360a03e5d6b0f115..5e6b5a2f0f70791707fb9c578d0b312cc8d11eab 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_comment_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_comments_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |V|i|m| |c|o|m@1|e|n|t|s| +0#0000000&@60
 @75
+@75
 |"+0#0000e05&| |L|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@51
 @75
 |#| |4+0#e000002&|2| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@60
@@ -16,5 +17,4 @@
 @75
 |c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|-+0#e000e06&|n|a|r|g|s|=|1+0#00e0003&| +0#0000000&|F|o@1|C|o|m@1|a|n|d| |{+0#e000e06&| +0#0000000&@45
 @2|#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@51
-@2|"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@46
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_comment_01.dump b/runtime/syntax/testdir/dumps/vim_comments_01.dump
similarity index 70%
rename from runtime/syntax/testdir/dumps/vim_comment_01.dump
rename to runtime/syntax/testdir/dumps/vim_comments_01.dump
index 4b8a47f2f2e255901ab7386f8e5acc2ce04b563a..c439d335b92d99b634d822dba5515c178c0a5ac0 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_comment_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_comments_01.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@46
+| +0&#ffffff0@1|#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@51
+@2|"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@46
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
 @75
 |c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|-+0#e000e06&|n|a|r|g|s|=|1+0#00e0003&| +0#0000000&|F|o@1|C|o|m@1|a|n|d| |{+0#e000e06&| +0#0000000&@45
-@2|#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@51
-@2>"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@46
+@2>#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@51
+@2|"+0#e000002&|u|s|e|l|e|s@1| |s|t|r|i|n|g|"| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@46
 |}+0#e000e06&| +0#0000000&@73
 @75
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52
@@ -16,5 +17,4 @@
 @75
 |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@65
 | +0#0000e05&@1|\| |c|o|n|t|i|n|u|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@52
-| +0#0000e05&@1|\| |c|o|n|t|i|n|u|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@52
-@57|1|9|,|3| @9|2|4|%| 
+@57|1|9|,|3| @9|2|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_comment_02.dump b/runtime/syntax/testdir/dumps/vim_comments_02.dump
similarity index 89%
rename from runtime/syntax/testdir/dumps/vim_comment_02.dump
rename to runtime/syntax/testdir/dumps/vim_comments_02.dump
index e1411ebe7cd5c18d30cb09382abb23d7033e6e2d..ee568be945fc2477b9127ef07311cb15d7f5fdd8 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_comment_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_comments_02.dump
@@ -1,9 +1,10 @@
 | +0#0000e05#ffffff0@1|\| |c|o|n|t|i|n|u|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@52
+| +0#0000e05&@1|\| |c|o|n|t|i|n|u|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@52
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&|"+0#0000e05&| |c|o|m@2|e|n|t| +0#0000000&@51
 | +0#0000e05&@1|\| |c|o|n|t|i|n|u|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@52
-| +0#0000e05&@1|\| |c|o|n|t|i|n|u|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@52
-> @74
+| +0#0000e05&@1>\| |c|o|n|t|i|n|u|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@52
+@75
 |"+0#0000e05&| |:|F|o@1| +0#0000000&@68
 | +0#0000e05&@5|\| |a|r|g|1| +0#0000000&@62
 | +0#0000e05&@5|"|\| |c|o|m@1|e|n|t| +0#0000000&@58
@@ -16,5 +17,4 @@
 @75
 |:|F|o@1| @70
 @6|"+0#0000e05&|\| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n| |c|o|m@1|e|n|t| +0#0000000&@40
-@6|\+0#e000e06&| +0#0000000&|a|r|g|1| @62
-@57|3|7|,|0|-|1| @7|5|8|%| 
+@57|3|7|,|3| @9|5|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_comment_03.dump b/runtime/syntax/testdir/dumps/vim_comments_03.dump
similarity index 82%
rename from runtime/syntax/testdir/dumps/vim_comment_03.dump
rename to runtime/syntax/testdir/dumps/vim_comments_03.dump
index a5886861de6d6e6e23e3ec111d9e57164721e8eb..2ceb8d6b34fed4790f7515eaafc93ae78bfdab90 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_comment_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_comments_03.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|a|r|g|1| @62
+| +0&#ffffff0@5|"+0#0000e05&|\| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n| |c|o|m@1|e|n|t| +0#0000000&@40
+@6|\+0#e000e06&| +0#0000000&|a|r|g|1| @62
 @6|"+0#0000e05&|\| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n| |c|o|m@1|e|n|t| +0#0000000&@40
 @6|\+0#e000e06&| +0#0000000&|a|r|g|2| @62
 @75
-@75
->"+0#0000e05&| +0#0000000&|I+0#e000e06&|s@1|u|e|:| +0#0000e05&|#|1|3|0|4|7| +0#0000000&@59
+> @74
+|"+0#0000e05&| +0#0000000&|I+0#e000e06&|s@1|u|e|:| +0#0000e05&|#|1|3|0|4|7| +0#0000000&@59
 @75
 |i+0#af5f00255&|f| +0#0000000&|!+0#af5f00255&|e+0#00e0e07&|x|i|s|t|s|(+0#e000e06&|"+0#e000002&|:|D|i|f@1|O|r|i|g|"|)+0#e000e06&| +0#0000000&@51
 @2|c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|D|i|f@1|O|r|i|g| |v+0#af5f00255&|e|r|t| +0#0000000&|n+0#af5f00255&|e|w| +0#0000000&||| |s+0#af5f00255&|e|t| +0#0000000&|b+0#e000e06&|t|=+0#af5f00255&|n+0#0000000&|o|f|i|l|e| ||| |r+0#af5f00255&| +0#0000000&|++0#af5f00255&@1|e+0#00e0e07&|d|i|t| +0#0000000&|#| ||| |0+0#e000002&|d+0#0000000&|_| ||| |d+0#af5f00255&|i|f@1|t|h|i|s| +0#0000000&@1
@@ -16,5 +17,4 @@
 |"+0#0000e05&| |T|h|i|s| |i|s| |w|h|a|t| |w|e| |c|a|l@1| |"| |b|l|a|h| +0#0000000&@45
 @75
 @75
-|"+0#0000e05&| |I|s@1|u|e| |#| |#|9|5|8|7| +0#0000000&@59
-@57|5@1|,|1| @9|9|2|%| 
+@57|5@1|,|0|-|1| @7|8|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_comment_04.dump b/runtime/syntax/testdir/dumps/vim_comments_04.dump
similarity index 73%
rename from runtime/syntax/testdir/dumps/vim_comment_04.dump
rename to runtime/syntax/testdir/dumps/vim_comments_04.dump
index 4e144d400ead7ef0636d0d8def3ceb27a0a7857f..645d45b64238dc2c761fb1591c117d038fc38359 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_comment_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_comments_04.dump
@@ -1,8 +1,10 @@
-|"+0#0000e05#ffffff0| |I|s@1|u|e| |#| |#|9|5|8|7| +0#0000000&@59
+| +0&#ffffff0@74
+|"+0#0000e05&| |I|s@1|u|e| |#| |#|9|5|8|7| +0#0000000&@59
 @75
 |d+0#af5f00255&|e|f| +0#0000000&|C|o|m@1|e|n|t|T|i|t|l|e|(+0#e000e06&|)| +0#0000000&@56
 @2|#+0#0000e05&| +0#0000000&|T+0#e000e06&|i|t|l|e|:| +0#0000e05&|.@2| +0#0000000&@60
 >e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
@@ -15,6 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|7|2|,|1| @9|B|o|t| 
+| +0#0000000&@56|7|3|,|1| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_abbreviate_00.dump b/runtime/syntax/testdir/dumps/vim_ex_abbreviate_00.dump
index 5224a4f6e59891fc3ea326730a2725cb84781a4c..274d906efbeb9f80e45265b73f0853b5563ca69e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_abbreviate_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_abbreviate_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|a|b@1|r|e|v|i|a|t|e| |c|o|m@1|a|n|d|s| +0#0000000&@48
 @75
+@75
 |a+0#af5f00255&|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f|o@1| |f|o@1|b|a|r| @48
 |c+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|c|f|o@1| |c|f|o@1|b|a|r| @45
 |i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i|f|o@1| |c|f|o@1|b|a|r| @45
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|c|f|o@1| |c|f|o@1|b|a|r| @38
 |i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i|f|o@1| |c|f|o@1|b|a|r| @38
 @75
-|u+0#af5f00255&|n|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f|o@1| @53
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_abbreviate_01.dump b/runtime/syntax/testdir/dumps/vim_ex_abbreviate_01.dump
index 10de160dd0a9023734f25d224e1dc9055edc94c7..62f33cc3d51379002754a0b0a4d9cfade046c902 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_abbreviate_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_abbreviate_01.dump
@@ -1,20 +1,20 @@
-| +0&#ffffff0@74
+|i+0#af5f00255#ffffff0|n|o|r|e|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i|f|o@1| |c|f|o@1|b|a|r| @41
+@75
 |a+0#af5f00255&|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f|o@1| |f|o@1|b|a|r| @41
 |c+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|c|f|o@1| |c|f|o@1|b|a|r| @38
 |i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|e|x|p|r|>| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i|f|o@1| |c|f|o@1|b|a|r| @38
-@75
->u+0#af5f00255&|n|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f|o@1| @53
+> @74
+|u+0#af5f00255&|n|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|f|o@1| @53
 |c+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|c|f|o@1| @51
 |i+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|i|f|o@1| @51
 @75
 |a+0#af5f00255&|b|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@58
 |c+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@57
 |i+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@57
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|9|,|1| @9|B|o|t| 
+| +0#0000000&@56|1|9|,|0|-|1| @7|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_augroup_00.dump b/runtime/syntax/testdir/dumps/vim_ex_augroup_00.dump
index 4ac5e2f6c8b0161b0e1289242876dcf0ea0bc51f..1435c62f7e753d7276ff6f0dbe6165530a52b044 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_augroup_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_augroup_00.dump
@@ -1,7 +1,7 @@
 | +0#0000e05#a8a8a8255@1>"+0&#ffffff0| |V|i|m| |:|a|u|g|r|o|u|p| |c|o|m@1|a|n|d| +0#0000000&@50
 | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |"+0#e000002&|a|"| +0#0000000&@29
 | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@2| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@26
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |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|A|u|g|r|o|u|p|N|a|m|e| |T|o|d|o| +0#0000000&@21
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|A|u|g|r|o|u|p|N|a|m|e| |T|o|d|o| +0#0000000&@28
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |a+0#af5f00255#ffffff0|u|g|r|o|u|p| +0#0000000&|f+0#0000001#ffff4012|o@1| +0#0000000#ffffff0@61

diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_00.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_00.dump
index b8c3b0ea631ae2e0f4057997b27db0ef63c145d7..82090d4cafe86377e1bfd8ed0605f8bfb94c9775 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_00.dump
@@ -1,20 +1,20 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|a|u|t|o|c|m|d| |c|o|m@1|a|n|d| +0#0000000&@52
-|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |v|i|m|A|u|t|o|C|m|d|G|r|o|u|p| |T|o|d|o| +0#0000000&@27
-|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t| |v|i|m|U|s|e|r|A|u|t|o|E|v|e|n|t| |T|i|t|l|e| +0#0000000&@25
+|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|A|u|t|o|C|m|d|G|r|o|u|p| |T|o|d|o| +0#0000000&@29
+|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|U|s|e|r|A|u|t|o|E|v|e|n|t| |T|i|t|l|e| +0#0000000&@27
 @75
 @75
 |"+0#0000e05&| |D|e|f|i|n|e| +0#0000000&@66
 @75
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @11|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@11|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@9
 @75
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @11|++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@11|++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2
 @75
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_01.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_01.dump
index 61ef015d6d819c84c28c22f7a528464e2b61794b..4b2480bb84ac5a912c8637e458c1a9f034e5adb6 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_01.dump
@@ -1,20 +1,20 @@
 |a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @11|++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@11|++0#e000e06&@1|o|n|c|e| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@2
 @75
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&
 >a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @11|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@11|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&
 @75
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o
 | +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@68
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o
 | +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@68
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o
 | +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@68
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @11|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@11|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o
 | +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@68
 @75
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@5|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|@+0#4040ff13&@2
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@5|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|@+0#4040ff13&@2
 | +0#0000000&@56|1|9|,|1| @10|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_02.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_02.dump
index 7738837b4fd65e44f0f64cd2436c14d1052e5d75..7af6098a79ca99ac706bb1781235e74c71c2181f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_02.dump
@@ -1,8 +1,8 @@
-|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@5|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
+|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@5|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
 |"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@60
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|=|4|2|>| +0#0000000&@2|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|=|4|2|>| +0#0000000&@2|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
 |"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@60
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|=|a|b|u|f|>| +0#0000000&|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|=|a|b|u|f|>| +0#0000000&|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
 |"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@60
 >a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@5|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
 |"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@60
@@ -16,5 +16,5 @@
 |"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@60
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d|,+0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|=|a|b|u|f|>| +0#0000000&|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
 |"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@60
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t|,|B|a|r|E|v|e|n|t| @10|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|@+0#4040ff13&@2
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t|,+0#0000000&|B+0#e000e06&|a|r|E|v|e|n|t| +0#0000000&@10|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|@+0#4040ff13&@2
 | +0#0000000&@56|3|1|,|1| @9|1|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_03.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_03.dump
index 17bd350adefec1cef58b8ce5b4d65a4b1c999945..c669cbb92107601cde612325449cd3cd58966a99 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_03.dump
@@ -1,7 +1,7 @@
-|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t|,|B|a|r|E|v|e|n|t| @10|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
+|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t|,+0#0000000&|B+0#e000e06&|a|r|E|v|e|n|t| +0#0000000&@10|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
 |"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@60
 @75
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|f|<|b|u|f@1|e|r|>|o@1| @2|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@11|f|<|b|u|f@1|e|r|>|o@1| @2|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1
 |"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@60
 > @74
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |{+0#e000e06&| +0#0000000&@51
@@ -12,9 +12,9 @@
 @2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@62
 @2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@62
 |}+0#e000e06&| +0#0000000&@73
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| |{+0#e000e06&| +0#0000000&@51
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&|{+0#e000e06&| +0#0000000&@51
 @2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@62
 @2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@62
 |}+0#e000e06&| +0#0000000&@73
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |{+0#e000e06&| +0#0000000&@42
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |{+0#e000e06&| +0#0000000&@42
 @57|4|0|,|0|-|1| @7|1|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_04.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_04.dump
index 7a82ab288b49c08d7e902c9d66e694d4fd1c72c5..4f18da29edb9234ab1aebb96005ca9ce4edd8b80 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_04.dump
@@ -1,4 +1,4 @@
-|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |{+0#e000e06&| +0#0000000&@42
+|a+0#af5f00255#ffffff0|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |{+0#e000e06&| +0#0000000&@42
 @2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@62
 @2|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@62
 |}+0#e000e06&| +0#0000000&@73

diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_05.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_05.dump
index ce00fb28d8db2e633b7912d460ef779271d88ac4..1823bf05e2399f2a296099ec68338b9333b38e13 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_05.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_05.dump
@@ -11,7 +11,7 @@
 @6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@56
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&||+0#0000000&| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|z|"| +0#0000000&@55
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @53
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@53
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| @54
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58

diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_06.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_06.dump
index 42eebd163bb0a95e091d69da07a1b1e3597dd5f7..4c03fefed14e4a0be2aec2fe220c4866270ce586 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_06.dump
@@ -1,6 +1,6 @@
 | +0&#ffffff0@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&||+0#0000000&| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|z|"| +0#0000000&@55
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @44
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @44
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| @54
 @6>"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58

diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_07.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_07.dump
index 220055b363ef55e91f35eba21619f8ea643f9b82..ca3c6951751248217021355e5b1cc1b862e0fb38 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_07.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_07.dump
@@ -9,12 +9,12 @@
 @75
 |"+0#0000e05&| |R|e|m|o|v|e| +0#0000000&@66
 @75
-|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a
+|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a
 |r|"| +0#0000000&@72
 |a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| |++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a
 |r|"| +0#0000000&@72
-|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @6|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a
+|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@6|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a
 |r|"| +0#0000000&@72
-|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @6|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a
+|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@6|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a
 |r|"| +0#0000000&@72
 @57|1@1|2|,|1| @8|4|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_08.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_08.dump
index 7e936c58430a987737ad8e2c3d366e30225578c5..59d0a40a9aa9c45ab93162ff1da6b7649ff31451 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_08.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_08.dump
@@ -1,20 +1,20 @@
-|a+0#af5f00255#ffffff0|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @6|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a
+|a+0#af5f00255#ffffff0|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@6|++0#e000e06&@1|o|n|c|e| +0#0000000&|++0#e000e06&@1|n|e|s|t|e|d| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a
 |r|"| +0#0000000&@72
 @75
-|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| @37
+|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| @37
 |a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| @37
->a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @43
-|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @43
+>a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@43
+|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@43
 @75
-|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| |*+0#00e0003&| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @49
+|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|*+0#00e0003&| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @49
 |a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|*+0#00e0003&| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @49
 @75
-|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@49
+|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@49
 |a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@49
-|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @43
-|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @43
+|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@43
+|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@43
 @75
-|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f|o@1|g|r|o|u|p| @57
+|a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0@57
 |a+0#af5f00255&|u|t|o|c|m|d|!| +0#0000000&@66
 @75
 @57|1|2|5|,|1| @8|5|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_09.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_09.dump
index d7ef69673b930e6a96cb3bbb0728f189617319ee..8efefee3aae51c38fd3de8ed721cb0cef25a47f0 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_09.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_09.dump
@@ -1,12 +1,12 @@
 | +0&#ffffff0@74
 |"+0#0000e05&| |c|o|m@1|a|n|d| |-|>| |b|a|n|g| |-|>| |g|r|o|u|p| |"+0#e000002&|!|f|o@1|g|r|o|u|p|!|"| +0#0000000&@35
-|a+0#af5f00255&|u|t|o|c|m|d|!|!+0#0000000&|f|o@1|g|r|o|u|p|!| @56
+|a+0#af5f00255&|u|t|o|c|m|d|!|!+0#0000001#ffff4012|f|o@1|g|r|o|u|p|!| +0#0000000#ffffff0@56
 |"+0#0000e05&| |c|o|m@1|a|n|d| |-|>| |b|a|n|g| |-|>| |g|r|o|u|p| |"+0#e000002&|f|o@1|g|r|o|u|p|"| +0#0000000&@37
-|a+0#af5f00255&|u|t|o|c|m|d|!|f+0#0000000&|o@1|g|r|o|u|p| @58
+|a+0#af5f00255&|u|t|o|c|m|d|!|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0@58
 >"+0#0000e05&| |c|o|m@1|a|n|d| |-|>| |b|a|n|g| |-|>| |e|v|e|n|t| +0#0000000&@48
 |a+0#af5f00255&|u|t|o|c|m|d|!|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@59
 |"+0#0000e05&| |c|o|m@1|a|n|d| |-|>| |b|a|n|g| |-|>| |u|s|e|r| |e|v|e|n|t| +0#0000000&@43
-|a+0#af5f00255&|u|t|o|c|m|d|!|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @53
+|a+0#af5f00255&|u|t|o|c|m|d|!|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@53
 @75
 |"+0#0000e05&| +0#0000000&|F+0#0000001#ffff4012|I|X|M|E|:+0#e000e06#ffffff0| +0#0000e05&|"|*|"| |a|n|d| |"+0#e000002&|B|u|f|R|e|a|d|"| +0#0000e05&|a|r|e| |v|a|l|i|d| |g|r|o|u|p| |n|a|m|e|s|,| |h|o|w|e|v|e|r|,| |:|h|e|l|p| |:|a|u|g|r|o|u|p| +0#0000000&@1
 |"+0#0000e05&| |e|x|p|l|i|c|i|t|l|y| |d|i|r|e|c|t|s| |t|h|e| |u|s|e|r| |N|O|T| |t|o| |s|h|a|d|o|w| |e|v|e|n|t| |n|a|m|e|s| +0#0000000&@19

diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_10.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_10.dump
index 9765796456726a01bfc8d2bc324f13d0bebcc386..b35de96498896268b6702f5082727653e33768e8 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_10.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_10.dump
@@ -1,17 +1,17 @@
 |"+0#0000e05#ffffff0| |L|i|s|t| +0#0000000&@68
 @75
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| @38
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| @38
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@6|*+0#e000e06&|.+0#0000000&|t|x|t| @38
 @75
->a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |*+0#00e0003&| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @50
+>a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|*+0#00e0003&| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @50
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|*+0#00e0003&| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @50
 @75
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@50
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@50
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@50
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @44
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @44
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@44
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@9|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@44
 @75
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| @58
+|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0@58
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@67
 @75
 @75

diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_11.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_11.dump
index a8b594c25f1b5627eded174fe53a0e7f1f79ce32..6a71d9d04901fc589d4b7e95bbcd6d2fde5d698b 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_11.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_11.dump
@@ -2,19 +2,19 @@
 |d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@57
 @75
 |d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @51
-|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@48
+|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@48
 >d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@44
 @75
-|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @29
+|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @29
 @75
-|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @51
-|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @42
-|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @38
+|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@51
+|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@42
+|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@38
 @75
-|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @29
+|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@29
 @75
-|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16
-|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@19
+|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16
+|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@19
 @75
 @75
 @57|1|7|9|,|1| @8|7|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_12.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_12.dump
index b4513f1074020d7892aee19cfd20be8942cabd4a..971dc181e6cdb03c988207faef0d23a681d3eb3a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_12.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_12.dump
@@ -4,17 +4,17 @@
 |d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@57
 @75
 >d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @51
-|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@48
+|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@48
 |d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&@44
 @75
-|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @29
+|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @29
 @75
-|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @51
-|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t|,|B|a|r|E|v|e|n|t| @42
-|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @42
-|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @38
+|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@51
+|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t|,+0#0000000&|B+0#e000e06&|a|r|E|v|e|n|t| +0#0000000&@42
+|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@42
+|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@38
 @75
-|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |U+0#00e0003&|s|e|r| +0#0000000&|F|o@1|E|v|e|n|t| @29
+|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|U+0#00e0003&|s|e|r| +0#0000000&|F+0#e000e06&|o@1|E|v|e|n|t| +0#0000000&@29
 @75
-|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16
+|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16
 @57|1|9|7|,|1| @8|8|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_autocmd_13.dump b/runtime/syntax/testdir/dumps/vim_ex_autocmd_13.dump
index 130476ff4c3ad46499e18d2d7d497472b83734c1..1d2ecbfaf5313aa43c34c894d06a4fc0ed381118 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_autocmd_13.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_autocmd_13.dump
@@ -1,8 +1,8 @@
-|d+0#af5f00255#ffffff0|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16
-|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f|o@1|g|r|o|u|p| |B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| ||| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@17
+|d+0#af5f00255#ffffff0|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@16
+|d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&|<+0#e000e06&|n|o|m|o|d|e|l|i|n|e|>| +0#0000000&|f+0#0000001#ffff4012|o@1|g|r|o|u|p| +0#0000000#ffffff0|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| ||| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@17
 @75
 @75
-|"+0#0000e05&| |p|a|t@1|e|r|n|s| +0#0000000&@64
+|"+0#0000e05&| |P|a|t@1|e|r|n|s| +0#0000000&@64
 > @74
 |a+0#af5f00255&|u| +0#0000000&|B+0#00e0003&|u|f|R|e|a|d| +0#0000000&|*+0#e000e06&|/+0#0000000&|*+0#e000e06&|.+0#0000000&|t|x|t| @56
 @75

diff --git a/runtime/syntax/testdir/dumps/vim_ex_behave_00.dump b/runtime/syntax/testdir/dumps/vim_ex_behave_00.dump
index b3c57de6f349aa062382e82f3329a5b273aaff8e..3b90d8c96392ac6c13e793fd835961076ac1788a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_behave_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_behave_00.dump
@@ -1,10 +1,12 @@
->"+0#0000e05#ffffff0| |V|i|m| |b|e|h|a|v|e| |c|o|m@1|a|n|d| +0#0000000&@54
+>"+0#0000e05#ffffff0| |V|i|m| |:|b|e|h|a|v|e| |c|o|m@1|a|n|d| +0#0000000&@53
+@75
 @75
 |b+0#af5f00255&|e|h|a|v|e| +0#0000000&|m+0#af5f00255&|s|w|i|n| +0#0000000&@62
 |b+0#af5f00255&|e|h|a|v|e| +0#0000000&|x+0#af5f00255&|t|e|r|m| +0#0000000&@62
 @75
 |b+0#af5f00255&|e|h|a|v|e|!| +0#0000000&|m+0#af5f00255&|s|w|i|n| +0#0000000&@61
 |b+0#af5f00255&|e|h|a|v|e|!| +0#0000000&|x+0#af5f00255&|t|e|r|m| +0#0000000&@61
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
@@ -15,6 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-|~| @73
 | +0#0000000&@56|1|,|1| @10|A|l@1| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_call_00.dump b/runtime/syntax/testdir/dumps/vim_ex_call_00.dump
index 117f159ddef196025fdf08bc489502b06db670bf..13fdb02e2c01f01a1df8e18d0a60d3937fae8fce 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_call_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_call_00.dump
@@ -1,7 +1,7 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|c|a|l@1| |c|o|m@1|a|n|d| +0#0000000&@55
 @75
 @75
-|"+0#0000e05&| |f|u|n|c|t|i|o|n|s| |f|o|r| |w|h|i|c|h| |t|h|e|r|e| |a|r|e| |s|a|m|e|-|n|a|m|e|d| |E|x| |c|o|m@1|a|n|d|s| +0#0000000&@20
+|"+0#0000e05&| |F|u|n|c|t|i|o|n|s| |w|i|t|h| |s|a|m|e|-|n|a|m|e|d| |E|x| |c|o|m@1|a|n|d|s| +0#0000000&@35
 @75
 |c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|r|o|w|s|e|(+0#e000e06&|s+0#00e0e07&|a|v|e|,+0#0000000&| |t+0#00e0e07&|i|t|l|e|,+0#0000000&| |i+0#00e0e07&|n|i|t|d|i|r|,+0#0000000&| |d+0#00e0e07&|e|f|a|u|l|t|)+0#e000e06&| +0#0000000&@32
 |c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|a|l@1|(+0#e000e06&|f+0#00e0e07&|u|n|c|,+0#0000000&| |a+0#00e0e07&|r|g|l|i|s|t|,+0#0000000&| |d+0#00e0e07&|i|c|t|)+0#e000e06&| +0#0000000&@44

diff --git a/runtime/syntax/testdir/dumps/vim_ex_call_01.dump b/runtime/syntax/testdir/dumps/vim_ex_call_01.dump
index a32e79e5748ccd9fe5f3269b0096894b525a0b28..ddae2cca9c2a3aee40a29ce2e34720448a986522 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_call_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_call_01.dump
@@ -17,4 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|c+0#00e0e07&|o|p|y| +0#0000000&|(+0#e000e06&|e+0#00e0e07&|x|p|r|)+0#e000e06&| +0#0000000&@58
 |c+0#af5f00255&|a|l@1| +0#0000000&|d+0#00e0e07&|e|l|e|t|e| +0#0000000&|(+0#e000e06&|f+0#00e0e07&|n|a|m|e|,+0#0000000&| |f+0#00e0e07&|l|a|g|s|)+0#e000e06&| +0#0000000&@48
 |c+0#af5f00255&|a|l@1| +0#0000000&|e+0#00e0e07&|v|a|l| +0#0000000&|(+0#e000e06&|s+0#00e0e07&|t|r|i|n|g|)+0#e000e06&| +0#0000000&@56
-@57|1|9|,|1| @9|4|0|%| 
+@57|1|9|,|1| @9|3|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_call_02.dump b/runtime/syntax/testdir/dumps/vim_ex_call_02.dump
index 73063048802d552c96a61db0629e7416929305e9..67f8905f21c7219299c2a3e5266dd1cd8a1f5390 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_call_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_call_02.dump
@@ -17,4 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|a+0#00e0e07&|r|g|1|,+0#0000000&| |a+0#00e0e07&|r|g|2|)+0#e000e06&| +0#0000000&@54
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|r+0#00e0e07&|e|s| +0#0000000&|=+0#af5f00255&| +0#0000000&|c+0#00e0e07&|a|l@1|(+0#e000e06&|f+0#00e0e07&|u|n|c|,+0#0000000&| |a+0#00e0e07&|r|g|l|i|s|t|,+0#0000000&| |d+0#00e0e07&|i|c|t|)+0#e000e06&| +0#0000000&@39
-@57|3|7|,|1| @9|9|6|%| 
+@57|3|7|,|1| @9|9|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_call_03.dump b/runtime/syntax/testdir/dumps/vim_ex_call_03.dump
index 857f319affcab8d5e88f08de8da4ed51a11b97ca..6669a0a7ac36879d1e38f6a3531a50db9cf55151 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_call_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_call_03.dump
@@ -1,5 +1,6 @@
 |l+0#af5f00255#ffffff0|e|t| +0#0000000&|r+0#00e0e07&|e|s| +0#0000000&|=+0#af5f00255&| +0#0000000&|c+0#00e0e07&|a|l@1|(+0#e000e06&|f+0#00e0e07&|u|n|c|,+0#0000000&| |a+0#00e0e07&|r|g|l|i|s|t|,+0#0000000&| |d+0#00e0e07&|i|c|t|)+0#e000e06&| +0#0000000&@39
->l+0#af5f00255&|e|t| +0#0000000&|r+0#00e0e07&|e|s| +0#0000000&|=+0#af5f00255&| +0#0000000&|c+0#00e0e07&|a|l@1| +0#0000000&|(+0#e000e06&|f+0#00e0e07&|u|n|c|,+0#0000000&| |a+0#00e0e07&|r|g|l|i|s|t|,+0#0000000&| |d+0#00e0e07&|i|c|t|)+0#e000e06&| +0#0000000&@38
+|l+0#af5f00255&|e|t| +0#0000000&|r+0#00e0e07&|e|s| +0#0000000&|=+0#af5f00255&| +0#0000000&|c+0#00e0e07&|a|l@1| +0#0000000&|(+0#e000e06&|f+0#00e0e07&|u|n|c|,+0#0000000&| |a+0#00e0e07&|r|g|l|i|s|t|,+0#0000000&| |d+0#00e0e07&|i|c|t|)+0#e000e06&| +0#0000000&@38
+> @74
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
@@ -16,5 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-| +0#0000000&@56|5|1|,|1| @9|B|o|t| 
+| +0#0000000&@56|5|2|,|0|-|1| @7|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_catch_00.dump b/runtime/syntax/testdir/dumps/vim_ex_catch_00.dump
index 748c48b820ba0a09385286089f439f1680a0dc62..de76e72a25a08461c62a6f44f285c24bfaeb519c 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_catch_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_catch_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|c|a|t|c|h| |c|o|m@1|a|n|d| +0#0000000&@54
 @75
+@75
 |"+0#0000e05&| |:|h|e|l|p| |:|c|a|t|c|h| +0#0000000&@60
 @75
 |c+0#af5f00255&|a|t|c|h| +0#0000000&|/+0#e000e06&|^+0#0000000&|V|i|m|:|I|n|t|e|r@1|u|p|t|$|/+0#e000e06&| +0#0000000&@8|"+0#0000e05&| |c|a|t|c|h| |i|n|t|e|r@1|u|p|t|s| |(|C|T|R|L|-|C|)| +0#0000000&@15
@@ -15,6 +16,5 @@
 @75
 |t+0#af5f00255&|r|y| +0#0000000&||| |s+0#af5f00255&|l|e@1|p| +0#0000000&|1+0#e000002&|0@1| +0#0000000&||| |c+0#af5f00255&|a|t|c|h| +0#0000000&|/+0#e000e06&|^+0#0000000&|V|i|m|:|I|n|t|e|r@1|u|p|t|$|/+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|n|d|t|r|y| +0#0000000&@24
 |t+0#af5f00255&|r|y| +0#0000000&||| |e+0#af5f00255&|d|i|t| +0#0000000&||| |c+0#af5f00255&|a|t|c|h| +0#0000000&|/+0#e000e06&|^+0#0000000&|V|i|m|(|e|d|i|t|)|:|E|\|d|\|+|/+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|e|r@1|o|r|"| +0#0000000&||| |e+0#af5f00255&|n|d|t|r|y| +0#0000000&@13
-|~+0#4040ff13&| @73
-|~| @73
-| +0#0000000&@56|1|,|1| @10|A|l@1| 
+@75
+@57|1|,|1| @10|A|l@1| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_00.dump b/runtime/syntax/testdir/dumps/vim_ex_command_00.dump
index e782ad02ba6af714fbd962e6a8f0fb1fef5c5d89..8ddf51eff5a38608a991e0a9ca9be9cca0cdb45a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_command_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_command_00.dump
@@ -1,15 +1,15 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|c|o|m@1|a|n|d|,| |:|d|e|l|c|o|m@1|a|n|d| |a|n|d| |:|c|o|m|c|l|e|a|r| |c|o|m@1|a|n|d|s| +0#0000000&@24
-|"+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|C|m|d|N|a|m|e| |T|o|d|o| +0#0000000&@23
-|"+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|D|e|l|c|o|m@1|a|n|d|N|a|m|e| |T|o|d|o| +0#0000000&@20
+|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|U|s|e|r|C|m|d|N|a|m|e| |T|o|d|o| +0#0000000&@30
+|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|D|e|l|c|o|m@1|a|n|d|N|a|m|e| |T|o|d|o| +0#0000000&@27
 @75
 @75
-|"+0#0000e05&| |l|i|s|t| +0#0000000&@68
+|"+0#0000e05&| |L|i|s|t| +0#0000000&@68
 @75
 |c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&@67
 |c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|F+0#0000001#ffff4012| +0#0000000#ffffff0@65
 @75
 @75
-|"+0#0000e05&| |d|e|f|i|n|e| +0#0000000&@66
+|"+0#0000e05&| |D|e|f|i|n|e| +0#0000000&@66
 @75
 |c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&@1|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@51
 |c+0#af5f00255&|o|m@1|a|n|d|!| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@51

diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_03.dump b/runtime/syntax/testdir/dumps/vim_ex_command_03.dump
index a0478b8fde8947c1c5544ad8c6f1998de416e355..d26554748d2fe1db0c211bd261ea9a5c45b19401 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_command_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_command_03.dump
@@ -9,7 +9,7 @@
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
 @75
 @75
-|"+0#0000e05&| |m|u|l|t|i|l|i|n|e| |d|e|f|i|n|e| +0#0000000&@56
+|"+0#0000e05&| |M|u|l|t|i|l|i|n|e| |d|e|f|i|n|e| +0#0000000&@56
 @75
 |c+0#af5f00255&|o|m@1|a|n|d|!| +0#0000000&|-+0#e000e06&|a|d@1|r|=|l+0#00e0003&|i|n|e|s| +0#0000000&@54
 @6|\+0#e000e06&| +0#0000000&|-+0#e000e06&|b|a|n|g| +0#0000000&@61

diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_06.dump b/runtime/syntax/testdir/dumps/vim_ex_command_06.dump
index d61480c46e6c4fcddd435155b25900dea866880f..f2d6966bbd0eeb032b6b55a49f24c0940cf44fcc 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_command_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_command_06.dump
@@ -14,7 +14,7 @@
 @6|\+0#e000e06&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|B|a|r|"| +0#0000000&@56
 @75
 @75
-|"+0#0000e05&| |e|r@1|o|r|s| +0#0000000&@66
+|"+0#0000e05&| |E|r@1|o|r|s| +0#0000000&@66
 @75
 |c+0#af5f00255&|o|m@1|a|n|d|!| +0#0000000&|-+0#ffffff16#ff404010|b|a|d|a|t@1|r|=+0#0000000#ffffff0|a|r|g|u|m|e|n|t|s| |-+0#e000e06&|b|a|n|g| +0#0000000&|-+0#ffffff16#ff404010|b|a|d|a|t@1|r| +0#0000000#ffffff0|-+0#e000e06&|n|a|r|g|s|=|*+0#00e0003&| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@8
 @57|1|0|4|,|7| @8|6|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_07.dump b/runtime/syntax/testdir/dumps/vim_ex_command_07.dump
index 312f5198bb6c387552adbde2a1367680021bf239..a9f3d4bc5ce13c8825d9d5ab52c42cef8270eeff 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_command_07.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_command_07.dump
@@ -1,7 +1,7 @@
 |c+0#af5f00255#ffffff0|o|m@1|a|n|d|!| +0#0000000&|-+0#ffffff16#ff404010|b|a|d|a|t@1|r|=+0#0000000#ffffff0|a|r|g|u|m|e|n|t|s| |-+0#e000e06&|b|a|n|g| +0#0000000&|-+0#ffffff16#ff404010|b|a|d|a|t@1|r| +0#0000000#ffffff0|-+0#e000e06&|n|a|r|g|s|=|*+0#00e0003&| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@8
 @75
 @75
-|"+0#0000e05&| |d|e|l|e|t|e| +0#0000000&@66
+|"+0#0000e05&| |D|e|l|e|t|e| +0#0000000&@66
 @75
 >d+0#af5f00255&|e|l|c|o|m@1|a|n|d| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0@60
 |d+0#af5f00255&|e|l|c|o|m@1|a|n|d| +0#0000000&|-+0#e000e06&|b|u|f@1|e|r| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0@52

diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_00.dump b/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_00.dump
index f61fadb15424d12747afbc5240358b4242e597b7..a6984d4c223b8265769f70a4cb3dffd226d0d9c0 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_command_modifiers_00.dump
@@ -1,4 +1,4 @@
->"+0#0000e05#ffffff0| |V|i|m| |e|x| |c|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@48
+>"+0#0000e05#ffffff0| |V|i|m| |E|x| |c|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@48
 @75
 @75
 @1|a+0#af5f00255&|b|o|v|e|l|e|f|t| +0#0000000&@7|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@46

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_00.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_00.dump
index ec359f92594e92abc1d8c065d0622a0050727be9..1818e0f9f8efe14f1ca1c385776b23bfde0ea527 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |E|x| |c|o|m@1|a|n|d|s| +0#0000000&@61
 @75
+@75
 |"+0#0000e05&| |S|T|A|R|T| |N|O|T| |M|A|T|C|H|E|D| +0#0000000&@55
 |:|@| @72
 |:|@+0#e000e06&@1| +0#0000000&@71
@@ -16,5 +17,4 @@
 |:+0#af5f00255&|a|p@1|e|n|d| +0#0000000&@67
 | +0#e000002&@3|t|e|x|t| +0#0000000&@66
 |.+0#af5f00255&| +0#0000000&@73
-|:|a+0#af5f00255&|b@1|r|e|v|i|a|t|e| +0#0000000&@63
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_01.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_01.dump
index f5c6471a05d34b9724e26c87a85b31568716a43b..45e5149cdb099e796753575d1a3f4dac9c0977d1 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_01.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0|:+0#af5f00255&| +0#0000000&|h+0#00e0e07&|e|l|p| +0#0000000&|#| |F|I|X|M|E| @59
+|:+0&#ffffff0| |h+0#af5f00255&|e|l|p| +0#0000000&@68
+@1|:+0#af5f00255&| +0#0000000&|h+0#00e0e07&|e|l|p| +0#0000000&|#| |F|I|X|M|E| @59
 @75
 |:+0#af5f00255&|a|p@1|e|n|d| +0#0000000&@67
 | +0#e000002&@3|t|e|x|t| +0#0000000&@66
-|.+0#af5f00255&| +0#0000000&@73
->:|a+0#af5f00255&|b@1|r|e|v|i|a|t|e| +0#0000000&@63
+>.+0#af5f00255&| +0#0000000&@73
+|:|a+0#af5f00255&|b@1|r|e|v|i|a|t|e| +0#0000000&@63
 |:|a+0#af5f00255&|b|c|l|e|a|r| +0#0000000&@66
 |:|a+0#af5f00255&|b|o|v|e|l|e|f|t| +0#0000000&@64
 |:|a+0#af5f00255&|l@1| +0#0000000&@70
@@ -16,5 +17,4 @@
 |:|a+0#af5f00255&|r|g|e|d|i|t| +0#0000000&@66
 |:|a+0#af5f00255&|r|g|d|o| +0#0000000&@68
 |:|a+0#af5f00255&|r|g@1|l|o|b|a|l| +0#0000000&@64
-|:|a+0#af5f00255&|r|g|l|o|c|a|l| +0#0000000&@65
 @57|1|9|,|1| @10|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_02.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_02.dump
index 2fb09df41eddf6ec6a490ac91c5b4a402d5e29d8..98b142a75b3656fbbcd480a5d5decc44bb56c11a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_02.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|a+0#af5f00255&|r|g|l|o|c|a|l| +0#0000000&@65
+|:+0&#ffffff0|a+0#af5f00255&|r|g@1|l|o|b|a|l| +0#0000000&@64
+|:|a+0#af5f00255&|r|g|l|o|c|a|l| +0#0000000&@65
 |:|a+0#af5f00255&|r|g|u|m|e|n|t| +0#0000000&@65
 |:|a+0#af5f00255&|s|c|i@1| +0#0000000&@68
 |:|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&@66
-|:|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|F|o@1| @62
->:|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|E|N|D| @62
+>:|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|F|o@1| @62
+|:|a+0#af5f00255&|u|g|r|o|u|p| +0#0000000&|E|N|D| @62
 |:|a+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
 |:|b+0#af5f00255&|u|f@1|e|r| +0#0000000&@67
 |:|b+0#af5f00255&|N|e|x|t| +0#0000000&@68
@@ -16,5 +17,4 @@
 |:|b+0#af5f00255&|e|l|o|w|r|i|g|h|t| +0#0000000&@63
 |:|b+0#af5f00255&|f|i|r|s|t| +0#0000000&@67
 |:|b+0#af5f00255&|l|a|s|t| +0#0000000&@68
-|:|b+0#af5f00255&|m|o|d|i|f|i|e|d| +0#0000000&@64
 @57|3|7|,|1| @10|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_03.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_03.dump
index 1cb1136bb45f378627ece4b172f4cdd0118ca347..fcedbfe3cc3ed084b0f6aed31e571d38dca7ac5c 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_03.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|b+0#af5f00255&|m|o|d|i|f|i|e|d| +0#0000000&@64
+|:+0&#ffffff0|b+0#af5f00255&|l|a|s|t| +0#0000000&@68
+|:|b+0#af5f00255&|m|o|d|i|f|i|e|d| +0#0000000&@64
 |:|b+0#af5f00255&|n|e|x|t| +0#0000000&@68
 |:|b+0#af5f00255&|o|t|r|i|g|h|t| +0#0000000&@65
 |:|b+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64
-|:|b+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66
->:|b+0#af5f00255&|r|e|a|k| +0#0000000&@68
+>:|b+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66
+|:|b+0#af5f00255&|r|e|a|k| +0#0000000&@68
 |:|b+0#af5f00255&|r|e|a|k|a|d@1| +0#0000000&@65
 |:|b+0#af5f00255&|r|e|a|k|d|e|l| +0#0000000&@65
 |:|b+0#af5f00255&|r|e|a|k|l|i|s|t| +0#0000000&@64
@@ -16,5 +17,4 @@
 | +0#e000002&@3|t|e|x|t| +0#0000000&@66
 |.+0#af5f00255&| +0#0000000&@73
 |:|c+0#af5f00255&|N|e|x|t| +0#0000000&@68
-|:|c+0#af5f00255&|N|f|i|l|e| +0#0000000&@67
 @57|5@1|,|1| @10|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_04.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_04.dump
index 4d514b0cc22a7851c90f21b9bca9f2c2aa8d6581..2a4372e58f3ca645ae2a4ea9da811781ace80917 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_04.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|c+0#af5f00255&|N|f|i|l|e| +0#0000000&@67
+|:+0&#ffffff0|c+0#af5f00255&|N|e|x|t| +0#0000000&@68
+|:|c+0#af5f00255&|N|f|i|l|e| +0#0000000&@67
 |:|c+0#af5f00255&|a|b@1|r|e|v| +0#0000000&@66
 |:|c+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&@65
 |:|c+0#af5f00255&|a|b|o|v|e| +0#0000000&@67
-|:|c+0#af5f00255&|a|d@1|b|u|f@1|e|r| +0#0000000&@63
->:|c+0#af5f00255&|a|d@1|e|x|p|r| +0#0000000&@65
+>:|c+0#af5f00255&|a|d@1|b|u|f@1|e|r| +0#0000000&@63
+|:|c+0#af5f00255&|a|d@1|e|x|p|r| +0#0000000&@65
 |:|c+0#af5f00255&|a|d@1|f|i|l|e| +0#0000000&@65
 |:|c+0#af5f00255&|a|f|t|e|r| +0#0000000&@67
 |:|c+0#af5f00255&|a|l@1| +0#0000000&@69
@@ -16,5 +17,4 @@
 |:|c+0#af5f00255&@1|l|o|s|e| +0#0000000&@67
 |:|c+0#af5f00255&|d| +0#0000000&@71
 |:|c+0#af5f00255&|d|o| +0#0000000&@70
-|:|c+0#af5f00255&|f|d|o| +0#0000000&@69
 @57|7|3|,|1| @10|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_05.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_05.dump
index b20ef99952681b34fccb12caa4a809f5bd70b8c9..8c9b77acd601038ec51ab0b6ec73f0ed21446a07 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_05.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_05.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|c+0#af5f00255&|f|d|o| +0#0000000&@69
+|:+0&#ffffff0|c+0#af5f00255&|d|o| +0#0000000&@70
+|:|c+0#af5f00255&|f|d|o| +0#0000000&@69
 |:|c+0#af5f00255&|e|n|t|e|r| +0#0000000&@67
 |:|c+0#af5f00255&|e|x|p|r| +0#0000000&@68
 |:|c+0#af5f00255&|f|i|l|e| +0#0000000&@68
-|:|c+0#af5f00255&|f|i|r|s|t| +0#0000000&@67
->:|c+0#af5f00255&|g|e|t|b|u|f@1|e|r| +0#0000000&@63
+>:|c+0#af5f00255&|f|i|r|s|t| +0#0000000&@67
+|:|c+0#af5f00255&|g|e|t|b|u|f@1|e|r| +0#0000000&@63
 |:|c+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@65
 |:|c+0#af5f00255&|g|e|t|f|i|l|e| +0#0000000&@65
 |:|c+0#af5f00255&|h|a|n|g|e|s| +0#0000000&@66
@@ -16,5 +17,4 @@
 |:|c+0#af5f00255&|l|i|s|t| +0#0000000&@68
 |:|c+0#af5f00255&|l|o|s|e| +0#0000000&@68
 |:|c+0#af5f00255&|m|a|p| +0#0000000&@69
-|:|c+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64
 @57|9|1|,|1| @10|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_06.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_06.dump
index 78eca017c3d1b9c9ad2c63f26b4cc12abda50003..368df373f9066e3cb6de3a53301761ee36949dcf 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_06.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|c+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64
+|:+0&#ffffff0|c+0#af5f00255&|m|a|p| +0#0000000&@69
+|:|c+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64
 |:|c+0#af5f00255&|m|e|n|u| +0#0000000&@68
 |:|c+0#af5f00255&|n|e|x|t| +0#0000000&@68
 |:|c+0#af5f00255&|n|e|w|e|r| +0#0000000&@67
-|:|c+0#af5f00255&|n|f|i|l|e| +0#0000000&@67
->:|c+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
+>:|c+0#af5f00255&|n|f|i|l|e| +0#0000000&@67
+|:|c+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
 |:|c+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&@62
 |:|c+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@64
 |:|c+0#af5f00255&|o|p|y| +0#0000000&@69
@@ -16,5 +17,4 @@
 |:|c+0#af5f00255&|o|n|f|i|r|m| +0#0000000&@66
 |:|c+0#af5f00255&|o|n|s|t| +0#0000000&@68
 |:|c+0#af5f00255&|o|p|e|n| +0#0000000&@68
-|:|c+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64
 @57|1|0|9|,|1| @9|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_07.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_07.dump
index 6909d76c5c7d635f1cc15fa737bea487f2f7f280..7507a133fac548166753f80d9bff1ce03c57b1e0 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_07.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_07.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|c+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64
+|:+0&#ffffff0|c+0#af5f00255&|o|p|e|n| +0#0000000&@68
+|:|c+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64
 |:|c+0#af5f00255&|p|f|i|l|e| +0#0000000&@67
 |:|c+0#af5f00255&|q|u|i|t| +0#0000000&@68
 |:|c+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66
-|:|c+0#af5f00255&|s|c|o|p|e| +0#0000000&@67
->:|c+0#af5f00255&|s|t|a|g| +0#0000000&@68
+>:|c+0#af5f00255&|s|c|o|p|e| +0#0000000&@67
+|:|c+0#af5f00255&|s|t|a|g| +0#0000000&@68
 |:|c+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
 |:|c+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&@64
 |:|c+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
@@ -16,5 +17,4 @@
 |:|d+0#af5f00255&|e|f|e|r| +0#0000000&@68
 |:|d+0#af5f00255&|e|l|c|o|m@1|a|n|d| +0#0000000&@63
 |:|d+0#af5f00255&|e|l|f|u|n|c|t|i|o|n| +0#0000000&@62
-|:|d+0#af5f00255&|e|l|m|a|r|k|s| +0#0000000&@65
 @57|1|2|7|,|1| @8|1|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_08.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_08.dump
index 1c708901bfb20ac06769d5594cd121c83fc21dbc..970062ec9d00cf73c5ab8d821d3d0dffc82f8ad9 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_08.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_08.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|d+0#af5f00255&|e|l|m|a|r|k|s| +0#0000000&@65
+|:+0&#ffffff0|d+0#af5f00255&|e|l|f|u|n|c|t|i|o|n| +0#0000000&@62
+|:|d+0#af5f00255&|e|l|m|a|r|k|s| +0#0000000&@65
 |:|d+0#af5f00255&|i|f@1|u|p|d|a|t|e| +0#0000000&@63
 |:|d+0#af5f00255&|i|f@1|g|e|t| +0#0000000&@66
 |:|d+0#af5f00255&|i|f@1|o|f@1| +0#0000000&@66
-|:|d+0#af5f00255&|i|f@1|p|a|t|c|h| +0#0000000&@64
->:|d+0#af5f00255&|i|f@1|p|u|t| +0#0000000&@66
+>:|d+0#af5f00255&|i|f@1|p|a|t|c|h| +0#0000000&@64
+|:|d+0#af5f00255&|i|f@1|p|u|t| +0#0000000&@66
 |:|d+0#af5f00255&|i|f@1|s|p|l|i|t| +0#0000000&@64
 |:|d+0#af5f00255&|i|f@1|t|h|i|s| +0#0000000&@65
 |:|d+0#af5f00255&|i|g|r|a|p|h|s| +0#0000000&@65
@@ -16,5 +17,4 @@
 |:|d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&@64
 |:|d+0#af5f00255&|p| +0#0000000&@71
 |:|d+0#af5f00255&|r|o|p| +0#0000000&@69
-|:|d+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66
 @57|1|4|5|,|1| @8|1@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_09.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_09.dump
index 416f05e8d8c187858fb39ee867bc8e72d30f9636..6a8def686944dd660ce0c5d243b63e11bb19ba67 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_09.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_09.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|d+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66
+|:+0&#ffffff0|d+0#af5f00255&|r|o|p| +0#0000000&@69
+|:|d+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66
 |:|d+0#af5f00255&|s|p|l|i|t| +0#0000000&@67
 |:|e+0#af5f00255&|d|i|t| +0#0000000&@69
 |:|e+0#af5f00255&|a|r|l|i|e|r| +0#0000000&@66
-|:|e+0#af5f00255&|c|h|o| +0#0000000&@69
->:|e+0#af5f00255&|c|h|o|c|o|n|s|o|l|e| +0#0000000&@62
+>:|e+0#af5f00255&|c|h|o| +0#0000000&@69
+|:|e+0#af5f00255&|c|h|o|c|o|n|s|o|l|e| +0#0000000&@62
 |:|e+0#af5f00255&|c|h|o|e|r@1| +0#0000000&@66
 |:|e+0#af5f00255&|c|h|o|h|l| +0#0000000&@67
 |:|e+0#af5f00255&|c|h|o|m|s|g| +0#0000000&@66
@@ -16,5 +17,4 @@
 |:|e+0#af5f00255&|n|d|i|f| +0#0000000&@68
 |:|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@67
 |:|e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@62
-|:|e+0#af5f00255&|n|d|t|r|y| +0#0000000&@67
 @57|1|6|3|,|1| @8|1|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_10.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_10.dump
index b226536cbb44b939a7baf7d2ce809316aeadf22a..2a6deef87f428f16d7a1242a5b6bedb833bf333f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_10.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_10.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|e+0#af5f00255&|n|d|t|r|y| +0#0000000&@67
+|:+0&#ffffff0|e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@62
+|:|e+0#af5f00255&|n|d|t|r|y| +0#0000000&@67
 |:|e+0#af5f00255&|n|d|w|h|i|l|e| +0#0000000&@65
 |:|e+0#af5f00255&|n|e|w| +0#0000000&@69
 |:|e+0#af5f00255&|v|a|l| +0#0000000&@69
-|:|e+0#af5f00255&|x| +0#0000000&@71
->:|e+0#af5f00255&|x|e|c|u|t|e| +0#0000000&@66
+>:|e+0#af5f00255&|x| +0#0000000&@71
+|:|e+0#af5f00255&|x|e|c|u|t|e| +0#0000000&@66
 |:|e+0#af5f00255&|x|i|t| +0#0000000&@69
 |:|e+0#af5f00255&|x|u|s|a|g|e| +0#0000000&@66
 |:|f+0#af5f00255&|i|l|e| +0#0000000&@69
@@ -16,5 +17,4 @@
 |:|f+0#af5f00255&|i|n|i|s|h| +0#0000000&@67
 |:|f+0#af5f00255&|i|r|s|t| +0#0000000&@68
 |:|f+0#af5f00255&|i|x|d|e|l| +0#0000000&@67
-|:|f+0#af5f00255&|o|l|d| +0#0000000&@69
 @57|1|8|1|,|1| @8|1|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_11.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_11.dump
index acd9f157f8eb422a646bceb2f85a6fdff2818eb0..a309127dcd07205a92ed02f2e984380434c89358 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_11.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_11.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|f+0#af5f00255&|o|l|d| +0#0000000&@69
+|:+0&#ffffff0|f+0#af5f00255&|i|x|d|e|l| +0#0000000&@67
+|:|f+0#af5f00255&|o|l|d| +0#0000000&@69
 |:|f+0#af5f00255&|o|l|d|c|l|o|s|e| +0#0000000&@64
 |:|f+0#af5f00255&|o|l|d@1|o@1|p|e|n| +0#0000000&@63
 |:|f+0#af5f00255&|o|l|d@1|o|c|l|o|s|e|d| +0#0000000&@61
-|:|f+0#af5f00255&|o|l|d|o|p|e|n| +0#0000000&@65
->:|f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@50
+>:|f+0#af5f00255&|o|l|d|o|p|e|n| +0#0000000&@65
+|:|f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@50
 |:|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&@65
 |:|g+0#af5f00255&|l|o|b|a|l|/|.+0#0000000&@2|/+0#af5f00255&| +0#0000000&@62
 |:|g+0#af5f00255&|o|t|o| +0#0000000&@69
@@ -16,5 +17,4 @@
 |:|h+0#af5f00255&|e|l|p|c|l|o|s|e| +0#0000000&@64
 |:|h+0#af5f00255&|e|l|p|f|i|n|d| +0#0000000&@65
 |:|h+0#af5f00255&|e|l|p|g|r|e|p| +0#0000000&@65
-|:|h+0#af5f00255&|e|l|p|t|a|g|s| +0#0000000&@65
 @57|1|9@1|,|1| @8|1|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_12.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_12.dump
index b84c2e70c4c72c56ba80b3710f55018a57e7078f..06203eb3fdca056fb7c7de6b5a022dcca899d6c2 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_12.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_12.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|h+0#af5f00255&|e|l|p|t|a|g|s| +0#0000000&@65
+|:+0&#ffffff0|h+0#af5f00255&|e|l|p|g|r|e|p| +0#0000000&@65
+|:|h+0#af5f00255&|e|l|p|t|a|g|s| +0#0000000&@65
 |:|h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&@64
 |:|h+0#af5f00255&|i|d|e| +0#0000000&@69
 |:|h+0#af5f00255&|i|s|t|o|r|y| +0#0000000&@66
-|:|h+0#af5f00255&|o|r|i|z|o|n|t|a|l| +0#0000000&@63
->:+0#af5f00255&|i|n|s|e|r|t| +0#0000000&@67
+>:|h+0#af5f00255&|o|r|i|z|o|n|t|a|l| +0#0000000&@63
+|:+0#af5f00255&|i|n|s|e|r|t| +0#0000000&@67
 | +0#e000002&@3|t|e|x|t| +0#0000000&@66
 |.+0#af5f00255&| +0#0000000&@73
 |:|i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&@66
@@ -16,5 +17,4 @@
 |:|i+0#af5f00255&|m|e|n|u| +0#0000000&@68
 |:|i+0#af5f00255&|m|p|o|r|t| +0#0000000&@67
 |:|i+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
-|:|i+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&@62
 @57|2|1|7|,|1| @8|1|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_13.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_13.dump
index 1338d1d5a8992abf29e125bd9fb0f047fddeef3b..a9e23fb2e89b81e6a5254c4d949e1476f906505e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_13.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_13.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|i+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&@62
+|:+0&#ffffff0|i+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
+|:|i+0#af5f00255&|n|o|r|e|a|b@1|r|e|v| +0#0000000&@62
 |:|i+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@64
 |:|i+0#af5f00255&|n|t|r|o| +0#0000000&@68
 |:|i+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66
-|:|i+0#af5f00255&|s|p|l|i|t| +0#0000000&@67
->:|i+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
+>:|i+0#af5f00255&|s|p|l|i|t| +0#0000000&@67
+|:|i+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
 |:|i+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&@64
 |:|i+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
 |:|j+0#af5f00255&|o|i|n| +0#0000000&@69
@@ -16,5 +17,4 @@
 |:|l+0#af5f00255&|N|e|x|t| +0#0000000&@68
 |:|l+0#af5f00255&|N|f|i|l|e| +0#0000000&@67
 |:|l+0#af5f00255&|i|s|t| +0#0000000&@69
-|:|l+0#af5f00255&|a|b|o|v|e| +0#0000000&@67
 @57|2|3|5|,|1| @8|1|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_14.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_14.dump
index a116f8f7dbd48bd41a35bf28dfb21fb222bd7ae2..26142ba6405f196c041ec66615db496de606f055 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_14.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_14.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|l+0#af5f00255&|a|b|o|v|e| +0#0000000&@67
+|:+0&#ffffff0|l+0#af5f00255&|i|s|t| +0#0000000&@69
+|:|l+0#af5f00255&|a|b|o|v|e| +0#0000000&@67
 |:|l+0#af5f00255&|a|d@1|e|x|p|r| +0#0000000&@65
 |:|l+0#af5f00255&|a|d@1|b|u|f@1|e|r| +0#0000000&@63
 |:|l+0#af5f00255&|a|d@1|f|i|l|e| +0#0000000&@65
-|:|l+0#af5f00255&|a|f|t|e|r| +0#0000000&@67
->:|l+0#af5f00255&|a|s|t| +0#0000000&@69
+>:|l+0#af5f00255&|a|f|t|e|r| +0#0000000&@67
+|:|l+0#af5f00255&|a|s|t| +0#0000000&@69
 |:|l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@65
 |:|l+0#af5f00255&|a|t|e|r| +0#0000000&@68
 |:|l+0#af5f00255&|b|e|f|o|r|e| +0#0000000&@66
@@ -16,5 +17,4 @@
 |:|l+0#af5f00255&|c|s|c|o|p|e| +0#0000000&@66
 |:|l+0#af5f00255&|d|o| +0#0000000&@70
 |:|l+0#af5f00255&|f|d|o| +0#0000000&@69
-|:|l+0#af5f00255&|e|f|t| +0#0000000&@69
 @57|2|5|3|,|1| @8|2|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_15.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_15.dump
index e6f82befb0efdf55746691558a8e3a11f226bb5c..08cf8f78919c8606edf533d0aaeaa5f6e51c3049 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_15.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_15.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|l+0#af5f00255&|e|f|t| +0#0000000&@69
+|:+0&#ffffff0|l+0#af5f00255&|f|d|o| +0#0000000&@69
+|:|l+0#af5f00255&|e|f|t| +0#0000000&@69
 |:|l+0#af5f00255&|e|f|t|a|b|o|v|e| +0#0000000&@64
 |:|l+0#af5f00255&|e|g|a|c|y| +0#0000000&@67
 |:|l+0#af5f00255&|e|t| +0#0000000&@70
-|:|l+0#af5f00255&|e|x|p|r| +0#0000000&@68
->:|l+0#af5f00255&|f|i|l|e| +0#0000000&@68
+>:|l+0#af5f00255&|e|x|p|r| +0#0000000&@68
+|:|l+0#af5f00255&|f|i|l|e| +0#0000000&@68
 |:|l+0#af5f00255&|f|i|r|s|t| +0#0000000&@67
 |:|l+0#af5f00255&|g|e|t|b|u|f@1|e|r| +0#0000000&@63
 |:|l+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@65
@@ -16,5 +17,4 @@
 |:|l+0#af5f00255&@1|a|s|t| +0#0000000&@68
 |:|l+0#af5f00255&@1|i|s|t| +0#0000000&@68
 |:|l+0#af5f00255&|m|a|k|e| +0#0000000&@68
-|:|l+0#af5f00255&|m|a|p| +0#0000000&@69
 @57|2|7|1|,|1| @8|2@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_16.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_16.dump
index 9ed31a0bb0d3b63a7a34fc635c5ccfb5f07a2637..a9a77266b78279a65fad365a782f8252ceb31adb 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_16.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_16.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|l+0#af5f00255&|m|a|p| +0#0000000&@69
+|:+0&#ffffff0|l+0#af5f00255&|m|a|k|e| +0#0000000&@68
+|:|l+0#af5f00255&|m|a|p| +0#0000000&@69
 |:|l+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64
 |:|l+0#af5f00255&|n|e|x|t| +0#0000000&@68
 |:|l+0#af5f00255&|n|e|w|e|r| +0#0000000&@67
-|:|l+0#af5f00255&|n|f|i|l|e| +0#0000000&@67
->:|l+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
+>:|l+0#af5f00255&|n|f|i|l|e| +0#0000000&@67
+|:|l+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
 |"+0#0000e05&| |:|l|o|a|d|k|e|y|m|a|p| |"| |d|i|s|a|b|l|e|d| |-| |r|u|n|s| |u|n|t|i|l| |E|O|F| +0#0000000&@33
 |:|l+0#af5f00255&|o|a|d|v|i|e|w| +0#0000000&@65
 |:|l+0#af5f00255&|o|c|k|m|a|r|k|s| +0#0000000&@64
@@ -16,5 +17,4 @@
 |:|l+0#af5f00255&|s| +0#0000000&@71
 |:|l+0#af5f00255&|t|a|g| +0#0000000&@69
 |:|l+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
-|:|l+0#af5f00255&|u|a| +0#0000000&@70
 @57|2|8|9|,|1| @8|2|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_17.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_17.dump
index 2210ad36895b812519c477a33a928c351ea0d57f..9f0186aaf6f842a064ffa208d5fdc8d224fed3c5 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_17.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_17.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|l+0#af5f00255&|u|a| +0#0000000&@70
+|:+0&#ffffff0|l+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
+|:|l+0#af5f00255&|u|a| +0#0000000&@70
 |:|l+0#af5f00255&|u|a|d|o| +0#0000000&@68
 |:|l+0#af5f00255&|u|a|f|i|l|e| +0#0000000&@66
 |:|l+0#af5f00255&|v|i|m|g|r|e|p| +0#0000000&@65
-|:|l+0#af5f00255&|v|i|m|g|r|e|p|a|d@1| +0#0000000&@62
->:|l+0#af5f00255&|w|i|n|d|o|w| +0#0000000&@66
+>:|l+0#af5f00255&|v|i|m|g|r|e|p|a|d@1| +0#0000000&@62
+|:|l+0#af5f00255&|w|i|n|d|o|w| +0#0000000&@66
 |:|m+0#af5f00255&|o|v|e| +0#0000000&@69
 |:|m+0#af5f00255&|a|r|k| +0#0000000&@69
 |:|m+0#af5f00255&|a|k|e| +0#0000000&@69
@@ -16,5 +17,4 @@
 |:|m+0#af5f00255&|e|s@1|a|g|e|s| +0#0000000&@65
 |:|m+0#af5f00255&|k|e|x|r|c| +0#0000000&@67
 |:|m+0#af5f00255&|k|s|e|s@1|i|o|n| +0#0000000&@64
-|:|m+0#af5f00255&|k|s|p|e|l@1| +0#0000000&@66
 @57|3|0|7|,|1| @8|2|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_18.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_18.dump
index e9d652e62f738f0f39c4efebab51f5f6f0e92ca9..ff65ca356babe26a8c78afb33a52e6c0161cbceb 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_18.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_18.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|m+0#af5f00255&|k|s|p|e|l@1| +0#0000000&@66
+|:+0&#ffffff0|m+0#af5f00255&|k|s|e|s@1|i|o|n| +0#0000000&@64
+|:|m+0#af5f00255&|k|s|p|e|l@1| +0#0000000&@66
 |:|m+0#af5f00255&|k|v|i|m|r|c| +0#0000000&@66
 |:|m+0#af5f00255&|k|v|i|e|w| +0#0000000&@67
 |:|m+0#af5f00255&|o|d|e| +0#0000000&@69
-|:|m+0#af5f00255&|z|s|c|h|e|m|e| +0#0000000&@65
->:|m+0#af5f00255&|z|f|i|l|e| +0#0000000&@67
+>:|m+0#af5f00255&|z|s|c|h|e|m|e| +0#0000000&@65
+|:|m+0#af5f00255&|z|f|i|l|e| +0#0000000&@67
 |:|n+0#af5f00255&|b|c|l|o|s|e| +0#0000000&@66
 |:|n+0#af5f00255&|b|k|e|y| +0#0000000&@68
 |:|n+0#af5f00255&|b|s|t|a|r|t| +0#0000000&@66
@@ -16,5 +17,4 @@
 |:|n+0#af5f00255&@1|o|r|e|m|e|n|u| +0#0000000&@64
 |:|n+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&@64
 |:|n+0#af5f00255&|o|r|e|m|a|p| +0#0000000&@66
-|:|n+0#af5f00255&|o|h|l|s|e|a|r|c|h| +0#0000000&@63
 @57|3|2|5|,|1| @8|2|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_19.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_19.dump
index 27e93bab5b9cdb1fca3037f28ed5a31cb38efb6a..2b91ce8c2736cff58edca4afc24d4283e55ce0ce 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_19.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_19.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|n+0#af5f00255&|o|h|l|s|e|a|r|c|h| +0#0000000&@63
+|:+0&#ffffff0|n+0#af5f00255&|o|r|e|m|a|p| +0#0000000&@66
+|:|n+0#af5f00255&|o|h|l|s|e|a|r|c|h| +0#0000000&@63
 |:|n+0#af5f00255&|o|r|e|a|b@1|r|e|v| +0#0000000&@63
 |:|n+0#af5f00255&|o|r|e|m|e|n|u| +0#0000000&@65
 |:|n+0#af5f00255&|o|r|m|a|l| +0#0000000&@67
-|:|n+0#af5f00255&|o|s|w|a|p|f|i|l|e| +0#0000000&@63
->:|n+0#af5f00255&|u|m|b|e|r| +0#0000000&@67
+>:|n+0#af5f00255&|o|s|w|a|p|f|i|l|e| +0#0000000&@63
+|:|n+0#af5f00255&|u|m|b|e|r| +0#0000000&@67
 |:|n+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
 |:|n+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
 |:|o+0#af5f00255&|l|d|f|i|l|e|s| +0#0000000&@65
@@ -16,5 +17,4 @@
 |:|o+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@64
 |:|o+0#af5f00255&|p|t|i|o|n|s| +0#0000000&@66
 |:|o+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
-|:|o+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
 @57|3|4|3|,|1| @8|2|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_20.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_20.dump
index 544d5a799a29bd1890129b25f8f707c033f28c0e..bf02f0157a3aa791d3e61cd025928162198e9d2f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_20.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_20.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|o+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
+|:+0&#ffffff0|o+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
+|:|o+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
 |:|o+0#af5f00255&|w|n|s|y|n|t|a|x| +0#0000000&@64
 |:|p+0#af5f00255&|a|c|k|a|d@1| +0#0000000&@66
 |:|p+0#af5f00255&|a|c|k|l|o|a|d|a|l@1| +0#0000000&@62
-|:|p+0#af5f00255&|c|l|o|s|e| +0#0000000&@67
->:|p+0#af5f00255&|e|d|i|t| +0#0000000&@68
+>:|p+0#af5f00255&|c|l|o|s|e| +0#0000000&@67
+|:|p+0#af5f00255&|e|d|i|t| +0#0000000&@68
 |:|p+0#af5f00255&|e|r|l| +0#0000000&@69
 |:|p+0#af5f00255&|r|i|n|t| +0#0000000&@68
 |:|p+0#af5f00255&|r|o|f|d|e|l| +0#0000000&@66
@@ -16,5 +17,4 @@
 |:|p+0#af5f00255&@1|o|p| +0#0000000&@69
 |:|p+0#af5f00255&|r|e|s|e|r|v|e| +0#0000000&@65
 |:|p+0#af5f00255&|r|e|v|i|o|u|s| +0#0000000&@65
-|:|p+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66
 @57|3|6|1|,|1| @8|2|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_21.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_21.dump
index 8a6b5f356487a4e9e6207c3cbdae1790009706bb..2ee8d6fbdcd71904ff8fec0f419735330a6ec33f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_21.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_21.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|p+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66
+|:+0&#ffffff0|p+0#af5f00255&|r|e|v|i|o|u|s| +0#0000000&@65
+|:|p+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@66
 |:|p+0#af5f00255&|t|a|g| +0#0000000&@69
 |:|p+0#af5f00255&|t|N|e|x|t| +0#0000000&@67
 |:|p+0#af5f00255&|t|f|i|r|s|t| +0#0000000&@66
-|:|p+0#af5f00255&|t|j|u|m|p| +0#0000000&@67
->:|p+0#af5f00255&|t|l|a|s|t| +0#0000000&@67
+>:|p+0#af5f00255&|t|j|u|m|p| +0#0000000&@67
+|:|p+0#af5f00255&|t|l|a|s|t| +0#0000000&@67
 |:|p+0#af5f00255&|t|n|e|x|t| +0#0000000&@67
 |:|p+0#af5f00255&|t|p|r|e|v|i|o|u|s| +0#0000000&@63
 |:|p+0#af5f00255&|t|r|e|w|i|n|d| +0#0000000&@65
@@ -16,5 +17,4 @@
 |:|p+0#af5f00255&|y|3|f|i|l|e| +0#0000000&@66
 |:|p+0#af5f00255&|y|t|h|o|n| +0#0000000&@67
 |:|p+0#af5f00255&|y|d|o| +0#0000000&@69
-|:|p+0#af5f00255&|y|f|i|l|e| +0#0000000&@67
 @57|3|7|9|,|1| @8|3|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_22.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_22.dump
index 9213c8b28e7664204295af9098072cd52b631ca6..376f35a219fb12462bd41a7834e918fe3bbf6c04 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_22.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_22.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|p+0#af5f00255&|y|f|i|l|e| +0#0000000&@67
+|:+0&#ffffff0|p+0#af5f00255&|y|d|o| +0#0000000&@69
+|:|p+0#af5f00255&|y|f|i|l|e| +0#0000000&@67
 |:|p+0#af5f00255&|y|x| +0#0000000&@70
 |:|p+0#af5f00255&|y|t|h|o|n|x| +0#0000000&@66
 |:|p+0#af5f00255&|y|x|d|o| +0#0000000&@68
-|:|p+0#af5f00255&|y|x|f|i|l|e| +0#0000000&@66
->:|q+0#af5f00255&|u|i|t| +0#0000000&@69
+>:|p+0#af5f00255&|y|x|f|i|l|e| +0#0000000&@66
+|:|q+0#af5f00255&|u|i|t| +0#0000000&@69
 |:|q+0#af5f00255&|u|i|t|a|l@1| +0#0000000&@66
 |:|q+0#af5f00255&|a|l@1| +0#0000000&@69
 |:|r+0#af5f00255&|e|a|d| +0#0000000&@69
@@ -16,5 +17,4 @@
 |:|r+0#af5f00255&|e|g|i|s|t|e|r|s| +0#0000000&@64
 |:|r+0#af5f00255&|e|s|i|z|e| +0#0000000&@67
 |:|r+0#af5f00255&|e|t|a|b| +0#0000000&@68
-|:|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@67
 @57|3|9|7|,|1| @8|3|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_23.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_23.dump
index 859440140c54160508fe7a493c2f49c83513b3fc..9c180652fd6db861dc5940097a776feb6de79d54 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_23.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_23.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@67
+|:+0&#ffffff0|r+0#af5f00255&|e|t|a|b| +0#0000000&@68
+|:|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@67
 |:|r+0#af5f00255&|e|w|i|n|d| +0#0000000&@67
 |:|r+0#af5f00255&|i|g|h|t| +0#0000000&@68
 |:|r+0#af5f00255&|i|g|h|t|b|e|l|o|w| +0#0000000&@63
-|:|r+0#af5f00255&|u|b|y| +0#0000000&@69
->:|r+0#af5f00255&|u|b|y|d|o| +0#0000000&@67
+>:|r+0#af5f00255&|u|b|y| +0#0000000&@69
+|:|r+0#af5f00255&|u|b|y|d|o| +0#0000000&@67
 |:|r+0#af5f00255&|u|b|y|f|i|l|e| +0#0000000&@65
 |:|r+0#af5f00255&|u|n|d|o| +0#0000000&@68
 |:|r+0#af5f00255&|u|n|t|i|m|e| +0#0000000&@66
@@ -16,5 +17,4 @@
 |:|s+0#af5f00255&|a|v|e|a|s| +0#0000000&@67
 |:|s+0#af5f00255&|b|u|f@1|e|r| +0#0000000&@66
 |:|s+0#af5f00255&|b|N|e|x|t| +0#0000000&@67
-|:|s+0#af5f00255&|b|a|l@1| +0#0000000&@68
 @57|4|1|5|,|1| @8|3|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_24.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_24.dump
index 5594625010ccda3f0578c1540cf2fa52cc83345c..1e45efe3c4eacfe0b6342e1b422a71ca5ede0bbe 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_24.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_24.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|s+0#af5f00255&|b|a|l@1| +0#0000000&@68
+|:+0&#ffffff0|s+0#af5f00255&|b|N|e|x|t| +0#0000000&@67
+|:|s+0#af5f00255&|b|a|l@1| +0#0000000&@68
 |:|s+0#af5f00255&|b|f|i|r|s|t| +0#0000000&@66
 |:|s+0#af5f00255&|b|l|a|s|t| +0#0000000&@67
 |:|s+0#af5f00255&|b|m|o|d|i|f|i|e|d| +0#0000000&@63
-|:|s+0#af5f00255&|b|n|e|x|t| +0#0000000&@67
->:|s+0#af5f00255&|b|p|r|e|v|i|o|u|s| +0#0000000&@63
+>:|s+0#af5f00255&|b|n|e|x|t| +0#0000000&@67
+|:|s+0#af5f00255&|b|p|r|e|v|i|o|u|s| +0#0000000&@63
 |:|s+0#af5f00255&|b|r|e|w|i|n|d| +0#0000000&@65
 |:|s+0#af5f00255&|c|r|i|p|t|n|a|m|e|s| +0#0000000&@62
 |:|s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&@59
@@ -16,5 +17,4 @@
 |:|s+0#af5f00255&|f|i|n|d| +0#0000000&@68
 |:|s+0#af5f00255&|f|i|r|s|t| +0#0000000&@67
 |:|s+0#af5f00255&|h|e|l@1| +0#0000000&@68
-|:|s+0#af5f00255&|i|m|a|l|t| +0#0000000&@67
 @57|4|3@1|,|1| @8|3|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_25.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_25.dump
index afc850c0fc1c19d362518da1a4f6af38c42357e5..2c6309378522622d882f220cb7e06e59fe819ea5 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_25.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_25.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|s+0#af5f00255&|i|m|a|l|t| +0#0000000&@67
+|:+0&#ffffff0|s+0#af5f00255&|h|e|l@1| +0#0000000&@68
+|:|s+0#af5f00255&|i|m|a|l|t| +0#0000000&@67
 |:|s+0#af5f00255&|i|g|n| +0#0000000&@69
 |:|s+0#af5f00255&|i|l|e|n|t| +0#0000000&@67
 |:|s+0#af5f00255&|l|e@1|p| +0#0000000&@68
-|:|s+0#af5f00255&|l|e@1|p|!| +0#0000000&@67
->:|s+0#af5f00255&|l|a|s|t| +0#0000000&@68
+>:|s+0#af5f00255&|l|e@1|p|!| +0#0000000&@67
+|:|s+0#af5f00255&|l|a|s|t| +0#0000000&@68
 |:|s+0#af5f00255&|m|a|g|i|c| +0#0000000&@67
 |:|s+0#af5f00255&|m|a|p| +0#0000000&@69
 |:|s+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64
@@ -16,5 +17,4 @@
 |:|s+0#af5f00255&|o|r|t| +0#0000000&@69
 |:|s+0#af5f00255&|o|u|r|c|e| +0#0000000&@67
 |:|s+0#af5f00255&|p|e|l@1|d|u|m|p| +0#0000000&@64
-|:|s+0#af5f00255&|p|e|l@1|g|o@1|d| +0#0000000&@64
 @57|4|5|1|,|1| @8|3|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_26.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_26.dump
index 052616f5d461ef7afa5bab91f5f4e3c212b4e109..147c58c75c4946be74e42a622d9bd4acc5d60b5d 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_26.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_26.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|s+0#af5f00255&|p|e|l@1|g|o@1|d| +0#0000000&@64
+|:+0&#ffffff0|s+0#af5f00255&|p|e|l@1|d|u|m|p| +0#0000000&@64
+|:|s+0#af5f00255&|p|e|l@1|g|o@1|d| +0#0000000&@64
 |:|s+0#af5f00255&|p|e|l@1|i|n|f|o| +0#0000000&@64
 |:|s+0#af5f00255&|p|e|l@1|r|a|r|e| +0#0000000&@64
 |:|s+0#af5f00255&|p|e|l@1|r|e|p|a|l@1| +0#0000000&@62
-|:|s+0#af5f00255&|p|e|l@1|u|n|d|o| +0#0000000&@64
->:|s+0#af5f00255&|p|e|l@1|w|r|o|n|g| +0#0000000&@63
+>:|s+0#af5f00255&|p|e|l@1|u|n|d|o| +0#0000000&@64
+|:|s+0#af5f00255&|p|e|l@1|w|r|o|n|g| +0#0000000&@63
 |:|s+0#af5f00255&|p|l|i|t| +0#0000000&@68
 |:|s+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64
 |:|s+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@66
@@ -16,5 +17,4 @@
 |:|s+0#af5f00255&|t|j|u|m|p| +0#0000000&@67
 |:|s+0#af5f00255&|t|s|e|l|e|c|t| +0#0000000&@65
 |:|s+0#af5f00255&|u|n|h|i|d|e| +0#0000000&@66
-|:|s+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
 @57|4|6|9|,|1| @8|3|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_27.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_27.dump
index 2761b3a6af99a77b632f1ff72da5bfb22c40294b..db85b31e87135948ae22dc3cbd7bff0cf08f02ff 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_27.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_27.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|s+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
+|:+0&#ffffff0|s+0#af5f00255&|u|n|h|i|d|e| +0#0000000&@66
+|:|s+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
 |:|s+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
 |:|s+0#af5f00255&|u|s|p|e|n|d| +0#0000000&@66
 |:|s+0#af5f00255&|v|i|e|w| +0#0000000&@68
-|:|s+0#af5f00255&|w|a|p|n|a|m|e| +0#0000000&@65
->:|s+0#af5f00255&|y|n|t|a|x| +0#0000000&@67
+>:|s+0#af5f00255&|w|a|p|n|a|m|e| +0#0000000&@65
+|:|s+0#af5f00255&|y|n|t|a|x| +0#0000000&@67
 |:|s+0#af5f00255&|y|n|t|i|m|e| +0#0000000&@66
 |:|s+0#af5f00255&|y|n|c|b|i|n|d| +0#0000000&@65
 |:|t+0#af5f00255&| +0#0000000&@72
@@ -16,5 +17,4 @@
 |:|t+0#af5f00255&|a|b|f|i|r|s|t| +0#0000000&@65
 |:|t+0#af5f00255&|a|b|l|a|s|t| +0#0000000&@66
 |:|t+0#af5f00255&|a|b|m|o|v|e| +0#0000000&@66
-|:|t+0#af5f00255&|a|b|n|e|w| +0#0000000&@67
 @57|4|8|7|,|1| @8|4|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_28.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_28.dump
index e7b8b0617c59965e9c0d857fa5b76fbab7ac8e64..5d1200e6cb41d95bb2b4c81e19b73ca7f668f3fa 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_28.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_28.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|t+0#af5f00255&|a|b|n|e|w| +0#0000000&@67
+|:+0&#ffffff0|t+0#af5f00255&|a|b|m|o|v|e| +0#0000000&@66
+|:|t+0#af5f00255&|a|b|n|e|w| +0#0000000&@67
 |:|t+0#af5f00255&|a|b|n|e|x|t| +0#0000000&@66
 |:|t+0#af5f00255&|a|b|o|n|l|y| +0#0000000&@66
 |:|t+0#af5f00255&|a|b|p|r|e|v|i|o|u|s| +0#0000000&@62
-|:|t+0#af5f00255&|a|b|r|e|w|i|n|d| +0#0000000&@64
->:|t+0#af5f00255&|a|b|s| +0#0000000&@69
+>:|t+0#af5f00255&|a|b|r|e|w|i|n|d| +0#0000000&@64
+|:|t+0#af5f00255&|a|b|s| +0#0000000&@69
 |:|t+0#af5f00255&|a|b| +0#0000000&@70
 |:|t+0#af5f00255&|a|g| +0#0000000&@70
 |:|t+0#af5f00255&|a|g|s| +0#0000000&@69
@@ -16,5 +17,4 @@
 |:|t+0#af5f00255&|e|r|m|i|n|a|l| +0#0000000&@65
 |:|t+0#af5f00255&|f|i|r|s|t| +0#0000000&@67
 |:|t+0#af5f00255&|h|r|o|w| +0#0000000&@68
-|:|t+0#af5f00255&|j|u|m|p| +0#0000000&@68
 @57|5|0|5|,|1| @8|4|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_29.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_29.dump
index 419f826214ea3af80faef762c290ed6585b9efd6..1b9117b388b32d9683d8efb5083da1ac0426b2fb 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_29.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_29.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|t+0#af5f00255&|j|u|m|p| +0#0000000&@68
+|:+0&#ffffff0|t+0#af5f00255&|h|r|o|w| +0#0000000&@68
+|:|t+0#af5f00255&|j|u|m|p| +0#0000000&@68
 |:|t+0#af5f00255&|l|a|s|t| +0#0000000&@68
 |:|t+0#af5f00255&|l|m|e|n|u| +0#0000000&@67
 |:|t+0#af5f00255&|l|n|o|r|e|m|e|n|u| +0#0000000&@63
-|:|t+0#af5f00255&|l|u|n|m|e|n|u| +0#0000000&@65
->:|t+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64
+>:|t+0#af5f00255&|l|u|n|m|e|n|u| +0#0000000&@65
+|:|t+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64
 |:|t+0#af5f00255&|m|a|p| +0#0000000&@69
 |:|t+0#af5f00255&|m|e|n|u| +0#0000000&@68
 |:|t+0#af5f00255&|n|e|x|t| +0#0000000&@68
@@ -16,5 +17,4 @@
 |:|t+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
 |:|t+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
 |:|u+0#af5f00255&|n|d|o| +0#0000000&@69
-|:|u+0#af5f00255&|n|d|o|j|o|i|n| +0#0000000&@65
 @57|5|2|3|,|1| @8|4|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_30.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_30.dump
index 19732cd6a3abe58d9eea35e58ed8e9217135442a..5bcbeef9af8e9a0a5bea730d78c92b431765e4b0 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_30.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_30.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|u+0#af5f00255&|n|d|o|j|o|i|n| +0#0000000&@65
+|:+0&#ffffff0|u+0#af5f00255&|n|d|o| +0#0000000&@69
+|:|u+0#af5f00255&|n|d|o|j|o|i|n| +0#0000000&@65
 |:|u+0#af5f00255&|n|d|o|l|i|s|t| +0#0000000&@65
 |:|u+0#af5f00255&|n|a|b@1|r|e|v|i|a|t|e| +0#0000000&@61
 |:|u+0#af5f00255&|n|a|b@1|r|e|v|i|a|t|e| +0#0000000&@61
-|:|u+0#af5f00255&|n|h|i|d|e| +0#0000000&@67
->:|u+0#af5f00255&|n|i|q| +0#0000000&@69
+>:|u+0#af5f00255&|n|h|i|d|e| +0#0000000&@67
+|:|u+0#af5f00255&|n|i|q| +0#0000000&@69
 |:|u+0#af5f00255&|n|l|e|t| +0#0000000&@68
 |:|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&@64
 |:|u+0#af5f00255&|n|m|a|p| +0#0000000&@68
@@ -16,5 +17,4 @@
 |:|v+0#af5f00255&|e|r|t|i|c|a|l| +0#0000000&@65
 |:|v+0#af5f00255&|i|m|9|c|m|d| +0#0000000&@66
 |:|v+0#af5f00255&|i|m|g|r|e|p| +0#0000000&@66
-|:|v+0#af5f00255&|i|m|g|r|e|p|a|d@1| +0#0000000&@63
 @57|5|4|1|,|1| @8|4@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_31.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_31.dump
index 2b109af95019bc21a99b724da20c2b67cd709855..5abc5ab7f43cd7f505afff70b1c598360877cd93 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_31.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_31.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|v+0#af5f00255&|i|m|g|r|e|p|a|d@1| +0#0000000&@63
+|:+0&#ffffff0|v+0#af5f00255&|i|m|g|r|e|p| +0#0000000&@66
+|:|v+0#af5f00255&|i|m|g|r|e|p|a|d@1| +0#0000000&@63
 |:|v+0#af5f00255&|i|s|u|a|l| +0#0000000&@67
 |:|v+0#af5f00255&|i|u|s|a|g|e| +0#0000000&@66
 |:|v+0#af5f00255&|i|e|w| +0#0000000&@69
-|:|v+0#af5f00255&|m|a|p| +0#0000000&@69
->:|v+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64
+>:|v+0#af5f00255&|m|a|p| +0#0000000&@69
+|:|v+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@64
 |:|v+0#af5f00255&|m|e|n|u| +0#0000000&@68
 |:|v+0#af5f00255&|n|e|w| +0#0000000&@69
 |:|v+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
@@ -16,5 +17,4 @@
 |:|w+0#af5f00255&|N|e|x|t| +0#0000000&@68
 |:|w+0#af5f00255&|a|l@1| +0#0000000&@69
 |:|w+0#af5f00255&|h|i|l|e| +0#0000000&@68
-|:|w+0#af5f00255&|i|n|s|i|z|e| +0#0000000&@66
 @57|5@1|9|,|1| @8|4|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_32.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_32.dump
index 79ecaafc5e073e378868dff06a6b35453315db62..8ec5f2f9a5ef0e452b6d28da1cdb8cd37a501e22 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_32.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_32.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|w+0#af5f00255&|i|n|s|i|z|e| +0#0000000&@66
+|:+0&#ffffff0|w+0#af5f00255&|h|i|l|e| +0#0000000&@68
+|:|w+0#af5f00255&|i|n|s|i|z|e| +0#0000000&@66
 |:|w+0#af5f00255&|i|n|c|m|d| +0#0000000&@67
 |:|w+0#af5f00255&|i|n|p|o|s| +0#0000000&@67
 |:|w+0#af5f00255&|n|e|x|t| +0#0000000&@68
-|:|w+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64
->:|w+0#af5f00255&|q| +0#0000000&@71
+>:|w+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@64
+|:|w+0#af5f00255&|q| +0#0000000&@71
 |:|w+0#af5f00255&|q|a|l@1| +0#0000000&@68
 |:|w+0#af5f00255&|u|n|d|o| +0#0000000&@68
 |:|w+0#af5f00255&|v|i|m|i|n|f|o| +0#0000000&@65
@@ -16,5 +17,4 @@
 |:|x+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@65
 |:|x+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@64
 |:|x+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
-|:|x+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
 @57|5|7@1|,|1| @8|4|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_33.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_33.dump
index 96730a652a42cf4c9821e485ef7d7e9f488a1b6c..cc321b4ecbea7bba458c61e25f7e3cd96003426a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_33.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_33.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|x+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
+|:+0&#ffffff0|x+0#af5f00255&|u|n|m|a|p| +0#0000000&@67
+|:|x+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@66
 |:|y+0#af5f00255&|a|n|k| +0#0000000&@69
 |:|z+0#af5f00255&| +0#0000000&@72
 @75
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)||+0#0000000&|h+0#af5f00255&|e|l|p| +0#0000000&@59
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p| +0#0000000&@57
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)||+0#0000000&|h+0#af5f00255&|e|l|p| +0#0000000&@59
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&|||h+0#af5f00255&|e|l|p| +0#0000000&@58
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)||+0#0000000&| |h+0#af5f00255&|e|l|p| +0#0000000&@58
 @75
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|b|o|v|e|l|e|f|t| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|l@1| +0#0000000&@58
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|m|e|n|u| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52
 @57|5|9|5|,|1| @8|4|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_34.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_34.dump
index d5b866a867e22e153d2cc9d7c038f77be7cd3aa5..bb2242efa28930c094acfc6234feb2e5938bdd25 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_34.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_34.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|m|e|n|u| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|s| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|a|d@1| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|d|e|d|u|p|e| +0#0000000&@52
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|d|e|l|e|t|e| +0#0000000&@52
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|e|d|i|t| +0#0000000&@54
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|d|e|l|e|t|e| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|e|d|i|t| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|d|o| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g@1|l|o|b|a|l| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |a+0#af5f00255&|r|g|l|o|c|a|l| +0#0000000&@53
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|N|e|x|t| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|a|l@1| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|a|d@1| +0#0000000&@57
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|a|l|t| +0#0000000&@57
-@57|6|1|3|,|1| @8|5|1|%| 
+@57|6|1|3|,|1| @8|5|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_35.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_35.dump
index 65f6ce69a88b65db3675a7f9c1dc22d12c4a1806..64447816b84b7b878e842cedac31ca23ab5b47be 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_35.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_35.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|a|l|t| +0#0000000&@57
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|a|d@1| +0#0000000&@57
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|a|l|t| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|d|e|l|e|t|e| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|e|h|a|v|e| +0#0000000&|m+0#af5f00255&|s|w|i|n| +0#0000000&@49
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|e|h|a|v|e| +0#0000000&|x+0#af5f00255&|t|e|r|m| +0#0000000&@49
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|e|l|o|w|r|i|g|h|t| +0#0000000&@51
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|f|i|r|s|t| +0#0000000&@55
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|e|l|o|w|r|i|g|h|t| +0#0000000&@51
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|f|i|r|s|t| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|l|a|s|t| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|m|o|d|i|f|i|e|d| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|n|e|x|t| +0#0000000&@56
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|r|e|a|k|l|i|s|t| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|r|o|w|s|e| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|f|d|o| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|f@1|e|r|s| +0#0000000&@54
 @57|6|3|1|,|1| @8|5|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_36.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_36.dump
index d3bba181e685d0df3325921b409932e9d48cbd60..b805d6e43b4bc6332c0bd6ccb67de481610a071e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_36.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_36.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|f@1|e|r|s| +0#0000000&@54
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|f|d|o| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|f@1|e|r|s| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|u|n|l|o|a|d| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |b+0#af5f00255&|w|i|p|e|o|u|t| +0#0000000&@53
 |"+0#0000e05&| |F+0#0000001#ffff4012|I|X|M|E| +0#0000000#ffffff0@67
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|a|n|g|e| +0#0000000&@55
-@4>t|e|x|t| @66
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|a|n|g|e| +0#0000000&@55
+@4|t|e|x|t| @66
 |.+0#af5f00255&| +0#0000000&@73
 |c+0#00e0e07&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|N|e|x|t| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|N|f|i|l|e| +0#0000000&@55
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|f|t|e|r| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|l@1| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|t|c|h| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|b|e|f|o|r|e| +0#0000000&@54
-@57|6|4|9|,|5| @8|5|4|%| 
+@57|6|4|9|,|1| @8|5|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_37.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_37.dump
index 89901bb829f5921c0362acd65da6b437da2c397c..739767ea0c49c8f626dc2515771d366eeaefbb8f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_37.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_37.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|b|e|f|o|r|e| +0#0000000&@54
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|a|t|c|h| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|b|e|f|o|r|e| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|b|e|l|o|w| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|b|o|t@1|o|m| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|b|u|f@1|e|r| +0#0000000&@54
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&@1| +0#0000000&@59
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&@1|l|o|s|e| +0#0000000&@55
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&@1| +0#0000000&@59
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&@1|l|o|s|e| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|d| +0#0000000&@59
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|d|o| +0#0000000&@58
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|f|d|o| +0#0000000&@57
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|g|e|t|f|i|l|e| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|a|n|g|e|s| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|d|i|r| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|e|c|k|p|a|t|h| +0#0000000&@52
 @57|6@1|7|,|1| @8|5@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_38.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_38.dump
index b739ed4b76b9254732ab9f4544ded1deff40fbe3..0ee37ba1dae0db323233cc26259aea74cca21542 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_38.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_38.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|e|c|k|p|a|t|h| +0#0000000&@52
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|d|i|r| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|e|c|k|p|a|t|h| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|e|c|k|t|i|m|e| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|h|i|s|t|o|r|y| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|a|s|t| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|e|a|r|j|u|m|p|s| +0#0000000&@51
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|i|s|t| +0#0000000&@56
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|e|a|r|j|u|m|p|s| +0#0000000&@51
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|i|s|t| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|l|o|s|e| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|m|a|p| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@52
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|p|y| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|l|d|e|r| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|l|o|r|s|c|h|e|m|e| +0#0000000&@50
 @57|6|8|5|,|1| @8|5|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_39.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_39.dump
index e610b4a3e999dec1ae2b3fb208eb349c5161bb73..71e0796dceacf365fd334ef37e1face1417fcf10 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_39.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_39.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|l|o|r|s|c|h|e|m|e| +0#0000000&@50
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|l|d|e|r| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|l|o|r|s|c|h|e|m|e| +0#0000000&@50
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|m|c|l|e|a|r| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|m|p|i|l|e|r| +0#0000000&@53
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|n|t|i|n|u|e| +0#0000000&@53
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|n|f|i|r|m| +0#0000000&@54
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|n|t|i|n|u|e| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|n|f|i|r|m| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|n|s|t| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|o|p|e|n| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@52
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|w|i|n|d|o|w| +0#0000000&@54
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|e|t|e| +0#0000000&@55
 @57|7|0|3|,|1| @8|5|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_40.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_40.dump
index 7a656b394e42a9cda69747304c473b26716fc3b7..1a5394dd173b56c1d6a06967c39bd8ba4cf1729d 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_40.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_40.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|e|t|e| +0#0000000&@55
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |c+0#af5f00255&|w|i|n|d|o|w| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|e|t|e| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|b|u|g| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@50
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f| +0#0000000&@58
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f|c|o|m|p|i|l|e| +0#0000000&@51
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f|e|r| +0#0000000&@56
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f|c|o|m|p|i|l|e| +0#0000000&@51
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|f|e|r| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|c|o|m@1|a|n|d| +0#0000000&@51
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|f|u|n|c|t|i|o|n| +0#0000000&@50
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|e|l|m|a|r|k|s| +0#0000000&@53
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|f@1|t|h|i|s| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|g|r|a|p|h|s| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|s|p|l|a|y| +0#0000000&@54
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|s|a|s@1|e|m|b|l|e| +0#0000000&@50
 @57|7|2|1|,|1| @8|6|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_41.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_41.dump
index 361dd438b6c3315fa4c53e16f25454194ca41de3..9586e555048535da150203997c118b50fc62a1c5 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_41.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_41.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|s|a|s@1|e|m|b|l|e| +0#0000000&@50
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|s|p|l|a|y| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|i|s|a|s@1|e|m|b|l|e| +0#0000000&@50
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|j|u|m|p| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|l| +0#0000000&@59
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|l|i|s|t| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&@52
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&@52
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|o|a|u|t|o|a|l@1| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|p| +0#0000000&@59
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|r|o|p| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |d+0#af5f00255&|s|e|a|r|c|h| +0#0000000&@54
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|h|l| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|m|s|g| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|n| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|w|i|n|d|o|w| +0#0000000&@51
 @57|7|3|9|,|1| @8|6|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_42.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_42.dump
index b6a36b168fcefdf4f2b4ba22327f7cda837b1f80..058fc102b7571af44ed0e0e8fb891ca346991194 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_42.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_42.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|w|i|n|d|o|w| +0#0000000&@51
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|n| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|c|h|o|w|i|n|d|o|w| +0#0000000&@51
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|l|s|e| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|l|s|e|i|f| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|m|e|n|u| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@55
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d|i|f| +0#0000000&@56
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d|i|f| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@50
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|n|d|t|r|y| +0#0000000&@55
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e+0#af5f00255&|x|u|s|a|g|e| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e|s| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e|t|y|p|e| +0#0000000&@53
 @57|7|5|7|,|1| @8|6|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_43.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_43.dump
index 2ab045baf37fcaa39d80f786eaa9c260229d7b4c..736510c9ae1838face9dbee4949b12dbfed83bce 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_43.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_43.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e|t|y|p|e| +0#0000000&@53
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e|s| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|e|t|y|p|e| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|l|t|e|r| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|d| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|a|l| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|a|l@1|y| +0#0000000&@54
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|i|s|h| +0#0000000&@55
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|a|l@1|y| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|i|s|h| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|r|s|t| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|x|d|e|l| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|o|l|d| +0#0000000&@57
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|l|o|b|a|l|/|.+0#0000000&@2|/+0#af5f00255&| +0#0000000&@50
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|o|t|o| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|r|e|p| +0#0000000&@57
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|r|e|p|a|d@1| +0#0000000&@54
 @57|7@1|5|,|1| @8|6|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_44.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_44.dump
index 39509e42e85793bc34907903c79d2e41baa8e649..9e5160d4607c6e6db05b10e2f84bfd6381c74ff6 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_44.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_44.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|r|e|p|a|d@1| +0#0000000&@54
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|r|e|p| +0#0000000&@57
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|r|e|p|a|d@1| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|u|i| +0#0000000&@58
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |g+0#af5f00255&|v|i|m| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|a|r|d|c|o|p|y| +0#0000000&@53
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p| +0#0000000&@57
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p|c|l|o|s|e| +0#0000000&@52
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p| +0#0000000&@57
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p|c|l|o|s|e| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p|f|i|n|d| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p|g|r|e|p| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |h+0#af5f00255&|e|l|p|t|a|g|s| +0#0000000&@53
@@ -16,5 +17,4 @@
 @4|t|e|x|t| @66
 |.+0#af5f00255&| +0#0000000&@73
 |c+0#00e0e07&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&@54
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&@53
 @57|7|9|3|,|1| @8|6@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_45.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_45.dump
index 3ac0534fbb0b91e3eb9ee7d56a788c588943f2a0..135407e8ce3833aab90786b4f052a4a6ad9a50fc 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_45.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_45.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&@53
+|c+0#00e0e07#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|a|b@1|r|e|v| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|a|b|c|l|e|a|r| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|f| +0#0000000&@59
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|j|u|m|p| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|l|i|s|t| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|a|p| +0#0000000&@57
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@52
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|a|p| +0#0000000&@57
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|e|n|u| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|m|p|o|r|t| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|u|n|a|b@1|r|e|v| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |i+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |j+0#af5f00255&|o|i|n| +0#0000000&@57
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |j+0#af5f00255&|u|m|p|s| +0#0000000&@56
 @57|8|1@1|,|1| @8|6|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_46.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_46.dump
index 4a35b95bda37f169705bcde0c18bfed8e75b1f84..2dc666444f0aa2a55e85a61d19435d54b3d65549 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_46.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_46.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |j+0#af5f00255&|u|m|p|s| +0#0000000&@56
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |j+0#af5f00255&|o|i|n| +0#0000000&@57
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |j+0#af5f00255&|u|m|p|s| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&| +0#0000000&@60
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p|a|l|t| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p|m|a|r|k|s| +0#0000000&@52
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p|j|u|m|p|s| +0#0000000&@52
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p@1|a|t@1|e|r|n|s| +0#0000000&@49
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p|j|u|m|p|s| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |k+0#af5f00255&|e@1|p@1|a|t@1|e|r|n|s| +0#0000000&@49
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|N|e|x|t| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|N|f|i|l|e| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|i|s|t| +0#0000000&@57
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|a|n|g|u|a|g|e| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|a|t|e|r| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|e|f|o|r|e| +0#0000000&@54
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|e|l|o|w| +0#0000000&@55
 @57|8|2|9|,|1| @8|6|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_47.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_47.dump
index f678da15655151c1dfecc4085b03f845e6ebf3ec..b5426c5b4559a2200a258cd162a1cd05201595f9 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_47.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_47.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|e|l|o|w| +0#0000000&@55
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|e|f|o|r|e| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|e|l|o|w| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|o|t@1|o|m| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|b|u|f@1|e|r| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|d| +0#0000000&@58
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|h|d|i|r| +0#0000000&@55
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|l|o|s|e| +0#0000000&@55
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|h|d|i|r| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|l|o|s|e| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|c|s|c|o|p|e| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|d|o| +0#0000000&@58
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|f|d|o| +0#0000000&@57
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|f|i|r|s|t| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|e|t|b|u|f@1|e|r| +0#0000000&@51
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@53
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|e|t|f|i|l|e| +0#0000000&@53
 @57|8|4|7|,|1| @8|7|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_48.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_48.dump
index dd112dbc4ed70b831fbef6ce0f3c6b361978c0b6..6c3ee2f4dea5cd9f1f45965679c9347421a33cab 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_48.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_48.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|e|t|f|i|l|e| +0#0000000&@53
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|e|t|e|x|p|r| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|e|t|f|i|l|e| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|r|e|p| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|g|r|e|p|a|d@1| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|h|e|l|p|g|r|e|p| +0#0000000&@52
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|h|i|s|t|o|r|y| +0#0000000&@53
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&@1| +0#0000000&@59
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|h|i|s|t|o|r|y| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&@1| +0#0000000&@59
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&@1|a|s|t| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&@1|i|s|t| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|m|a|k|e| +0#0000000&@56
@@ -16,5 +17,4 @@
 |"+0#0000e05&| |c|a|l@1| |F|o@1|(|)| ||| |l|o|a|d|k|e|y|m|a|p| |"| |d|i|s|a|b|l|e|d| |-| |r|u|n|s| |u|n|t|i|l| |E|O|F| +0#0000000&@21
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|a|d|v|i|e|w| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|m|a|r|k|s| +0#0000000&@52
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&@54
 @57|8|6|5|,|1| @8|7|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_49.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_49.dump
index 6dd13d24bd6dd1137d4a035a93a327d9ec30d6d3..5e7527e11914fadc5dff55220152b8f84e8d85a2 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_49.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_49.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&@54
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|m|a|r|k|s| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|l|d|e|r| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|o|p|e|n| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@52
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|p|f|i|l|e| +0#0000000&@55
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@54
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|p|f|i|l|e| +0#0000000&@55
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|s| +0#0000000&@59
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|t|a|g| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |l+0#af5f00255&|u|n|m|a|p| +0#0000000&@55
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|o|v|e| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|r|k| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|k|e| +0#0000000&@57
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|p| +0#0000000&@58
 @57|8@1|3|,|1| @8|7|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_50.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_50.dump
index 800d69888b7971234759815f44b5b300268afdc6..13d729c01d9c5f695a19789dfb033f0005dc2f77 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_50.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_50.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|p| +0#0000000&@58
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|k|e| +0#0000000&@57
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|p| +0#0000000&@58
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|p|c|l|e|a|r| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|r|k|s| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|a|t|c|h| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|e|n|u| +0#0000000&@57
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&@48
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|e|n|u| +0#0000000&@57
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&@48
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|e|s@1|a|g|e|s| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|k|e|x|r|c| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |m+0#af5f00255&|k|s|e|s@1|i|o|n| +0#0000000&@52
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|b|c|l|o|s|e| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|b|k|e|y| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|b|s|t|a|r|t| +0#0000000&@54
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|e|x|t| +0#0000000&@57
 @57|9|0|1|,|1| @8|7|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_51.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_51.dump
index 0b0b630f3f413343196784802db89387d20887f6..643459ba1ed4204ca3ff8156f8265f24dc010408 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_51.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_51.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|e|x|t| +0#0000000&@57
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|b|s|t|a|r|t| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|e|x|t| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|e|w| +0#0000000&@58
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|m|a|p| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@52
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|m|e|n|u| +0#0000000&@56
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&@1|o|r|e|m|a|p| +0#0000000&@53
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|m|e|n|u| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&@1|o|r|e|m|a|p| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&@1|o|r|e|m|e|n|u| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|o|a|u|t|o|c|m|d| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|o|r|e|m|a|p| +0#0000000&@54
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|u|n|m|a|p| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |n+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|l|d|f|i|l|e|s| +0#0000000&@53
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|p|e|n| +0#0000000&@57
 @57|9|1|9|,|1| @8|7|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_52.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_52.dump
index a7137cbe29e0425f8a5161f11905dcbb5399272b..64f99821cd3f64d11c4c456f9b8c013ee3365345 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_52.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_52.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|p|e|n| +0#0000000&@57
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|l|d|f|i|l|e|s| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|p|e|n| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|m|a|p| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|m|e|n|u| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|l|y| +0#0000000&@57
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|l|y| +0#0000000&@57
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|p|t|i|o|n|s| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |o+0#af5f00255&|u|n|m|a|p| +0#0000000&@55
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|e|r|l| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|i|n|t| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|f|d|e|l| +0#0000000&@54
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@54
 @57|9|3|7|,|1| @8|7|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_53.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_53.dump
index 94114a5db7912d05975ae3fb514f3ce81555fc63..5e3d63d7f9af189c8fbe714376810b570c68e5fa 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_53.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_53.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@54
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|f|d|e|l| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|m|p|t|f|i|n|d| +0#0000000&@51
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|o|m|p|t|r|e|p|l| +0#0000000&@51
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|e|r|l|d|o| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|o|p| +0#0000000&@58
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|o|p|u|p| +0#0000000&@56
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|o|p| +0#0000000&@58
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|o|p|u|p| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&@1|o|p| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|e|s|e|r|v|e| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|r|e|v|i|o|u|s| +0#0000000&@53
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|n|e|x|t| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|p|r|e|v|i|o|u|s| +0#0000000&@51
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|r|e|w|i|n|d| +0#0000000&@53
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|s|e|l|e|c|t| +0#0000000&@53
 @57|9|5@1|,|1| @8|7|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_54.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_54.dump
index 835d1594b3b06fe4ae43dd7d01e04d3531236f39..da5b8ab7a16f587ab01bc11dadea9f72effbc7a9 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_54.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_54.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|s|e|l|e|c|t| +0#0000000&@53
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|r|e|w|i|n|d| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|t|s|e|l|e|c|t| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|u|t| +0#0000000&@58
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|w|d| +0#0000000&@58
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|3| +0#0000000&@58
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|t|h|o|n|3| +0#0000000&@54
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|3|d|o| +0#0000000&@56
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|t|h|o|n|3| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|3|d|o| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|3|f|i|l|e| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|t|h|o|n| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |p+0#af5f00255&|y|d|o| +0#0000000&@57
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |q+0#af5f00255&|u|i|t|a|l@1| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |q+0#af5f00255&|a|l@1| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|a|d| +0#0000000&@57
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|c|o|v|e|r| +0#0000000&@54
 @57|9|7|3|,|1| @8|8|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_55.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_55.dump
index 19c6265ce830629387ac60d3859f0b3ddf9d593e..736a9c5094f1b641323e861330a27356efbb9720 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_55.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_55.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|c|o|v|e|r| +0#0000000&@54
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|a|d| +0#0000000&@57
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|c|o|v|e|r| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|o| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|i|r| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w| +0#0000000&@55
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w|s|t|a|t|u|s| +0#0000000&@49
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w|t|a|b|l|i|n|e| +0#0000000&@48
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w|s|t|a|t|u|s| +0#0000000&@49
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|d|r|a|w|t|a|b|l|i|n|e| +0#0000000&@48
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|g|i|s|t|e|r|s| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|s|i|z|e| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|e|t|a|b| +0#0000000&@56
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|u|b|y|f|i|l|e| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|u|n|d|o| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|u|n|t|i|m|e| +0#0000000&@54
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|v|i|m|i|n|f|o| +0#0000000&@53
 @57|9@1|1|,|1| @8|8|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_56.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_56.dump
index 74e7be00148bb0e4d00cedc9caea0f27fa37b7b1..86f8660abafdb7635475626276923c28b98223f0 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_56.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_56.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|v|i|m|i|n|f|o| +0#0000000&@53
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|u|n|t|i|m|e| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |r+0#af5f00255&|v|i|m|i|n|f|o| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|u|b|s|t|i|t|u|t|e| +0#0000000&@51
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|N|e|x|t| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|n|d|b|o|x| +0#0000000&@54
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|r|g|u|m|e|n|t| +0#0000000&@52
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|l@1| +0#0000000&@57
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|r|g|u|m|e|n|t| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|l@1| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|a|v|e|a|s| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|u|f@1|e|r| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|N|e|x|t| +0#0000000&@55
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|b|r|e|w|i|n|d| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|c|r|i|p|t|n|a|m|e|s| +0#0000000&@50
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&@47
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|c|r|i|p|t|v|e|r|s|i|o|n| +0#0000000&@48
 @57|1|0@1|9|,|1| @7|8|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_57.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_57.dump
index 1f6a759bf1f8dae54a2592e3708a7427a9228e99..71b504ea1b85b075fdee39db8284f58719873077 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_57.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_57.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|c|r|i|p|t|v|e|r|s|i|o|n| +0#0000000&@48
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&@47
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|c|r|i|p|t|v|e|r|s|i|o|n| +0#0000000&@48
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|c|s|c|o|p|e| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t| +0#0000000&@58
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t|f|i|l|e|t|y|p|e| +0#0000000&@50
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t|g|l|o|b|a|l| +0#0000000&@52
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t|l|o|c|a|l| +0#0000000&@53
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t|g|l|o|b|a|l| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|e|t|l|o|c|a|l| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|f|i|n|d| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|f|i|r|s|t| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|h|e|l@1| +0#0000000&@56
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|a|g|i|c| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|a|p| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@52
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|e|n|u| +0#0000000&@56
 @57|1|0|2|7|,|1| @7|8|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_58.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_58.dump
index 4bcd68c65b9e520cea08c010c2c1c44b01cc9bc9..6753a5100a8d66f65e46cd9708d87a53bc5c2ffa 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_58.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_58.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|e|n|u| +0#0000000&@56
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@52
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|e|n|u| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|m|i|l|e| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|e|x|t| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|o|m|a|g|i|c| +0#0000000&@53
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|o|r|t| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|o|u|r|c|e| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|p|e|l@1|d|u|m|p| +0#0000000&@52
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|p|l|i|t| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@54
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|o|p| +0#0000000&@57
 @57|1|0|4|5|,|1| @7|8|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_59.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_59.dump
index 7e661e264d04279dfd7c5d3cb77a5bbc90befd55..57073b2e25c4a73b2eccae6a642b1f24610d42af 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_59.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_59.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|o|p| +0#0000000&@57
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|o|p| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|a|g| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|a|r|t|i|n|s|e|r|t| +0#0000000&@50
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|a|r|t|g|r|e|p|l|a|c|e| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|a|r|t|r|e|p|l|a|c|e| +0#0000000&@49
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|o|p|i|n|s|e|r|t| +0#0000000&@51
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|a|r|t|r|e|p|l|a|c|e| +0#0000000&@49
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|o|p|i|n|s|e|r|t| +0#0000000&@51
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|j|u|m|p| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|t|s|e|l|e|c|t| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|u|n|h|i|d|e| +0#0000000&@54
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|y|n|t|i|m|e| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s+0#af5f00255&|y|n|c|b|i|n|d| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&| +0#0000000&@60
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|N|e|x|t| +0#0000000&@56
 @57|1|0|6|3|,|1| @7|8@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_60.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_60.dump
index f3ffdf27aeedab8e3657efd66ca1d84d2331b690..b23003377805ad1536dba1438fb0e8f6202b3104 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_60.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_60.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|N|e|x|t| +0#0000000&@56
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&| +0#0000000&@60
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|N|e|x|t| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|N|e|x|t| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|c|l|o|s|e| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|d|o| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|e|d|i|t| +0#0000000&@54
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|f|i|n|d| +0#0000000&@54
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|e|d|i|t| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|f|i|n|d| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|f|i|r|s|t| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|l|a|s|t| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b|m|o|v|e| +0#0000000&@54
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|b| +0#0000000&@58
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|g| +0#0000000&@58
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|g|s| +0#0000000&@57
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|d| +0#0000000&@58
 @57|1|0|8|1|,|1| @7|9|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_61.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_61.dump
index 4a9025921c91fa728da712138e8b0f5f8fddbdb8..ffc8eab758015af0cd25e4240098db397dbcb977 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_61.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_61.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|d| +0#0000000&@58
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|a|g|s| +0#0000000&@57
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|d| +0#0000000&@58
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|h|d|i|r| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|l| +0#0000000&@58
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|l|d|o| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|l|f|i|l|e| +0#0000000&@54
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|e|a|r|o|f@1| +0#0000000&@54
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|c|l|f|i|l|e| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|e|a|r|o|f@1| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|e|r|m|i|n|a|l| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|f|i|r|s|t| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|h|r|o|w| +0#0000000&@56
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|m|a|p| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|m|e|n|u| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|n|e|x|t| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53
 @57|1|0|9@1|,|1| @7|9|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_62.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_62.dump
index e6a70dd47d44396bd2fec6a3aa8cfd531e4319ca..54d4e484e9a5e0930e16d6c48a256f9460ff793b 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_62.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_62.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|n|e|x|t| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|o|p|l|e|f|t| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|p|r|e|v|i|o|u|s| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|r|e|w|i|n|d| +0#0000000&@54
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|r|y| +0#0000000&@58
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|s|e|l|e|c|t| +0#0000000&@54
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|r|y| +0#0000000&@58
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|s|e|l|e|c|t| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|u|n|m|a|p| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|d|o| +0#0000000&@57
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|l|e|t| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|m|a|p| +0#0000000&@56
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|m|e|n|u| +0#0000000&@55
 @57|1@2|7|,|1| @7|9|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_63.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_63.dump
index fe75432d1983b408e2fe7be1ca9f997d82a84729..5d3070de16cfcde6cb125ab3442bb209aed22bb4 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_63.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_63.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|m|e|n|u| +0#0000000&@55
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|m|a|p| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|m|e|n|u| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|n|s|i|l|e|n|t| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |u+0#af5f00255&|p|d|a|t|e| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|g|l|o|b|a|l|/|.+0#0000000&@2|/+0#af5f00255&| +0#0000000&@49
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|s|i|o|n| +0#0000000&@54
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|b|o|s|e| +0#0000000&@54
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|s|i|o|n| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|b|o|s|e| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|e|r|t|i|c|a|l| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|i|m|9|c|m|d| +0#0000000&@54
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|i|m|g|r|e|p| +0#0000000&@54
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|m|e|n|u| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|n|e|w| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52
 @57|1@1|3|5|,|1| @7|9|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_64.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_64.dump
index d84bf6a3b5d935617784850d3ae9d5f36c7dc0aa..64c9f4dc3d011c7630d19465ba4ae8bc2981a81a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_64.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_64.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|s|p|l|i|t| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|u|n|m|a|p| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|u|n|m|e|n|u| +0#0000000&@54
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|i|n|d|o| +0#0000000&@56
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|r|i|t|e| +0#0000000&@56
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|i|n|d|o| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|r|i|t|e| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|N|e|x|t| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|a|l@1| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|h|i|l|e| +0#0000000&@56
@@ -16,5 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|q|a|l@1| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|u|n|d|o| +0#0000000&@56
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|v|i|m|i|n|f|o| +0#0000000&@53
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|i|t| +0#0000000&@58
 @57|1@1|5|3|,|1| @7|9|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_65.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_65.dump
index a85dd4f72b680a4c7839e8304740fbae475328bc..51b2aa18f2960303462c46b7c201507e4747a7d9 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_65.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_65.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|i|t| +0#0000000&@58
+|c+0#af5f00255#ffffff0|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |w+0#af5f00255&|v|i|m|i|n|f|o| +0#0000000&@53
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|i|t| +0#0000000&@58
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|a|l@1| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|m|a|p| +0#0000000&@57
-|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|m|e|n|u| +0#0000000&@56
->c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|r|e|s|t|o|r|e| +0#0000000&@53
+>c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|m|e|n|u| +0#0000000&@56
+|c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|r|e|s|t|o|r|e| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|n|o|r|e|m|a|p| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|n|o|r|e|m|e|n|u| +0#0000000&@52
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&||| |x+0#af5f00255&|u|n|m|a|p| +0#0000000&@55
@@ -16,5 +17,4 @@
 @75
 |:|a|b|s|t|r|a|c|t| @65
 |:|c|l|a|s@1| @68
-|:|e|n|d|c|l|a|s@1| @65
 @57|1@1|7|1|,|1| @7|9|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_66.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_66.dump
index dd64f779b29d9ad111bb821ccbe67d188b27a836..ab374c22c7480152b0812d06d084b2ca92479d05 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_66.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_66.dump
@@ -1,9 +1,10 @@
-|:+0&#ffffff0|e|n|d|c|l|a|s@1| @65
+|:+0&#ffffff0|c|l|a|s@1| @68
+|:|e|n|d|c|l|a|s@1| @65
 |:|e|n|d|i|n|t|e|r|f|a|c|e| @61
 |:|e|n|d|e|n|u|m| @66
 |:|e|n|u|m| @69
-|:|e|x|p|o|r|t| @67
->:|f+0#af5f00255&|i|n|a|l| +0#0000000&@68
+>:|e|x|p|o|r|t| @67
+|:|f+0#af5f00255&|i|n|a|l| +0#0000000&@68
 |:|i|n|t|e|r|f|a|c|e| @64
 |:|p|u|b|l|i|c| @67
 |:|s|t|a|t|i|c| @67
@@ -16,5 +17,4 @@
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e|n|d|e|n|u|m| @59
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e|n|d|i|n|t|e|r|f|a|c|e| @54
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |e|n|u|m| @62
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e|x|p|o|r|t| @60
 @57|1@1|8|9|,|1| @7|9@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_commands_67.dump b/runtime/syntax/testdir/dumps/vim_ex_commands_67.dump
index c21adbc0f47a55dfaac256ec06765b7651e4b7ae..7677b76cb11ea37b8fb9fc34352d405fc471a39e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_commands_67.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_commands_67.dump
@@ -1,9 +1,10 @@
-|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |e|x|p|o|r|t| @60
+|F+0&#ffffff0|o@1|(+0#e000e06&|)| +0#0000000&||| |e|n|u|m| @62
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |e|x|p|o|r|t| @60
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |f+0#af5f00255&|i|n|a|l| +0#0000000&@61
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |i|n|t|e|r|f|a|c|e| @57
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |p|u|b|l|i|c| @60
-|F|o@1|(+0#e000e06&|)| +0#0000000&||| |s|t|a|t|i|c| @60
->F|o@1|(+0#e000e06&|)| +0#0000000&||| |t|y|p|e| @62
+>F|o@1|(+0#e000e06&|)| +0#0000000&||| |s|t|a|t|i|c| @60
+|F|o@1|(+0#e000e06&|)| +0#0000000&||| |t|y|p|e| @62
 |F|o@1|(+0#e000e06&|)| +0#0000000&||| |v+0#af5f00255&|a|r| +0#0000000&@63
 @75
 |~+0#4040ff13&| @73
@@ -16,5 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
 | +0#0000000&@56|1|2|0|7|,|1| @7|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_00.dump b/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_00.dump
index 479c44aa7ac584230df7aeb29712058b2a1cc8ea..17af170e195332cf7f125a8ed58bf57f6ba4bf0b 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|d|e|b|u|g@1|r|e@1|d|y| |c|o|m@1|a|n|d| +0#0000000&@48
 @75
+@75
 |d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@63
 |0+0#e000002&|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@62
 @75
@@ -16,5 +17,4 @@
 @2|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@1|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@50
 @2|0+0#e000002&|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@50
 @75
-@2|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@1||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_01.dump b/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_01.dump
index d1aa252102314d7a59e56b09e26a476fea5c28e1..a850ee8b68434788156d97c3f1833b0ae6067faf 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_01.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|0+0#e000002&|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@60
+| +0&#ffffff0@1|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@61
+@2|0+0#e000002&|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@60
 @75
 @2|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@1|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@50
 @2|0+0#e000002&|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@50
-@75
-@2>d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@1||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
+> @74
+@2|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@1||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
 @2|0+0#e000002&|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63
 @75
@@ -16,5 +17,4 @@
 @75
 @2|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&@1||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
 @2|0+0#e000002&|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
-|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
-@57|1|9|,|3| @9|9|2|%| 
+@57|1|9|,|0|-|1| @7|8|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_02.dump b/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_02.dump
index 7bb07b6c50e507b4ed6c9ca51410f4495ec3546a..357f8bb297b53013a643e3bd0aaf38d4b7b6cc54 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_debuggreedy_02.dump
@@ -1,4 +1,5 @@
-|e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@68
+| +0&#ffffff0@1|0+0#e000002&|d+0#af5f00255&|e|b|u|g@1|r|e@1|d|y| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
+|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
 > @74
 |~+0#4040ff13&| @73
 |~| @73
@@ -16,5 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-| +0#0000000&@56|3@1|,|0|-|1| @7|B|o|t| 
+| +0#0000000&@56|3|4|,|0|-|1| @7|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_00.dump b/runtime/syntax/testdir/dumps/vim_ex_def_00.dump
index 4bc88584b5241a85a883e91b20b7aaaad4aa9810..2f87f33053b02950e8b3e1c3834624ec9d61fc94 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_def_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_00.dump
@@ -1,7 +1,7 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|d|e|f| |c|o|m@1|a|n|d| +0#0000000&@56
 @75
 @75
-|"+0#0000e05&| |l|i|s|t| +0#0000000&@68
+|"+0#0000e05&| |L|i|s|t| +0#0000000&@68
 @75
 |d+0#af5f00255&|e|f| +0#0000000&@71
 |d+0#af5f00255&|e|f| +0#0000000&|F|o@1| @67
@@ -13,7 +13,7 @@
 |d+0#af5f00255&|e|f| +0#0000000&|F|o@1| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@57
 @75
 @75
-|"+0#0000e05&| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@62
+|"+0#0000e05&| |D|e|f|i|n|i|t|i|o|n| +0#0000000&@62
 @75
 |"+0#0000e05&| |e|m|p|t|y| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@56
 |d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@65

diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_01.dump b/runtime/syntax/testdir/dumps/vim_ex_def_01.dump
index d97b992c5fedf4a8e6d3319d54913e2259b922cc..f13f4f4e3c8e6260354a3ce68c9bb50eddf2e49b 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_def_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_01.dump
@@ -1,6 +1,6 @@
 | +0&#ffffff0@74
 @75
-|"+0#0000e05&| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@62
+|"+0#0000e05&| |D|e|f|i|n|i|t|i|o|n| +0#0000000&@62
 @75
 |"+0#0000e05&| |e|m|p|t|y| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@56
 >d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@65

diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_03.dump b/runtime/syntax/testdir/dumps/vim_ex_def_03.dump
index 6ba5f46f89afa06d5dfdbe8b70267f338af50e1e..4ab6ef5e9b7d5d5c11751383d7e1c4ce092892b3 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_def_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_03.dump
@@ -11,7 +11,7 @@
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
 @75
 @75
-|"+0#0000e05&| |r|e|t|u|r|n| |t|y|p|e|s| +0#0000000&@60
+|"+0#0000e05&| |R|e|t|u|r|n| |t|y|p|e|s| +0#0000000&@60
 @75
 |d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)|:+0#0000000&| |v+0#00e0003&|o|i|d| +0#0000000&@59
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68

diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_05.dump b/runtime/syntax/testdir/dumps/vim_ex_def_05.dump
index de9ae6d322febccb6852d288bf70d29e94719185..65192267462a5648492e8bb73a7405b22b1fce27 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_def_05.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_05.dump
@@ -4,7 +4,7 @@
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&|#+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@58
 @75
 > @74
-|"+0#0000e05&| |p|a|r|a|m|e|t|e|r|s| +0#0000000&@62
+|"+0#0000e05&| |P|a|r|a|m|e|t|e|r|s| +0#0000000&@62
 @75
 |d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|x+0#00e0e07&|:+0#0000000&| |b+0#00e0003&|o@1|l|,+0#0000000&| |y+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |z+0#00e0e07&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|z|e|d|"|)+0#e000e06&| +0#0000000&@31
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68

diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_06.dump b/runtime/syntax/testdir/dumps/vim_ex_def_06.dump
index 265237c68d5de21f7fb72e22cc5a6315ba3d963f..3c4b3ab06cadde1e49f0a98605d93ae8577aec55 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_def_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_06.dump
@@ -3,7 +3,7 @@
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
 @75
 @75
->"+0#0000e05&| |c|o|m@1|e|n|t|s| +0#0000000&@64
+>"+0#0000e05&| |C|o|m@1|e|n|t|s| +0#0000000&@64
 @75
 |d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@65
 @2|#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@51
@@ -11,7 +11,7 @@
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
 @75
 @75
-|"+0#0000e05&| |l|e|a|d|i|n|g| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@47
+|"+0#0000e05&| |L|e|a|d|i|n|g| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@47
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@52
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68

diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_07.dump b/runtime/syntax/testdir/dumps/vim_ex_def_07.dump
index 897c72bd8265523536ec7ca77918afab42e12d44..87f3964bd008144903ace6e79fd2bd7eb1937e75 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_def_07.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_07.dump
@@ -1,5 +1,5 @@
 | +0&#ffffff0@74
-|"+0#0000e05&| |c|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@55
+|"+0#0000e05&| |C|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@55
 @75
 |s+0#af5f00255&|i|l|e|n|t|!| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@57
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68

diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_fold_00.dump b/runtime/syntax/testdir/dumps/vim_ex_def_fold_00.dump
index f48fb87ba33129538d46cb0d95f4aa34d71d3eb4..cbf57d74a4e67b7bc9f66361a3a3d74bacbdc50d 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_def_fold_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_fold_00.dump
@@ -3,7 +3,7 @@
 | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@2| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@26
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |l|i|s|t| +0#0000000&@66
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |L|i|s|t| +0#0000000&@66
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|d+0#af5f00255#ffffff0|e|f| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1|d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|o@1| @65
@@ -15,6 +15,6 @@
 | +0#0000e05#a8a8a8255@1|d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|o@1| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@55
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@60
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |D|e|f|i|n|i|t|i|o|n| +0#0000000&@60
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_fold_01.dump b/runtime/syntax/testdir/dumps/vim_ex_def_fold_01.dump
index 00af38d1f3464af82b1eb3c018efbb54f1d8487c..50073ed433f38f764bb5183669e7a82bd7d5c89e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_def_fold_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_fold_01.dump
@@ -2,7 +2,7 @@
 | +0#0000e05#a8a8a8255@1|d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|o@1| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@55
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@60
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |D|e|f|i|n|i|t|i|o|n| +0#0000000&@60
 | +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |e|m|p|t|y| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@54
 |-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@63

diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_fold_03.dump b/runtime/syntax/testdir/dumps/vim_ex_def_fold_03.dump
index e9e3fead5db42c3fab8b3db9442c73f34c80971f..39f91a710f6301d2cebf64ec0f5c8d9e5415b23c 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_def_fold_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_fold_03.dump
@@ -13,7 +13,7 @@
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |r|e|t|u|r|n| |t|y|p|e|s| +0#0000000&@58
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |R|e|t|u|r|n| |t|y|p|e|s| +0#0000000&@58
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)|:+0#0000000&| |v+0#00e0003&|o|i|d| +0#0000000&@57
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66

diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_fold_05.dump b/runtime/syntax/testdir/dumps/vim_ex_def_fold_05.dump
index 987900413941f5d170ea8e4189eb5dc021041d6f..6177af78e22aff4b3e72b5517dba8154c6d56092 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_def_fold_05.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_fold_05.dump
@@ -6,7 +6,7 @@
 ||+0#0000e05#a8a8a8255| >e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&|#| |c|o|m@1|e|n|t| @56
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |p|a|r|a|m|e|t|e|r|s| +0#0000000&@60
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |P|a|r|a|m|e|t|e|r|s| +0#0000000&@60
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|o@1|(+0#e000e06&|x+0#00e0e07&|:+0#0000000&| |b+0#00e0003&|o@1|l|,+0#0000000&| |y+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|,+0#0000000&| |z+0#00e0e07&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|z|e|d|"|)+0#e000e06&| +0#0000000&@29
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66

diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_fold_06.dump b/runtime/syntax/testdir/dumps/vim_ex_def_fold_06.dump
index 4be99795abcb9c47004cad14206e3ec5f1eb1bc5..f2045053d17379f7bc3390e3d0b2e12e8496d329 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_def_fold_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_fold_06.dump
@@ -1,6 +1,6 @@
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |c|o|m@1|e|n|t|s| +0#0000000&@62
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |C|o|m@1|e|n|t|s| +0#0000000&@62
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@63
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1>#+0#0000e05&| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@49
@@ -8,13 +8,13 @@
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |c|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@53
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |C|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@53
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |s+0#af5f00255#ffffff0|i|l|e|n|t|!| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@55
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |l|e|a|d|i|n|g| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@45
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |L|e|a|d|i|n|g| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@45
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |d+0#af5f00255&|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@50
 @57|1|0|8|,|3| @8|6|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_fold_07.dump b/runtime/syntax/testdir/dumps/vim_ex_def_fold_07.dump
index 0a2fc33d595f4a113ed7f8727552980a811ed02a..698735cb4fb699dbd588bda876c8c5ea0b46a802 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_def_fold_07.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_fold_07.dump
@@ -2,7 +2,7 @@
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |f|o|l|d|-|r|e|g|i|o|n| |e|n|d|i|n|g| +0#0000000&@52
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |F|o|l|d|-|r|e|g|i|o|n| |e|n|d|i|n|g| +0#0000000&@52
 | +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |d+0#af5f00255#ffffff0|e|f| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@63
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|#+0#0000e05&| |e|n|d@1|e|f| +0#0000000&@62

diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_nested_00.dump b/runtime/syntax/testdir/dumps/vim_ex_def_nested_00.dump
index d9f765d07a51e7767a02c5b0a8b2a7f6766291e3..9fe6696f43ef7c33f32dd628d1584fcfa0c8c648 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_def_nested_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_nested_00.dump
@@ -2,6 +2,7 @@
 |#+0#0000e05&| |V|i|m|9| |:|d|e|f| |c|o|m@1|a|n|d| |(|n|e|s|t|e|d|)| +0#0000000&@46
 |#+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|T|h|i|s| |T|o|d|o| +0#0000000&@36
 @75
+@75
 |c+0#af5f00255&|l|a|s@1| +0#0000000&|T|e|s|t| @64
 @4|c+0#af5f00255&|o|n|s|t| +0#0000000&|n+0#00e0e07&|a|m|e|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@52
 @75
@@ -16,5 +17,4 @@
 @75
 | +0#00e0e07&@7|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|n+0#00e0e07&|a|m|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|N|a|m|e|(+0#e000e06&|)| +0#0000000&@48
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
-|e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump b/runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump
index e85f7ed9f9ab716e77cb878c0518960f7bc3d0ef..0fc35aaf4847163eebf606be1e6f6c404b52df92 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump
@@ -1,11 +1,13 @@
-| +0&#ffffff0@11|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|G|i|v|e|N|a|m|e|(+0#e000e06&|)| +0#0000000&@45
+| +0&#ffffff0@74
+@12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|G|i|v|e|N|a|m|e|(+0#e000e06&|)| +0#0000000&@45
 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
 @75
 | +0#00e0e07&@7|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|n+0#00e0e07&|a|m|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|N|a|m|e|(+0#e000e06&|)| +0#0000000&@48
-@4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
->e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66
+@4>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
+|e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|T|e|s|t|.|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@59
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
@@ -15,6 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|9|,|1| @9|B|o|t| 
+| +0#0000000&@56|1|9|,|5| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_00.dump b/runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_00.dump
index 1b71d3a0a4e1a8de487f4f2f29bfec65360e11f5..26c48152e89cdd5bf8dd7c7f455eb0297ab4edfe 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_00.dump
@@ -1,10 +1,10 @@
 | +0#0000e05#a8a8a8255@1>v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@62
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|i|m|9| |:|d|e|f| |c|o|m@1|a|n|d| |(|n|e|s|t|e|d|)| +0#0000000&@44
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |'|f|'| +0#0000000&@29
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@34
 | +0#0000e05#a8a8a8255@1|#+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|9|T|h|i|s| |T|o|d|o| +0#0000000&@34
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|T|e|s|t| @62
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|n+0#00e0e07&|a|m|e|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@50
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
@@ -12,9 +12,9 @@
 | @1|e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|T|e|s|t|.|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@57
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
 |~| @73
-|~| @73
 | +0#0000000&@56|1|,|1| @10|A|l@1| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_echo_00.dump b/runtime/syntax/testdir/dumps/vim_ex_echo_00.dump
index 1a8bd425bc33cbc9646f45e3811b3ca8c1074634..077f03dcbfcb3d477ab3a46c5f5e77bc6308927c 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_echo_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_echo_00.dump
@@ -9,7 +9,7 @@
 |e+0#af5f00255&|c|h|o|c|o|n|s|o|l|e| +0#0000000&|"+0#e000002&|A|n|s|w|e|r| |=| |"| +0#0000000&|4+0#e000002&|2| +0#0000000&@48
 @75
 @75
-|"+0#0000e05&| |t|r|a|i|l|i|n|g| |b|a|r| |v|s| |O|R| |o|p|e|r|a|t|o|r| +0#0000000&@45
+|"+0#0000e05&| |T|r|a|i|l|i|n|g| |b|a|r| |v|s| |O|R| |o|p|e|r|a|t|o|r| +0#0000000&@45
 @75
 |"+0#0000e05&| |O|R| |o|p|e|r|a|t|o|r| +0#0000000&@61
 |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||+0#af5f00255&@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@59

diff --git a/runtime/syntax/testdir/dumps/vim_ex_echo_01.dump b/runtime/syntax/testdir/dumps/vim_ex_echo_01.dump
index efc9170642a86bd027a4fe62b3c6730ebf25ce1e..f23db5d58084369d48034c3a8e9ac2276eed1e24 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_echo_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_echo_01.dump
@@ -12,7 +12,7 @@
 |e+0#af5f00255&|c|h|o|h|l| +0#0000000&|W+0#00e0003&|a|r|n|i|n|g|M|s|g| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|D|o|n|'|t| |p|a|n|i|c|!|"| +0#0000000&||| |e+0#af5f00255&|c|h|o|h|l| +0#0000000&|N+0#00e0003&|o|n|e| +0#0000000&@21
 @75
 @75
-|"+0#0000e05&| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54
+|"+0#0000e05&| |L|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|A|n|s|w|e|r| |=| |"| +0#0000000&@58
 @5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@59

diff --git a/runtime/syntax/testdir/dumps/vim_ex_echo_02.dump b/runtime/syntax/testdir/dumps/vim_ex_echo_02.dump
index 7cc91d41c867839b61950ad535035c6c4516e405..54b1cfe704e7b28139df529b7b84a5b07385a35e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_echo_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_echo_02.dump
@@ -6,7 +6,7 @@
 @6>\+0#e000e06&| +0#0000000&|4+0#e000002&|2| +0#0000000&@64
 @75
 @75
-|"+0#0000e05&| |t|r|a|i|l|i|n|g| |b|a|r| |a|n|d| |c|o|m@1|e|n|t|s| +0#0000000&@47
+|"+0#0000e05&| |T|r|a|i|l|i|n|g| |b|a|r| |a|n|d| |c|o|m@1|e|n|t|s| +0#0000000&@47
 @75
 |"+0#0000e05&| |:|e|c|h|o| |w|i|t|h|o|u|t| |{|e|x|p|r|}| +0#0000000&@52
 |e+0#af5f00255&|c|h|o||+0#0000000&| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@58

diff --git a/runtime/syntax/testdir/dumps/vim_ex_execute_01.dump b/runtime/syntax/testdir/dumps/vim_ex_execute_01.dump
index 657b6f16ab57d9df78492df0f5eb44378448e7f3..8e9af8ec722587916d0484c115d2a0605b99b4db 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_execute_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_execute_01.dump
@@ -4,7 +4,7 @@
 |e+0#af5f00255&|x|e|c|u|t|e| +0#0000000&|'+0#e000002&|w|h|i|l|e| |i| |<| |5| ||| |e|c|h|o| |i| ||| |l|e|t| |i| |=| |i| |+| |1| ||| |e|n|d|w|h|i|l|e|'| +0#0000000&@17
 @75
 > @74
-|"+0#0000e05&| |t|r|a|i|l|i|n|g| |b|a|r| |v|s| |O|R| |o|p|e|r|a|t|o|r| +0#0000000&@45
+|"+0#0000e05&| |T|r|a|i|l|i|n|g| |b|a|r| |v|s| |O|R| |o|p|e|r|a|t|o|r| +0#0000000&@45
 @75
 |"+0#0000e05&| |O|R| |o|p|e|r|a|t|o|r| +0#0000000&@61
 |e+0#af5f00255&|x|e|c|u|t|e| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||+0#af5f00255&@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&|:+0#af5f00255&| +0#0000000&|"+0#e000002&|N|o|t|F|o@1|"| +0#0000000&@37

diff --git a/runtime/syntax/testdir/dumps/vim_ex_execute_02.dump b/runtime/syntax/testdir/dumps/vim_ex_execute_02.dump
index 7b3370865109e0969c0c1200f23a88eddbf03b1a..f93db78945fbe9464073cc31c786e76a44b7defe 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_execute_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_execute_02.dump
@@ -1,6 +1,6 @@
 | +0&#ffffff0@74
 @75
-|"+0#0000e05&| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54
+|"+0#0000e05&| |L|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54
 @75
 |e+0#af5f00255&|x|e|c|u|t|e| +0#0000000&|"+0#e000002&|c|a|l@1|"| +0#0000000&@60
 @6>"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
@@ -12,7 +12,7 @@
 @6|\+0#e000e06&| +0#0000000&|"+0#e000002&|F|o@1|(|)|"| +0#0000000&@59
 @75
 @75
-|"+0#0000e05&| |t|r|a|i|l|i|n|g| |b|a|r| |a|n|d| |c|o|m@1|e|n|t|s| +0#0000000&@47
+|"+0#0000e05&| |T|r|a|i|l|i|n|g| |b|a|r| |a|n|d| |c|o|m@1|e|n|t|s| +0#0000000&@47
 @75
 |"+0#0000e05&| |:|e|x|e|c|u|t|e| |w|i|t|h|o|u|t| |{|e|x|p|r|}| +0#0000000&@49
 |e+0#af5f00255&|x|e|c|u|t|e||+0#0000000&| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@55

diff --git a/runtime/syntax/testdir/dumps/vim_ex_filter_00.dump b/runtime/syntax/testdir/dumps/vim_ex_filter_00.dump
index 345ef7adcd99ab79d8670da7cafd8611c9a626a5..0aaf0eb6a000df60db917fd4f0a6d463058128e2 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_filter_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_filter_00.dump
@@ -1,5 +1,5 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|f|i|l|t|e|r| |c|o|m@1|a|n|d| +0#0000000&@53
-|"+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|C|m|d|S|e|p| |O|p|e|r|a|t|o|r| +0#0000000&@24
+|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|C|m|d|S|e|p| |O|p|e|r|a|t|o|r| +0#0000000&@31
 @75
 @75
 |f+0#af5f00255&|i|l|t|e|r| +0#0000000&@1|p|a|\+0#e000e06&|%|(|t+0#0000000&@1|\+0#e000e06&|)|e+0#0000000&|r|n| @1|o+0#af5f00255&|l|d|f|i|l|e|s| +0#0000000&@44

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_00.dump b/runtime/syntax/testdir/dumps/vim_ex_function_00.dump
index 5c67fd858e7535a7cfcb5f21ed00397352c19ff5..e6f67d5b308786f418b2965d62ea139da364636b 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_00.dump
@@ -1,7 +1,7 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|f|u|n|c|t|i|o|n| |c|o|m@1|a|n|d| +0#0000000&@51
 @75
 @75
-|"+0#0000e05&| |l|i|s|t| +0#0000000&@68
+|"+0#0000e05&| |L|i|s|t| +0#0000000&@68
 @75
 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&@66
 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1| @62
@@ -13,7 +13,7 @@
 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@52
 @75
 @75
-|"+0#0000e05&| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@62
+|"+0#0000e05&| |D|e|f|i|n|i|t|i|o|n| +0#0000000&@62
 @75
 |"+0#0000e05&| |e|m|p|t|y| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@56
 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_01.dump b/runtime/syntax/testdir/dumps/vim_ex_function_01.dump
index 1523d7467bbe87cf1bd5b500a8667591114b1718..c009a805c31f4854618c9b10e5fe8dab50eecf79 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_01.dump
@@ -1,6 +1,6 @@
 | +0&#ffffff0@74
 @75
-|"+0#0000e05&| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@62
+|"+0#0000e05&| |D|e|f|i|n|i|t|i|o|n| +0#0000000&@62
 @75
 |"+0#0000e05&| |e|m|p|t|y| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@56
 >f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_06.dump b/runtime/syntax/testdir/dumps/vim_ex_function_06.dump
index ad75d36a1db73c62442ea97d33ef93802b124a13..6eaeddd8ab6333fde339b05586c5d0966485b981 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_06.dump
@@ -8,7 +8,7 @@
 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63
 @75
 @75
-|"+0#0000e05&| |m|o|d|i|f|i|e|r|s| +0#0000000&@63
+|"+0#0000e05&| |M|o|d|i|f|i|e|r|s| +0#0000000&@63
 @75
 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&|r+0#e000e06&|a|n|g|e| +0#0000000&@54
 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_10.dump b/runtime/syntax/testdir/dumps/vim_ex_function_10.dump
index cd29b7495f60359fb0bf97502a30cb1664240bf3..3a384803f2d19d0b452b2408aed6249ea1f986da 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_10.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_10.dump
@@ -1,7 +1,7 @@
 |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@53
 @75
 @75
-|"+0#0000e05&| |p|a|r|a|m|e|t|e|r|s| +0#0000000&@62
+|"+0#0000e05&| |P|a|r|a|m|e|t|e|r|s| +0#0000000&@62
 @75
 >f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|x+0#00e0e07&|,+0#0000000&| |y+0#00e0e07&|,+0#0000000&| |z+0#00e0e07&|,+0#0000000&| |.+0#00e0e07&@2|)+0#e000e06&| +0#0000000&@48
 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|4+0#e000002&|2| +0#0000000&@63

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_12.dump b/runtime/syntax/testdir/dumps/vim_ex_function_12.dump
index 8968153f9fa83a874e4262d47bae95bf455f0402..7b3b789ae3bd85bd03daa8e3cd0eef6e5100d764 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_12.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_12.dump
@@ -6,7 +6,7 @@
 >e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63
 @75
 @75
-|"+0#0000e05&| |a|r|g|u|m|e|n|t|s| +0#0000000&@63
+|"+0#0000e05&| |A|r|g|u|m|e|n|t|s| +0#0000000&@63
 @75
 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|a+0#00e0e07&|,+0#0000000&| |b+0#00e0e07&|,+0#0000000&| |c+0#00e0e07&|)+0#e000e06&| +0#0000000&@53
 @2|e+0#af5f00255&|c|h|o| +0#0000000&|a+0#00e0e07&|:|a| +0#0000000&|a+0#00e0e07&|:|b| +0#0000000&|a+0#00e0e07&|:|c| +0#0000000&@56

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_13.dump b/runtime/syntax/testdir/dumps/vim_ex_function_13.dump
index 066f06c6e8599841536027771a2ac41e679d15c9..69be8a98f110fe3430730c27acc501566fae60d9 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_13.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_13.dump
@@ -9,7 +9,7 @@
 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63
 @75
 @75
-|"+0#0000e05&| |c|o|m@1|e|n|t|s| +0#0000000&@64
+|"+0#0000e05&| |C|o|m@1|e|n|t|s| +0#0000000&@64
 @75
 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60
 @2|"+0#0000e05&| |L|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@49

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_14.dump b/runtime/syntax/testdir/dumps/vim_ex_function_14.dump
index 6d0e2d7f910b51a14d7608e118b411a7b6f28fe3..0096229877b7ef101c1428edefb9689f82eead5a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_14.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_14.dump
@@ -1,12 +1,12 @@
 | +0&#ffffff0@74
 @75
-|"+0#0000e05&| |c|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@55
+|"+0#0000e05&| |C|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@55
 @75
 |s+0#af5f00255&|i|l|e|n|t|!| +0#0000000&|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@52
 >e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63
 @75
 @75
-|"+0#0000e05&| |l|e|a|d|i|n|g| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@47
+|"+0#0000e05&| |L|e|a|d|i|n|g| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@47
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@47
 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_00.dump b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_00.dump
index 9e7ba32823f58086d24995aab035bbf5c81149b9..82bdf388ddfcdf573382c93526ed8e60c77d3c34 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_00.dump
@@ -1,6 +1,7 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|f|u|n|c|t|i|o|n| |a|n|d| |:|d|e|f| |t|a|i|l| |c|o|m@1|e|n|t| |e|r@1|o|r|s| +0#0000000&@30
 |"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |u|n|l|e|t|!| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| +0#0000000&@34
 @75
+@75
 |f+0#af5f00255&|u|n| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|1|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@12|#+0#ffffff16#ff404010| |f|u|n| +0#0000000#ffffff0@37
 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|1+0#e000002&| +0#0000000&@64
 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34
@@ -16,5 +17,4 @@
 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|3|(+0#e000e06&|)| +0#0000000&@54
 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34
 @75
-|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|4|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@10|"+0#ffffff16#ff404010| |d|e|f| +0#0000000#ffffff0@37
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_01.dump b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_01.dump
index 08abcfe8d4dbafb94b68124ec596c3d9f933953a..c76fa06e4309d6a8c797bb103eda4cfb38bab5b5 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_01.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|3+0#e000002&| +0#0000000&@62
+| +0&#ffffff0@1|f+0#af5f00255&|u|n| +0#0000000&|s+0#e000e06&|:|D+0#0000000&|o|T|e|s|t|3|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@8|#+0#ffffff16#ff404010| |f|u|n| +0#0000000#ffffff0@37
+@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|3+0#e000002&| +0#0000000&@62
 @2|e+0#af5f00255&|n|d|f|u|n| +0#0000000&@23|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34
 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|3|(+0#e000e06&|)| +0#0000000&@54
 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34
-@75
->d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|4|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@10|"+0#ffffff16#ff404010| |d|e|f| +0#0000000#ffffff0@37
+> @74
+|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|4|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@10|"+0#ffffff16#ff404010| |d|e|f| +0#0000000#ffffff0@37
 @2|d+0#af5f00255&|e|f| +0#0000000&|D|o|T|e|s|t|4|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@8|"+0#ffffff16#ff404010| |d|e|f| +0#0000000#ffffff0@37
 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|4+0#e000002&| +0#0000000&@62
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@23|"+0#ffffff16#ff404010| |e|n|d@1|e|f| +0#0000000#ffffff0@34
@@ -16,5 +17,4 @@
 @2|e+0#af5f00255&|n|d|f|u|n| +0#0000000&@23|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34
 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|T|e|s|t|5|(+0#e000e06&|)| +0#0000000&@56
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@25|"+0#ffffff16#ff404010| |e|n|d@1|e|f| +0#0000000#ffffff0@34
-@75
-@57|1|9|,|1| @9|5|4|%| 
+@57|1|9|,|0|-|1| @7|5|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_02.dump b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_02.dump
index 9c2a4666f50213be1adaf24080a04cc05c441405..025986f526414212bf5981dcf0027b062321df49 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comment_errors_02.dump
@@ -1,20 +1,20 @@
-| +0&#ffffff0@74
+|e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@25|"+0#ffffff16#ff404010| |e|n|d@1|e|f| +0#0000000#ffffff0@34
+@75
 |f+0#af5f00255&|u|n| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|6|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@12|#+0#ffffff16#ff404010| |f|u|n| +0#0000000#ffffff0@37
 @2|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|:|D+0#0000000&|o|T|e|s|t|6|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@6|"+0#ffffff16#ff404010| |d|e|f| +0#0000000#ffffff0@37
 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|6+0#e000002&| +0#0000000&@62
-@2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@23|"+0#ffffff16#ff404010| |e|n|d@1|e|f| +0#0000000#ffffff0@34
-@2>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|6|(+0#e000e06&|)| +0#0000000&@54
+@2>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@23|"+0#ffffff16#ff404010| |e|n|d@1|e|f| +0#0000000#ffffff0@34
+@2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|6|(+0#e000e06&|)| +0#0000000&@54
 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|#+0#ffffff16#ff404010| |e|n|d|f|u|n| +0#0000000#ffffff0@34
 @75
 |f+0#af5f00255&|o|r| +0#0000000&|d+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|r+0#00e0e07&|a|n|g|e|(+0#e000e06&|1+0#e000002&|,+0#0000000&| |6+0#e000002&|)+0#e000e06&|-+0#af5f00255&|>|r+0#00e0e07&|e|v|e|r|s|e|(+0#e000e06&|)| +0#0000000&@43
 @2|e+0#af5f00255&|x|e|c| +0#0000000&|$+0#e000002&|'|e|c|h|o| |s|:|T|e|s|t|{+0#e000e06&|d+0#00e0e07&|}+0#e000e06&|(+0#e000002&|)|'| +0#0000000&@48
 @2|e+0#af5f00255&|x|e|c| +0#0000000&|$+0#e000002&|'|d|e|l|f|u|n|c|t|i|o|n| |s|:|T|e|s|t|{+0#e000e06&|d+0#00e0e07&|}+0#e000e06&|'+0#e000002&| +0#0000000&@43
 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-|~| @73
 | +0#0000000&@56|3|7|,|3| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_00.dump b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_00.dump
index 8aa59de78ba40eb23169d60872dae1308b270aef..111094edcd31831be388c9a57f0e312457bc3fb7 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_00.dump
@@ -1,6 +1,7 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|f|u|n|c|t|i|o|n| |a|n|d| |:|d|e|f| |t|a|i|l| |c|o|m@1|e|n|t|s| +0#0000000&@36
 |"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |u|n|l|e|t|!| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| +0#0000000&@34
 @75
+@75
 |f+0#af5f00255&|u|n| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|1|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@12|"+0#0000e05&| |f|u|n| +0#0000000&@37
 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|1+0#e000002&| +0#0000000&@64
 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|"+0#0000e05&| |e|n|d|f|u|n| +0#0000000&@34
@@ -16,5 +17,4 @@
 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|3|(+0#e000e06&|)| +0#0000000&@54
 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|"+0#0000e05&| |e|n|d|f|u|n| +0#0000000&@34
 @75
-|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|4|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@10|#+0#0000e05&| |d|e|f| +0#0000000&@37
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_01.dump b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_01.dump
index 12268cdd59b454cb4a16a53a4e23f90ef5ba71bd..0049aeddc389a649b192b04b5b5f6a7b49c50b89 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_01.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|3+0#e000002&| +0#0000000&@62
+| +0&#ffffff0@1|f+0#af5f00255&|u|n| +0#0000000&|s+0#e000e06&|:|D+0#0000000&|o|T|e|s|t|3|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@8|"+0#0000e05&| |f|u|n| +0#0000000&@37
+@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|3+0#e000002&| +0#0000000&@62
 @2|e+0#af5f00255&|n|d|f|u|n| +0#0000000&@23|"+0#0000e05&| |e|n|d|f|u|n| +0#0000000&@34
 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|3|(+0#e000e06&|)| +0#0000000&@54
 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|"+0#0000e05&| |e|n|d|f|u|n| +0#0000000&@34
-@75
->d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|4|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@10|#+0#0000e05&| |d|e|f| +0#0000000&@37
+> @74
+|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|4|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@10|#+0#0000e05&| |d|e|f| +0#0000000&@37
 @2|d+0#af5f00255&|e|f| +0#0000000&|D|o|T|e|s|t|4|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@8|#+0#0000e05&| |d|e|f| +0#0000000&@37
 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|4+0#e000002&| +0#0000000&@62
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@23|#+0#0000e05&| |e|n|d@1|e|f| +0#0000000&@34
@@ -16,5 +17,4 @@
 @2|e+0#af5f00255&|n|d|f|u|n| +0#0000000&@23|"+0#0000e05&| |e|n|d|f|u|n| +0#0000000&@34
 @2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|T|e|s|t|5|(+0#e000e06&|)| +0#0000000&@56
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@25|#+0#0000e05&| |e|n|d@1|e|f| +0#0000000&@34
-@75
-@57|1|9|,|1| @9|5|4|%| 
+@57|1|9|,|0|-|1| @7|5|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_02.dump b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_02.dump
index c948b6cc769430861ecb1ca5104a8f702b5a5039..ae919ba17bc5bcc8cb1aad3e41d226a5bd1976e5 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_def_tail_comments_02.dump
@@ -1,20 +1,20 @@
-| +0&#ffffff0@74
+|e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@25|#+0#0000e05&| |e|n|d@1|e|f| +0#0000000&@34
+@75
 |f+0#af5f00255&|u|n| +0#0000000&|s+0#e000e06&|:|T+0#0000000&|e|s|t|6|(+0#e000e06&|)| +0#0000000&|a+0#e000e06&|b|o|r|t| +0#0000000&@12|"+0#0000e05&| |f|u|n| +0#0000000&@37
 @2|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|:|D+0#0000000&|o|T|e|s|t|6|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@6|#+0#0000e05&| |d|e|f| +0#0000000&@37
 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|6+0#e000002&| +0#0000000&@62
-@2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@23|#+0#0000e05&| |e|n|d@1|e|f| +0#0000000&@34
-@2>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|6|(+0#e000e06&|)| +0#0000000&@54
+@2>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@23|#+0#0000e05&| |e|n|d@1|e|f| +0#0000000&@34
+@2|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|:|D+0#0000000&|o|T|e|s|t|6|(+0#e000e06&|)| +0#0000000&@54
 |e+0#af5f00255&|n|d|f|u|n| +0#0000000&@25|"+0#0000e05&| |e|n|d|f|u|n| +0#0000000&@34
 @75
 |f+0#af5f00255&|o|r| +0#0000000&|d+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|r+0#00e0e07&|a|n|g|e|(+0#e000e06&|1+0#e000002&|,+0#0000000&| |6+0#e000002&|)+0#e000e06&|-+0#af5f00255&|>|r+0#00e0e07&|e|v|e|r|s|e|(+0#e000e06&|)| +0#0000000&@43
 @2|e+0#af5f00255&|x|e|c| +0#0000000&|$+0#e000002&|'|e|c|h|o| |s|:|T|e|s|t|{+0#e000e06&|d+0#00e0e07&|}+0#e000e06&|(+0#e000002&|)|'| +0#0000000&@48
 @2|e+0#af5f00255&|x|e|c| +0#0000000&|$+0#e000002&|'|d|e|l|f|u|n|c|t|i|o|n| |s|:|T|e|s|t|{+0#e000e06&|d+0#00e0e07&|}+0#e000e06&|'+0#e000002&| +0#0000000&@43
 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-|~| @73
 | +0#0000000&@56|3|7|,|3| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_00.dump b/runtime/syntax/testdir/dumps/vim_ex_function_fold_00.dump
index 2266ae01f066538e2a38cd5af5dde01927f36cbe..4fa7e437ae31fed7e7e71fa29aa58877c1a87279 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_00.dump
@@ -3,7 +3,7 @@
 | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|l|=|9@2| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@26
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |l|i|s|t| +0#0000000&@66
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |L|i|s|t| +0#0000000&@66
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1|f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1| @60
@@ -15,6 +15,6 @@
 | +0#0000e05#a8a8a8255@1|f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@50
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@60
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |D|e|f|i|n|i|t|i|o|n| +0#0000000&@60
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_01.dump b/runtime/syntax/testdir/dumps/vim_ex_function_fold_01.dump
index ac29b853124346db76c9286889aaaa3598740e63..78eef92c4cd554dd3609623be95319ff20f081e7 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_01.dump
@@ -2,7 +2,7 @@
 | +0#0000e05#a8a8a8255@1|f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@50
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@60
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |D|e|f|i|n|i|t|i|o|n| +0#0000000&@60
 | +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |e|m|p|t|y| |d|e|f|i|n|i|t|i|o|n| +0#0000000&@54
 |-+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@58

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_06.dump b/runtime/syntax/testdir/dumps/vim_ex_function_fold_06.dump
index 8a38361afee87eb794b5a4d138dd5ede816b1c18..4ad53bda382353e991c4b8f368a1fe78ee9c2316 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_06.dump
@@ -10,7 +10,7 @@
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&@61
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |m|o|d|i|f|i|e|r|s| +0#0000000&@61
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |M|o|d|i|f|i|e|r|s| +0#0000000&@61
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&|r+0#e000e06&|a|n|g|e| +0#0000000&@52
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&@61

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_10.dump b/runtime/syntax/testdir/dumps/vim_ex_function_fold_10.dump
index 091bed6becb679f36daac02a0622bcdf4db6fbc4..065c6370559014881ddbce335593131819b0b7e9 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_10.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_10.dump
@@ -3,7 +3,7 @@
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1>"+0&#ffffff0| |p|a|r|a|m|e|t|e|r|s| +0#0000000&@60
+| +0#0000e05#a8a8a8255@1>"+0&#ffffff0| |P|a|r|a|m|e|t|e|r|s| +0#0000000&@60
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|x+0#00e0e07&|,+0#0000000&| |y+0#00e0e07&|,+0#0000000&| |z+0#00e0e07&|,+0#0000000&| |.+0#00e0e07&@2|)+0#e000e06&| +0#0000000&@46
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|4+0#e000002&|2| +0#0000000&@61

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_12.dump b/runtime/syntax/testdir/dumps/vim_ex_function_fold_12.dump
index ab806b1b3378145e1eceddc0205c388eeaec8d2e..b118773bb538735e654146f394fa3000df766a8e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_12.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_12.dump
@@ -8,7 +8,7 @@
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&@61
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |a|r|g|u|m|e|n|t|s| +0#0000000&@61
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |A|r|g|u|m|e|n|t|s| +0#0000000&@61
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|a+0#00e0e07&|,+0#0000000&| |b+0#00e0e07&|,+0#0000000&| |c+0#00e0e07&|)+0#e000e06&| +0#0000000&@51
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|c|h|o| +0#0000000&|a+0#00e0e07&|:|a| +0#0000000&|a+0#00e0e07&|:|b| +0#0000000&|a+0#00e0e07&|:|c| +0#0000000&@54

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_13.dump b/runtime/syntax/testdir/dumps/vim_ex_function_fold_13.dump
index 96bd8fc1d7fa8c1cb4a464ee14d43c5f78fce023..a73c91e52686530f41989443b1aa0b15b205b9d4 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_13.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_13.dump
@@ -10,7 +10,7 @@
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&@61
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |c|o|m@1|e|n|t|s| +0#0000000&@62
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |C|o|m@1|e|n|t|s| +0#0000000&@62
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@58
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|"+0#0000e05&| |L|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@47

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_14.dump b/runtime/syntax/testdir/dumps/vim_ex_function_fold_14.dump
index 94063c1d55d836360253426fad7a372396a18b23..e64fe80c85adcbfbdceb94a3a30dbf703e8ddf3a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_14.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_14.dump
@@ -1,13 +1,13 @@
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&@61
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |c|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@53
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |C|o|m@1|a|n|d| |m|o|d|i|f|i|e|r|s| +0#0000000&@53
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| >s+0#af5f00255#ffffff0|i|l|e|n|t|!| +0#0000000&|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@50
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&@61
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |l|e|a|d|i|n|g| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@45
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |L|e|a|d|i|n|g| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@45
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&||| |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@45
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c|t|i|o|n| +0#0000000&@61

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_15.dump b/runtime/syntax/testdir/dumps/vim_ex_function_fold_15.dump
index 02db046de5a94dc61434561233849101ef7e0575..48a877e15944a2dfbcc3f2bb466a9d2641a88ecd 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_15.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_15.dump
@@ -3,7 +3,7 @@
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|f|u|n|c| +0#0000000&@65
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1>"+0&#ffffff0| |f|o|l|d|-|r|e|g|i|o|n| |e|n|d|i|n|g| +0#0000000&@52
+| +0#0000e05#a8a8a8255@1>"+0&#ffffff0| |F|o|l|d|-|r|e|g|i|o|n| |e|n|d|i|n|g| +0#0000000&@52
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@58
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|"+0#0000e05&| |e|n|d|f|u|n|c|t|i|o|n| +0#0000000&@57

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_nested_00.dump b/runtime/syntax/testdir/dumps/vim_ex_function_nested_00.dump
index 6f0ca86a2e55270f5c09afdd7dd92b737ead2787..dd0f87a92342977f3d325be0fd665d079ca8e43c 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_nested_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_nested_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|d|e|f| |a|n|d| |:|f|u|n|c|t|i|o|n| |c|o|m@1|a|n|d|s| |(|n|e|s|t|e|d|)| +0#0000000&@32
 @75
+@75
 |d+0#af5f00255&|e|f| +0#0000000&|F|u|n|A|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@56
 @4|d+0#af5f00255&|e|f| +0#0000000&|D|o|F|u|n|A|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@50
 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&|.|"| +0#0000000&@56
@@ -16,5 +17,4 @@
 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|F|u|n|B|(+0#e000e06&|)| +0#0000000&@55
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
 @75
-|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|u|n|C|(+0#e000e06&|)| +0#0000000&@59
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_nested_01.dump b/runtime/syntax/testdir/dumps/vim_ex_function_nested_01.dump
index 640bdf5545eff9d2c1d0ee5322b3bdc94f8127e2..1f035effe53d531498dba86c4ac437f409434a54 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_nested_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_nested_01.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@3|e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@59
+| +0&#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&|.@1|"| +0#0000000&@55
+@4|e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@59
 @75
 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|F|u|n|B|(+0#e000e06&|)| +0#0000000&@55
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
-@75
->f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|u|n|C|(+0#e000e06&|)| +0#0000000&@59
+> @74
+|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|u|n|C|(+0#e000e06&|)| +0#0000000&@59
 @4|d+0#af5f00255&|e|f| +0#0000000&|D|o|F|u|n|C|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@50
 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&|.@2|"| +0#0000000&@54
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
@@ -16,5 +17,4 @@
 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|"+0#e000002&|.@3|"| +0#0000000&@53
 @4|e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@59
 @75
-@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|F|u|n|D|(+0#e000e06&|)| +0#0000000&@55
-@57|1|9|,|1| @9|6|8|%| 
+@57|1|9|,|0|-|1| @7|6|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_nested_02.dump b/runtime/syntax/testdir/dumps/vim_ex_function_nested_02.dump
index e60a27796bd3fb60c051fb6a66f22ce30defdc0f..6061a7656887262a0f117200b8d2dd84505ba50f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_nested_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_nested_02.dump
@@ -1,10 +1,12 @@
-| +0&#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|F|u|n|D|(+0#e000e06&|)| +0#0000000&@55
+| +0&#ffffff0@74
+@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|D|o|F|u|n|D|(+0#e000e06&|)| +0#0000000&@55
 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|F|u|n|A|(+0#e000e06&|)| +0#0000000&@63
-|e+0#af5f00255&|c|h|o| +0#0000000&|F|u|n|B|(+0#e000e06&|)| +0#0000000&@63
->e+0#af5f00255&|c|h|o| +0#0000000&|F|u|n|C|(+0#e000e06&|)| +0#0000000&@63
+>e+0#af5f00255&|c|h|o| +0#0000000&|F|u|n|B|(+0#e000e06&|)| +0#0000000&@63
+|e+0#af5f00255&|c|h|o| +0#0000000&|F|u|n|C|(+0#e000e06&|)| +0#0000000&@63
 |e+0#af5f00255&|c|h|o| +0#0000000&|F|u|n|D|(+0#e000e06&|)| +0#0000000&@63
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
@@ -15,6 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-|~| @73
 | +0#0000000&@56|3|7|,|1| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_nested_fold_00.dump b/runtime/syntax/testdir/dumps/vim_ex_function_nested_fold_00.dump
index 7d658b742cffc6e3345b63c994889b322f571e6d..85ca3ef50b3a546ebf9d388e5eafca1da4e4acfc 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_function_nested_fold_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_nested_fold_00.dump
@@ -2,6 +2,7 @@
 | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|f|o|l|d|i|n|g| |=| |'|f|'| +0#0000000&@29
 | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l| |f|d|c|=|2| |f|d|m|=|s|y|n|t|a|x| +0#0000000&@34
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |++0#0000e05#a8a8a8255| |+|-@1| @1|7| |l|i|n|e|s|:| |d|e|f| |F|u|n|A|(|)|:| |s|t|r|i|n|g|-@40
 | @1| +0#0000000#ffffff0@72
 |++0#0000e05#a8a8a8255| |+|-@1| @1|7| |l|i|n|e|s|:| |d|e|f| |F|u|n|B|(|)|:| |s|t|r|i|n|g|-@40
@@ -14,7 +15,6 @@
 | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|F|u|n|B|(+0#e000e06&|)| +0#0000000&@61
 | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|F|u|n|C|(+0#e000e06&|)| +0#0000000&@61
 | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|F|u|n|D|(+0#e000e06&|)| +0#0000000&@61
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |~+0#4040ff13&| @73
-|~| @73
-|~| @73
 | +0#0000000&@56|1|,|1| @10|A|l@1| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_grep_00.dump b/runtime/syntax/testdir/dumps/vim_ex_grep_00.dump
index c23ec04d23e22ebd2779a703b1c69ab1902dcce8..702882a7144cd1bc4b908e4d372cbb8108d48ac7 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_grep_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_grep_00.dump
@@ -16,5 +16,5 @@
 |l+0#af5f00255&|g|r|e|p|a|d@1|!| +0#0000000&|'|p|a|t|\+0#e000e06&|||t+0#0000000&|e|r|n|'| |f|o@1|.|t|x|t| @45
 @75
 @75
-|"+0#0000e05&| |s|p|e|c|i|a|l| |f|i|l|e|n|a|m|e| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@45
+|"+0#0000e05&| |S|p|e|c|i|a|l| |f|i|l|e|n|a|m|e| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@45
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_grep_01.dump b/runtime/syntax/testdir/dumps/vim_ex_grep_01.dump
index 4bfb61327ac4526c35b7d4b3b23d5db5ff7783a2..fd6df33d5aa98319e9d8f2641dc07c14f3dc1d19 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_grep_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_grep_01.dump
@@ -3,7 +3,7 @@
 |l+0#af5f00255&|g|r|e|p|a|d@1|!| +0#0000000&|'|p|a|t|\+0#e000e06&|||t+0#0000000&|e|r|n|'| |f|o@1|.|t|x|t| @45
 @75
 @75
->"+0#0000e05&| |s|p|e|c|i|a|l| |f|i|l|e|n|a|m|e| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@45
+>"+0#0000e05&| |S|p|e|c|i|a|l| |f|i|l|e|n|a|m|e| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@45
 @75
 |g+0#af5f00255&|r|e|p| +0#0000000&@1|'|p|a|t|\+0#e000e06&|||t+0#0000000&|e|r|n|'| |%| @55
 |l+0#af5f00255&|g|r|e|p| +0#0000000&|'|p|a|t|\+0#e000e06&|||t+0#0000000&|e|r|n|'| |%| @55

diff --git a/runtime/syntax/testdir/dumps/vim_ex_grep_02.dump b/runtime/syntax/testdir/dumps/vim_ex_grep_02.dump
index bce2ea4096d4cde421c1aa675429c7c36518117a..0dd1030c50a0760c5deb237637766570a1f8f6a9 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_grep_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_grep_02.dump
@@ -1,6 +1,6 @@
 | +0&#ffffff0@74
 @75
-|"+0#0000e05&| |t|r|a|i|l|i|n|g| |b|a|r|,| |n|o| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@43
+|"+0#0000e05&| |T|r|a|i|l|i|n|g| |b|a|r|,| |n|o| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@43
 @75
 |g+0#af5f00255&|r|e|p| +0#0000000&@1|'|p|a|t|\+0#e000e06&|||t+0#0000000&|e|r|n|'| |f|o@1|.|t|x|t| ||+0#af5f00255&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@36
 >l+0#af5f00255&|g|r|e|p| +0#0000000&|'|p|a|t|\+0#e000e06&|||t+0#0000000&|e|r|n|'| |f|o@1|.|t|x|t| ||+0#af5f00255&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@36

diff --git a/runtime/syntax/testdir/dumps/vim_ex_highlight_00.dump b/runtime/syntax/testdir/dumps/vim_ex_highlight_00.dump
index e58e4b0c8d47abdcce483d6d10ea5835ec681f28..8e32efb164009f7e4212b9b02fdc582ef271c2f7 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_highlight_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_highlight_00.dump
@@ -2,7 +2,7 @@
 |"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|H|i|G|r|o|u|p| |T|o|d|o| +0#0000000&@34
 @75
 @75
-|"+0#0000e05&| |l|i|s|t| +0#0000000&@68
+|"+0#0000e05&| |L|i|s|t| +0#0000000&@68
 @75
 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&@65
 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|C+0#00e0003&|o|m@1|e|n|t| +0#0000000&@57
@@ -11,10 +11,10 @@
 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0@61
 @75
 @75
-|"+0#0000e05&| |r|e|s|e|t| +0#0000000&@67
+|"+0#0000e05&| |R|e|s|e|t| +0#0000000&@67
 @75
 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|c+0#00e0003&|l|e|a|r| +0#0000000&@59
 @75
 @75
-|"+0#0000e05&| |d|i|s|a|b|l|e| +0#0000000&@65
+|"+0#0000e05&| |D|i|s|a|b|l|e| +0#0000000&@65
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_highlight_01.dump b/runtime/syntax/testdir/dumps/vim_ex_highlight_01.dump
index 6a593e7745815e3c9221e43398603eddbf3ca6fe..0e3ab04015092f2ba6008f7dc32f728731d327f9 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_highlight_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_highlight_01.dump
@@ -1,9 +1,9 @@
-|"+0#0000e05#ffffff0| |r|e|s|e|t| +0#0000000&@67
+|"+0#0000e05#ffffff0| |R|e|s|e|t| +0#0000000&@67
 @75
 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|c+0#00e0003&|l|e|a|r| +0#0000000&@59
 @75
 @75
->"+0#0000e05&| |d|i|s|a|b|l|e| +0#0000000&@65
+>"+0#0000e05&| |D|i|s|a|b|l|e| +0#0000000&@65
 @75
 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|c+0#00e0003&|l|e|a|r| +0#0000000&|C+0#00e0003&|o|m@1|e|n|t| +0#0000000&@51
 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|c+0#00e0003&|l|e|a|r| +0#0000000&|C+0#00e0003&|o|n|c|e|a|l| +0#0000000&@51
@@ -16,5 +16,5 @@
 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|N+0#00e0003&|O|N|E| +0#0000000&@56
 @75
 @75
-|"+0#0000e05&| |a|d@1|/|m|o|d|i|f|y| +0#0000000&@62
+|"+0#0000e05&| |A|d@1|/|m|o|d|i|f|y| +0#0000000&@62
 @57|1|9|,|1| @9|1|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_highlight_02.dump b/runtime/syntax/testdir/dumps/vim_ex_highlight_02.dump
index a06876473b5cc5e3dcc904d4f13a9dfe499eaf9f..f91917d432996dac42e00336ce28e34d6fab2e1f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_highlight_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_highlight_02.dump
@@ -1,4 +1,4 @@
-|"+0#0000e05#ffffff0| |a|d@1|/|m|o|d|i|f|y| +0#0000000&@62
+|"+0#0000e05#ffffff0| |A|d@1|/|m|o|d|i|f|y| +0#0000000&@62
 @75
 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|C+0#00e0003&|o|m@1|e|n|t| +0#0000000&|c+0#00e0003&|t|e|r|m|=+0#0000000&|u+0#e000e06&|n|d|e|r|l|i|n|e| +0#0000000&@41
 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|C+0#00e0003&|o|n|c|e|a|l| +0#0000000&|c+0#00e0003&|t|e|r|m|=+0#0000000&|u+0#e000e06&|n|d|e|r|l|i|n|e| +0#0000000&@41
@@ -11,7 +11,7 @@
 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|E+0#00e0003&|r@1|o|r|M|s|g| +0#0000000&|t+0#00e0003&|e|r|m|=+0#0000000&|b+0#e000e06&|o|l|d| +0#0000000&@42
 @75
 @75
-|"+0#0000e05&| |l|i|n|k| +0#0000000&@68
+|"+0#0000e05&| |L|i|n|k| +0#0000000&@68
 @75
 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|l+0#00e0003&|i|n|k| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|C+0#00e0003&|o|m@1|e|n|t| +0#0000000&@48
 |h+0#af5f00255&|i|g|h|l|i|g|h|t|!| +0#0000000&|l+0#00e0003&|i|n|k| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|C+0#00e0003&|o|m@1|e|n|t| +0#0000000&@47

diff --git a/runtime/syntax/testdir/dumps/vim_ex_highlight_03.dump b/runtime/syntax/testdir/dumps/vim_ex_highlight_03.dump
index d82e771d6d23e8b02cf0f18a5e6e570fa03f3385..f5da0db9b0510185964ac2e93cbf8b74cbdaec2f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_highlight_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_highlight_03.dump
@@ -3,7 +3,7 @@
 |h+0#af5f00255&|i|g|h|l|i|g|h|t|!| +0#0000000&|l+0#00e0003&|i|n|k| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|E+0#00e0003&|r@1|o|r|M|s|g| +0#0000000&@46
 @75
 @75
->"+0#0000e05&| |d|e|f|a|u|l|t| |l|i|n|k| +0#0000000&@60
+>"+0#0000e05&| |D|e|f|a|u|l|t| |l|i|n|k| +0#0000000&@60
 @75
 |h+0#af5f00255&|i|g|h|l|i|g|h|t| +0#0000000&|d+0#00e0003&|e|f|a|u|l|t| |l|i|n|k| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|C+0#00e0003&|o|m@1|e|n|t| +0#0000000&@40
 |h+0#af5f00255&|i|g|h|l|i|g|h|t|!| +0#0000000&|d+0#00e0003&|e|f|a|u|l|t| |l|i|n|k| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|C+0#00e0003&|o|m@1|e|n|t| +0#0000000&@39
@@ -13,7 +13,7 @@
 |h+0#af5f00255&|i|g|h|l|i|g|h|t|!| +0#0000000&|d+0#00e0003&|e|f|a|u|l|t| |l|i|n|k| +0#0000000&|F+0#0000001#ffff4012|o@1| +0#0000000#ffffff0|E+0#00e0003&|r@1|o|r|M|s|g| +0#0000000&@38
 @75
 @75
-|"+0#0000e05&| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n| |a|n|d| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@33
+|"+0#0000e05&| |L|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n| |a|n|d| |c|o|m@1|a|n|d| |s|e|p|a|r|a|t|o|r| +0#0000000&@33
 @75
 |h+0#af5f00255&|i| +0#0000000&|C+0#00e0003&|o|m@1|e|n|t| +0#0000000&@64
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58

diff --git a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_04.dump b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_04.dump
index af1ff53a8a6159a9449066611ff9eb4cd74edb64..5b8263a2c7b8e0e5f1dd380a15209021c302bfff 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_04.dump
@@ -1,7 +1,7 @@
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|O|S| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |t|r|i|m| +0#0000000&@66
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |T|r|i|m| +0#0000000&@66
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| >l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52
 ||+0#0000e05#a8a8a8255| | +0#e000002#ffffff0@1|l|i|n|e|1| +0#0000000&@65
@@ -14,7 +14,7 @@
 ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |i|n|t|e|r|p|o|l|a|t|i|o|n| +0#0000000&@57
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |I|n|t|e|r|p|o|l|a|t|i|o|n| +0#0000000&@57
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |E|N|D| +0#0000000&@52
 @57|7|3|,|1| @9|2|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_06.dump b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_06.dump
index ca53c5f74eff18ac2dadff8f90a4c3e47674e530..cca169c05acac4326604d3b6c0aff2b8e2910d95 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_06.dump
@@ -1,6 +1,6 @@
 ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |n|o| |i|n|t|e|r|p|o|l|a|t|i|o|n| |(|e|s|c|a|p|e|d| |{| |a|n|d| |}|)| +0#0000000&@36
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |N|o| |i|n|t|e|r|p|o|l|a|t|i|o|n| |(|e|s|c|a|p|e|d| |{| |a|n|d| |}|)| +0#0000000&@36
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |E|N|D| +0#0000000&@52
 ||+0#0000e05#a8a8a8255| >l+0#e000002#ffffff0|i|n|e|{+0#e000e06&@1|1+0#e000002&| |+| |0|}+0#e000e06&@1| +0#0000000&@59

diff --git a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_07.dump b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_07.dump
index be981200aaa5fcc9270822d0286b4a97357f94e9..bfa037dedd67929d85e4be5ecb46411dd7fe2550 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_07.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_07.dump
@@ -5,7 +5,7 @@
 ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67
 | +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |n|o| |i|n|t|e|r|p|o|l|a|t|i|o|n| +0#0000000&@54
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |N|o| |i|n|t|e|r|p|o|l|a|t|i|o|n| +0#0000000&@54
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@57
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|{|1| |+| |0|}| +0#0000000&@61

diff --git a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_08.dump b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_08.dump
index e4f3f1e76569a6f09d16aa569ae00fa0926b0c70..661c39eb6971d78d0faaa36332d8d4115815ad5d 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_08.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_08.dump
@@ -10,7 +10,7 @@
 ||+0#0000e05#a8a8a8255| | +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@67
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |e|n|d| |m|a|r|k|e|r| |m|u|s|t| |n|o|t| |b|e| |f|o|l@1|o|w|e|d| |b|y| |w|h|i|t|e|s|p|a|c|e| +0#0000000&@25
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |E|n|d| |m|a|r|k|e|r| |m|u|s|t| |n|o|t| |b|e| |f|o|l@1|o|w|e|d| |b|y| |w|h|i|t|e|s|p|a|c|e| +0#0000000&@25
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |a|s@1|e|r|t|_|e|q|u|a|l|(|f|o@1|,| |[|"|E|N|D| |"|]|)| +0#0000000&@43
 |-+0#0000e05#a8a8a8255| |l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@57

diff --git a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_12.dump b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_12.dump
index 2c69f9ef1eed56efd3eb78036182bade3fa104be..a65d1ff236b27a6f4daaf233a0295963f72e16b7 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_12.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_12.dump
@@ -16,5 +16,5 @@
 ||+0#0000e05#a8a8a8255| |E+0#e000e06#ffffff0|N|D| +0#0000000&@69
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |e|n|d| |m|a|r|k|e|r|s| +0#0000000&@59
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |E|n|d| |m|a|r|k|e|r|s| +0#0000000&@59
 @57|2|1|5|,|1| @8|9|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_13.dump b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_13.dump
index 12ff7d5b9597706ddb5f5986275eb865ce575f9a..b69d31d850c25cab9d3b0c47257ed52a9d8fa95c 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_13.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_let_heredoc_13.dump
@@ -1,4 +1,4 @@
-| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |e|n|d| |m|a|r|k|e|r|s| +0#0000000&@59
+| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |E|n|d| |m|a|r|k|e|r|s| +0#0000000&@59
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |!|@|#|$|%|^|&|*|(|)|_|+| +0#0000000&@48
 ||+0#0000e05#a8a8a8255| |l+0#e000002#ffffff0|i|n|e|1| +0#0000000&@67

diff --git a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump
index bda8d791b63663fb07a40b35e3a150c390341d64..ab573500b7e58550df07a440a3406bc20cab0937 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d| +0#0000000&@49
 @75
+@75
 |s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&|u|t|f|-+0#af5f00255&|8+0#e000002&| +0#0000000&@54
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|k|e|y|m|a|p|_|n|a|m|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|s|y|n|t|a|x|-|t|e|s|t|"| +0#0000000&@41
@@ -16,5 +17,4 @@
 |"+0#0000e05&| |S|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| +0#0000000&@56
 |<+0#e000e06&|c|h|a|r|-|6|2|>| +0#0000000&@5|B| @14|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |L|H|S| |-| |d|e|c|i|m|a|l| +0#0000000&@2
 |c| @13|<+0#e000e06&|c|h|a|r|-|0|1|0|3|>| +0#0000000&@4|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |R|H|S| |-| |o|c|t|a|l| +0#0000000&@4
-|<+0#e000e06&|c|h|a|r|-|0|x|0@1|6|4|>| +0#0000000&@1|<+0#e000e06&|c|h|a|r|-|0|x|0@1|4@1|>| +0#0000000&@2|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |L|H|S| |a|n|d| |R|H|S| |-|@+0#4040ff13&@2
-| +0#0000000&@56|1|,|1| @10|T|o|p| 
+@57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump
index 2fb05a7f094b3773921de23271340403d7e63723..246775f5d29fa5aa5d0019e20cf2e043681342c6 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump
@@ -1,9 +1,10 @@
-|'+0&#ffffff0|a| |á| @2|M+0#0000e05&|o|r|e| |t|h|a|n| |o|n|e| |c|h|a|r| |i|n| |f|i|r|s|t| |c|o|l|u|m|n| +0#0000000&@33
+|a+0&#ffffff0| |A| @3|B+0#0000e05&|a|s|i|c| |m|a|p@1|i|n|g| +0#0000000&@54
+|'|a| |á| @2|M+0#0000e05&|o|r|e| |t|h|a|n| |o|n|e| |c|h|a|r| |i|n| |f|i|r|s|t| |c|o|l|u|m|n| +0#0000000&@33
 @75
 |"+0#0000e05&| |S|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| +0#0000000&@56
 |<+0#e000e06&|c|h|a|r|-|6|2|>| +0#0000000&@5|B| @14|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |L|H|S| |-| |d|e|c|i|m|a|l| +0#0000000&@2
-|c| @13|<+0#e000e06&|c|h|a|r|-|0|1|0|3|>| +0#0000000&@4|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |R|H|S| |-| |o|c|t|a|l| +0#0000000&@4
-><+0#e000e06&|c|h|a|r|-|0|x|0@1|6|4|>| +0#0000000&@1|<+0#e000e06&|c|h|a|r|-|0|x|0@1|4@1|>| +0#0000000&@2|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |L|H|S| |a|n|d| |R|H|S| |-| |h|e
+>c| @13|<+0#e000e06&|c|h|a|r|-|0|1|0|3|>| +0#0000000&@4|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |R|H|S| |-| |o|c|t|a|l| +0#0000000&@4
+|<+0#e000e06&|c|h|a|r|-|0|x|0@1|6|4|>| +0#0000000&@1|<+0#e000e06&|c|h|a|r|-|0|x|0@1|4@1|>| +0#0000000&@2|S+0#0000e05&|p|e|c|i|a|l| |n|o|t|a|t|i|o|n| |a|l@1|o|w|e|d| |i|n| |L|H|S| |a|n|d| |R|H|S| |-| |h|e
 |x|a|d|e|c|i|m|a|l| +0#0000000&@65
 @75
 |"+0#0000e05&| |V|i|m|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@43
@@ -13,8 +14,7 @@
 @1|e|n|t| +0#0000000&@70
 |:| |"| @27|L+0#0000e05&|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a| |l|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m
 @1|e|n|t| +0#0000000&@70
+@75
 |~+0#4040ff13&| @73
 |~| @73
-|~| @73
-|~| @73
 | +0#0000000&@56|1|9|,|1| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump
index 664947534f6a669c3e67c7bfcf1c0e929300ed5b..4ecde124bb2795240624458251a00507873c872b 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_bar_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d| |(|a|f|t|e|r| |"+0#e000002&|||"|)+0#0000e05&| +0#0000000&@37
 @75
+@75
 |s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&|u|t|f|-+0#af5f00255&|8+0#e000002&| +0#0000000&@54
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|k|e|y|m|a|p|_|n|a|m|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|s|y|n|t|a|x|-|t|e|s|t|"| +0#0000000&@41
@@ -16,5 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
 | +0#0000000&@56|1|,|1| @10|A|l@1| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump
index f0e5adc17f032d19e6c726f33094d35534afb1c3..d7911d86b5c1b7cc6d32150914609ff04de5db4b 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_after_colon_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|l|o|a|d|k|e|y|m|a|p| |c|o|m@1|a|n|d| |(|a|f|t|e|r| |"+0#e000002&|:|"|)+0#0000e05&| +0#0000000&@37
 @75
+@75
 |s+0#af5f00255&|c|r|i|p|t|e|n|c|o|d|i|n|g| +0#0000000&|u|t|f|-+0#af5f00255&|8+0#e000002&| +0#0000000&@54
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|k|e|y|m|a|p|_|n|a|m|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|s|y|n|t|a|x|-|t|e|s|t|"| +0#0000000&@41
@@ -16,5 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
 | +0#0000000&@56|1|,|1| @10|A|l@1| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_make_00.dump b/runtime/syntax/testdir/dumps/vim_ex_make_00.dump
index 9de6731e94034ea4b348070e631d2b4273082ba3..f7bc47c7c824835f81b5558399a061580f6daeb1 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_make_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_make_00.dump
@@ -1,6 +1,6 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|*|m|a|k|e| |c|o|m@1|a|n|d|s| +0#0000000&@53
-|"+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|C|m|d|S|e|p| |O|p|e|r|a|t|o|r| +0#0000000&@24
-|"+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|M|a|k|e|B|a|r|E|s|c|a|p|e| |S|p|e|c|i|a|l| +0#0000000&@18
+|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|C|m|d|S|e|p| |O|p|e|r|a|t|o|r| +0#0000000&@31
+|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|M|a|k|e|B|a|r|E|s|c|a|p|e| |S|p|e|c|i|a|l| +0#0000000&@25
 @75
 @75
 |m+0#af5f00255&|a|k|e| +0#0000000&@70
@@ -16,5 +16,5 @@
 |l+0#af5f00255&|m|a|k|e|!| +0#0000000&|-|o|p|t|i|o|n|s| |t|a|r|g|e|t| @52
 @75
 @75
-|"+0#0000e05&| |s|p|e|c|i|a|l| |f|i|l|e|n|a|m|e| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@45
+|"+0#0000e05&| |S|p|e|c|i|a|l| |f|i|l|e|n|a|m|e| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@45
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_make_01.dump b/runtime/syntax/testdir/dumps/vim_ex_make_01.dump
index bd89d5abc393383e87e42267421f28266f1aa8fa..570358cbba0e8d2f55fb4a0f25bd0a940ae6ef45 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_make_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_make_01.dump
@@ -3,13 +3,13 @@
 |l+0#af5f00255&|m|a|k|e|!| +0#0000000&|-|o|p|t|i|o|n|s| |t|a|r|g|e|t| @52
 @75
 @75
->"+0#0000e05&| |s|p|e|c|i|a|l| |f|i|l|e|n|a|m|e| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@45
+>"+0#0000e05&| |S|p|e|c|i|a|l| |f|i|l|e|n|a|m|e| |c|h|a|r|a|c|t|e|r|s| +0#0000000&@45
 @75
 |m+0#af5f00255&|a|k|e| +0#0000000&@1|%| @67
 |l+0#af5f00255&|m|a|k|e| +0#0000000&|%| @67
 @75
 @75
-|"+0#0000e05&| |t|r|a|i|l|i|n|g| |b|a|r|,| |n|o| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@43
+|"+0#0000e05&| |T|r|a|i|l|i|n|g| |b|a|r|,| |n|o| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@43
 @75
 |m+0#af5f00255&|a|k|e| +0#0000000&@1|t|a|r|\+0#e000e06&|||g+0#0000000&|e|t| ||+0#af5f00255&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
 |l+0#af5f00255&|m|a|k|e| +0#0000000&|t|a|r|\+0#e000e06&|||g+0#0000000&|e|t| ||+0#af5f00255&| +0#0000000&|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47

diff --git a/runtime/syntax/testdir/dumps/vim_ex_map_00.dump b/runtime/syntax/testdir/dumps/vim_ex_map_00.dump
index 0f5ccdbffa8d0ab50d4a543d0215700bad51f788..48b215a7560f92e643223c185e227fc363ea037a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_map_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_map_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|m|a|p| |c|o|m@1|a|n|d|s| +0#0000000&@55
 @75
+@75
 |m+0#af5f00255&|a|p|!| +0#0000000&@70
 |m+0#af5f00255&|a|p|!| +0#0000000&|l|h|s| |r|h|s| @62
 |m+0#af5f00255&|a|p| +0#0000000&@71
@@ -16,5 +17,4 @@
 @75
 |m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |<+0#e000e06&|L|e|a|d|e|r|>|r+0#0000000&|h|s| @55
 |m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |<+0#e000e06&|L|o|c|a|l|L|e|a|d|e|r|>|r+0#0000000&|h|s| @50
-@75
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_map_01.dump b/runtime/syntax/testdir/dumps/vim_ex_map_01.dump
index 51299511e9341fb5515519eb4a902bbb88d64dd0..c69b9b3764c4252ddc15a31642919af82e33cad4 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_map_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_map_01.dump
@@ -1,9 +1,10 @@
-|m+0#af5f00255#ffffff0|a|p| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|l+0#0000000&|h|s| @5|r|h|s| @50
+| +0&#ffffff0@74
+|m+0#af5f00255&|a|p| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|l+0#0000000&|h|s| @5|r|h|s| @50
 |m+0#af5f00255&|a|p| +0#0000000&|<+0#e000e06&|L|o|c|a|l|L|e|a|d|e|r|>|l+0#0000000&|h|s| |r|h|s| @50
 @75
 |m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |<+0#e000e06&|L|e|a|d|e|r|>|r+0#0000000&|h|s| @55
-|m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |<+0#e000e06&|L|o|c|a|l|L|e|a|d|e|r|>|r+0#0000000&|h|s| @50
-> @74
+>m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |<+0#e000e06&|L|o|c|a|l|L|e|a|d|e|r|>|r+0#0000000&|h|s| @50
+@75
 |m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |<+0#e000e06&|P|l|u|g|>|r+0#0000000&|h|s| @57
 @75
 |m+0#af5f00255&|a|p|c|l|e|a|r| +0#0000000&@1|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56
@@ -16,5 +17,4 @@
 |i+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56
 |l+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56
 |c+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56
-|t+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56
-@57|1|9|,|0|-|1| @7|1|3|%| 
+@57|1|9|,|1| @9|1|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_map_02.dump b/runtime/syntax/testdir/dumps/vim_ex_map_02.dump
index a05d8a29450b5f34c87cab74d85ddd69ebd189bd..1acccc9f86d2f2766a0eea4d6b50846ed40d380a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_map_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_map_02.dump
@@ -1,9 +1,10 @@
-|t+0#af5f00255#ffffff0|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56
+|c+0#af5f00255#ffffff0|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56
+|t+0#af5f00255&|m|a|p|c|l|e|a|r| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&@56
 @75
 @75
 |"+0#0000e05&| |:|h|e|l|p| |m|a|p|-|b|a|r| +0#0000000&@59
-@75
->"+0#0000e05&| |<|B|a|r|>| @4|'|<|'| |i|s| |n|o|t| |i|n| |'|c|p|o|p|t|i|o|n|s|'| +0#0000000&@37
+> @74
+|"+0#0000e05&| |<|B|a|r|>| @4|'|<|'| |i|s| |n|o|t| |i|n| |'|c|p|o|p|t|i|o|n|s|'| +0#0000000&@37
 |m+0#af5f00255&|a|p| +0#0000000&|_|l| |:|!|l|s| |<+0#e000e06&|B|a|r|>| +0#0000000&|m|o|r|e|^|M|:|e|c|h|o| |"|r|h|s|"|<+0#e000e06&|C|R|>| +0#0000000&@35
 |"+0#0000e05&| |\||| @7|'|b|'| |i|s| |n|o|t| |i|n| |'|c|p|o|p|t|i|o|n|s|'| +0#0000000&@37
 |m+0#af5f00255&|a|p| +0#0000000&|_|l| |:|!|l|s| |\||| |m|o|r|e|^|M|:|e|c|h|o| |"|r|h|s|"|<+0#e000e06&|C|R|>| +0#0000000&@38
@@ -13,8 +14,7 @@
 |m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |:|s|e|a|r|c|h|(|'|f|o@1|\@1|||b|a|r|'|)|<+0#e000e06&|C|R|>|:+0#0000000&|e|c|h|o| |"|r|h|s|"|<+0#e000e06&|C|R|>| +0#0000000&@27
 @75
 @75
-|"+0#0000e05&| |m|u|l|t|i|l|i|n|e| |R|H|S| +0#0000000&@59
+|"+0#0000e05&| |M|u|l|t|i|l|i|n|e| |R|H|S| +0#0000000&@59
 @75
 |m+0#af5f00255&|a|p| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|b+0#0000000&|a|z| @59
-@2|\+0#e000e06&| +0#0000000&|:|e|c|h|o| |(|<+0#e000e06&|B|a|r|>| +0#0000000&@58
-@57|3|7|,|1| @9|3|1|%| 
+@57|3|7|,|0|-|1| @7|3|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_map_03.dump b/runtime/syntax/testdir/dumps/vim_ex_map_03.dump
index d6dbe57398a08abcb23be5413c7c8f651dfd87ef..f9c9a7221cfcd7e58e9a2bc0230a558d181e0631 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_map_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_map_03.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|\+0#e000e06&| +0#0000000&|:|e|c|h|o| |(|<+0#e000e06&|B|a|r|>| +0#0000000&@58
+|m+0#af5f00255#ffffff0|a|p| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|b+0#0000000&|a|z| @59
+@2|\+0#e000e06&| +0#0000000&|:|e|c|h|o| |(|<+0#e000e06&|B|a|r|>| +0#0000000&@58
 @2|\+0#e000e06&| +0#0000000&@71
 @2|\+0#e000e06&|'+0#0000000&|b|a|r|'|)|<+0#e000e06&|C|R|>| +0#0000000&@61
 @2|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@62
-@75
->m+0#af5f00255&|a|p| +0#0000000&|l|h|s| @67
+> @74
+|m+0#af5f00255&|a|p| +0#0000000&|l|h|s| @67
 @2|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@62
 @2|\+0#e000e06&| +0#0000000&|e|c|h|o| |"|f|o@1|"| @60
 @75
@@ -16,5 +17,4 @@
 @2|\+0#e000e06&| +0#0000000&|e|c|h|o| |"|f|o@1|"| @60
 @75
 |m+0#af5f00255&|a|p| +0#0000000&|l|^+0#0000e05&|V| +0#0000000&|h|s| @64
-@2|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@62
-@57|5@1|,|1| @9|4|9|%| 
+@57|5@1|,|0|-|1| @7|4|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_map_04.dump b/runtime/syntax/testdir/dumps/vim_ex_map_04.dump
index feb06ed1e0698d2a4bc5697cd8af7c512670a671..1f395aed39f44a9a6ff703ae954adc4f22a89764 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_map_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_map_04.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@62
+|m+0#af5f00255#ffffff0|a|p| +0#0000000&|l|^+0#0000e05&|V| +0#0000000&|h|s| @64
+@2|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@62
 @2|\+0#e000e06&| +0#0000000&|e|c|h|o| |"|f|o@1|"| @60
 @75
 |m+0#af5f00255&|a|p| +0#0000000&|l|^+0#0000e05&|V| +0#0000000&|h|s| @64
-@2|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@62
-@2>\+0#e000e06&| +0#0000000&|e|c|h|o| |"|f|o@1|"| @60
+@2>"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@62
+@2|\+0#e000e06&| +0#0000000&|e|c|h|o| |"|f|o@1|"| @60
 @75
 |m+0#af5f00255&|a|p| +0#0000000&|l|h|s| |r|h|s| @63
 |m+0#af5f00255&|a|p| +0#0000000&|l|^+0#0000e05&|V| +0#0000000&|h|^+0#0000e05&|V| +0#0000000&|s|^+0#0000e05&|V| +0#0000000&@1|r|h|s| @54
@@ -16,5 +17,4 @@
 |"+0#0000e05&| |D|i|f@1|e|r|e|n|t|i|a|t|e| |m|a|p|(|)| |f|r|o|m| |:|m|a|p| +0#0000000&@43
 @75
 |m+0#af5f00255&|a|p| +0#0000000&|(| |:|e|c|h|o| |"|o|p|e|n|-|p|a|r|e|n|"|<+0#e000e06&|C|R|>| +0#0000000&@46
-@75
-@57|7|3|,|3| @9|6|7|%| 
+@57|7|3|,|3| @9|6|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_map_05.dump b/runtime/syntax/testdir/dumps/vim_ex_map_05.dump
index b7727950c5a1bc1559a486d23bc0393e7e35c0ec..a7584f738fc9f4ceb59a8a57bae4841813117b54 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_map_05.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_map_05.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+|m+0#af5f00255#ffffff0|a|p| +0#0000000&|(| |:|e|c|h|o| |"|o|p|e|n|-|p|a|r|e|n|"|<+0#e000e06&|C|R|>| +0#0000000&@46
+@75
 |c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|a|p|(+0#e000e06&|l+0#00e0e07&|i|s|t|,+0#0000000&| |'+0#e000002&|v|:|v|a|l|'|)+0#e000e06&| +0#0000000&@51
 |c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|a|p| +0#0000000&|(+0#e000e06&|l+0#00e0e07&|i|s|t|,+0#0000000&| |'+0#e000002&|v|:|v|a|l|'|)+0#e000e06&| +0#0000000&@50
 @75
-|f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60
-@2>m+0#af5f00255&|a|p| +0#0000000&|(| |:|e|c|h|o| |"|o|p|e|n|-|p|a|r|e|n|"|<+0#e000e06&|C|R|>| +0#0000000&@44
+>f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60
+@2|m+0#af5f00255&|a|p| +0#0000000&|(| |:|e|c|h|o| |"|o|p|e|n|-|p|a|r|e|n|"|<+0#e000e06&|C|R|>| +0#0000000&@44
 @2|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|a|p|(+0#e000e06&|l+0#00e0e07&|i|s|t|,+0#0000000&| |'+0#e000002&|v|:|v|a|l|'|)+0#e000e06&| +0#0000000&@49
 @2|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|a|p| +0#0000000&|(+0#e000e06&|l+0#00e0e07&|i|s|t|,+0#0000000&| |'+0#e000002&|v|:|v|a|l|'|)+0#e000e06&| +0#0000000&@48
 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63
@@ -16,5 +17,4 @@
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
 @75
 @75
-|"+0#0000e05&| |I|s@1|u|e| @1|#|1|2|6|7|2| +0#0000000&@59
-@57|9|1|,|3| @9|8|5|%| 
+@57|9|1|,|1| @9|8|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_map_06.dump b/runtime/syntax/testdir/dumps/vim_ex_map_06.dump
index f047296918a405bb1ba819d15c2119b64388a2bd..ca0d8cda29fc629484dd7af4b373af13031f701a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_map_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_map_06.dump
@@ -1,9 +1,10 @@
-|"+0#0000e05#ffffff0| |I|s@1|u|e| @1|#|1|2|6|7|2| +0#0000000&@59
+| +0&#ffffff0@74
+|"+0#0000e05&| |I|s@1|u|e| @1|#|1|2|6|7|2| +0#0000000&@59
 @75
 |n+0#af5f00255&@1|o|r|e|m|a|p| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|f+0#0000000&|o@1| |:|e|c|h|o| |c|a|l@1|(| @42
 @2|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@62
-@2|\+0#e000e06&| +0#0000000&|{|x|-|>|x|}|,| @63
-@2>\+0#e000e06&| +0#0000000&|[|'|f|o@1|'|]|)|<+0#e000e06&|C|R|>| +0#0000000&@58
+@2>\+0#e000e06&| +0#0000000&|{|x|-|>|x|}|,| @63
+@2|\+0#e000e06&| +0#0000000&|[|'|f|o@1|'|]|)|<+0#e000e06&|C|R|>| +0#0000000&@58
 @75
 |n+0#af5f00255&@1|o|r|e|m|a|p| +0#0000000&|<+0#e000e06&|L|e|a|d|e|r|>|b+0#0000000&|a|r| |:|e|c|h|o| |(| @46
 @2|\+0#e000e06&| +0#0000000&@71
@@ -15,6 +16,5 @@
 @75
 |i+0#af5f00255&|f| +0#0000000&|!+0#af5f00255&|h+0#00e0e07&|a|s|m|a|p|t|o|(+0#e000e06&|'+0#e000002&|<|P|l|u|g|>|N|e|t|r|w|O|p|e|n|F|i|l|e|'|)+0#e000e06&| +0#0000000&@9|||n+0#af5f00255&|m|a|p| +0#0000000&|<+0#e000e06&|b|u|f@1|e|r|>| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|<+0#e000e06&|n|o|w|a|i
 |t|>| +0#0000000&|%| |<+0#e000e06&|P|l|u|g|>|N+0#0000000&|e|t|r|w|O|p|e|n|F|i|l|e|||e+0#af5f00255&|n|d|i|f| +0#0000000&@44
-|~+0#4040ff13&| @73
-|~| @73
-| +0#0000000&@56|1|0|9|,|3| @8|B|o|t| 
+@75
+@57|1|0|9|,|3| @8|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_menu_00.dump b/runtime/syntax/testdir/dumps/vim_ex_menu_00.dump
index 09c82c465eaa9c09eb5dceefbcd5cb8d682a167f..2c2d4c3dc195830ed993a74d263eca23c0ab8194 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_menu_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_menu_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|m|e|n|u| |c|o|m@1|a|n|d|s| +0#0000000&@54
 @75
+@75
 |"+0#0000e05&| |:|h|e|l|p| |d|i|s|a|b|l|e| |m|e|n|u|s| +0#0000000&@53
 |m+0#af5f00255&|e|n|u| +0#0000000&|d+0#e000e06&|i|s|a|b|l|e| +0#0000000&|&+0#e000e06&|F|i|l|e|.|&|O|p|e|n|\|.|\|.|\|.| +0#0000000&@44
 |a+0#af5f00255&|m|e|n|u| +0#0000000&|e+0#e000e06&|n|a|b|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&@60
@@ -16,5 +17,4 @@
 @75
 @75
 |"+0#0000e05&| |s|p|e|c|i|a|l| |k|e|y|s| +0#0000000&@60
-|m+0#af5f00255&|e|n|u| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|&+0#e000e06&|F|o@1|\| |b|a|r| +0#0000000&@1|:|e|c|h|o| |"|F|o@1|b|a|r|"|<+0#e000e06&|C|R|>| +0#0000000&@31
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_menu_01.dump b/runtime/syntax/testdir/dumps/vim_ex_menu_01.dump
index 9b60b2a1280fb11f4b23c4427b70178ff8157c5e..bc17da919a0ed596b4e55199596c83b5850db78f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_menu_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_menu_01.dump
@@ -1,9 +1,10 @@
-|i+0#af5f00255#ffffff0|m|e|n|u| +0#0000000&|W+0#e000e06&|o|r|d|s|.|A|d@1|\| |V|a|r| +0#0000000&@8|<+0#e000e06&|E|s|c|>|w+0#0000000&|b|"|z|y|e|:|m|e|n|u|!| |W|o|r|d|s|.|<+0#e000e06&|C|-|R|>|z+0#0000000&| |<+0#e000e06&|C|-|R|>|z+0#0000000&|<+0#e000e06&|C|R|>|a+0#0000000&| @3
+|v+0#af5f00255#ffffff0|m|e|n|u| +0#0000000&|W+0#e000e06&|o|r|d|s|.|R|e|m|o|v|e|\| |V|a|r| +0#0000000&@5|"|z|y|:|u|n|m|e|n|u|!| |W|o|r|d|s|.|<+0#e000e06&|C|-|R|>|z+0#0000000&|<+0#e000e06&|C|R|>| +0#0000000&@17
+|i+0#af5f00255&|m|e|n|u| +0#0000000&|W+0#e000e06&|o|r|d|s|.|A|d@1|\| |V|a|r| +0#0000000&@8|<+0#e000e06&|E|s|c|>|w+0#0000000&|b|"|z|y|e|:|m|e|n|u|!| |W|o|r|d|s|.|<+0#e000e06&|C|-|R|>|z+0#0000000&| |<+0#e000e06&|C|-|R|>|z+0#0000000&|<+0#e000e06&|C|R|>|a+0#0000000&| @3
 |i+0#af5f00255&|m|e|n|u| +0#0000000&|W+0#e000e06&|o|r|d|s|.|R|e|m|o|v|e|\| |V|a|r| +0#0000000&@5|<+0#e000e06&|E|s|c|>|w+0#0000000&|b|"|z|y|e|:|u|n|m|e|n|u|!| |W|o|r|d|s|.|<+0#e000e06&|C|-|R|>|z+0#0000000&|<+0#e000e06&|C|R|>|a+0#0000000&| @8
 @75
 @75
-|"+0#0000e05&| |s|p|e|c|i|a|l| |k|e|y|s| +0#0000000&@60
->m+0#af5f00255&|e|n|u| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|&+0#e000e06&|F|o@1|\| |b|a|r| +0#0000000&@1|:|e|c|h|o| |"|F|o@1|b|a|r|"|<+0#e000e06&|C|R|>| +0#0000000&@31
+>"+0#0000e05&| |s|p|e|c|i|a|l| |k|e|y|s| +0#0000000&@60
+|m+0#af5f00255&|e|n|u| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|&+0#e000e06&|F|o@1|\| |b|a|r| +0#0000000&@1|:|e|c|h|o| |"|F|o@1|b|a|r|"|<+0#e000e06&|C|R|>| +0#0000000&@31
 |m+0#af5f00255&|e|n|u| +0#0000000&|<+0#e000e06&|s|p|e|c|i|a|l|>| +0#0000000&|&+0#e000e06&|F|o@1|\| |b|a|r| +0#0000000&|:|e|c|h|o| |"|F|o@1|b|a|r|"|<+0#e000e06&|C|R|>| +0#0000000&@31
 |m+0#af5f00255&|e|n|u| +0#0000000&|<+0#e000e06&|s|c|r|i|p|t|>| +0#0000000&|&+0#e000e06&|F|o@1|\| |b|a|r| +0#0000000&@1|:|e|c|h|o| |"|F|o@1|b|a|r|"|<+0#e000e06&|C|R|>| +0#0000000&@31
 |m+0#af5f00255&|e|n|u| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|<+0#e000e06&|s|p|e|c|i|a|l|>| +0#0000000&|&+0#e000e06&|F|o@1|\| |b|a|r| +0#0000000&|:|e|c|h|o| |"|F|o@1|b|a|r|"|<+0#e000e06&|C|R|>| +0#0000000&@22
@@ -16,5 +17,4 @@
 @75
 @75
 |"+0#0000e05&| +0#0000000&|E+0#e000e06&|x|a|m|p|l|e|:| +0#0000e05&|r|u|n|t|i|m|e|/|m|e|n|u|.|v|i|m| |(|m|o|d|i|f|i|e|d|)| +0#0000000&@36
-|a+0#af5f00255&|n| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|1+0#e000002&|0|.|3@1|0| +0#0000000&|&+0#e000e06&|F|i|l|e|.|&|C|l|o|s|e|<|T|a|b|>|:|c|l|o|s|e| +0#0000000&|:|c|o|n|f|i|r|m| |c|l|o|s|e|<+0#e000e06&|C|R|>| +0#0000000&@13
-@57|1|9|,|1| @9|1|9|%| 
+@57|1|9|,|1| @9|1|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_menu_02.dump b/runtime/syntax/testdir/dumps/vim_ex_menu_02.dump
index a5c1acf071643f26d8856486c8e716c00742e457..83bb8c17e037bd9ddfa99018509bb668c6a98e2d 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_menu_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_menu_02.dump
@@ -1,9 +1,10 @@
-|a+0#af5f00255#ffffff0|n| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|1+0#e000002&|0|.|3@1|0| +0#0000000&|&+0#e000e06&|F|i|l|e|.|&|C|l|o|s|e|<|T|a|b|>|:|c|l|o|s|e| +0#0000000&|:|c|o|n|f|i|r|m| |c|l|o|s|e|<+0#e000e06&|C|R|>| +0#0000000&@13
+|"+0#0000e05#ffffff0| +0#0000000&|E+0#e000e06&|x|a|m|p|l|e|:| +0#0000e05&|r|u|n|t|i|m|e|/|m|e|n|u|.|v|i|m| |(|m|o|d|i|f|i|e|d|)| +0#0000000&@36
+|a+0#af5f00255&|n| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|1+0#e000002&|0|.|3@1|0| +0#0000000&|&+0#e000e06&|F|i|l|e|.|&|C|l|o|s|e|<|T|a|b|>|:|c|l|o|s|e| +0#0000000&|:|c|o|n|f|i|r|m| |c|l|o|s|e|<+0#e000e06&|C|R|>| +0#0000000&@13
 @75
 |a+0#af5f00255&|n| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|1+0#e000002&|0|.|3@1|0| +0#0000000&|&+0#e000e06&|F|i|l|e|.|&|C|l|o|s|e|<|T|a|b|>|:|c|l|o|s|e| +0#0000000&@32
 @8|\+0#e000e06&| +0#0000000&|:|i|f| |w|i|n|h|e|i|g|h|t|(|2|)| |<| |0| |&@1| |t|a|b|p|a|g|e|w|i|n@1|r|(|2|)| |=@1| |0| |<+0#e000e06&|B|a|r|>| +0#0000000&@14
-@8|\+0#e000e06&| +0#0000000&@2|c|o|n|f|i|r|m| |e|n|e|w| |<+0#e000e06&|B|a|r|>| +0#0000000&@44
-@8>\+0#e000e06&| +0#0000000&|e|l|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@54
+@8>\+0#e000e06&| +0#0000000&@2|c|o|n|f|i|r|m| |e|n|e|w| |<+0#e000e06&|B|a|r|>| +0#0000000&@44
+@8|\+0#e000e06&| +0#0000000&|e|l|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@54
 @8|\+0#e000e06&| +0#0000000&@2|c|o|n|f|i|r|m| |c|l|o|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@43
 @8|\+0#e000e06&| +0#0000000&|e|n|d|i|f|<+0#e000e06&|C|R|>| +0#0000000&@55
 @75
@@ -16,5 +17,4 @@
 @8|\+0#e000e06&| +0#0000000&|e|l|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@54
 @8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56
 @8|\+0#e000e06&| +0#0000000&@2|c|o|n|f|i|r|m| |c|l|o|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@43
-@8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56
-@57|3|7|,|2|-|9| @7|4|5|%| 
+@57|3|7|,|2|-|9| @7|4@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_menu_03.dump b/runtime/syntax/testdir/dumps/vim_ex_menu_03.dump
index 2ba87490f361b866c52625a2081c55daa7df4096..84dd1599cda209fe722d6d67a4abe6bd8a563f53 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_menu_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_menu_03.dump
@@ -1,4 +1,5 @@
-| +0&#ffffff0@7|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56
+| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&@2|c|o|n|f|i|r|m| |c|l|o|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@43
+@8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56
 @8|\+0#e000e06&| +0#0000000&|e|n|d|i|f|<+0#e000e06&|C|R|>| +0#0000000&@55
 @75
 |a+0#af5f00255&|n| +0#0000000&|<+0#e000e06&|s|i|l|e|n|t|>| +0#0000000&|1+0#e000002&|0|.|3@1|0| +0#0000000&|&+0#e000e06&|F|i|l|e|.|&|C|l|o|s|e|<|T|a|b|>|:|c|l|o|s|e| +0#0000000&|:|i|f| |w|i|n|h|e|i|g|h|t|(|2|)| |<| |0| |&@1| |t|a|b|p|a|g|e|w
@@ -16,5 +17,4 @@
 @8|\+0#e000e06&| +0#0000000&|e|l|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@54
 @8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56
 @8|\+0#e000e06&| +0#0000000&@2|c|o|n|f|i|r|m| |c|l|o|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@43
-@8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56
-@57|5|4|,|2|-|9| @7|7|0|%| 
+@57|5@1|,|2|-|9| @7|6|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_menu_04.dump b/runtime/syntax/testdir/dumps/vim_ex_menu_04.dump
index 17236e2c8903690c9ac17718dd0315583ece1423..9c99fb70a227988168a93fd56b4f74e6106695b8 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_menu_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_menu_04.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@7|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56
+| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&@2|c|o|n|f|i|r|m| |c|l|o|s|e| |<+0#e000e06&|B|a|r|>| +0#0000000&@43
+@8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56
 @8|\+0#e000e06&| +0#0000000&|e|n|d|i|f|<+0#e000e06&|C|R|>| +0#0000000&@55
 @75
 @75
-|"+0#0000e05&| |p|o|p|u|p| |m|e|n|u|s| +0#0000000&@61
->p+0#af5f00255&|o|p|u|p| +0#0000000&|&+0#e000e06&|F|o@1| +0#0000000&@1||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@50
+>"+0#0000e05&| |p|o|p|u|p| |m|e|n|u|s| +0#0000000&@61
+|p+0#af5f00255&|o|p|u|p| +0#0000000&|&+0#e000e06&|F|o@1| +0#0000000&@1||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@50
 |p+0#af5f00255&|o|p|u|p|!| +0#0000000&|&+0#e000e06&|F|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@50
 @75
 @75
@@ -16,5 +17,4 @@
 @8|(+0#e000e06&|r+0#00e0e07&|e|s|,+0#0000000&| |_+0#00e0e07&|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|{+0#e000e06&| +0#0000000&@53
 @12|H|i|s|t|o|r|y|J|u|m|p|(+0#e000e06&|r+0#00e0e07&|e|s|.+0#af5f00255&|t+0#00e0e07&|e|x|t|)+0#e000e06&| +0#0000000&@41
 @8|}+0#e000e06&|)| +0#0000000&@64
-|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
-@57|7|1|,|1| @9|9|5|%| 
+@57|7|1|,|1| @9|9|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_menu_05.dump b/runtime/syntax/testdir/dumps/vim_ex_menu_05.dump
index 4d9e9cc798b9c15c33368cb2ba1630aa2d9f41b5..d86687905ba6394b2ed96ae7f50d29e639a355f2 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_menu_05.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_menu_05.dump
@@ -1,4 +1,5 @@
-|e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@68
+| +0&#ffffff0@7|}+0#e000e06&|)| +0#0000000&@64
+|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@68
 @75
 |p+0#af5f00255&|o|p|u|p|\+0#e000e06&|.|F|i|l|t|e|r|M|e|n|u|<|T|a|b|>|F|i|l|t|e|r|(|)|<|C|R|>| +0#0000000&@40
 > @74
@@ -16,5 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-| +0#0000000&@56|8|7|,|0|-|1| @7|B|o|t| 
+| +0#0000000&@56|8@1|,|0|-|1| @7|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_menutranslate_00.dump b/runtime/syntax/testdir/dumps/vim_ex_menutranslate_00.dump
index 82bcce485bec29319adab6cdf05315d6d22b1451..448d554af83fb59d3b25cd71cce2a5dbb46a3590 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_menutranslate_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_menutranslate_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|m|e|n|u|t|r|a|n|s|l|a|t|e| |c|o|m@1|a|n|d| +0#0000000&@46
 @75
+@75
 |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&|c+0#e000e06&|l|e|a|r| +0#0000000&@55
 |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&|c+0#e000e06&|l|e|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@42
 |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&|c+0#e000e06&|l|e|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@45
@@ -16,5 +17,4 @@
 |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|o+0#0000000&@1|\+0#e000e06&| |b+0#0000000&|a|r| @57
 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
-@75
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_menutranslate_01.dump b/runtime/syntax/testdir/dumps/vim_ex_menutranslate_01.dump
index f479aeb46ac2c168dc5a4cd914afdfb787551862..35fd08b57d0f9586369bb672a0de6fc878600c2e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_menutranslate_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_menutranslate_01.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
+|m+0#af5f00255#ffffff0|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&|&+0#e000e06&|F|o+0#0000000&@1|\+0#e000e06&| |b+0#0000000&|a|r| @51
+@6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
 @75
 |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|o+0#0000000&@1|\+0#e000e06&| |b+0#0000000&|a|r| @57
-@6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
-> @74
+@6>\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
+@75
 |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|o+0#0000000&@1|\+0#e000e06&| |b+0#0000000&|a|r| @57
 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@48
@@ -16,5 +17,4 @@
 |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&|&+0#e000e06&|F|o+0#0000000&@1|\+0#e000e06&| |b+0#0000000&|a|r| @51
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
-@75
-@57|1|9|,|0|-|1| @7|4|0|%| 
+@57|1|9|,|7| @9|3|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_menutranslate_02.dump b/runtime/syntax/testdir/dumps/vim_ex_menutranslate_02.dump
index 7623f7079e32aa404a3e057b373ca84053929345..d163d17cee87edd6103ddaff9aeafd694307e1be 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_menutranslate_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_menutranslate_02.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
+@75
 |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&@61
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|o+0#0000000&@1|\+0#e000e06&| |b+0#0000000&|a|r| @57
-@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
-@6>\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
+@6>"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
+@6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@47
 @75
 |m+0#af5f00255&|e|n|u|t|r|a|n|s|l|a|t|e| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|o+0#0000000&@1|\+0#e000e06&| |b+0#0000000&|a|r| @57
@@ -16,5 +17,4 @@
 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|o+0#0000000&@1|\+0#e000e06&| |b+0#0000000&|a|r| @57
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| @60
-@6|\+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@54
-@57|3|7|,|7| @9|9|6|%| 
+@57|3|7|,|7| @9|9|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_menutranslate_03.dump b/runtime/syntax/testdir/dumps/vim_ex_menutranslate_03.dump
index 06d85e9fa8e8e7a074460a731369fcac8943e0ba..17d7482d6c5e4bf25d91edd3ad8e0bf92693aae5 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_menutranslate_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_menutranslate_03.dump
@@ -1,4 +1,5 @@
-| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@54
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|&+0#e000e06&|F|u+0#0000000&|b|a|r| @60
+@6|\+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@54
 > @74
 |~+0#4040ff13&| @73
 |~| @73
@@ -16,5 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-| +0#0000000&@56|5|1|,|0|-|1| @7|B|o|t| 
+| +0#0000000&@56|5|2|,|0|-|1| @7|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_normal_00.dump b/runtime/syntax/testdir/dumps/vim_ex_normal_00.dump
index 60a45378448111a3eb4234a6749de210fe4d8c8b..83ca511826515bcc42c68bf9a151474167db5542 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_normal_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_normal_00.dump
@@ -1,20 +1,20 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|n|o|r|m|a|l| |c|o|m@1|a|n|d| +0#0000000&@53
 @75
+@75
 |n+0#af5f00255&|o|r|m|a|l| +0#0000000&|j| @66
 |n+0#af5f00255&|o|r|m|a|l|!| +0#0000000&|j| @65
 |n+0#af5f00255&|o|r|m|a|l|!|j+0#0000000&| @66
 @75
-|"+0#0000e05&| |n|o| |t|r|a|i|l|i|n|g| |b|a|r| +0#0000000&@57
+@75
+|"+0#0000e05&| |N|o| |t|r|a|i|l|i|n|g| |b|a|r| +0#0000000&@57
+@75
 |n+0#af5f00255&|o|r|m|a|l| +0#0000000&|j| |4|2|||e|c|h|o| |"|n|o|t| |e|c|h|o| |c|o|m@1|a|n|d|"| @39
 @75
-|"+0#0000e05&| |n|o| |t|r|a|i|l|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@53
+@75
+|"+0#0000e05&| |N|o| |t|r|a|i|l|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@53
+@75
 |n+0#af5f00255&|o|r|m|a|l| +0#0000000&|j| |"|0|p| @62
 @75
-|"+0#0000e05&| |m|u|l|t|i|l|i|n|e| |a|r|g| +0#0000000&@59
-|n+0#af5f00255&|o|r|m|a|l| +0#0000000&|j| @66
-@6|\+0#e000e06&|k+0#0000000&| @66
-@6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
-@6|\+0#e000e06&|j+0#0000000&| @66
 @75
-|"+0#0000e05&| |w|o|r|d|-|b|o|u|n|d|a|r|y| |r|e|q|u|i|r|e|d| |a|f|t|e|r| |n|a|m|e| |(|o|l|d| |b|u|g|)| +0#0000000&@29
+|"+0#0000e05&| |M|u|l|t|i|l|i|n|e| |a|r|g| +0#0000000&@59
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_normal_01.dump b/runtime/syntax/testdir/dumps/vim_ex_normal_01.dump
index b6fa3b87c07a9a60cb046eb52c04578650267280..73a54807249a5db522c49bc85260e4c44e04c2e4 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_normal_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_normal_01.dump
@@ -1,20 +1,20 @@
-|n+0#af5f00255#ffffff0|o|r|m|a|l| +0#0000000&|j| @66
+|"+0#0000e05#ffffff0| |N|o| |t|r|a|i|l|i|n|g| |c|o|m@1|e|n|t| +0#0000000&@53
+@75
+|n+0#af5f00255&|o|r|m|a|l| +0#0000000&|j| |"|0|p| @62
+@75
+@75
+>"+0#0000e05&| |M|u|l|t|i|l|i|n|e| |a|r|g| +0#0000000&@59
+@75
+|n+0#af5f00255&|o|r|m|a|l| +0#0000000&|j| @66
 @6|\+0#e000e06&|k+0#0000000&| @66
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&|j+0#0000000&| @66
 @75
->"+0#0000e05&| |w|o|r|d|-|b|o|u|n|d|a|r|y| |r|e|q|u|i|r|e|d| |a|f|t|e|r| |n|a|m|e| |(|o|l|d| |b|u|g|)| +0#0000000&@29
+@75
+|"+0#0000e05&| +0#0000000&|I+0#e000e06&|s@1|u|e|:| +0#0000e05&|w|o|r|d|-|b|o|u|n|d|a|r|y| |r|e|q|u|i|r|e|d| |a|f|t|e|r| |n|a|m|e| |(|o|l|d| |b|u|g|)| +0#0000000&@22
+@75
 |n|o|r|m|a|l|j| @67
+@75
 |~+0#4040ff13&| @73
 |~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
 | +0#0000000&@56|1|9|,|1| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_profile_00.dump b/runtime/syntax/testdir/dumps/vim_ex_profile_00.dump
index c6ebae57a7a0fc577fbbaf4e7cefe3151d916844..4ff1540da141ec25ca03953e2942a3e69e997931 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_profile_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_profile_00.dump
@@ -15,6 +15,6 @@
 |p+0#af5f00255&|r|o|f|d|e|l| +0#0000000&@1|h+0#00e0003&|e|r|e| +0#0000000&@61
 @75
 @75
-|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@60
+|"+0#0000e05&| |T|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@60
 @75
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_profile_01.dump b/runtime/syntax/testdir/dumps/vim_ex_profile_01.dump
index a8f5e60f639307cfb25f8df8d2d01616d50902b8..5c206a31a9a1c5cdbdf35c0206185ab5a2a49af7 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_profile_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_profile_01.dump
@@ -2,7 +2,7 @@
 |p+0#af5f00255&|r|o|f|d|e|l| +0#0000000&@1|h+0#00e0003&|e|r|e| +0#0000000&@61
 @75
 @75
-|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@60
+|"+0#0000e05&| |T|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@60
 > @74
 |p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@1|s+0#00e0003&|t|a|r|t| +0#0000000&|/|t|m|p|/|m|y|p|r|o|f|i|l|e| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@35
 |p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@1|s+0#00e0003&|t|o|p| +0#0000000&@16|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@35

diff --git a/runtime/syntax/testdir/dumps/vim_ex_profile_02.dump b/runtime/syntax/testdir/dumps/vim_ex_profile_02.dump
index c1cc1f6d850535a3858080fdac02693c7e043f3c..dd038ced8580c15cb080b965cc86c3e7a94090aa 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_profile_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_profile_02.dump
@@ -1,6 +1,6 @@
 | +0&#ffffff0@74
 @75
-|"+0#0000e05&| |t|r|a|i|l|i|n|g| |c|o|m@1|a|n|d| +0#0000000&@56
+|"+0#0000e05&| |T|r|a|i|l|i|n|g| |c|o|m@1|a|n|d| +0#0000000&@56
 @75
 |p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@1|s+0#00e0003&|t|a|r|t| +0#0000000&|/|t|m|p|/|m|y|p|r|o|f|i|l|e| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@32
 >p+0#af5f00255&|r|o|f|i|l|e| +0#0000000&@1|s+0#00e0003&|t|o|p| +0#0000000&@16||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@32

diff --git a/runtime/syntax/testdir/dumps/vim_ex_sleep_00.dump b/runtime/syntax/testdir/dumps/vim_ex_sleep_00.dump
index 002b9ff6a0896292e0e66a01fc804f9785d09009..0e99c5a7cd9a00d5350543ba1e878c555e4da231 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_sleep_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_sleep_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|s|l|e@1|p| |c|o|m@1|a|n|d| +0#0000000&@54
 @75
+@75
 |s+0#af5f00255&|l|e@1|p| +0#0000000&@7|"+0#0000e05&| |s|l|e@1|p| |f|o|r| |o|n|e| |s|e|c|o|n|d| +0#0000000&@39
 |5+0#e000002&| +0#0000000&|s+0#af5f00255&|l|e@1|p| +0#0000000&@5|"+0#0000e05&| |s|l|e@1|p| |f|o|r| |f|i|v|e| |s|e|c|o|n|d|s| +0#0000000&@37
 |s+0#af5f00255&|l|e@1|p| +0#0000000&|1+0#e000002&|0@1|m| +0#0000000&@2|"+0#0000e05&| |s|l|e@1|p| |f|o|r| |1|0@1| |m|i|l@1|i|s|e|c|o|n|d|s| +0#0000000&@33
@@ -9,12 +10,11 @@
 |5+0#e000002&| +0#0000000&|s+0#af5f00255&|l|e@1|p|!| +0#0000000&@4|"+0#0000e05&| |s|l|e@1|p| |f|o|r| |f|i|v|e| |s|e|c|o|n|d|s| +0#0000000&@37
 |s+0#af5f00255&|l|e@1|p|!| +0#0000000&|1+0#e000002&|0@1|m| +0#0000000&@1|"+0#0000e05&| |s|l|e@1|p| |f|o|r| |1|0@1| |m|i|l@1|i|s|e|c|o|n|d|s| +0#0000000&@33
 |1+0#e000002&|0@1| +0#0000000&|s+0#af5f00255&|l|e@1|p|!| +0#0000000&|m+0#e000002&| +0#0000000&|"+0#0000e05&| |s|l|e@1|p| |f|o|r| |1|0@1| |m|i|l@1|i|s|e|c|o|n|d|s| +0#0000000&@33
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-|~| @73
 | +0#0000000&@56|1|,|1| @10|A|l@1| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_throw_00.dump b/runtime/syntax/testdir/dumps/vim_ex_throw_00.dump
index c4089e8ec9d9e74062aa8fcafe8428138d0873e6..a596aed7c9cf1d86e73e62a14c79879fff6f9538 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_throw_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_throw_00.dump
@@ -1,8 +1,10 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|t|h|r|o|w| |c|o|m@1|a|n|d| +0#0000000&@54
 @75
+@75
 |"+0#0000e05&| |:|h|e|l|p| |:|t|h|r|o|w| +0#0000000&@60
 @75
 |t+0#af5f00255&|r|y| +0#0000000&||| |t+0#af5f00255&|h|r|o|w| +0#0000000&|"+0#e000002&|o@1|p|s|"| +0#0000000&||| |c+0#af5f00255&|a|t|c|h| +0#0000000&|/+0#e000e06&|^+0#0000000&|o@1|/+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|c|a|u|g|h|t|"| +0#0000000&||| |e+0#af5f00255&|n|d|t|r|y| +0#0000000&@17
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
@@ -15,6 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-|~| @73
 | +0#0000000&@56|1|,|1| @10|A|l@1| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_vimgrep_00.dump b/runtime/syntax/testdir/dumps/vim_ex_vimgrep_00.dump
index 299d8ea1be045ff2406686ac2e06968f18fced8e..b7862da29b58048f99c8b9310111ca7b24b5108d 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_vimgrep_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_vimgrep_00.dump
@@ -1,7 +1,7 @@
 >"+0#0000e05#ffffff0| |V|i|m| |:|*|v|i|m|g|r|e|p| |a|n|d| |:|*|v|i|m|g|r|e|p|a|d@1| |c|o|m@1|a|n|d|s| +0#0000000&@33
-|"+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|V|i|m|g|r|e|p|F|i|l|e| |T|o|d|o| +0#0000000&@23
-|"+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|C|m|d|S|e|p| |O|p|e|r|a|t|o|r| +0#0000000&@24
-|"+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|V|i|m|g|r|e|p|B|a|r|E|s|c|a|p|e| |S|p|e|c|i|a|l| +0#0000000&@15
+|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|V|i|m|g|r|e|p|F|i|l|e| |T|o|d|o| +0#0000000&@30
+|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|C|m|d|S|e|p| |O|p|e|r|a|t|o|r| +0#0000000&@31
+|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|V|i|m|g|r|e|p|B|a|r|E|s|c|a|p|e| |S|p|e|c|i|a|l| +0#0000000&@22
 @75
 @75
 |v+0#af5f00255&|i|m|g|r|e|p| +0#0000000&|p|a|\+0#e000e06&|%|(|t+0#0000000&@1|\+0#e000e06&|)|e+0#0000000&|r|n| @2|f+0#0000001#ffff4012|o@1|.|t|x|t| +0#0000000#ffffff0@44

diff --git a/runtime/syntax/testdir/dumps/vim_expr_24.dump b/runtime/syntax/testdir/dumps/vim_expr_24.dump
deleted file mode 100644 (file)
index 94a94af..0000000
--- a/runtime/syntax/testdir/dumps/vim_expr_24.dump
+++ /dev/null
@@ -1,20 +0,0 @@
-| +0&#ffffff0@1|\+0#e000e06&| +0#0000000&@2|)+0#e000e06&| +0#0000000&@67
-@2|\+0#e000e06&| +0#0000000&@2|:+0#af5f00255&| +0#0000000&|(+0#e000e06&|1+0#e000002&| +0#0000000&@64
-@2|\+0#e000e06&| +0#0000000&@2|)+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|f|u|n|c|t|i|o|n| +0#0000000&@63
-> @74
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|4|2|3|,|0|-|1| @6|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_00.dump b/runtime/syntax/testdir/dumps/vim_expressions_00.dump
similarity index 63%
rename from runtime/syntax/testdir/dumps/vim_expr_00.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_00.dump
index dd2f98c281912c4003314268d052a5dccf6aff65..91fa0f54f6039419493f3cde81f43666c0c9db5f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_00.dump
@@ -1,4 +1,7 @@
->"+0#0000e05#ffffff0| |S|t|r|i|n|g| +0#0000000&@66
+>"+0#0000e05#ffffff0| |V|i|m| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@57
+@75
+@75
+|"+0#0000e05&| |S|t|r|i|n|g| +0#0000000&@66
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|I|t|'+0#e000e06&@1|s+0#e000002&| |a| |s|t|r|i|n|g|'| +0#0000000&@53
 |e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|t|a|b|:| |\|t|,| |n|e|w| |l|i|n|e|:| |\|n|,| |b|a|c|k|s|l|a|s|h|:| |\@1|'| +0#0000000&@31
@@ -14,7 +17,4 @@
 @6|\+0#e000e06&| +0#0000000&|'+0#e000002&|b|a|z|'| +0#0000000&@61
 @75
 |"+0#0000e05&| |S|t|r|i|n|g| |e|s|c|a|p|e| |s|e|q|u|e|n|c|e|s| +0#0000000&@49
-@75
-|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|3|1|6| +0#e000002&|-| |\+0#e000e06&|3|1| +0#e000002&|-| |\+0#e000e06&|3| +0#e000002&|-| |\+0#e000e06&|x|1|f| +0#e000002&|-| |\+0#e000e06&|x|f| +0#e000002&|-| |\+0#e000e06&|X|1|F| +0#e000002&|-| |\+0#e000e06&|X|F| +0#e000002&|-| |\+0#e000e06&|u|0|2|a|4| +0#e000002&|-| |\+0#e000e06&|U|0@4|2|a|4| +0#e000002&|-| |\+0#e000e06&|b| +0#e000002&
-|-| |\+0#e000e06&|e| +0#e000002&|-| |\+0#e000e06&|f| +0#e000002&|-| |\+0#e000e06&|n| +0#e000002&|-| |\+0#e000e06&|r| +0#e000002&|-| |\+0#e000e06&|t| +0#e000002&|-| |\+0#e000e06&@1| +0#e000002&|-| |\+0#e000e06&|"| +0#e000002&|-| |\+0#e000e06&|<|C|-|W|>|"+0#e000002&| +0#0000000&@30
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_01.dump b/runtime/syntax/testdir/dumps/vim_expressions_01.dump
similarity index 84%
rename from runtime/syntax/testdir/dumps/vim_expr_01.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_01.dump
index af306c4e5eb8662cd46bee7206cc99483928120e..b111646c7154f45667b3d23b5302b62d4c60d17e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_01.dump
@@ -1,9 +1,11 @@
-| +0#e000002#ffffff0@5|\+0#e000e06&|'+0#e000002&|b|a|r|'| +0#0000000&@62
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|z|"| +0#0000000&@61
+|e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|f|o@1|'| +0#0000000&@64
+| +0#e000002&@5|\+0#e000e06&|'+0#e000002&|b|a|r|'| +0#0000000&@62
 @6|\+0#e000e06&| +0#0000000&|'+0#e000002&|b|a|z|'| +0#0000000&@61
 @75
-|"+0#0000e05&| |S|t|r|i|n|g| |e|s|c|a|p|e| |s|e|q|u|e|n|c|e|s| +0#0000000&@49
+>"+0#0000e05&| |S|t|r|i|n|g| |e|s|c|a|p|e| |s|e|q|u|e|n|c|e|s| +0#0000000&@49
 @75
->e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|3|1|6| +0#e000002&|-| |\+0#e000e06&|3|1| +0#e000002&|-| |\+0#e000e06&|3| +0#e000002&|-| |\+0#e000e06&|x|1|f| +0#e000002&|-| |\+0#e000e06&|x|f| +0#e000002&|-| |\+0#e000e06&|X|1|F| +0#e000002&|-| |\+0#e000e06&|X|F| +0#e000002&|-| |\+0#e000e06&|u|0|2|a|4| +0#e000002&|-| |\+0#e000e06&|U|0@4|2|a|4| +0#e000002&|-| |\+0#e000e06&|b| +0#e000002&
+|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|3|1|6| +0#e000002&|-| |\+0#e000e06&|3|1| +0#e000002&|-| |\+0#e000e06&|3| +0#e000002&|-| |\+0#e000e06&|x|1|f| +0#e000002&|-| |\+0#e000e06&|x|f| +0#e000002&|-| |\+0#e000e06&|X|1|F| +0#e000002&|-| |\+0#e000e06&|X|F| +0#e000002&|-| |\+0#e000e06&|u|0|2|a|4| +0#e000002&|-| |\+0#e000e06&|U|0@4|2|a|4| +0#e000002&|-| |\+0#e000e06&|b| +0#e000002&
 |-| |\+0#e000e06&|e| +0#e000002&|-| |\+0#e000e06&|f| +0#e000002&|-| |\+0#e000e06&|n| +0#e000002&|-| |\+0#e000e06&|r| +0#e000002&|-| |\+0#e000e06&|t| +0#e000002&|-| |\+0#e000e06&@1| +0#e000002&|-| |\+0#e000e06&|"| +0#e000002&|-| |\+0#e000e06&|<|C|-|W|>|"+0#e000002&| +0#0000000&@30
 |e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|\|3|1|6| |\|3|1| |\|3| |\|x|1|f| |\|x|f| |\|X|1|F| |\|X|F| |\|u|0|2|a|4| |\|U|0@4|2|a|4| |\|b| |\|e| |\|f| |\|n| |\|r| |\|t| |\@1| 
 |\|"| |\|<|C|-|W|>|'| +0#0000000&@64
@@ -15,6 +17,4 @@
 | |\|"| |\|<|C|-|W|>|'| +0#0000000&@63
 |e+0#af5f00255&|c|h|o| +0#0000000&|$+0#e000002&|"|\+0#e000e06&|3|1|6|0+0#e000002&| |-| |\+0#e000e06&|x|1|f|0+0#e000002&| |-| |\+0#e000e06&|X|1|F|0+0#e000002&| |-| |\+0#e000e06&|u|0|2|a|4|0+0#e000002&| |-| |\+0#e000e06&|U|0@4|2|a|4|0+0#e000002&|"| +0#0000000&@21
 @75
-|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|C|-|a|>|"+0#e000002&| +0#0000000&@61
-|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|*|C|-|a|>|"+0#e000002&| +0#0000000&@60
-@57|1|8|,|1| @10|2|%| 
+@57|1|9|,|1| @10|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_02.dump b/runtime/syntax/testdir/dumps/vim_expressions_02.dump
similarity index 80%
rename from runtime/syntax/testdir/dumps/vim_expr_02.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_02.dump
index 563d02a72cf19cddb9ccd70748616aa9f4dec50d..89d199ad81602861c0591b2fbdc7ba34bf50f49a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_02.dump
@@ -1,9 +1,11 @@
-|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|*|C|-|a|>|"+0#e000002&| +0#0000000&@60
+| +0&#ffffff0@74
+|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|C|-|a|>|"+0#e000002&| +0#0000000&@61
+|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|*|C|-|a|>|"+0#e000002&| +0#0000000&@60
 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|C|-|>@1|"+0#e000002&| +0#0000000&@61
 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|*|C|-|>@1|"+0#e000002&| +0#0000000&@60
-|e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|C|-|>@1|>+0#e000002&|"| +0#0000000&@60
+>e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|C|-|>@1|>+0#e000002&|"| +0#0000000&@60
 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|*|C|-|>@1|>+0#e000002&|"| +0#0000000&@59
-> @74
+@75
 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&@1| +0#0000000&@67
 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|\+0#e000e06&|"|"+0#e000002&| +0#0000000&@65
 |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|f|o@1|\+0#e000e06&|"|"+0#e000002&| +0#0000000&@62
@@ -15,6 +17,4 @@
 |e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|'+0#e000e06&@1|f+0#e000002&|o@1|'| +0#0000000&@62
 |e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|f|o@1|'+0#e000e06&@1|'+0#e000002&| +0#0000000&@62
 |e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|f|o@1|'+0#e000e06&@1|b+0#e000002&|a|r|'| +0#0000000&@59
-@75
-|"+0#0000e05&| |U|n|r|e|p|o|r|t|e|d| |i|s@1|u|e| |(|i|n|c|o|r@1|e|c|t|l|y| |m|a|t|c|h|e|s| |a|s| |v|i|m|S|t|r|i|n|g| |v|i|m|M|a|r|k| |v|i|m|O|p|e|r| |N|O|N|E|)| +0#0000000&
-@57|3|2|,|0|-|1| @8|6|%| 
+@57|3@1|,|1| @10|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_03.dump b/runtime/syntax/testdir/dumps/vim_expressions_03.dump
similarity index 86%
rename from runtime/syntax/testdir/dumps/vim_expr_03.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_03.dump
index 728805fc42f4527760687d3d28bbdb71f4dc3995..e625a05fca688b4c0fc233478ba0c78428d34386 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_03.dump
@@ -1,9 +1,11 @@
-|"+0#0000e05#ffffff0| |U|n|r|e|p|o|r|t|e|d| |i|s@1|u|e| |(|i|n|c|o|r@1|e|c|t|l|y| |m|a|t|c|h|e|s| |a|s| |v|i|m|S|t|r|i|n|g| |v|i|m|M|a|r|k| |v|i|m|O|p|e|r| |N|O|N|E|)| +0#0000000&
+|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|'+0#e000002&|f|o@1|'+0#e000e06&@1|b+0#e000002&|a|r|'| +0#0000000&@59
+@75
+|"+0#0000e05&| |U|n|r|e|p|o|r|t|e|d| |i|s@1|u|e| |(|i|n|c|o|r@1|e|c|t|l|y| |m|a|t|c|h|e|s| |a|s| |v|i|m|S|t|r|i|n|g| |v|i|m|M|a|r|k| |v|i|m|O|p|e|r| |N|O|N|E|)| +0#0000000&
 |"+0#0000e05&| |h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|t|p|o|p|e|/|v|i|m|-|u|n|i|m|p|a|i|r|e|d|/|b|l|o|b|/|6|d|4@1|a|6|d|c|2|e|c|3|4|6|0|7|c|4|1|e|c|7|8|a|c|f|8|1
 |6|5|7|2|4|8|5|8|0|b|f|1|/|p|l|u|g|i|n|/|u|n|i|m|p|a|i|r|e|d|.|v|i|m|#|L|2|3|2| +0#0000000&@35
-|l+0#af5f00255&|e|t| +0#0000000&|c+0#00e0e07&|m|d| +0#0000000&|=+0#af5f00255&| +0#0000000&|'+0#e000002&|p|u|t|!|=|r|e|p|e|a|t|(|n|r|2|c|h|a|r|(|1|0|)|,| |v|:|c|o|u|n|t|1|)|||s|i|l|e|n|t| |'+0#e000e06&@1|]+0#e000002&|+|'| +0#0000000&@16
+>l+0#af5f00255&|e|t| +0#0000000&|c+0#00e0e07&|m|d| +0#0000000&|=+0#af5f00255&| +0#0000000&|'+0#e000002&|p|u|t|!|=|r|e|p|e|a|t|(|n|r|2|c|h|a|r|(|1|0|)|,| |v|:|c|o|u|n|t|1|)|||s|i|l|e|n|t| |'+0#e000e06&@1|]+0#e000002&|+|'| +0#0000000&@16
+@75
 @75
-> @74
 |"+0#0000e05&| |S|t|r|i|n|g| |i|n|t|e|r|p|o|l|a|t|i|o|n| +0#0000000&@52
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|D|o|n|'+0#e000e06&@1|t+0#e000002&| |h|i|g|h|l|i|g|h|t| |i|n|t|e|r|p|o|l|a|t|i|o|n|:| |{@1| |{|1| |+| |2|}| |}@1|'| +0#0000000&@22
@@ -15,6 +17,4 @@
 @75
 @75
 |"+0#0000e05&| |C|o|n|t|i|n|u|e|d| |s|t|r|i|n|g| +0#0000000&@56
-@75
-|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&| +0#0000000&@65
-@57|4|9|,|0|-|1| @7|1|0|%| 
+@57|5|0|,|1| @9|1@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_04.dump b/runtime/syntax/testdir/dumps/vim_expressions_04.dump
similarity index 81%
rename from runtime/syntax/testdir/dumps/vim_expr_04.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_04.dump
index 09f3a69944972bd02e255624d8954d17ef1c034d..728e47ca6df7bcaaa1e2c128af269b2fc9a45d02 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_04.dump
@@ -1,9 +1,11 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&| +0#0000000&@65
+|"+0#0000e05#ffffff0| |C|o|n|t|i|n|u|e|d| |s|t|r|i|n|g| +0#0000000&@56
+@75
+|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&| +0#0000000&@65
 | +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 | +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |1| +0#0000000&@60
-| +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
-| +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2| +0#0000000&@60
 | +0#e000002&@5>"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
+| +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2| +0#0000000&@60
+| +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 | +0#e000002&@5|\+0#e000e06&|"+0#e000002&| +0#0000000&|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@51
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|\+0#e000e06&|"| +0#0000000&@63
@@ -15,6 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|'+0#e000002&| +0#0000000&@65
 | +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 | +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |1| +0#0000000&@60
-| +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
-| +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2| +0#0000000&@60
-@57|6|7|,|7| @9|1|5|%| 
+@57|6|8|,|7| @9|1|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_05.dump b/runtime/syntax/testdir/dumps/vim_expressions_05.dump
similarity index 80%
rename from runtime/syntax/testdir/dumps/vim_expr_05.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_05.dump
index ab5f3031ac6d5c02e3ed9b6d5e9792c50844c0e6..a57b1c81038956f42399714acd9934856a95cf05 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_05.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_05.dump
@@ -1,9 +1,11 @@
-| +0#e000002#ffffff0@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2| +0#0000000&@60
+| +0#e000002#ffffff0@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |1| +0#0000000&@60
+| +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
+| +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2| +0#0000000&@60
 | +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 | +0#e000002&@5|\+0#e000e06&|'+0#e000002&| +0#0000000&|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@51
-@75
+> @74
 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|'+0#e000002&|'+0#e000e06&@1| +0#0000000&@63
-| +0#e000002&@5>\+0#e000e06&|'@1| +0#e000002&|p|a|r|t| |1| |'+0#e000e06&@1| +0#0000000&@55
+| +0#e000002&@5|\+0#e000e06&|'@1| +0#e000002&|p|a|r|t| |1| |'+0#e000e06&@1| +0#0000000&@55
 | +0#e000002&@5|"+0#0000e05&|\| |e|s|c|a|p|e| |s|e|q|u|e|n|c|e| +0#0000000&@50
 | +0#e000002&@5|\+0#e000e06&| +0#e000002&|'+0#e000e06&@1|p+0#e000002&|a|r|t| |2|'+0#e000e06&@1| +0#0000000&@56
 | +0#e000002&@5|\+0#e000e06&|'@1|'+0#e000002&| +0#0000000&|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@49
@@ -15,6 +17,4 @@
 | +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2| +0#0000000&@60
 | +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 | +0#e000002&@5|\+0#e000e06&|"+0#e000002&| +0#0000000&|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@51
-@75
-|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|$+0#e000002&|'| +0#0000000&@64
-@57|8|5|,|7| @9|1|9|%| 
+@57|8|6|,|0|-|1| @7|1|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_06.dump b/runtime/syntax/testdir/dumps/vim_expressions_06.dump
similarity index 79%
rename from runtime/syntax/testdir/dumps/vim_expr_06.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_06.dump
index 057d9d00535af3bfa6e6cef45d210a4e3793f3ef..81e340dea2076ec0f0945c9a7d0ceceaad54e175 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_06.dump
@@ -1,9 +1,11 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|$+0#e000002&|'| +0#0000000&@64
+| +0#e000002#ffffff0@5|\+0#e000e06&|"+0#e000002&| +0#0000000&|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@51
+@75
+|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|$+0#e000002&|'| +0#0000000&@64
 | +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 | +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |1| +0#0000000&@60
-| +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
-| +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2| +0#0000000&@60
 | +0#e000002&@5>"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
+| +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2| +0#0000000&@60
+| +0#e000002&@5|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 | +0#e000002&@5|\+0#e000e06&|'+0#e000002&| +0#0000000&|"+0#0000e05&| |t|a|i|l| |c|o|m@1|e|n|t| +0#0000000&@51
 @75
 |c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|t|r|l|e|n|(+0#e000e06&|"+0#e000002&|p|a|r|t| |1| +0#0000000&@55
@@ -15,6 +17,4 @@
 | +0#e000002&@5|\+0#e000e06&| +0#e000002&|p|a|r|t| |2|"|)+0#e000e06&| +0#0000000&@58
 @75
 @75
-|"+0#0000e05&| |N|u|m|b|e|r| +0#0000000&@66
-@75
-@57|1|0|3|,|7| @8|2|4|%| 
+@57|1|0|4|,|7| @8|2|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_07.dump b/runtime/syntax/testdir/dumps/vim_expressions_07.dump
similarity index 78%
rename from runtime/syntax/testdir/dumps/vim_expr_07.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_07.dump
index b90a4f7d1cfc270dce3ee0041e13198b77e1ec56..428a2ede181fcfc41ca871a937731a4a9fe1b0c9 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_07.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_07.dump
@@ -1,9 +1,11 @@
 | +0&#ffffff0@74
+|"+0#0000e05&| |N|u|m|b|e|r| +0#0000000&@66
+@75
 |"+0#0000e05&| |H|e|x|a|d|e|c|i|m|a|l| +0#0000000&@61
 |e+0#af5f00255&|c|h|o| +0#0000000&@1|0+0#e000002&|x|F@1| +0#0000000&@64
-|e+0#af5f00255&|c|h|o| +0#0000000&@1|0+0#e000002&|X|F@1| +0#0000000&@64
+>e+0#af5f00255&|c|h|o| +0#0000000&@1|0+0#e000002&|X|F@1| +0#0000000&@64
 |e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|x|F@1| +0#0000000&@64
->e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|X|F@1| +0#0000000&@64
+|e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|X|F@1| +0#0000000&@64
 @75
 |"+0#0000e05&| |D|e|c|i|m|a|l| +0#0000000&@65
 |e+0#af5f00255&|c|h|o| +0#0000000&@1|2+0#e000002&|5@1| +0#0000000&@65
@@ -15,6 +17,4 @@
 |e+0#af5f00255&|c|h|o| +0#0000000&@1|0+0#e000002&|O|3|7@1| +0#0000000&@63
 |e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|3|7@1| +0#0000000&@64
 |e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|o|3|7@1| +0#0000000&@63
-|e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|O|3|7@1| +0#0000000&@63
-@75
-@57|1|2|1|,|1| @8|2|8|%| 
+@57|1|2@1|,|1| @8|2|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_08.dump b/runtime/syntax/testdir/dumps/vim_expressions_08.dump
similarity index 72%
rename from runtime/syntax/testdir/dumps/vim_expr_08.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_08.dump
index ce5375ddf08b1c03f9e5b26b9af1a112c68b9d54..95dd9099ad54979847fc8712d5d8849f848a6cfe 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_08.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_08.dump
@@ -1,9 +1,11 @@
-| +0&#ffffff0@74
+|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|o|3|7@1| +0#0000000&@63
+|e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|O|3|7@1| +0#0000000&@63
+@75
 |"+0#0000e05&| |B|i|n|a|r|y| +0#0000000&@66
 |e+0#af5f00255&|c|h|o| +0#0000000&@1|0+0#e000002&|b|1@7| +0#0000000&@58
-|e+0#af5f00255&|c|h|o| +0#0000000&@1|0+0#e000002&|B|1@7| +0#0000000&@58
+>e+0#af5f00255&|c|h|o| +0#0000000&@1|0+0#e000002&|B|1@7| +0#0000000&@58
 |e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|b|1@7| +0#0000000&@58
->e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|B|1@7| +0#0000000&@58
+|e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|0+0#e000002&|B|1@7| +0#0000000&@58
 @75
 |"+0#0000e05&| |F|l|o|a|t| +0#0000000&@67
 |e+0#af5f00255&|c|h|o| +0#0000000&|1+0#e000002&|2|3|.|4|5|6| +0#0000000&@62
@@ -15,6 +17,4 @@
 |e+0#af5f00255&|c|h|o| +0#0000000&|-+0#af5f00255&|3+0#e000002&|.|1|4|1|6|e|+|8@1| +0#0000000&@58
 @75
 |"+0#0000e05&| |B|l|o|b| +0#0000000&@68
-|e+0#af5f00255&|c|h|o| +0#0000000&|0+0#e000002&|z| +0#0000000&@67
-|e+0#af5f00255&|c|h|o| +0#0000000&|0+0#e000002&|z|F@1|0@1|E|D|0|1|5|D|A|F| +0#0000000&@55
-@57|1|3|9|,|1| @8|3|2|%| 
+@57|1|4|0|,|1| @8|3|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_09.dump b/runtime/syntax/testdir/dumps/vim_expressions_09.dump
similarity index 76%
rename from runtime/syntax/testdir/dumps/vim_expr_09.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_09.dump
index cd4cbe97884e26944e4532fb4fbb429a6867627d..2063012d61f4049c303ca86590c2b54593336ef0 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_09.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_09.dump
@@ -1,9 +1,11 @@
-|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|0+0#e000002&|z|F@1|0@1|E|D|0|1|5|D|A|F| +0#0000000&@55
+|"+0#0000e05#ffffff0| |B|l|o|b| +0#0000000&@68
+|e+0#af5f00255&|c|h|o| +0#0000000&|0+0#e000002&|z| +0#0000000&@67
+|e+0#af5f00255&|c|h|o| +0#0000000&|0+0#e000002&|z|F@1|0@1|E|D|0|1|5|D|A|F| +0#0000000&@55
 |e+0#af5f00255&|c|h|o| +0#0000000&|0+0#e000002&|z|F@1|0@1|.|E|D|0|1|.|5|D|A|F| +0#0000000&@53
 |e+0#af5f00255&|c|h|o| +0#0000000&|0+0#e000002&|z|F@1|.|0@1|.|E|D|.|0|1|.|5|D|.|A|F| +0#0000000&@50
-@75
-|"+0#0000e05&| |L|i|s|t| +0#0000000&@68
 > @74
+|"+0#0000e05&| |L|i|s|t| +0#0000000&@68
+@75
 |e+0#af5f00255&|c|h|o| +0#0000000&|[+0#e000e06&|]| +0#0000000&@67
 |e+0#af5f00255&|c|h|o| +0#0000000&|[+0#e000e06&|4+0#e000002&|2|]+0#e000e06&| +0#0000000&@65
 |e+0#af5f00255&|c|h|o| +0#0000000&|[+0#e000e06&@1|1+0#e000002&@1|,+0#0000000&| |1+0#e000002&|2|]+0#e000e06&|,+0#0000000&| |[+0#e000e06&|2+0#e000002&|1|,+0#0000000&| |2+0#e000002&@1|]+0#e000e06&|,+0#0000000&| |[+0#e000e06&|3+0#e000002&|1|,+0#0000000&| |3+0#e000002&|2|]+0#e000e06&@1| +0#0000000&@39
@@ -14,7 +16,5 @@
 @6|\+0#e000e06&|]| +0#0000000&@66
 |e+0#af5f00255&|c|h|o| +0#0000000&|[+0#e000e06&|1+0#e000002&|,+0#0000000&| |'+0#e000002&|t|w|o|'|,+0#0000000&| |1+0#e000002&| +0#0000000&|++0#af5f00255&| +0#0000000&|2+0#e000002&|,+0#0000000&| |"+0#e000002&|f|o|"| +0#0000000&|.+0#af5f00255&@1| +0#0000000&|"+0#e000002&|u|r|"|]+0#e000e06&| +0#0000000&@38
 @75
-|"+0#0000e05&| |I|s@1|u|e| |#|5|8|3|0| |(|I|n|c|o|r@1|e|c|t| |s|y|n|t|a|x| |h|i|g|h|l|i|g|h|t|i|n|g| |i|n| |V|i|m| |s|c|r|i|p|t| |w|h|e|n| |o|m|i|t@1|i|n|g| |s|p
-|a|c|e| |i|n| |l|i|s|t| |o|f| |s|t|r|i|n|g|)| +0#0000000&@52
-|l+0#af5f00255&|e|t| +0#0000000&|l+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|'+0#e000002&|a|'|,+0#0000000&|'+0#e000002&|b|'|,+0#0000000&|'+0#e000002&|c|'|]+0#e000e06&| +0#0000000&@53
-@57|1|5|7|,|0|-|1| @6|3|7|%| 
+|"+0#0000e05&| |I|s@1|u|e| |#|5|8|3|0| |(|I|n|c|o|r@1|e|c|t| |s|y|n|t|a|x| |h|i|g|h|l|i|g|h|t|i|n|g| |i|n| |V|i|m| |s|c|r|i|p|t| |w|h|e|n| |o|m|i|t@1|i|n|g|@+0#4040ff13&@2
+| +0#0000000&@56|1|5|8|,|0|-|1| @6|3|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_10.dump b/runtime/syntax/testdir/dumps/vim_expressions_10.dump
similarity index 77%
rename from runtime/syntax/testdir/dumps/vim_expr_10.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_10.dump
index 5be3b10878497aa765f789e52fae0b199c02c195..a17403edce8e26db04c4944d40517e62f2e971b0 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_10.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_10.dump
@@ -1,9 +1,11 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|l+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|'+0#e000002&|a|'|,+0#0000000&|'+0#e000002&|b|'|,+0#0000000&|'+0#e000002&|c|'|]+0#e000e06&| +0#0000000&@53
+|"+0#0000e05#ffffff0| |I|s@1|u|e| |#|5|8|3|0| |(|I|n|c|o|r@1|e|c|t| |s|y|n|t|a|x| |h|i|g|h|l|i|g|h|t|i|n|g| |i|n| |V|i|m| |s|c|r|i|p|t| |w|h|e|n| |o|m|i|t@1|i|n|g| |s|p
+|a|c|e| |i|n| |l|i|s|t| |o|f| |s|t|r|i|n|g|)| +0#0000000&@52
+|l+0#af5f00255&|e|t| +0#0000000&|l+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|'+0#e000002&|a|'|,+0#0000000&|'+0#e000002&|b|'|,+0#0000000&|'+0#e000002&|c|'|]+0#e000e06&| +0#0000000&@53
 @75
 |"+0#0000e05&| |D|i|c|t|i|o|n|a|r|y| +0#0000000&@62
-@75
+> @74
 |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&|'+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
 |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&@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
 @75
@@ -15,6 +17,4 @@
 |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&@40
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| @1|{+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&@40
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| @1|{+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&@40
-|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| @1|{+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&@40
-@57|1|7|4|,|1| @8|4|1|%| 
+@57|1|7|5|,|0|-|1| @6|4|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_11.dump b/runtime/syntax/testdir/dumps/vim_expressions_11.dump
similarity index 78%
rename from runtime/syntax/testdir/dumps/vim_expr_11.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_11.dump
index d8be50a4ecb2956943bff89d17d759fe9c7a2feb..38e9322184199493c9c7323fb22eec4d38f16cb3 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_11.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_11.dump
@@ -1,9 +1,11 @@
-|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| @1|{+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&@40
+|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| @1|{+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&@40
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| @1|{+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&@40
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&|'+0#e000002&|f|o@1|'|:+0#0000000&| @1|{+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&@40
 |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&@40
 |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&@40
-|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&@40
+>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&@40
 @75
->e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| @1|{+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&@40
+|e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| @1|{+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&@40
 |e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| @1|{+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&@40
 |e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&@3|4+0#e000002&|2|:+0#0000000&| @1|{+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&@40
 |e+0#af5f00255&|c|h|o| +0#0000000&|{+0#e000e06&| +0#0000000&@3|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&@40
@@ -15,6 +17,4 @@
 @6|\+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&@42
 @6|\+0#e000e06&|}| +0#0000000&@66
 @75
-|"+0#0000e05&| +0#0000000&|T+0#0000001#ffff4012|O|D|O|:+0#e000e06#ffffff0| +0#0000e05&|a|r|b|i|t|r|a|r|y| |e|x|p|r|e|s@1|i|o|n| |k|e|y|s| +0#0000000&@41
-@75
-@57|1|9|2|,|1| @8|4|6|%| 
+@57|1|9|3|,|1| @8|4|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_12.dump b/runtime/syntax/testdir/dumps/vim_expressions_12.dump
similarity index 81%
rename from runtime/syntax/testdir/dumps/vim_expr_12.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_12.dump
index 71462fe487c84aebcf9997fca95358350cb8a7e2..cb1099b7e9ed4aaebe8c23473f7f2eea0e440c41 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_12.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_12.dump
@@ -1,9 +1,11 @@
 | +0&#ffffff0@74
+|"+0#0000e05&| +0#0000000&|T+0#0000001#ffff4012|O|D|O|:+0#e000e06#ffffff0| +0#0000e05&|a|r|b|i|t|r|a|r|y| |e|x|p|r|e|s@1|i|o|n| |k|e|y|s| +0#0000000&@41
+@75
 |"+0#0000e05&| |L|i|t|e|r|a|l| |D|i|c|t|i|o|n|a|r|y| +0#0000000&@54
 @75
-|e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{|}| +0#0000000&@66
+>e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{|}| +0#0000000&@66
 |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&@51
->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&@51
+|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&@51
 |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&@51
 @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&@41
@@ -15,6 +17,4 @@
 @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&@39
 |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&@39
-|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&@39
-|e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| @1|{+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&@39
-@57|2|1|0|,|1| @8|5|0|%| 
+@57|2|1@1|,|1| @8|5|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_13.dump b/runtime/syntax/testdir/dumps/vim_expressions_13.dump
similarity index 75%
rename from runtime/syntax/testdir/dumps/vim_expr_13.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_13.dump
index 3f9b56da6d49134d047eb8a5bcf986a342f80df0..1cd89fdf89fadb599326efe325086860a17cd37b 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_13.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_13.dump
@@ -1,9 +1,11 @@
-|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| @1|{+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&@39
+|e+0#af5f00255#ffffff0|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&@39
+|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&@39
+|e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| @1|{+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&@39
 |e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| @1|{+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&@39
 |e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|-+0#af5f00255&|f+0#00e0e07&|o@1|-+0#af5f00255&|:+0#0000000&| @1|{+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&@39
-@75
+> @74
 |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&@42
->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&@42
+|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&@42
 |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&@42
 |e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|4+0#e000002&|2|:+0#0000000&| @1|{+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&@42
 |e+0#af5f00255&|c|h|o| +0#0000000&|#+0#e000e06&|{| +0#0000000&|4+0#e000002&|2|:+0#0000000&| @1|{+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&@42
@@ -15,6 +17,4 @@
 @6|\+0#e000e06&| +0#0000000&@3|b+0#00e0e07&|a|r|:+0#0000000&| |2+0#e000002&|1| +0#0000000&|*+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&@52
 @6|\+0#e000e06&| +0#0000000&@1|}+0#e000e06&| +0#0000000&@64
 @6|\+0#e000e06&|}| +0#0000000&@66
-@75
-|"+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
-@57|2@1|8|,|1| @8|5|4|%| 
+@57|2@1|9|,|0|-|1| @6|5|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_14.dump b/runtime/syntax/testdir/dumps/vim_expressions_14.dump
similarity index 86%
rename from runtime/syntax/testdir/dumps/vim_expr_14.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_14.dump
index ccd2840429082780d0383a257f060628626cadc8..59727033bca18d898775c8c9f502fb4d84d26fd7 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_14.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_14.dump
@@ -1,9 +1,11 @@
-|"+0#0000e05#ffffff0| |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
+| +0&#ffffff0@5|\+0#e000e06&|}| +0#0000000&@66
+@75
+|"+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&@9
 @75
-|"+0#0000e05&| |T|u|p|l|e| +0#0000000&@67
+>"+0#0000e05&| |T|u|p|l|e| +0#0000000&@67
 @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&@67
 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|,+0#0000000&|)+0#e000e06&| +0#0000000&@64
 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&@1|1+0#e000002&@1|,+0#0000000&| |1+0#e000002&|2|)+0#e000e06&|,+0#0000000&| |(+0#e000e06&|2+0#e000002&|1|,+0#0000000&| |2+0#e000002&@1|)+0#e000e06&|,+0#0000000&| |(+0#e000e06&|3+0#e000002&|1|,+0#0000000&| |3+0#e000002&|2|)+0#e000e06&@1| +0#0000000&@39
 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|1+0#e000002&|,+0#0000000&| @66
@@ -15,6 +17,4 @@
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|,+0#0000000&| |8+0#e000002&|7|)+0#e000e06&| +0#0000000&@55
 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|,+0#0000000&| |8+0#e000002&|7|)+0#e000e06&| +0#0000000&|++0#af5f00255&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@55
-@75
-|"+0#0000e05&| |R|e|g|i|s|t|e|r| +0#0000000&@64
-@57|2|4|6|,|1| @8|5|9|%| 
+@57|2|4|7|,|1| @8|5|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_15.dump b/runtime/syntax/testdir/dumps/vim_expressions_15.dump
similarity index 86%
rename from runtime/syntax/testdir/dumps/vim_expr_15.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_15.dump
index b261b70da082c30928c50c85e3f50d2b1176d1e6..ffafa542015c3cfd9ccf775988746fe2f88a9cac 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_15.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_15.dump
@@ -1,10 +1,12 @@
-|"+0#0000e05#ffffff0| |R|e|g|i|s|t|e|r| +0#0000000&@64
+|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|,+0#0000000&| |8+0#e000002&|7|)+0#e000e06&| +0#0000000&|++0#af5f00255&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@55
+@75
+|"+0#0000e05&| |R|e|g|i|s|t|e|r| +0#0000000&@64
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|"| +0#0000000&|@+0#e000e06&@1| +0#0000000&@64
-|e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|0| +0#0000000&|@+0#e000e06&|1| +0#0000000&|@+0#e000e06&|2| +0#0000000&|@+0#e000e06&|3| +0#0000000&|@+0#e000e06&|4| +0#0000000&|@+0#e000e06&|5| +0#0000000&|@+0#e000e06&|6| +0#0000000&|@+0#e000e06&|7| +0#0000000&|@+0#e000e06&|8| +0#0000000&|@+0#e000e06&|9| +0#0000000&@40
+>e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|0| +0#0000000&|@+0#e000e06&|1| +0#0000000&|@+0#e000e06&|2| +0#0000000&|@+0#e000e06&|3| +0#0000000&|@+0#e000e06&|4| +0#0000000&|@+0#e000e06&|5| +0#0000000&|@+0#e000e06&|6| +0#0000000&|@+0#e000e06&|7| +0#0000000&|@+0#e000e06&|8| +0#0000000&|@+0#e000e06&|9| +0#0000000&@40
 |e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|a| +0#0000000&|@+0#e000e06&|b| +0#0000000&|@+0#e000e06&|c| +0#0000000&|@+0#e000e06&|d| +0#0000000&|@+0#e000e06&|e| +0#0000000&|@+0#e000e06&|f| +0#0000000&|@+0#e000e06&|g| +0#0000000&|@+0#e000e06&|h| +0#0000000&|@+0#e000e06&|i| +0#0000000&|@+0#e000e06&|j| +0#0000000&|@+0#e000e06&|k| +0#0000000&|@+0#e000e06&|l| +0#0000000&|@+0#e000e06&|m| +0#0000000&|@+0#e000e06&|n| +0#0000000&|@+0#e000e06&|o| +0#0000000&|@+0#e000e06&|p| +0#0000000&|@+0#e000e06&|q| +0#0000000&|@+0#e000e06&|r| +0#0000000&|@+0#e000e06&|s| +0#0000000&|@+0#e000e06&|t| +0#0000000&|@+0#e000e06&|u| +0#0000000&|@+0#e000e06&|v| +0#0000000&|@+0#e000e06&|w| +0#0000000&|@+0#e000e06&
 |x| +0#0000000&|@+0#e000e06&|y| +0#0000000&|@+0#e000e06&|z| +0#0000000&@67
->e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|A| +0#0000000&|@+0#e000e06&|B| +0#0000000&|@+0#e000e06&|C| +0#0000000&|@+0#e000e06&|D| +0#0000000&|@+0#e000e06&|E| +0#0000000&|@+0#e000e06&|F| +0#0000000&|@+0#e000e06&|G| +0#0000000&|@+0#e000e06&|H| +0#0000000&|@+0#e000e06&|I| +0#0000000&|@+0#e000e06&|J| +0#0000000&|@+0#e000e06&|K| +0#0000000&|@+0#e000e06&|L| +0#0000000&|@+0#e000e06&|M| +0#0000000&|@+0#e000e06&|N| +0#0000000&|@+0#e000e06&|O| +0#0000000&|@+0#e000e06&|P| +0#0000000&|@+0#e000e06&|Q| +0#0000000&|@+0#e000e06&|R| +0#0000000&|@+0#e000e06&|S| +0#0000000&|@+0#e000e06&|T| +0#0000000&|@+0#e000e06&|U| +0#0000000&|@+0#e000e06&|V| +0#0000000&|@+0#e000e06&|W| +0#0000000&|@+0#e000e06&
+|e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|A| +0#0000000&|@+0#e000e06&|B| +0#0000000&|@+0#e000e06&|C| +0#0000000&|@+0#e000e06&|D| +0#0000000&|@+0#e000e06&|E| +0#0000000&|@+0#e000e06&|F| +0#0000000&|@+0#e000e06&|G| +0#0000000&|@+0#e000e06&|H| +0#0000000&|@+0#e000e06&|I| +0#0000000&|@+0#e000e06&|J| +0#0000000&|@+0#e000e06&|K| +0#0000000&|@+0#e000e06&|L| +0#0000000&|@+0#e000e06&|M| +0#0000000&|@+0#e000e06&|N| +0#0000000&|@+0#e000e06&|O| +0#0000000&|@+0#e000e06&|P| +0#0000000&|@+0#e000e06&|Q| +0#0000000&|@+0#e000e06&|R| +0#0000000&|@+0#e000e06&|S| +0#0000000&|@+0#e000e06&|T| +0#0000000&|@+0#e000e06&|U| +0#0000000&|@+0#e000e06&|V| +0#0000000&|@+0#e000e06&|W| +0#0000000&|@+0#e000e06&
 |X| +0#0000000&|@+0#e000e06&|Y| +0#0000000&|@+0#e000e06&|Z| +0#0000000&@67
 |e+0#af5f00255&|c|h|o| +0#0000000&|@+0#e000e06&|-| +0#0000000&|@+0#e000e06&|:| +0#0000000&|@+0#e000e06&|.| +0#0000000&|@+0#e000e06&|%| +0#0000000&|@+0#e000e06&|#| +0#0000000&|@+0#e000e06&|=| +0#0000000&|@+0#e000e06&|*| +0#0000000&|@+0#e000e06&|+| +0#0000000&|@+0#e000e06&|~| +0#0000000&|@+0#e000e06&|_| +0#0000000&|@+0#e000e06&|/| +0#0000000&@37
 @75
@@ -15,6 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|9| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|a| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|k| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
-|l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|z| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
-|l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|A| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
-@57|2|6|4|,|1| @8|6|3|%| 
+@57|2|6|5|,|1| @8|6|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_16.dump b/runtime/syntax/testdir/dumps/vim_expressions_16.dump
similarity index 71%
rename from runtime/syntax/testdir/dumps/vim_expr_16.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_16.dump
index 36583d5ac8d3b788c018fe4c13561f6b7f15e7de..398b2b8ca3d264df32a9174f920015787e4e1a83 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_16.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_16.dump
@@ -1,9 +1,11 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|@+0#e000e06&|A| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
+|l+0#af5f00255#ffffff0|e|t| +0#0000000&|@+0#e000e06&|k| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
+|l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|z| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
+|l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|A| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|K| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|Z| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
-|l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|-| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
+>l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|-| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|#| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
->l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|=| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
+|l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|=| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|*| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|+| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
 |l+0#af5f00255&|e|t| +0#0000000&|@+0#e000e06&|_| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|f|o@1|"| +0#0000000&@60
@@ -15,6 +17,4 @@
 |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
 |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|2|8|0|,|1| @8|6|7|%| 
+@57|2|8|1|,|1| @8|6|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_17.dump b/runtime/syntax/testdir/dumps/vim_expressions_17.dump
similarity index 69%
rename from runtime/syntax/testdir/dumps/vim_expr_17.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_17.dump
index 02070297e90d3f76ddb688f95600156cc2d26383..65b6b11223743de33e7c5f412fcb1028c46e4288 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_17.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_17.dump
@@ -1,9 +1,11 @@
-| +0&#ffffff0@74
+|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&|"+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
 |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
 @6|\+0#e000e06&| +0#0000000&|?+0#af5f00255&| +0#0000000&|"+0#e000002&|t|o|p|"| +0#0000000&@59
-@6|\+0#e000e06&| +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&@52
+@6>\+0#e000e06&| +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&@52
 @6|\+0#e000e06&| +0#0000000&@8|?+0#af5f00255&| +0#0000000&|"+0#e000002&|l|a|s|t|"| +0#0000000&@50
-@6>\+0#e000e06&| +0#0000000&@8|:+0#af5f00255&| +0#0000000&|l+0#00e0e07&|n|u|m| +0#0000000&@52
+@6|\+0#e000e06&| +0#0000000&@8|:+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
 @6|\+0#e000e06&| +0#0000000&|"+0#e000002&|t|o|p|"| +0#0000000&|:+0#af5f00255&| +0#0000000&@59
 @6|\+0#e000e06&| +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&@52
@@ -15,6 +17,4 @@
 |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
-@57|2|9|8|,|7| @8|7|2|%| 
+@57|2|9@1|,|7| @8|7|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_18.dump b/runtime/syntax/testdir/dumps/vim_expressions_18.dump
similarity index 69%
rename from runtime/syntax/testdir/dumps/vim_expr_18.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_18.dump
index e509a7d39781a26814695656d22788edbdb1d2d3..dd8c9613893f7240aadde49acacf25c0e566efc8 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_18.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_18.dump
@@ -1,9 +1,11 @@
-|e+0#af5f00255#ffffff0|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#ffffff0|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&|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
-|"+0#0000e05&| |F|a|l|s|y| +0#0000000&@67
+>"+0#0000e05&| |F|a|l|s|y| +0#0000000&@67
 |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
-> @74
+@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
 @75
@@ -15,6 +17,4 @@
 |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
-@57|3|1|6|,|0|-|1| @6|7|6|%| 
+@57|3|1|7|,|1| @8|7|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_19.dump b/runtime/syntax/testdir/dumps/vim_expressions_19.dump
similarity index 75%
rename from runtime/syntax/testdir/dumps/vim_expr_19.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_19.dump
index 72fb8be5ca3afa76d07bab16e63482b405fc63bb..05e9989d95014cc48b89b6ebf631502c9cacca1a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_19.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_19.dump
@@ -1,9 +1,11 @@
-|e+0#af5f00255#ffffff0|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#ffffff0|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&|1+0#e000002&|)+0#e000e06&| +0#0000000&|?+0#af5f00255&@1| +0#0000000&|(+0#e000e06&|1+0#e000002&|)+0#e000e06&| +0#0000000&@59
+>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
->"+0#0000e05&| |C|o|m|p|a|r|i|s|o|n| |-| |u|s|i|n|g| |'|i|g|n|o|r|c|a|s|e|'| +0#0000000&@42
+|"+0#0000e05&| |C|o|m|p|a|r|i|s|o|n| |-| |u|s|i|n|g| |'|i|g|n|o|r|c|a|s|e|'| +0#0000000&@42
 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&@1| +0#0000000&@4|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|!+0#af5f00255&|=| +0#0000000&@4|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|>+0#af5f00255&| +0#0000000&@5|e+0#00e0e07&|x|p|r| +0#0000000&@53
@@ -15,6 +17,4 @@
 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|i+0#af5f00255&|s| +0#0000000&@4|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|i+0#af5f00255&|s|n|o|t| +0#0000000&@1|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @75
-|"+0#0000e05&| |C|o|m|p|a|r|i|s|o|n| |-| |m|a|t|c|h| |c|a|s|e| +0#0000000&@49
-|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&@1|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
-@57|3@1|4|,|1| @8|8|1|%| 
+@57|3@1|5|,|1| @8|8|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_20.dump b/runtime/syntax/testdir/dumps/vim_expressions_20.dump
similarity index 84%
rename from runtime/syntax/testdir/dumps/vim_expr_20.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_20.dump
index 6501baa4e3248a7ec7391cede3db348db190cd88..1a9b6a6a000040414ecf59064be59d8b0c750005 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_20.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_20.dump
@@ -1,9 +1,11 @@
-|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&@1|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
+| +0&#ffffff0@74
+|"+0#0000e05&| |C|o|m|p|a|r|i|s|o|n| |-| |m|a|t|c|h| |c|a|s|e| +0#0000000&@49
+|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&@1|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|!+0#af5f00255&|=|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|>+0#af5f00255&|#| +0#0000000&@4|e+0#00e0e07&|x|p|r| +0#0000000&@53
-|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|>+0#af5f00255&|=|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
+>e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|>+0#af5f00255&|=|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|<+0#af5f00255&|#| +0#0000000&@4|e+0#00e0e07&|x|p|r| +0#0000000&@53
->e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|<+0#af5f00255&|=|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
+|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|<+0#af5f00255&|=|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&|~|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|!+0#af5f00255&|~|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|i+0#af5f00255&|s|#| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
@@ -15,6 +17,4 @@
 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|>+0#af5f00255&|?| +0#0000000&@4|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|>+0#af5f00255&|=|?| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|<+0#af5f00255&|?| +0#0000000&@4|e+0#00e0e07&|x|p|r| +0#0000000&@53
-|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|<+0#af5f00255&|=|?| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
-|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&|~|?| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
-@57|3|5|2|,|1| @8|8|5|%| 
+@57|3|5|3|,|1| @8|8|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_21.dump b/runtime/syntax/testdir/dumps/vim_expressions_21.dump
similarity index 75%
rename from runtime/syntax/testdir/dumps/vim_expr_21.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_21.dump
index 6628f1de0b9fdbcc2e9942b13ba6466c1b7cf735..e49a5b752c0f305a0585b96fd6122fdc6c08101f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_21.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_21.dump
@@ -1,9 +1,11 @@
-|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&|~|?| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
+|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|<+0#af5f00255&|?| +0#0000000&@4|e+0#00e0e07&|x|p|r| +0#0000000&@53
+|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|<+0#af5f00255&|=|?| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
+|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&|~|?| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|!+0#af5f00255&|~|?| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|i+0#af5f00255&|s|?| +0#0000000&@3|e+0#00e0e07&|x|p|r| +0#0000000&@53
-|e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|i+0#af5f00255&|s|n|o|t|?| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
+>e+0#af5f00255&|c|h|o| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|i+0#af5f00255&|s|n|o|t|?| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @75
->"+0#0000e05&| |U|n|r|e|p|o|r|t|e|d| |i|s@1|u|e| |(|"|i|s|"| |i|n|c|o|r@1|e|c|t|l|y| |m|a|t|c|h|e|s| |a|s| |"+0#e000002&|e|c|h|o| |v|i|m|N|u|m|b|e|r| |*|v|i|m|C|o|m@1|a|n|d
+|"+0#0000e05&| |U|n|r|e|p|o|r|t|e|d| |i|s@1|u|e| |(|"|i|s|"| |i|n|c|o|r@1|e|c|t|l|y| |m|a|t|c|h|e|s| |a|s| |"+0#e000002&|e|c|h|o| |v|i|m|N|u|m|b|e|r| |*|v|i|m|C|o|m@1|a|n|d
 |*| |v|i|m|N|u|m|b|e|r|"|)+0#0000e05&| +0#0000000&@61
 |e+0#af5f00255&|c|h|o| +0#0000000&|4+0#e000002&|2| +0#0000000&|i+0#af5f00255&|s| +0#0000000&|4+0#e000002&|2| +0#0000000&@61
 @75
@@ -15,6 +17,4 @@
 @6|"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|++0#af5f00255&| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|z|"| +0#0000000&@61
-@75
-|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&| +0#0000000&@59
-@57|3|7|0|,|1| @8|8|9|%| 
+@57|3|7|1|,|1| @8|8|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_22.dump b/runtime/syntax/testdir/dumps/vim_expressions_22.dump
similarity index 64%
rename from runtime/syntax/testdir/dumps/vim_expr_22.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_22.dump
index fbb3e291353218eaa0ca979df1e542fdd09365bb..0e5d818fac7b82f1aaa04d3917521beaeb1155be 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_22.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_22.dump
@@ -1,9 +1,11 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&| +0#0000000&@59
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|z|"| +0#0000000&@61
+@75
+|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&| +0#0000000&@59
 @6|"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&@67
-@6|"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58
+@6>"+0#0000e05&|\| +0#0000000&|c+0#0000e05&|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&@67
-@6>\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|++0#af5f00255&| +0#0000000&@61
+@6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|++0#af5f00255&| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|"+0#e000002&|b|a|z|"| +0#0000000&@61
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&| +0#0000000&@59
@@ -15,6 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|F|o@1|(+0#e000e06&|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| |v+0#00e0e07&|:|f|a|l|s|e|,+0#0000000&| |v+0#00e0e07&|:|n|u|l@1|)+0#e000e06&| +0#0000000&@41
 @75
 @75
-|"+0#0000e05&| |I|s@1|u|e| |#|1|6|2@1|1| |(|v|i|m|S|t|r|i|n|g| |b|e|c|o|m|e|s| |v|i|m|V|a|r| |w|h|e|n| |p|r|e|c|e|d|e|d| |b|y| |!|)| +0#0000000&@14
-@75
-@57|3|8|7|,|7| @8|9|4|%| 
+@57|3|8@1|,|7| @8|9|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expr_23.dump b/runtime/syntax/testdir/dumps/vim_expressions_23.dump
similarity index 86%
rename from runtime/syntax/testdir/dumps/vim_expr_23.dump
rename to runtime/syntax/testdir/dumps/vim_expressions_23.dump
index d6713df24aaa7a8d6697b47d28082ed9c60be0a2..19fb9a423875edb406317c3bc9ca344fbaa9bbaf 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_expr_23.dump
+++ b/runtime/syntax/testdir/dumps/vim_expressions_23.dump
@@ -1,9 +1,11 @@
 | +0&#ffffff0@74
-|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|!+0#af5f00255&|'+0#e000002&|g|:|b|a|r|'|-+0#af5f00255&|>|e+0#00e0e07&|x|i|s|t|s|(+0#e000e06&|)| +0#0000000&@46
+|"+0#0000e05&| |I|s@1|u|e| |#|1|6|2@1|1| |(|v|i|m|S|t|r|i|n|g| |b|e|c|o|m|e|s| |v|i|m|V|a|r| |w|h|e|n| |p|r|e|c|e|d|e|d| |b|y| |!|)| +0#0000000&@14
 @75
+|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|!+0#af5f00255&|'+0#e000002&|g|:|b|a|r|'|-+0#af5f00255&|>|e+0#00e0e07&|x|i|s|t|s|(+0#e000e06&|)| +0#0000000&@46
 @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
 > @74
+|"+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&@67
 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|r|u|t|h|y| +0#0000000&|=+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@60
 |\+0#e000e06&| +0#0000000&@2|?+0#af5f00255&| +0#0000000&|(+0#e000e06&|0+0#e000002&| +0#0000000&@66
@@ -15,6 +17,4 @@
 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60
 | +0#e000002&@1|?+0#e000e06&|t+0#e000002&|r|u|t|h|y| +0#0000000&@65
 @2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|r|u|t|h|y| +0#0000000&|=+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@58
-@2|\+0#e000e06&| +0#0000000&@2|?+0#af5f00255&| +0#0000000&|(+0#e000e06&|0+0#e000002&| +0#0000000&@64
-@2|\+0#e000e06&| +0#0000000&@2|)+0#e000e06&| +0#0000000&@67
-@57|4|0|5|,|0|-|1| @6|9|8|%| 
+@57|4|0|6|,|0|-|1| @6|9|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_expressions_24.dump b/runtime/syntax/testdir/dumps/vim_expressions_24.dump
new file mode 100644 (file)
index 0000000..6231d52
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_expressions_24.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|r|u|t|h|y| +0#0000000&|=+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@58
+@2|\+0#e000e06&| +0#0000000&@2|?+0#af5f00255&| +0#0000000&|(+0#e000e06&|0+0#e000002&| +0#0000000&@64
+@2|\+0#e000e06&| +0#0000000&@2|)+0#e000e06&| +0#0000000&@67
+@2|\+0#e000e06&| +0#0000000&@2|:+0#af5f00255&| +0#0000000&|(+0#e000e06&|1+0#e000002&| +0#0000000&@64
+@2|\+0#e000e06&| +0#0000000&@2|)+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|f|u|n|c|t|i|o|n| +0#0000000&@63
+@75
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|4|2|4|,|3| @8|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_00.dump b/runtime/syntax/testdir/dumps/vim_function_calls_00.dump
similarity index 85%
rename from runtime/syntax/testdir/dumps/vim_function_call_00.dump
rename to runtime/syntax/testdir/dumps/vim_function_calls_00.dump
index 538215dfff4821f3688714203e02b72672ddee3c..68d1ec63a184832f53138e62666e4ff0f00b0c28 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_00.dump
@@ -1,11 +1,11 @@
 >"+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|_|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| |l|i|n|k| |v|i|m|U|s|e|r|F|u|n|c| |T|o|d|o| +0#0000000&@33
 @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
 @75
 @75
-|"+0#0000e05&| |c|o|m@1|a|n|d|/|f|u|n|c|t|i|o|n| |d|i|s|t|i|n|c|t|i|o|n| +0#0000000&@44
+|"+0#0000e05&| |C|o|m@1|a|n|d|/|f|u|n|c|t|i|o|n| |d|i|s|t|i|n|c|t|i|o|n| +0#0000000&@44
 @75
 |"+0#0000e05&| |a|p@1|e|n|d| |b|r|o|w|s|e| |c|a|l@1| |c|h|d|i|r| |c|o|n|f|i|r|m| |c|o|p|y| |d|e|l|e|t|e| |e|v|a|l| |e|x|e|c|u|t|e| |f|i|l|t|e|r| |f|u|n|c|t|i|o|n
 |"| |i|n|s|e|r|t| |j|o|i|n| |m|a|p| |m|a|t|c|h| |m|o|d|e| |s|o|r|t| |s|p|l|i|t| |s|u|b|s|t|i|t|u|t|e| |s|w|a|p|n|a|m|e| |t|y|p|e| +0#0000000&@10

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_01.dump b/runtime/syntax/testdir/dumps/vim_function_calls_01.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_function_call_01.dump
rename to runtime/syntax/testdir/dumps/vim_function_calls_01.dump

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_02.dump b/runtime/syntax/testdir/dumps/vim_function_calls_02.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_function_call_02.dump
rename to runtime/syntax/testdir/dumps/vim_function_calls_02.dump

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_03.dump b/runtime/syntax/testdir/dumps/vim_function_calls_03.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_function_call_03.dump
rename to runtime/syntax/testdir/dumps/vim_function_calls_03.dump

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_04.dump b/runtime/syntax/testdir/dumps/vim_function_calls_04.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_function_call_04.dump
rename to runtime/syntax/testdir/dumps/vim_function_calls_04.dump

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_05.dump b/runtime/syntax/testdir/dumps/vim_function_calls_05.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_function_call_05.dump
rename to runtime/syntax/testdir/dumps/vim_function_calls_05.dump

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_06.dump b/runtime/syntax/testdir/dumps/vim_function_calls_06.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_function_call_06.dump
rename to runtime/syntax/testdir/dumps/vim_function_calls_06.dump

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_07.dump b/runtime/syntax/testdir/dumps/vim_function_calls_07.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_function_call_07.dump
rename to runtime/syntax/testdir/dumps/vim_function_calls_07.dump

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_08.dump b/runtime/syntax/testdir/dumps/vim_function_calls_08.dump
similarity index 97%
rename from runtime/syntax/testdir/dumps/vim_function_call_08.dump
rename to runtime/syntax/testdir/dumps/vim_function_calls_08.dump
index 655a8cc1414190a8febda4eace97549b18223230..882b3258df0bcbf3a9d098565a2c8d22a32ff5aa 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_08.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_08.dump
@@ -4,7 +4,7 @@
 |u+0#af5f00255&|n|i|q| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@65
 @75
 > @74
-|"+0#0000e05&| |e|r@1|o|r|s| +0#0000000&@66
+|"+0#0000e05&| |E|r@1|o|r|s| +0#0000000&@66
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|f+0#ffffff16#ff404010|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@57
 |c+0#af5f00255&|a|l@1| +0#0000000&|f+0#ffffff16#ff404010|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@62

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_09.dump b/runtime/syntax/testdir/dumps/vim_function_calls_09.dump
similarity index 96%
rename from runtime/syntax/testdir/dumps/vim_function_call_09.dump
rename to runtime/syntax/testdir/dumps/vim_function_calls_09.dump
index ee2a46931ea45238cc2b7271d8efbad82772091f..207e4efcc13205204561b4b5eb332c513df1ccff 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_09.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_09.dump
@@ -4,7 +4,7 @@
 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@65
 @75
 > @74
-|"+0#0000e05&| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@61
+|"+0#0000e05&| |E|x|p|r|e|s@1|i|o|n|s| +0#0000000&@61
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|a+0#00e0e07&|b|s|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@57
 @75

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_10.dump b/runtime/syntax/testdir/dumps/vim_function_calls_10.dump
similarity index 96%
rename from runtime/syntax/testdir/dumps/vim_function_call_10.dump
rename to runtime/syntax/testdir/dumps/vim_function_calls_10.dump
index 867bb0d3adb5f035061871851cfdc2cbd1bbe68b..c38576536514a57b98bb76ed3480684476056dd2 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_10.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_10.dump
@@ -1,7 +1,7 @@
 |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
+|"+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#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

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_11.dump b/runtime/syntax/testdir/dumps/vim_function_calls_11.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_function_call_11.dump
rename to runtime/syntax/testdir/dumps/vim_function_calls_11.dump

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_12.dump b/runtime/syntax/testdir/dumps/vim_function_calls_12.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_function_call_12.dump
rename to runtime/syntax/testdir/dumps/vim_function_calls_12.dump

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_13.dump b/runtime/syntax/testdir/dumps/vim_function_calls_13.dump
similarity index 96%
rename from runtime/syntax/testdir/dumps/vim_function_call_13.dump
rename to runtime/syntax/testdir/dumps/vim_function_calls_13.dump
index ef1fca47137c84a8ea56302e4840bf9b29d2aa6a..6ad6d7d0a9b356dfd9435a4cf87e8be8bc817fea 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_13.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_13.dump
@@ -9,7 +9,7 @@
 |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
+|"+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#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

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_14.dump b/runtime/syntax/testdir/dumps/vim_function_calls_14.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_function_call_14.dump
rename to runtime/syntax/testdir/dumps/vim_function_calls_14.dump

diff --git a/runtime/syntax/testdir/dumps/vim_function_call_15.dump b/runtime/syntax/testdir/dumps/vim_function_calls_15.dump
similarity index 93%
rename from runtime/syntax/testdir/dumps/vim_function_call_15.dump
rename to runtime/syntax/testdir/dumps/vim_function_calls_15.dump
index a932e5fb8787b7b69e7d115020254167c98c0b49..bf9957334c413560983490690a2af2f857404e3e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_call_15.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_15.dump
@@ -1,5 +1,5 @@
 | +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
+|"+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
 |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&|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_00.dump b/runtime/syntax/testdir/dumps/vim_function_variables_00.dump
index 8e12eae4bb9e749044acd38452a266a67c440de1..fc69801f61059396f37368d8a5e181c531379c9a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |V|i|m| |f|u|n|c|t|i|o|n| |v|a|r|i|a|b|l|e| |h|i|g|h|l|i|g|h|t|i|n|g| +0#0000000&@38
 @75
+@75
 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60
 @2|"+0#0000e05&| |:|l|e|t| +0#0000000&@66
 @75
@@ -16,5 +17,4 @@
 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
-@2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_01.dump b/runtime/syntax/testdir/dumps/vim_function_variables_01.dump
index c86a8f5e3ee66b6c215b67f545938018394dd600..fd296bc0395845d25081bf1da6c3934d13be3476 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_01.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
+@75
 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 @75
-@2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
-@2>l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
+@2>l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
+@2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
@@ -16,5 +17,4 @@
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 @2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
-@2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 @57|1|9|,|3| @10|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_02.dump b/runtime/syntax/testdir/dumps/vim_function_variables_02.dump
index c868567978e28ae34a5551d40a04d2d9386edf76..a06d1aa3b9111d2f03f82672e3ad3381fa496a39 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_02.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
+| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
+@2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 @2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
-@2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
-> @74
+@2>l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
+@75
 @2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @2|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
@@ -16,5 +17,4 @@
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @75
-@2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
-@57|3|7|,|0|-|1| @8|7|%| 
+@57|3|7|,|3| @10|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_03.dump b/runtime/syntax/testdir/dumps/vim_function_variables_03.dump
index d8e00be7a1bf4f50b976984ee1a8d5fd6cd6d264..3dcc8e7170dc3ef468f811cdf64acc87fbc1a8a2 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_03.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
+| +0&#ffffff0@74
+@2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 @2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 @2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 @2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
-@75
-@2>l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
+> @74
+@2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
 @2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
@@ -16,5 +17,4 @@
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
 @75
-@2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
-@57|5@1|,|3| @9|1|2|%| 
+@57|5@1|,|0|-|1| @7|1|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_04.dump b/runtime/syntax/testdir/dumps/vim_function_variables_04.dump
index b494c6e792ac059fc8a58c809cc9d73afa29c8b0..d33a29da621b95a2e7a96b30033113559fe10616 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_04.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
+| +0&#ffffff0@74
+@2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 @2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
-@2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
-@2>l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
+@2>l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
+@2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
 @2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
@@ -16,5 +17,4 @@
 @2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @2|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 @75
-@2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
-@57|7|3|,|3| @9|1|7|%| 
+@57|7|3|,|3| @9|1|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_05.dump b/runtime/syntax/testdir/dumps/vim_function_variables_05.dump
index c1d9dd0bf05ec9264ed8c47d2c880867ad465654..88e95928d5c47c1937447a192b38133aa3d64e45 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_05.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_05.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
+| +0&#ffffff0@74
+@2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @75
-@2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
-@2>l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
+@2>l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
+@2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 @2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 @2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @75
@@ -16,5 +17,4 @@
 @2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
-@2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 @57|9|1|,|3| @9|2|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_06.dump b/runtime/syntax/testdir/dumps/vim_function_variables_06.dump
index 0d54bab7e1c651ed214c70042fec64a8d5abc6d8..cde39acfb74f0de1bb528f1daf53c10713363be1 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_06.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
+| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
+@2|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @75
-@2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#e000e06&|0+0#e000002&|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
-> @74
+@2>l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#e000e06&|0+0#e000002&|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
+@75
 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#e000e06&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50
 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#e000e06&|:+0#0000000&|2+0#e000002&|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#e000e06&|1+0#e000002&|:+0#0000000&|]+0#e000e06&| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
@@ -16,5 +17,4 @@
 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
-@2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
-@57|1|0|9|,|0|-|1| @6|2|6|%| 
+@57|1|0|9|,|3| @8|2|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_07.dump b/runtime/syntax/testdir/dumps/vim_function_variables_07.dump
index c7a38f849ed0c2316a28dc2c4d8050dd67702708..b114753a039491890d4ef753637f65c851c49dda 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_07.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_07.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
+| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
+@2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 @2|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @75
-@2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
-> @74
+@2>l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
+@75
 @2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
@@ -16,5 +17,4 @@
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
-@2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
-@57|1|2|7|,|0|-|1| @6|3|0|%| 
+@57|1|2|7|,|3| @8|3|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_08.dump b/runtime/syntax/testdir/dumps/vim_function_variables_08.dump
index 8b1c14859a9b7d5dd11d2d5e4c405699b9051e0d..5c74c14aa22879f2feca922d62ee5230421a0834 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_08.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_08.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
+| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
+@2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
-@2|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
-> @74
+@2>l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
+@75
 @2|l+0#af5f00255&|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 @2|l+0#af5f00255&|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
 @2|l+0#af5f00255&|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
@@ -16,5 +17,4 @@
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|t|_|k|1| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|E|s|c|>|[+0#e000002&|2|3|4|;|"| +0#0000000&@47
 @75
-@2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
-@57|1|4|5|,|0|-|1| @6|3|5|%| 
+@57|1|4|5|,|3| @8|3|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_09.dump b/runtime/syntax/testdir/dumps/vim_function_variables_09.dump
index e05918f54478c0ca5f741efe17177c5d918768cf..2d3d20fe19459aadef6ef50deeca6aeb96867e28 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_09.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_09.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
+| +0&#ffffff0@74
+@2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
-@75
-@2>l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
+> @74
+@2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
@@ -16,5 +17,4 @@
 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 @2|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
-@75
-@57|1|6|3|,|3| @8|3|9|%| 
+@57|1|6|3|,|0|-|1| @6|3|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_10.dump b/runtime/syntax/testdir/dumps/vim_function_variables_10.dump
index 9eb9acc6eb9879da6153a3188be0bfa4bb349ec1..338836f681d376b1770980c72aaa3f9d88018e05 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_10.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_10.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
+@75
 @2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 @2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @63
 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
-@2|l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| |v+0#00e0e07&|:|f|a|l|s|e|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@44
-@2>l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| @60
+@2>l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| |v+0#00e0e07&|:|f|a|l|s|e|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@44
+@2|l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| @60
 @8|\+0#e000e06&| +0#0000000&|v+0#00e0e07&|:|f|a|l|s|e|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
 @2|l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| |&+0#00e0e07&|b|k|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
 @2|l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| @62
@@ -16,5 +17,4 @@
 @8|\+0#e000e06&| +0#0000000&@1|@+0#e000e06&|b|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50
-@2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
 @57|1|8|1|,|3| @8|4@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_11.dump b/runtime/syntax/testdir/dumps/vim_function_variables_11.dump
index 54ff6e8ce4e2d9b57cfe946a45f60ba75ce11462..6e2e0519aabe045eced05b6f03b43a43aaf27dde 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_11.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_11.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
+| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50
+@2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
 @2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50
 @2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@50
 @75
-@2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@46
-@2>l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @63
+@2>l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@46
+@2|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @63
 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r|;+0#0000000&| @60
 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @2|l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| |v+0#00e0e07&|:|f|a|l|s|e|;+0#0000000&| |v+0#00e0e07&|:|n|o|n|e|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@36
@@ -16,5 +17,4 @@
 @8|\+0#e000e06&| +0#0000000&|$+0#e000e06&|b|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 @2|l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| |&+0#00e0e07&|b|k|c|;+0#0000000&| |&+0#00e0e07&|c|m|p|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@43
 @2|l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| @62
-@8|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|b|k|c|;+0#0000000&| @59
 @57|1|9@1|,|3| @8|4|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_12.dump b/runtime/syntax/testdir/dumps/vim_function_variables_12.dump
index 1ffe2a810ab8c048fb065c18d968be1af09b6c91..0e972533da87370d4a3ff8459aa05005c9a26169 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_12.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_12.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|b|k|c|;+0#0000000&| @59
+| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| @62
+@8|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|b|k|c|;+0#0000000&| @59
 @8|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|c|m|p|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 @2|l+0#af5f00255&|e|t| +0#0000000&|[|@+0#e000e06&|a|,+0#0000000&| |@+0#e000e06&|b|;+0#0000000&| |@+0#e000e06&|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
 @2|l+0#af5f00255&|e|t| +0#0000000&|[|@+0#e000e06&|a|,+0#0000000&| @64
-@8|\+0#e000e06&| +0#0000000&|@+0#e000e06&|b|;+0#0000000&| @61
-@8>\+0#e000e06&| +0#0000000&|@+0#e000e06&|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
+@8>\+0#e000e06&| +0#0000000&|@+0#e000e06&|b|;+0#0000000&| @61
+@8|\+0#e000e06&| +0#0000000&|@+0#e000e06&|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@57
 |.+0#e000002&@2| +0#0000000&@71
@@ -16,5 +17,4 @@
 |E+0#e000e06&|N|D| +0#0000000&@71
 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |e|v|a|l| |E|N|D| +0#0000000&@47
 | +0#e000002&@1|.@2| +0#0000000&@69
-| +0#e000e06&@1|E|N|D| +0#0000000&@69
 @57|2|1|7|,|2|-|9| @6|5|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_13.dump b/runtime/syntax/testdir/dumps/vim_function_variables_13.dump
index 4de7e3c5f341c05cd8cc5a0f03d0fd815a89d5c1..cf9f6cc8ed697524c20488efdc5bf4e5911a54bf 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_13.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_13.dump
@@ -1,9 +1,10 @@
-| +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@69
+| +0#e000002#ffffff0@1|.@2| +0#0000000&@69
+| +0#e000e06&@1|E|N|D| +0#0000000&@69
 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |t|r|i|m| |E|N|D| +0#0000000&@47
 | +0#e000002&@3|.@2| +0#0000000&@67
 | +0#e000e06&@1|E|N|D| +0#0000000&@69
-@75
-@2>"+0#0000e05&| |:|l|e|t| |l|i|s|t| |v|a|l|u|e|s| +0#0000000&@54
+> @74
+@2|"+0#0000e05&| |:|l|e|t| |l|i|s|t| |v|a|l|u|e|s| +0#0000000&@54
 @75
 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@65
 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| @61
@@ -16,5 +17,4 @@
 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@52
 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51
 @2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@48
-@2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| |"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@50
-@57|2|3|5|,|3| @8|5|8|%| 
+@57|2|3|5|,|0|-|1| @6|5|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_14.dump b/runtime/syntax/testdir/dumps/vim_function_variables_14.dump
index 433231a017b633b84d86e188b59668648303eeae..c4d5265aaacd5aa5a4d567720a9485313b80a894 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_14.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_14.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| |"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@50
+| +0&#ffffff0@1|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@48
+@2|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| |"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@50
 @75
 @2|"+0#0000e05&| |:|u|n|l|e|t| +0#0000000&@64
 @75
-@2|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@63
-@2>u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@59
+@2>u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@63
+@2|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@59
 @2|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@63
 @8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56
 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61
@@ -16,5 +17,4 @@
 @75
 @2|u+0#af5f00255&|n|l|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@62
 @2|u+0#af5f00255&|n|l|e|t|!| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@61
-@75
 @57|2|5|3|,|3| @8|6|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_15.dump b/runtime/syntax/testdir/dumps/vim_function_variables_15.dump
index 898c57e92d68ee97f17003afbfdd204127b8e69c..663c073c1d7908022db144feb65f011706e0a14b 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_15.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_15.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+| +0&#ffffff0@1|u+0#af5f00255&|n|l|e|t|!| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@61
+@75
 @2|u+0#af5f00255&|n|l|e|t| +0#0000000&|l+0#00e0e07&|i|s|t|[+0#0000000&|3+0#e000002&|]+0#0000000&| @59
 @2|u+0#af5f00255&|n|l|e|t| +0#0000000&|l+0#00e0e07&|i|s|t|[+0#0000000&|3+0#e000002&|:+0#0000000&|]| @58
 @2|u+0#af5f00255&|n|l|e|t| +0#0000000&|d+0#00e0e07&|i|c|t|[+0#0000000&|'+0#e000002&|t|w|o|'|]+0#0000000&| @55
-@2|u+0#af5f00255&|n|l|e|t| +0#0000000&|d+0#00e0e07&|i|c|t|.+0#0000000&|t+0#00e0e07&|w|o| +0#0000000&@58
-> @74
+@2>u+0#af5f00255&|n|l|e|t| +0#0000000&|d+0#00e0e07&|i|c|t|.+0#0000000&|t+0#00e0e07&|w|o| +0#0000000&@58
+@75
 @2|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@53
 @2|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@52
 @2|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@50
@@ -16,5 +17,4 @@
 @2|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
 @75
 @2|c+0#af5f00255&|o|n|s|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
-@75
-@57|2|7|1|,|0|-|1| @6|6|7|%| 
+@57|2|7|1|,|3| @8|6|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_16.dump b/runtime/syntax/testdir/dumps/vim_function_variables_16.dump
index d9a11d2aab8e9695b7a301221a664fa13cb52cb8..816d15ccb0a39e4c80ec4c65e6c8a95690131d8f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_16.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_16.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+| +0&#ffffff0@1|c+0#af5f00255&|o|n|s|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@49
+@75
 @2|c+0#af5f00255&|o|n|s|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@44
 @75
 @2|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@55
-|.+0#e000002&@2| +0#0000000&@71
->E+0#e000e06&|N|D| +0#0000000&@71
+>.+0#e000002&@2| +0#0000000&@71
+|E+0#e000e06&|N|D| +0#0000000&@71
 @2|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@50
 | +0#e000002&@1|.@2| +0#0000000&@69
 | +0#e000e06&@1|E|N|D| +0#0000000&@69
@@ -16,5 +17,4 @@
 @2|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |t|r|i|m| |E|N|D| +0#0000000&@45
 | +0#e000002&@3|.@2| +0#0000000&@67
 | +0#e000e06&@1|E|N|D| +0#0000000&@69
-@75
 @57|2|8|9|,|1| @8|7|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_17.dump b/runtime/syntax/testdir/dumps/vim_function_variables_17.dump
index add83c3db525924894b94b72952c5657ef0b7dc6..139a55716548b98e87379cab0b570e615e994c30 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_17.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_17.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+| +0#e000e06#ffffff0@1|E|N|D| +0#0000000&@69
+@75
 @2|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@63
 @2|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| @59
 @75
-@2|"+0#0000e05&| |:|f|o|r| +0#0000000&@66
-> @74
+@2>"+0#0000e05&| |:|f|o|r| +0#0000000&@66
+@75
 @2|f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 @2|e+0#af5f00255&|n|d|f|o|r| +0#0000000&@66
 @75
@@ -16,5 +17,4 @@
 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@57
 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@61
 @8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56
-@8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61
-@57|3|0|7|,|0|-|1| @6|7|6|%| 
+@57|3|0|7|,|3| @8|7|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_18.dump b/runtime/syntax/testdir/dumps/vim_function_variables_18.dump
index afed84abcdfecf0a816558363524c813ac28778d..05464652d5aaff4fe2e26ff34b4e70707984f49a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_18.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_18.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61
+| +0&#ffffff0@7|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56
+@8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61
 @75
 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51
 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@48
-@2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47
-@2>l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@44
+@2>l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47
+@2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@44
 @75
 @2|l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@60
 @2|l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@56
@@ -16,5 +17,4 @@
 @2|l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@46
 @2|l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@43
 @75
-@2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59
 @57|3|2|5|,|3| @8|8|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_19.dump b/runtime/syntax/testdir/dumps/vim_function_variables_19.dump
index 4c2ac534d1241ef1d7d665f82f753be23ca5bb50..b6c1b1221684052c9535a186004a92b5cf544b78 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_19.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_19.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59
+| +0&#ffffff0@74
+@2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59
 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@55
 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59
 @8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56
-@8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61
-> @74
+@8>\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61
+@75
 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@49
 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@46
 @2|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@45
@@ -16,5 +17,4 @@
 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59
 @8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56
 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61
-@75
-@57|3|4|3|,|0|-|1| @6|8|5|%| 
+@57|3|4|3|,|2|-|9| @6|8|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_20.dump b/runtime/syntax/testdir/dumps/vim_function_variables_20.dump
index ecee1dcb4fdaccdf27e26f193c4a7dd56dda7033..05682bce4c4d7cb5181d02e49334bc37e4e3151b 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_20.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_20.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61
+@75
 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@49
 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@46
 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@45
-@2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@42
-> @74
+@2>u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@42
+@75
 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@58
 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@54
 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@58
@@ -16,5 +17,4 @@
 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@41
 @75
 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@57
-@2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@53
-@57|3|6|1|,|0|-|1| @6|9|0|%| 
+@57|3|6|1|,|3| @8|8|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_21.dump b/runtime/syntax/testdir/dumps/vim_function_variables_21.dump
index 6eb25b0d93e05d14ecc7837b4c6a339ee0afc84c..3cbed5db1fde10a09b3aec4298e79dbb0343fd92 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_21.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_21.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@1|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@53
+| +0&#ffffff0@1|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@57
+@2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@53
 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@57
 @8|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@56
 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61
-@75
-@2>u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47
+> @74
+@2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47
 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@44
 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@43
 @2|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@40
@@ -16,5 +17,4 @@
 |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|g+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
 |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|l+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
 |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|s+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
-|e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|a+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
-@57|3|7|9|,|3| @8|9|4|%| 
+@57|3|7|9|,|0|-|1| @6|9|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_22.dump b/runtime/syntax/testdir/dumps/vim_function_variables_22.dump
index 0b19595af7a763e0c51979b1bfd0964852456ff5..380217a62d3ac709a5d9ea6a5ad847d607cc46b6 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_22.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_22.dump
@@ -1,9 +1,10 @@
-|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|a+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
+|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|s+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
+|e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|a+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
 |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|v+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
 @75
 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|b+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|b+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
-|f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|w+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|w+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
->f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
+>f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|w+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|w+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
+|f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|g+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|l+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|s+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|s+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
@@ -16,5 +17,4 @@
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|c+0#0000000&|h|a|n@1|e|l| |&+0#00e0e07&|i+0#0000000&|n|c@1|o|m@1|a|n|d| |&+0#00e0e07&|m+0#0000000&|o|u|s|e|s|c|r|o|l@1| |&+0#00e0e07&|p+0#0000000&|u|m|b|l|e|n|d| |&+0#00e0e07&|r+0#0000000&|e|d|r|a|w|d|e|b|u|g| |&+0#00e0e07&|s+0#0000000&|c|r|o|l@1|b|a|c|k| @1
 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|s+0#0000000&|h|a|d|a| |&+0#00e0e07&|s+0#0000000&|h|a|d|a|f|i|l|e| |&+0#00e0e07&|s+0#0000000&|t|a|t|u|s|c|o|l|u|m|n| |&+0#00e0e07&|t+0#0000000&|e|r|m|p|a|s|t|e|f|i|l|t|e|r| |&+0#00e0e07&|t+0#0000000&|e|r|m|s|y|n|c| |&+0#00e0e07&|w+0#0000000&|i|n|b|a|r| @3
-|e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|w+0#0000000&|i|n|b|l|e|n|d| |&+0#00e0e07&|w+0#0000000&|i|n|h|i|g|h|l|i|g|h|t| @46
-@57|3|9|7|,|1| @8|9@1|%| 
+@57|3|9|7|,|1| @8|9|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_function_variables_23.dump b/runtime/syntax/testdir/dumps/vim_function_variables_23.dump
index 852ce0e1d150189760963449dd807f33c681d353..85733da6fad4f003c8fa3d724fae62e991adc710 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_function_variables_23.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_variables_23.dump
@@ -1,4 +1,5 @@
-|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|&+0#00e0e07&|w+0#0000000&|i|n|b|l|e|n|d| |&+0#00e0e07&|w+0#0000000&|i|n|h|i|g|h|l|i|g|h|t| @46
+|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|&+0#00e0e07&|s+0#0000000&|h|a|d|a| |&+0#00e0e07&|s+0#0000000&|h|a|d|a|f|i|l|e| |&+0#00e0e07&|s+0#0000000&|t|a|t|u|s|c|o|l|u|m|n| |&+0#00e0e07&|t+0#0000000&|e|r|m|p|a|s|t|e|f|i|l|t|e|r| |&+0#00e0e07&|t+0#0000000&|e|r|m|s|y|n|c| |&+0#00e0e07&|w+0#0000000&|i|n|b|a|r| @3
+|e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|w+0#0000000&|i|n|b|l|e|n|d| |&+0#00e0e07&|w+0#0000000&|i|n|h|i|g|h|l|i|g|h|t| @46
 @75
 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63
 > @74
@@ -16,5 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-| +0#0000000&@56|4|1|3|,|0|-|1| @6|B|o|t| 
+| +0#0000000&@56|4|1|4|,|0|-|1| @6|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_00.dump b/runtime/syntax/testdir/dumps/vim_key_notation_00.dump
index ea3711595778fac71a9adb314e1bad58ce26d952..a6cd90a18e0dfbd17f00ab9bfe9514cfab6c4d7e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_key_notation_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_key_notation_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |K|e|y| |n|o|t|a|t|i|o|n| +0#0000000&@60
 @75
+@75
 |m+0#af5f00255&|a|p| +0#0000000&|f|o@1| @67
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|S|p|a|c|e|>| +0#0000000&@59
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|T|a|b|>| +0#0000000&@61
@@ -16,5 +17,4 @@
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|E|s|c|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|C|S|I|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|C|S|I|>| +0#0000000&@60
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|B|a|r|>| +0#0000000&@61
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_01.dump b/runtime/syntax/testdir/dumps/vim_key_notation_01.dump
index b14d575da9d0bc6001fac39116278a37dd5466e9..46c4c926f23e617bc3a292a8201516b6ad0feb0e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_key_notation_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_key_notation_01.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|B|S|>| +0#0000000&@62
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|E|n|t|e|r|>| +0#0000000&@59
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|B|S|>| +0#0000000&@62
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|B|a|c|k|S|p|a|c|e|>| +0#0000000&@55
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|E|s|c|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|C|S|I|>| +0#0000000&@61
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|C|S|I|>| +0#0000000&@60
-@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|B|a|r|>| +0#0000000&@61
+@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|C|S|I|>| +0#0000000&@60
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|B|a|r|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|B|s|l|a|s|h|>| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|D|e|l|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|D|e|l|e|t|e|>| +0#0000000&@58
@@ -16,5 +17,4 @@
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|D|o|w|n|>| +0#0000000&@59
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|L|e|f|t|>| +0#0000000&@59
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|R|i|g|h|t|>| +0#0000000&@58
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|P|a|s|t|e|S|t|a|r|t|>| +0#0000000&@54
 @57|1|9|,|7| @10|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_02.dump b/runtime/syntax/testdir/dumps/vim_key_notation_02.dump
index 5826a4eccb8c7ebe0daa55a62cf501b1774d4af0..87a6258d896dd88a60e6e18157629cdd9f6d11b6 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_key_notation_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_key_notation_02.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|P|a|s|t|e|S|t|a|r|t|>| +0#0000000&@54
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|R|i|g|h|t|>| +0#0000000&@58
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|P|a|s|t|e|S|t|a|r|t|>| +0#0000000&@54
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|P|a|s|t|e|E|n|d|>| +0#0000000&@56
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|>| +0#0000000&@62
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2|>| +0#0000000&@62
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|>| +0#0000000&@62
-@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|4|>| +0#0000000&@62
+@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|>| +0#0000000&@62
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|4|>| +0#0000000&@62
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|5|>| +0#0000000&@62
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|6|>| +0#0000000&@62
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|7|>| +0#0000000&@62
@@ -16,5 +17,4 @@
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|4|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|5|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|6|>| +0#0000000&@61
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|7|>| +0#0000000&@61
 @57|3|7|,|7| @9|2|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_03.dump b/runtime/syntax/testdir/dumps/vim_key_notation_03.dump
index ccb9f026d8b65ec34de684ea87d2233a5561db8e..484a0c3e5d800c1d8de47c6f374e66d57d187199 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_key_notation_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_key_notation_03.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|7|>| +0#0000000&@61
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|6|>| +0#0000000&@61
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|7|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|8|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|1|9|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2|0|>| +0#0000000&@61
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2|1|>| +0#0000000&@61
-@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2@1|>| +0#0000000&@61
+@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2|1|>| +0#0000000&@61
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2@1|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2|3|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2|4|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|2|5|>| +0#0000000&@61
@@ -16,5 +17,4 @@
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|2|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3@1|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|4|>| +0#0000000&@61
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|5|>| +0#0000000&@61
 @57|5@1|,|7| @9|3@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_04.dump b/runtime/syntax/testdir/dumps/vim_key_notation_04.dump
index d346187521feac0367b664531d9316a5484d9e46..f852d6fee4f930edaa37571315c226064a5f3572 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_key_notation_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_key_notation_04.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|5|>| +0#0000000&@61
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|4|>| +0#0000000&@61
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|5|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|6|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|F|3|7|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|F|1|>| +0#0000000&@61
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|F|2|>| +0#0000000&@61
-@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|F|3|>| +0#0000000&@61
+@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|F|2|>| +0#0000000&@61
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|F|3|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|F|4|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|H|e|l|p|>| +0#0000000&@60
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|U|n|d|o|>| +0#0000000&@60
@@ -16,5 +17,4 @@
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|z|H|o|m|e|>| +0#0000000&@59
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|E|n|d|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|E|n|d|>| +0#0000000&@60
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|E|n|d|>| +0#0000000&@60
 @57|7|3|,|7| @9|4|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_05.dump b/runtime/syntax/testdir/dumps/vim_key_notation_05.dump
index 2962483d0a438bbd009e0aed52b37e3952f9d120..4a85d5e010164b244cd67b82fe1c57bd13f6f271 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_key_notation_05.dump
+++ b/runtime/syntax/testdir/dumps/vim_key_notation_05.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|E|n|d|>| +0#0000000&@60
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|E|n|d|>| +0#0000000&@60
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|x|E|n|d|>| +0#0000000&@60
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|z|E|n|d|>| +0#0000000&@60
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|P|a|g|e|U|p|>| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|P|a|g|e|D|o|w|n|>| +0#0000000&@56
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|P|a|g|e|U|p|>| +0#0000000&@57
-@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|P|a|g|e|D|o|w|n|>| +0#0000000&@55
+@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|P|a|g|e|U|p|>| +0#0000000&@57
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|P|a|g|e|D|o|w|n|>| +0#0000000&@55
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|P|l|u|s|>| +0#0000000&@59
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|M|i|n|u|s|>| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|D|i|v|i|d|e|>| +0#0000000&@57
@@ -16,5 +17,4 @@
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|3|>| +0#0000000&@62
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|4|>| +0#0000000&@62
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|5|>| +0#0000000&@62
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|6|>| +0#0000000&@62
-@57|9|1|,|7| @9|5|8|%| 
+@57|9|1|,|7| @9|5|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_06.dump b/runtime/syntax/testdir/dumps/vim_key_notation_06.dump
index 66a80f213e4d8b7c0bc9eac5e86089523b1202d6..008f04fd36a887d0aa73add74aba6fcf77982a8e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_key_notation_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_key_notation_06.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|6|>| +0#0000000&@62
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|5|>| +0#0000000&@62
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|6|>| +0#0000000&@62
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|7|>| +0#0000000&@62
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|8|>| +0#0000000&@62
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|k|9|>| +0#0000000&@62
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|l|t|>| +0#0000000&@62
-@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|M|o|u|s|e|>| +0#0000000&@59
+@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|l|t|>| +0#0000000&@62
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|M|o|u|s|e|>| +0#0000000&@59
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|N|e|t|M|o|u|s|e|>| +0#0000000&@56
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|D|e|c|M|o|u|s|e|>| +0#0000000&@56
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|J|s|b|M|o|u|s|e|>| +0#0000000&@56
@@ -16,5 +17,4 @@
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|L|e|f|t|D|r|a|g|>| +0#0000000&@56
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|L|e|f|t|R|e|l|e|a|s|e|>| +0#0000000&@53
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|L|e|f|t|R|e|l|e|a|s|e|N|M|>| +0#0000000&@51
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|M|o|u|s|e|M|o|v|e|>| +0#0000000&@55
 @57|1|0|9|,|7| @8|7|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_07.dump b/runtime/syntax/testdir/dumps/vim_key_notation_07.dump
index a05017e018970d560ea6bfb18b5000728cb453ea..8bec3fe58e6031890caf5dbb510dc46bcfc2828e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_key_notation_07.dump
+++ b/runtime/syntax/testdir/dumps/vim_key_notation_07.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|M|o|u|s|e|M|o|v|e|>| +0#0000000&@55
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|L|e|f|t|R|e|l|e|a|s|e|N|M|>| +0#0000000&@51
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|M|o|u|s|e|M|o|v|e|>| +0#0000000&@55
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|M|i|d@1|l|e|M|o|u|s|e|>| +0#0000000&@53
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|M|i|d@1|l|e|D|r|a|g|>| +0#0000000&@54
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|M|i|d@1|l|e|R|e|l|e|a|s|e|>| +0#0000000&@51
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|R|i|g|h|t|M|o|u|s|e|>| +0#0000000&@54
-@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|R|i|g|h|t|D|r|a|g|>| +0#0000000&@55
+@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|R|i|g|h|t|M|o|u|s|e|>| +0#0000000&@54
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|R|i|g|h|t|D|r|a|g|>| +0#0000000&@55
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|R|i|g|h|t|R|e|l|e|a|s|e|>| +0#0000000&@52
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|S|c|r|o|l@1|W|h|e@1|l|U|p|>| +0#0000000&@51
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|S|c|r|o|l@1|W|h|e@1|l|D|o|w|n|>| +0#0000000&@49
@@ -16,5 +17,4 @@
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|X|1|R|e|l|e|a|s|e|>| +0#0000000&@55
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|X|2|M|o|u|s|e|>| +0#0000000&@57
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|X|2|D|r|a|g|>| +0#0000000&@58
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|X|2|R|e|l|e|a|s|e|>| +0#0000000&@55
 @57|1|2|7|,|7| @8|8|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_08.dump b/runtime/syntax/testdir/dumps/vim_key_notation_08.dump
index 37db049f7d90a7421e92bc734de2369724ad74aa..70a7ff84083c530befe3acdcdd545e2c4680ca61 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_key_notation_08.dump
+++ b/runtime/syntax/testdir/dumps/vim_key_notation_08.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|X|2|R|e|l|e|a|s|e|>| +0#0000000&@55
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|X|2|D|r|a|g|>| +0#0000000&@58
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|X|2|R|e|l|e|a|s|e|>| +0#0000000&@55
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|D|r|o|p|>| +0#0000000&@60
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|N|u|l|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|S|N|R|>| +0#0000000&@61
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|P|l|u|g|>| +0#0000000&@60
-@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|C|u|r|s|o|r|H|o|l|d|>| +0#0000000&@54
+@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|P|l|u|g|>| +0#0000000&@60
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|C|u|r|s|o|r|H|o|l|d|>| +0#0000000&@54
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|I|g|n|o|r|e|>| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|C|m|d|>| +0#0000000&@61
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|S|c|r|i|p|t|C|m|d|>| +0#0000000&@55
@@ -16,5 +17,4 @@
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|c|f|i|l|e|>| +0#0000000&@59
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|a|f|i|l|e|>| +0#0000000&@59
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|a|b|u|f|>| +0#0000000&@60
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|a|m|a|t|c|h|>| +0#0000000&@58
-@57|1|4|5|,|7| @8|9|5|%| 
+@57|1|4|5|,|7| @8|9|4|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_key_notation_09.dump b/runtime/syntax/testdir/dumps/vim_key_notation_09.dump
index d9adc7b3faf480b4b1bd618b82d6c42d71357ffb..156de87e1c71d58b81ae032a5d63a18b0f72d401 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_key_notation_09.dump
+++ b/runtime/syntax/testdir/dumps/vim_key_notation_09.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|a|m|a|t|c|h|>| +0#0000000&@58
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|<+0#e000e06&|a|b|u|f|>| +0#0000000&@60
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|a|m|a|t|c|h|>| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|s|f|i|l|e|>| +0#0000000&@59
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|s|t|a|c|k|>| +0#0000000&@59
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|s|c|r|i|p|t|>| +0#0000000&@58
-@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|s|l|n|u|m|>| +0#0000000&@59
-@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|s|f|l|n|u|m|>| +0#0000000&@58
+@6>\+0#e000e06&| +0#0000000&|<+0#e000e06&|s|l|n|u|m|>| +0#0000000&@59
+@6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|s|f|l|n|u|m|>| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|<+0#e000e06&|c|l|i|e|n|t|>| +0#0000000&@58
 @75
 |~+0#4040ff13&| @73
@@ -16,5 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
 | +0#0000000&@56|1|6|3|,|7| @8|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_lambda_00.dump b/runtime/syntax/testdir/dumps/vim_lambdas_00.dump
similarity index 92%
rename from runtime/syntax/testdir/dumps/vim_lambda_00.dump
rename to runtime/syntax/testdir/dumps/vim_lambdas_00.dump
index 2925e380999ed7677454e93d44f2b8a2967ca3dd..5d365c3f3fe953f36c66a825692afedb6ac875d4 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_lambda_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_lambdas_00.dump
@@ -1,7 +1,7 @@
 >"+0#0000e05#ffffff0| |V|i|m| |l|a|m|b|d|a| |e|x|p|r|e|s@1|i|o|n|s| +0#0000000&@50
 |"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|L|a|m|b|d|a|O|p|e|r|a|t|o|r| |T|o|d|o| +0#0000000&@27
-|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|L|a|m|b|d|a|B|r|a|c|e| @3|T|o|d|o| +0#0000000&@27
-|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|F|u|n|c|P|a|r|a|m| @5|I|d|e|n|t|i|f|i|e|r| +0#0000000&@21
+|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|L|a|m|b|d|a|B|r|a|c|e| |T|o|d|o| +0#0000000&@30
+|"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |v|i|m|F|u|n|c|P|a|r|a|m| |I|d|e|n|t|i|f|i|e|r| +0#0000000&@26
 @75
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@61
@@ -15,6 +15,6 @@
 |l+0#af5f00255&|e|t| +0#0000000&|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#0000001#ffff4012|x+0#00e0e07#ffffff0|,+0#0000000&| |y+0#00e0e07&| +0#0000000&|-+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r|}+0#0000001#ffff4012| +0#0000000#ffffff0@50
 @75
 @75
-|"+0#0000e05&| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54
+|"+0#0000e05&| |L|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54
 @75
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_lambda_01.dump b/runtime/syntax/testdir/dumps/vim_lambdas_01.dump
similarity index 96%
rename from runtime/syntax/testdir/dumps/vim_lambda_01.dump
rename to runtime/syntax/testdir/dumps/vim_lambdas_01.dump
index 96d94893509150db7cabb73fcedb049ec8311bef..4de33e5fdd2dd9dfd2a72fe4b9172044a7b71140 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_lambda_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_lambdas_01.dump
@@ -2,7 +2,7 @@
 |l+0#af5f00255&|e|t| +0#0000000&|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#0000001#ffff4012|x+0#00e0e07#ffffff0|,+0#0000000&| |y+0#00e0e07&| +0#0000000&|-+0#0000001#ffff4012|>| +0#0000000#ffffff0|e+0#00e0e07&|x|p|r|}+0#0000001#ffff4012| +0#0000000#ffffff0@50
 @75
 @75
-|"+0#0000e05&| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54
+|"+0#0000e05&| |L|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| +0#0000000&@54
 > @74
 |l+0#af5f00255&|e|t| +0#0000000&|F+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#0000001#ffff4012|-|>| +0#0000000#ffffff0@61
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58

diff --git a/runtime/syntax/testdir/dumps/vim_lambda_02.dump b/runtime/syntax/testdir/dumps/vim_lambdas_02.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_lambda_02.dump
rename to runtime/syntax/testdir/dumps/vim_lambdas_02.dump

diff --git a/runtime/syntax/testdir/dumps/vim_lambda_03.dump b/runtime/syntax/testdir/dumps/vim_lambdas_03.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_lambda_03.dump
rename to runtime/syntax/testdir/dumps/vim_lambdas_03.dump

diff --git a/runtime/syntax/testdir/dumps/vim_lambda_04.dump b/runtime/syntax/testdir/dumps/vim_lambdas_04.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_lambda_04.dump
rename to runtime/syntax/testdir/dumps/vim_lambdas_04.dump

diff --git a/runtime/syntax/testdir/dumps/vim_lambda_05.dump b/runtime/syntax/testdir/dumps/vim_lambdas_05.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_lambda_05.dump
rename to runtime/syntax/testdir/dumps/vim_lambdas_05.dump

diff --git a/runtime/syntax/testdir/dumps/vim_lambda_06.dump b/runtime/syntax/testdir/dumps/vim_lambdas_06.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_lambda_06.dump
rename to runtime/syntax/testdir/dumps/vim_lambdas_06.dump

diff --git a/runtime/syntax/testdir/dumps/vim_lambda_07.dump b/runtime/syntax/testdir/dumps/vim_lambdas_07.dump
similarity index 100%
rename from runtime/syntax/testdir/dumps/vim_lambda_07.dump
rename to runtime/syntax/testdir/dumps/vim_lambdas_07.dump

diff --git a/runtime/syntax/testdir/dumps/vim_line_continuation_00.dump b/runtime/syntax/testdir/dumps/vim_line_continuation_00.dump
index d6b526ffdaf492d49d48426b2c088b2445ebfe12..b9fd0ad5fe95c1bd46de4381efaa47adc1adff09 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_line_continuation_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_line_continuation_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |V|i|m| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n|s| |w|i|t|h| |i|n|t|e|r|s|p|e|r|s|e|d| |c|o|m@1|e|n|t|s| +0#0000000&@23
 @75
+@75
 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&| +0#0000000&@61
 @6|"+0#0000e05&|\| |p|a|r|a|m| |a| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|a+0#00e0e07&|,+0#0000000&| @64
@@ -16,5 +17,4 @@
 @8|"+0#0000e05&|\| |p|r|i|n|t| |b| +0#0000000&@56
 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|a+0#00e0e07&|:|b|}+0#e000e06&|,+0#0000000&| @54
 @8|"+0#0000e05&|\| |p|r|i|n|t| |c| +0#0000000&@56
-@8|\+0#e000e06&| +0#0000000&|c+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|a+0#00e0e07&|:|c|}+0#e000e06&| +0#0000000&@55
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_line_continuation_01.dump b/runtime/syntax/testdir/dumps/vim_line_continuation_01.dump
index e5a9a186ac87fcacb118ccaf2b73cbba9e8ecfae..11577d8de2b5188368a81db723a1d129b35e616e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_line_continuation_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_line_continuation_01.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@7|"+0#0000e05&|\| |p|r|i|n|t| |a| +0#0000000&@56
+| +0&#ffffff0@7|\+0#e000e06&| +0#0000000&|$|"| @62
+@8|"+0#0000e05&|\| |p|r|i|n|t| |a| +0#0000000&@56
 @8|\+0#e000e06&| +0#0000000&|a+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|a+0#00e0e07&|:|a|}+0#e000e06&|,+0#0000000&| @54
 @8|"+0#0000e05&|\| |p|r|i|n|t| |b| +0#0000000&@56
 @8|\+0#e000e06&| +0#0000000&|b+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|a+0#00e0e07&|:|b|}+0#e000e06&|,+0#0000000&| @54
-@8|"+0#0000e05&|\| |p|r|i|n|t| |c| +0#0000000&@56
-@8>\+0#e000e06&| +0#0000000&|c+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|a+0#00e0e07&|:|c|}+0#e000e06&| +0#0000000&@55
+@8>"+0#0000e05&|\| |p|r|i|n|t| |c| +0#0000000&@56
+@8|\+0#e000e06&| +0#0000000&|c+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|a+0#00e0e07&|:|c|}+0#e000e06&| +0#0000000&@55
 @8|"+0#0000e05&|\| |e|n|d| |s|t|r|i|n|g| +0#0000000&@53
 @8|\+0#e000e06&|"+0#0000000&| @64
 |e+0#af5f00255&|n|d|f|u|n|c|t|i|o|n| +0#0000000&@63
@@ -16,5 +17,4 @@
 @6|"+0#0000e05&|\| |a|r|g| |3| +0#0000000&@60
 @6|\+0#e000e06&| +0#0000000&|3+0#e000002&@1| +0#0000000&@64
 @6|\+0#e000e06&|)| +0#0000000&@66
-@75
-@57|1|9|,|2|-|9| @7|4|3|%| 
+@57|1|9|,|2|-|9| @7|4|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_line_continuation_02.dump b/runtime/syntax/testdir/dumps/vim_line_continuation_02.dump
index b9abdc03fe3e0056ae1026fcdf1e159df13ce805..23b5388a9e9f3eec191a7a67c0952d2fd39b9d36 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_line_continuation_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_line_continuation_02.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+| +0&#ffffff0@5|\+0#e000e06&|)| +0#0000000&@66
+@75
 |l+0#af5f00255&|e|t| +0#0000000&|d+0#00e0e07&|i|c|t| +0#0000000&|=+0#af5f00255&| +0#0000000&|#+0#e000e06&|{| +0#0000000&@61
 @6|"+0#0000e05&|\| |p|a|i|r| |1| +0#0000000&@59
 @6|\+0#e000e06&| +0#0000000&|a+0#00e0e07&|:| +0#0000000&|1+0#e000002&|,+0#0000000&| @61
-@6|"+0#0000e05&|\| |p|a|i|r| |2| +0#0000000&@59
-@6>\+0#e000e06&| +0#0000000&|b+0#00e0e07&|:| +0#0000000&|2+0#e000002&|,+0#0000000&| @61
+@6>"+0#0000e05&|\| |p|a|i|r| |2| +0#0000000&@59
+@6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|:| +0#0000000&|2+0#e000002&|,+0#0000000&| @61
 @6|"+0#0000e05&|\| |p|a|i|r| |3| +0#0000000&@59
 @6|\+0#e000e06&| +0#0000000&|c+0#00e0e07&|:+0#0000000&| |3+0#e000002&| +0#0000000&@62
 @6|\+0#e000e06&|}| +0#0000000&@66
@@ -16,5 +17,4 @@
 @6|"+0#0000e05&|\| |e|l|e|m|e|n|t| |3| +0#0000000&@56
 @6|\+0#e000e06&| +0#0000000&|3+0#e000002&| +0#0000000&@65
 @6|\+0#e000e06&|]| +0#0000000&@66
-|~+0#4040ff13&| @73
-| +0#0000000&@56|3|7|,|7| @9|B|o|t| 
+@57|3|7|,|7| @9|9|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_line_continuation_03.dump b/runtime/syntax/testdir/dumps/vim_line_continuation_03.dump
new file mode 100644 (file)
index 0000000..9ff096f
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_line_continuation_03.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@5|\+0#e000e06&|]| +0#0000000&@66
+> @74
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|5|1|,|0|-|1| @7|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_new_00.dump b/runtime/syntax/testdir/dumps/vim_new_00.dump
index db3b48aac7cf929d1dec99f200bec151c99500a5..511a5f9552581b33276d4baa65baaf057776645f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_new_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_new_00.dump
@@ -1,20 +1,20 @@
 >v+0#af5f00255#ffffff0|i|m|9|s|c|r|i|p|t| +0#0000000&@64
+|#+0#0000e05&| |V|i|m| |:|n|e|w| |c|o|m@1|a|n|d| |a|n|d| |c|l|a|s@1| |c|o|n|s|t|r|u|c|t|o|r|s| +0#0000000&@33
+|#+0#0000e05&| +0#0000000&|T+0#0000001#ffff4012|O|D|O|:+0#e000e06#ffffff0| +0#0000e05&|m|o|v|e| |t|o| |v|i|m|9|_|c|o|n|s|t|r|u|c|t|o|r| |a|n|d| |c|r|e|a|t|e| |n|e|w| |v|i|m|_|e|x|_|n|e|w| |a|n|d| |v|i|m|9|_|e|x|_|n|e|w| +0#0000000&
+|#+0#0000e05&| @6|t|e|s|t|s| +0#0000000&@61
+@75
 @75
-|#+0#0000e05&| |V|i|m| |:|n|e|w| |c|o|m@1|a|n|d| |a|n|d| |c|l|a|s@1| |c|o|n|s|t|r|u|c|t|o|r|s|.| +0#0000000&@32
 |c+0#af5f00255&|l|a|s@1| +0#0000000&|T|e|s|t| @64
-@8|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@57
-@8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
-@8|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|O|t|h|e|r|(+0#e000e06&|)| +0#0000000&@52
-@8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
-@8|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|y|e|t|a|n|o|t|h|e|r|(+0#e000e06&|)| +0#0000000&@47
-@8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
+@2|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@63
+@2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
+@2|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|O|t|h|e|r|(+0#e000e06&|)| +0#0000000&@58
+@2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
+@2|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|y|e|t|a|n|o|t|h|e|r|(+0#e000e06&|)| +0#0000000&@53
+@2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 |e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66
 @75
 |T|e|s|t|.|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@64
 |T|e|s|t|.|n+0#00e0e07&|e|w|O|t|h|e|r|(+0#e000e06&|)| +0#0000000&@59
 |T|e|s|t|.|n+0#00e0e07&|e|w|y|e|t|a|n|o|t|h|e|r|(+0#e000e06&|)| +0#0000000&@54
 |n+0#af5f00255&|e|w| +0#0000000&@71
-|q+0#af5f00255&|u|i|t| +0#0000000&@70
-|~+0#4040ff13&| @73
-|~| @73
-| +0#0000000&@56|1|,|1| @10|A|l@1| 
+@57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_new_01.dump b/runtime/syntax/testdir/dumps/vim_new_01.dump
new file mode 100644 (file)
index 0000000..06651c4
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_new_01.dump
@@ -0,0 +1,20 @@
+|e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@66
+@75
+|T|e|s|t|.|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@64
+|T|e|s|t|.|n+0#00e0e07&|e|w|O|t|h|e|r|(+0#e000e06&|)| +0#0000000&@59
+|T|e|s|t|.|n+0#00e0e07&|e|w|y|e|t|a|n|o|t|h|e|r|(+0#e000e06&|)| +0#0000000&@54
+>n+0#af5f00255&|e|w| +0#0000000&@71
+|q+0#af5f00255&|u|i|t| +0#0000000&@70
+@75
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|9|,|1| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_no_comment_strings_00.dump b/runtime/syntax/testdir/dumps/vim_no_comment_strings_00.dump
similarity index 93%
rename from runtime/syntax/testdir/dumps/vim_ex_no_comment_strings_00.dump
rename to runtime/syntax/testdir/dumps/vim_no_comment_strings_00.dump
index 52c115f5d5048595f2a851152952e54ef7d2522d..acb0a2e6987a9e0ff831f5eda7b6f2d7ff1e6410 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_no_comment_strings_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_no_comment_strings_00.dump
@@ -1,6 +1,7 @@
 >"+0#0000e05#ffffff0| |V|i|m| |c|o|m@1|e|n|t| |s|t|r|i|n|g|s| +0#0000000&@53
 |"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|c|o|m@1|e|n|t|_|s|t|r|i|n|g|s| |=| |v|:|f|a|l|s|e| +0#0000000&@19
 @75
+@75
 |"+0#0000e05&| |p|r|e| |"|s|t|r|i|n|g|"| |p|o|s|t| +0#0000000&@55
 @75
 |f+0#af5f00255&|u|n|c|t|i|o|n| +0#0000000&|F|o@1|(+0#e000e06&|)| +0#0000000&@60
@@ -16,5 +17,4 @@
 |}+0#e000e06&| +0#0000000&@73
 @75
 |a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52
-@2|#+0#0000e05&| |p|r|e| |"|s|t|r|i|n|g|"| |p|o|s|t| +0#0000000&@53
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_ex_no_comment_strings_01.dump b/runtime/syntax/testdir/dumps/vim_no_comment_strings_01.dump
similarity index 53%
rename from runtime/syntax/testdir/dumps/vim_ex_no_comment_strings_01.dump
rename to runtime/syntax/testdir/dumps/vim_no_comment_strings_01.dump
index 856c33083404e123b8abc22319ec1c7fc93e3154..6b22d4113b12b3242f12fba556e63affe2dc2932 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_ex_no_comment_strings_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_no_comment_strings_01.dump
@@ -1,10 +1,12 @@
-|c+0#af5f00255#ffffff0|o|m@1|a|n|d| +0#0000000&|F|o@1| |{+0#e000e06&| +0#0000000&@61
+| +0&#ffffff0@74
+|c+0#af5f00255&|o|m@1|a|n|d| +0#0000000&|F|o@1| |{+0#e000e06&| +0#0000000&@61
 @2|#+0#0000e05&| |p|r|e| |"|s|t|r|i|n|g|"| |p|o|s|t| +0#0000000&@53
 |}+0#e000e06&| +0#0000000&@73
 @75
-|a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52
-@2>#+0#0000e05&| |p|r|e| |"|s|t|r|i|n|g|"| |p|o|s|t| +0#0000000&@53
+>a+0#af5f00255&|u|t|o|c|m|d| +0#0000000&|B+0#00e0003&|u|f|N|e|w|F|i|l|e| +0#0000000&|*+0#e000e06&| +0#0000000&|{+0#e000e06&| +0#0000000&@52
+@2|#+0#0000e05&| |p|r|e| |"|s|t|r|i|n|g|"| |p|o|s|t| +0#0000000&@53
 |}+0#e000e06&| +0#0000000&@73
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
@@ -15,6 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|9|,|3| @9|B|o|t| 
+| +0#0000000&@56|1|9|,|1| @9|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/vim_nvim_variables_00.dump b/runtime/syntax/testdir/dumps/vim_nvim_variables_00.dump
index c7dab677a0fea9269bac4dd2e9113f20fc9a19b8..30e14ff5a1919192e2a50bc5c32a7c325c58e2ab 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_nvim_variables_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_nvim_variables_00.dump
@@ -1,6 +1,7 @@
 >"+0#0000e05#ffffff0| |N|e|o|v|i|m| |v|a|r|i|a|b|l|e| |h|i|g|h|l|i|g|h|t|i|n|g| +0#0000000&@44
 |"+0#0000e05&| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|v|i|m|s|y|n|_|v|i|m|_|f|e|a|t|u|r|e|s| |=| |[|"|n|v|i|m|"|]| +0#0000000&@21
 @75
+@75
 |e+0#af5f00255&|c|h|o| +0#0000000&|v+0#00e0e07&|:|l|u|a| +0#0000000&|v+0#00e0e07&|:|m|s|g|p|a|c|k|_|t|y|p|e|s| +0#0000000&|v+0#00e0e07&|:|r|e|l|n|u|m| +0#0000000&|v+0#00e0e07&|:|s|t|d|e|r@1| +0#0000000&|v+0#00e0e07&|:|t|e|r|m|r|e|q|u|e|s|t| +0#0000000&|v+0#00e0e07&|:|v|i|r|t|n|u|m| +0#0000000&@6
 @75
 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|c|h|a|n@1|e|l| +0#0000000&|&+0#00e0e07&|i|n|c@1|o|m@1|a|n|d| +0#0000000&|&+0#00e0e07&|m|o|u|s|e|s|c|r|o|l@1| +0#0000000&|&+0#00e0e07&|p|u|m|b|l|e|n|d| +0#0000000&|&+0#00e0e07&|r|e|d|r|a|w|d|e|b|u|g| +0#0000000&|&+0#00e0e07&|s|c|r|o|l@1|b|a|c|k| +0#0000000&@1
@@ -16,5 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
 | +0#0000000&@56|1|,|1| @10|A|l@1| 

diff --git a/runtime/syntax/testdir/dumps/vim_shebang_00.dump b/runtime/syntax/testdir/dumps/vim_shebang_00.dump
index c79da4422ef412eafdad9b280f48302ebb559d1b..ffb7bafa085e74af0241434b3c8862c6bffb6048 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_shebang_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_shebang_00.dump
@@ -1,7 +1,7 @@
 >#+0#e000e06#ffffff0|!|/|u|s|r|/|b|i|n|/|e|n|v| |v|i|m| |-|S| +0#0000000&@53
-@75
 |"+0#0000e05&| |V|i|m| |s|h|e|b|a|n|g| |l|i|n|e| +0#0000000&@56
 @75
+@75
 |#+0#ffffff16#ff404010|!|/|u|s|r|/|b|i|n|/|e|n|v| |v|i|m| |-|S| +0#0000000#ffffff0@53
 |~+0#4040ff13&| @73
 |~| @73

diff --git a/runtime/syntax/testdir/dumps/vim_variables_00.dump b/runtime/syntax/testdir/dumps/vim_variables_00.dump
index f6764484d18ae031c91113c7622d2224ae3a64aa..b06b1497c08eb5fa226dbdd25b8e48444d16f534 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_00.dump
@@ -1,5 +1,6 @@
 >"+0#0000e05#ffffff0| |V|i|m| |v|a|r|i|a|b|l|e| |h|i|g|h|l|i|g|h|t|i|n|g| +0#0000000&@47
 @75
+@75
 |"+0#0000e05&| |:|l|e|t| +0#0000000&@68
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@60
@@ -16,5 +17,4 @@
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
-|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
 @57|1|,|1| @10|T|o|p| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_01.dump b/runtime/syntax/testdir/dumps/vim_variables_01.dump
index 8f133984aa11eef0451bea5cedb425c4899dcadc..2d0f65903150707fd73b2859f43ec54b6a09e1f4 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_01.dump
@@ -1,9 +1,10 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
+| +0&#ffffff0@74
+|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
-|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
->l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
+>l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
+|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
@@ -16,5 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
-|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @57|1|9|,|1| @10|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_02.dump b/runtime/syntax/testdir/dumps/vim_variables_02.dump
index ce0a8c34432c5116376d62bc7ec0cf455e6a2dd9..fac2cbf866444a51631f5383089176321ad29f7e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_02.dump
@@ -1,9 +1,10 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
+|l+0#af5f00255#ffffff0|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
+|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
-@75
->l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
+> @74
+|l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 |l+0#af5f00255&|e|t| +0#0000000&|b+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
@@ -16,5 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
-|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
-@57|3|7|,|1| @10|7|%| 
+@57|3|7|,|0|-|1| @8|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_03.dump b/runtime/syntax/testdir/dumps/vim_variables_03.dump
index ac24e5e75b7ac011705bb4c3c83b181f2dab7a7f..cf025188cd2490cc9fde653e98b48d87d15d1d4a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_03.dump
@@ -1,9 +1,10 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
+|l+0#af5f00255#ffffff0|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
+|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 |l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 |l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
->l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
+>l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
+|l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 |l+0#af5f00255&|e|t| +0#0000000&|g+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
@@ -16,5 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
-@75
 @57|5@1|,|1| @9|1|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_04.dump b/runtime/syntax/testdir/dumps/vim_variables_04.dump
index 4f3b2aadbdc8bc355980133f482142cf75fafc99..b633655bac1761957d6235fbb339f1afbc54e937 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_04.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+|l+0#af5f00255#ffffff0|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
+@75
 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
-|l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
-> @74
+>l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
+@75
 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1|[+0#0000000&|'+0#e000002&|k|e|y|'|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 @75
@@ -16,5 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
-@75
-@57|7|3|,|0|-|1| @7|1|7|%| 
+@57|7|3|,|1| @9|1|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_05.dump b/runtime/syntax/testdir/dumps/vim_variables_05.dump
index 0601c4344b453b08d78cb4de09b3257ed0865b21..0a11e8d22a1673a1c5776fb7ff2400d17c58d2b8 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_05.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_05.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+|l+0#af5f00255#ffffff0|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
+@75
 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
-|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
->l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
+>l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
+|l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1|[+0#0000000&|"+0#e000002&|k|e|y|"|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
@@ -16,5 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
-@75
 @57|9|1|,|1| @9|2|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_06.dump b/runtime/syntax/testdir/dumps/vim_variables_06.dump
index 833f52b62b4141a28b1ffe6aa32e06d141fd079f..031115c1912bf023b5d7844066b24ff5679a3ea1 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_06.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+|l+0#af5f00255#ffffff0|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
+@75
 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
-@75
->l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
+> @74
+|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#0000000&|1+0#e000002&|:+0#0000000&|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e|[+0#0000000&|:|]| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
@@ -16,5 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
-|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
-@57|1|0|9|,|1| @8|2|6|%| 
+@57|1|0|9|,|0|-|1| @6|2|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_07.dump b/runtime/syntax/testdir/dumps/vim_variables_07.dump
index ded6062d5cc2cf50204b2560ee8a555f4e778c7b..a8219d9829bfd9ac2fce4a55280ed9b5960cea4f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_07.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_07.dump
@@ -1,9 +1,10 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
+|l+0#af5f00255#ffffff0|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
+|l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
-@75
->l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
+> @74
+|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1|[+0#0000000&|0+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1|[+0#0000000&|1+0#e000002&|:+0#0000000&|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1|[+0#0000000&|:|2+0#e000002&|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
@@ -16,5 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
-|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
-@57|1|2|7|,|1| @8|3|0|%| 
+@57|1|2|7|,|0|-|1| @6|3|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_08.dump b/runtime/syntax/testdir/dumps/vim_variables_08.dump
index d209554930d3744a526ce7882bc6cf59ad7f82dd..5ca7f0d36451ac1828fb4397cdc16019e1b3a62e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_08.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_08.dump
@@ -1,9 +1,10 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
+|l+0#af5f00255#ffffff0|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
+|l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 |l+0#af5f00255&|e|t| +0#0000000&|w+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
-@75
->l+0#af5f00255&|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
+> @74
+|l+0#af5f00255&|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
 |l+0#af5f00255&|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
 |l+0#af5f00255&|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 @75
@@ -16,5 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|t|_|k|1| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|E|s|c|>|[+0#e000002&|2|3|4|;|"| +0#0000000&@49
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
-|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
-@57|1|4|5|,|1| @8|3|5|%| 
+@57|1|4|5|,|0|-|1| @6|3|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_09.dump b/runtime/syntax/testdir/dumps/vim_variables_09.dump
index 6627a389cefe5d6cfe7973daa2a0843cbf45dd72..737a044c63192c6f338d0f287880318384be3de7 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_09.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_09.dump
@@ -1,9 +1,10 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
+|l+0#af5f00255#ffffff0|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
+|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@57
 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
-> @74
+>l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
+@75
 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|l|:|a|l|e|p|h| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
@@ -16,5 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
-@57|1|6|3|,|0|-|1| @6|4|0|%| 
+@57|1|6|3|,|1| @8|4|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_10.dump b/runtime/syntax/testdir/dumps/vim_variables_10.dump
index 29931ed1583df754a737dc38af38d2002b30d052..d7a7d46d4b51dfa92d00517ece340d5cb9835825 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_10.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_10.dump
@@ -1,9 +1,10 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
+| +0&#ffffff0@74
+|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
 |l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @65
 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 |l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| |v+0#00e0e07&|:|f|a|l|s|e|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@46
-|l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| @62
-@6>\+0#e000e06&| +0#0000000&|v+0#00e0e07&|:|f|a|l|s|e|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
+>l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| @62
+@6|\+0#e000e06&| +0#0000000&|v+0#00e0e07&|:|f|a|l|s|e|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 |l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| |&+0#00e0e07&|b|k|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 |l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| @64
 @6|\+0#e000e06&| +0#0000000&@1|&+0#00e0e07&|b|k|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@53
@@ -16,5 +17,4 @@
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 |l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
-|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
-@57|1|8|1|,|7| @8|4@1|%| 
+@57|1|8|1|,|1| @8|4@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_11.dump b/runtime/syntax/testdir/dumps/vim_variables_11.dump
index 40fcb3a5ccd3cc93a0cb4f2b93aee4f096ad4ea7..042f7123545d3a5a717272bc9450db70342be570 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_11.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_11.dump
@@ -1,9 +1,10 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
+|l+0#af5f00255#ffffff0|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
+|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 |l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@48
-|l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @65
-@6>\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r|;+0#0000000&| @62
+>l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| @65
+@6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r|;+0#0000000&| @62
 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@55
 |l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| |v+0#00e0e07&|:|f|a|l|s|e|;+0#0000000&| |v+0#00e0e07&|:|n|o|n|e|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@38
 |l+0#af5f00255&|e|t| +0#0000000&|[|v+0#00e0e07&|:|t|r|u|e|,+0#0000000&| @62
@@ -16,5 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| |&+0#00e0e07&|b|k|c|;+0#0000000&| |&+0#00e0e07&|c|m|p|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@45
 |l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| @64
 @6|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|b|k|c|;+0#0000000&| @61
-@6|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|c|m|p|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
-@57|1|9@1|,|7| @8|4|9|%| 
+@57|1|9@1|,|1| @8|4|9|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_12.dump b/runtime/syntax/testdir/dumps/vim_variables_12.dump
index 5117e1ad034a0d5d59de3f1d886cd1ee8bef3202..d2acc484d5a746a99dc2bcd7090a049a474aa10a 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_12.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_12.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|c|m|p|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|b|k|c|;+0#0000000&| @61
+@6|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|c|m|p|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 |l+0#af5f00255&|e|t| +0#0000000&|[|@+0#e000e06&|a|,+0#0000000&| |@+0#e000e06&|b|;+0#0000000&| |@+0#e000e06&|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 |l+0#af5f00255&|e|t| +0#0000000&|[|@+0#e000e06&|a|,+0#0000000&| @66
 @6|\+0#e000e06&| +0#0000000&|@+0#e000e06&|b|;+0#0000000&| @63
-@6|\+0#e000e06&| +0#0000000&|@+0#e000e06&|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
-> @74
+@6>\+0#e000e06&| +0#0000000&|@+0#e000e06&|c|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
+@75
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@59
 |.+0#e000002&@2| +0#0000000&@71
 |E+0#e000e06&|N|D| +0#0000000&@71
@@ -16,5 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |e|v|a|l| |E|N|D| +0#0000000&@49
 |.+0#e000002&@2| +0#0000000&@71
 |E+0#e000e06&|N|D| +0#0000000&@71
-|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |t|r|i|m| |E|N|D| +0#0000000&@49
-@57|2|1|7|,|0|-|1| @6|5|3|%| 
+@57|2|1|7|,|7| @8|5|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_13.dump b/runtime/syntax/testdir/dumps/vim_variables_13.dump
index bfa84286a13799ddff19ed5e51920aa9ede630bf..11593c5d7e4995d7911c99b1034d363e547d374f 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_13.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_13.dump
@@ -1,9 +1,10 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |t|r|i|m| |E|N|D| +0#0000000&@49
+|E+0#e000e06#ffffff0|N|D| +0#0000000&@71
+|l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |t|r|i|m| |E|N|D| +0#0000000&@49
 |.+0#e000002&@2| +0#0000000&@71
 |E+0#e000e06&|N|D| +0#0000000&@71
 @75
-|"+0#0000e05&| |:|l|e|t| |l|i|s|t| |v|a|l|u|e|s| +0#0000000&@56
-> @74
+>"+0#0000e05&| |:|l|e|t| |l|i|s|t| |v|a|l|u|e|s| +0#0000000&@56
+@75
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@67
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| @63
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@67
@@ -16,5 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@53
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@50
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| |"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@52
-@75
-@57|2|3|5|,|0|-|1| @6|5|8|%| 
+@57|2|3|5|,|1| @8|5|8|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_14.dump b/runtime/syntax/testdir/dumps/vim_variables_14.dump
index 4cb8061bb6d1098d8292bfb45b5ca5819f4baf89..e85091b1d8e5a08661c65f8322bffd12125c8319 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_14.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_14.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+|l+0#af5f00255#ffffff0|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| |"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@52
+@75
 |"+0#0000e05&| |:|u|n|l|e|t| +0#0000000&@66
 @75
 |u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@65
-|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61
->u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@65
+>u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@61
+|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@65
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@63
 @75
@@ -16,5 +17,4 @@
 |u+0#af5f00255&|n|l|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@64
 |u+0#af5f00255&|n|l|e|t|!| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@63
 @75
-|u+0#af5f00255&|n|l|e|t| +0#0000000&|l+0#00e0e07&|i|s|t|[+0#0000000&|3+0#e000002&|]+0#0000000&| @61
 @57|2|5|3|,|1| @8|6|3|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_15.dump b/runtime/syntax/testdir/dumps/vim_variables_15.dump
index 73cc0c676ecffdbfad40771ab70a428dbbd255d9..567fd59df545d60607b211a3547841645cfe351e 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_15.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_15.dump
@@ -1,9 +1,10 @@
-|u+0#af5f00255#ffffff0|n|l|e|t| +0#0000000&|l+0#00e0e07&|i|s|t|[+0#0000000&|3+0#e000002&|]+0#0000000&| @61
+| +0&#ffffff0@74
+|u+0#af5f00255&|n|l|e|t| +0#0000000&|l+0#00e0e07&|i|s|t|[+0#0000000&|3+0#e000002&|]+0#0000000&| @61
 |u+0#af5f00255&|n|l|e|t| +0#0000000&|l+0#00e0e07&|i|s|t|[+0#0000000&|3+0#e000002&|:+0#0000000&|]| @60
 |u+0#af5f00255&|n|l|e|t| +0#0000000&|d+0#00e0e07&|i|c|t|[+0#0000000&|'+0#e000002&|t|w|o|'|]+0#0000000&| @57
 |u+0#af5f00255&|n|l|e|t| +0#0000000&|d+0#00e0e07&|i|c|t|.+0#0000000&|t+0#00e0e07&|w|o| +0#0000000&@60
-@75
->u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@55
+> @74
+|u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@55
 |u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@54
 |u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@52
 |u+0#af5f00255&|n|l|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51
@@ -16,5 +17,4 @@
 @75
 |c+0#af5f00255&|o|n|s|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 @75
-|c+0#af5f00255&|o|n|s|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@46
-@57|2|7|1|,|1| @8|6|7|%| 
+@57|2|7|1|,|0|-|1| @6|6|7|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_16.dump b/runtime/syntax/testdir/dumps/vim_variables_16.dump
index 1b0ddfab06519f87ed23f3e47c7149f9a49fe0e1..5a4618c68bf1ebf263ac031d18f67a40de7af7b2 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_16.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_16.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@46
+| +0&#ffffff0@74
+|c+0#af5f00255&|o|n|s|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|;+0#0000000&| |b+0#00e0e07&|a|z|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@46
 @75
 |c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |E|N|D| +0#0000000&@57
 |.+0#e000002&@2| +0#0000000&@71
-|E+0#e000e06&|N|D| +0#0000000&@71
->c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52
+>E+0#e000e06&|N|D| +0#0000000&@71
+|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |E|N|D| +0#0000000&@52
 |.+0#e000002&@2| +0#0000000&@71
 |E+0#e000e06&|N|D| +0#0000000&@71
 |c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |e|v|a|l| |E|N|D| +0#0000000&@52
@@ -16,5 +17,4 @@
 |.+0#e000002&@2| +0#0000000&@71
 |E+0#e000e06&|N|D| +0#0000000&@71
 @75
-|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@65
 @57|2|8|9|,|1| @8|7|2|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_17.dump b/runtime/syntax/testdir/dumps/vim_variables_17.dump
index 07cb153d52fdb349b4aae140da3b9d8a87efb676..2a49205a91c9ad5c142a4b24841e4ea9b87ac9e6 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_17.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_17.dump
@@ -1,9 +1,10 @@
-|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@65
+| +0&#ffffff0@74
+|c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@65
 |c+0#af5f00255&|o|n|s|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| @61
 @75
 |"+0#0000e05&| |:|f|o|r| +0#0000000&@68
-@75
->f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
+> @74
+|f+0#af5f00255&|o|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@59
 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68
 @75
 |f+0#af5f00255&|o|r| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |i+0#af5f00255&|n| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
@@ -16,5 +17,4 @@
 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@63
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@63
-@75
-@57|3|0|7|,|1| @8|7|6|%| 
+@57|3|0|7|,|0|-|1| @6|7|6|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_18.dump b/runtime/syntax/testdir/dumps/vim_variables_18.dump
index 75c9d8000d149f510173df27878c199f8cfdff03..4e6913502a33ca5b32289b876802ffe271b256c1 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_18.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_18.dump
@@ -1,9 +1,10 @@
-| +0&#ffffff0@74
+| +0&#ffffff0@5|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@63
+@75
 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@53
 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@50
 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@49
-|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@46
-> @74
+>l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@46
+@75
 |l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@62
 |l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@58
 |l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@62
@@ -16,5 +17,4 @@
 |l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@45
 @75
 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@61
-|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@57
-@57|3|2|5|,|0|-|1| @6|8|1|%| 
+@57|3|2|5|,|1| @8|8|1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_19.dump b/runtime/syntax/testdir/dumps/vim_variables_19.dump
index 853644e39850537d2dffec49c4615ce54974f273..5510ea6406d758a85cf65cfa9eb0ccac5cdba903 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_19.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_19.dump
@@ -1,9 +1,10 @@
-|l+0#af5f00255#ffffff0|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@57
+|l+0#af5f00255#ffffff0|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@61
+|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@57
 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@61
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@63
-@75
->l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51
+> @74
+|l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51
 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@48
 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47
 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@44
@@ -16,5 +17,4 @@
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@63
 @75
-|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51
-@57|3|4|3|,|1| @8|8|6|%| 
+@57|3|4|3|,|0|-|1| @6|8|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_20.dump b/runtime/syntax/testdir/dumps/vim_variables_20.dump
index e280dd0c4d7ca1e940ec94498da468ef1f619847..2b1c0c7e30e8530a35569e52beca1cbe781714f8 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_20.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_20.dump
@@ -1,9 +1,10 @@
-|u+0#af5f00255#ffffff0|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51
+| +0&#ffffff0@74
+|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@51
 |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@48
 |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@47
 |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@44
-@75
->u+0#af5f00255&|n|l|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@60
+> @74
+|u+0#af5f00255&|n|l|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@60
 |u+0#af5f00255&|n|l|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@56
 |u+0#af5f00255&|n|l|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@60
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
@@ -16,5 +17,4 @@
 @75
 |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59
 |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@55
-|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59
-@57|3|6|1|,|1| @8|9|0|%| 
+@57|3|6|1|,|0|-|1| @6|9|0|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_21.dump b/runtime/syntax/testdir/dumps/vim_variables_21.dump
index ecc9a4bf424c1b5651da6811a29c8b6df787ff54..a721556dafe180a750154a36b0734cc940e17f28 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_21.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_21.dump
@@ -1,9 +1,10 @@
-|u+0#af5f00255#ffffff0|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59
+|u+0#af5f00255#ffffff0|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@55
+|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@63
 @75
-|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@49
->u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@46
+>u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@49
+|u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@46
 |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@45
 |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@42
 @75
@@ -16,5 +17,4 @@
 |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|l+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
 |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|s+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
 |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|a+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
-|e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|v+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
 @57|3|7|9|,|1| @8|9|5|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_22.dump b/runtime/syntax/testdir/dumps/vim_variables_22.dump
index afb4dbf42a08e59e6b9fba983a8bceed47192b34..0b19595af7a763e0c51979b1bfd0964852456ff5 100644 (file)
--- a/runtime/syntax/testdir/dumps/vim_variables_22.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_22.dump
@@ -1,9 +1,10 @@
-|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|v+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
+|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|a+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
+|e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|v+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
 @75
 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|b+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|b+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|w+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|w+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
-|f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
->f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|g+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
+>f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|t+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
+|f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|g+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|l+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|s+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|s+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
 |f+0#af5f00255&|o|r| +0#0000000&|k+0#00e0e07&| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|a+0#00e0e07&|:|)+0#e000e06&| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|a+0#00e0e07&|:|[+0#0000000&|k+0#00e0e07&|]+0#0000000&| ||| |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@35
@@ -16,5 +17,4 @@
 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|c+0#0000000&|h|a|n@1|e|l| |&+0#00e0e07&|i+0#0000000&|n|c@1|o|m@1|a|n|d| |&+0#00e0e07&|m+0#0000000&|o|u|s|e|s|c|r|o|l@1| |&+0#00e0e07&|p+0#0000000&|u|m|b|l|e|n|d| |&+0#00e0e07&|r+0#0000000&|e|d|r|a|w|d|e|b|u|g| |&+0#00e0e07&|s+0#0000000&|c|r|o|l@1|b|a|c|k| @1
 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|s+0#0000000&|h|a|d|a| |&+0#00e0e07&|s+0#0000000&|h|a|d|a|f|i|l|e| |&+0#00e0e07&|s+0#0000000&|t|a|t|u|s|c|o|l|u|m|n| |&+0#00e0e07&|t+0#0000000&|e|r|m|p|a|s|t|e|f|i|l|t|e|r| |&+0#00e0e07&|t+0#0000000&|e|r|m|s|y|n|c| |&+0#00e0e07&|w+0#0000000&|i|n|b|a|r| @3
 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|w+0#0000000&|i|n|b|l|e|n|d| |&+0#00e0e07&|w+0#0000000&|i|n|h|i|g|h|l|i|g|h|t| @46
-@75
-@57|3|9|7|,|1| @8|B|o|t| 
+@57|3|9|7|,|1| @8|9@1|%| 

diff --git a/runtime/syntax/testdir/dumps/vim_variables_23.dump b/runtime/syntax/testdir/dumps/vim_variables_23.dump
new file mode 100644 (file)
index 0000000..6b00839
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_variables_23.dump
@@ -0,0 +1,20 @@
+|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|&+0#00e0e07&|w+0#0000000&|i|n|b|l|e|n|d| |&+0#00e0e07&|w+0#0000000&|i|n|h|i|g|h|l|i|g|h|t| @46
+> @74
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|4|1@1|,|0|-|1| @6|B|o|t| 

diff --git a/runtime/syntax/testdir/input/setup/vim9_block.vim b/runtime/syntax/testdir/input/setup/vim9_blocks.vim
similarity index 100%
rename from runtime/syntax/testdir/input/setup/vim9_block.vim
rename to runtime/syntax/testdir/input/setup/vim9_blocks.vim

diff --git a/runtime/syntax/testdir/input/setup/vim9_comment.vim b/runtime/syntax/testdir/input/setup/vim9_builtin_object_methods2.vim
similarity index 100%
rename from runtime/syntax/testdir/input/setup/vim9_comment.vim
rename to runtime/syntax/testdir/input/setup/vim9_builtin_object_methods2.vim

diff --git a/runtime/syntax/testdir/input/setup/vim9_expr.vim b/runtime/syntax/testdir/input/setup/vim9_comments.vim
similarity index 100%
rename from runtime/syntax/testdir/input/setup/vim9_expr.vim
rename to runtime/syntax/testdir/input/setup/vim9_comments.vim

diff --git a/runtime/syntax/testdir/input/setup/vim9_lambda.vim b/runtime/syntax/testdir/input/setup/vim9_expressions.vim
similarity index 100%
rename from runtime/syntax/testdir/input/setup/vim9_lambda.vim
rename to runtime/syntax/testdir/input/setup/vim9_expressions.vim

diff --git a/runtime/syntax/testdir/input/setup/vim_comment.vim b/runtime/syntax/testdir/input/setup/vim9_lambdas.vim
similarity index 100%
rename from runtime/syntax/testdir/input/setup/vim_comment.vim
rename to runtime/syntax/testdir/input/setup/vim9_lambdas.vim

diff --git a/runtime/syntax/testdir/input/setup/vim_expr.vim b/runtime/syntax/testdir/input/setup/vim_comments.vim
similarity index 100%
rename from runtime/syntax/testdir/input/setup/vim_expr.vim
rename to runtime/syntax/testdir/input/setup/vim_comments.vim

diff --git a/runtime/syntax/testdir/input/setup/vim_lambda.vim b/runtime/syntax/testdir/input/setup/vim_expressions.vim
similarity index 100%
rename from runtime/syntax/testdir/input/setup/vim_lambda.vim
rename to runtime/syntax/testdir/input/setup/vim_expressions.vim

diff --git a/runtime/syntax/testdir/input/setup/vim_object_methods.vim b/runtime/syntax/testdir/input/setup/vim_lambdas.vim
similarity index 100%
rename from runtime/syntax/testdir/input/setup/vim_object_methods.vim
rename to runtime/syntax/testdir/input/setup/vim_lambdas.vim

diff --git a/runtime/syntax/testdir/input/vim9_block.vim b/runtime/syntax/testdir/input/vim9_blocks.vim
similarity index 84%
rename from runtime/syntax/testdir/input/vim9_block.vim
rename to runtime/syntax/testdir/input/vim9_blocks.vim
index ddc6657ff0882e941ac2dc3566ba5bcc0977ad19..20a68fc5ab7f97d138c301622d4a295442f385a1 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_block.vim
+++ b/runtime/syntax/testdir/input/vim9_blocks.vim
@@ -1,6 +1,6 @@
 vim9script
 # Vim9 blocks
-# VIM_TESTSETUP set list listchars=tab:> ,trail:-,extends:>,precedes:<,nbsp:+
+# VIM_TESTSETUP set list listchars=trail:-
 
 
 {

diff --git a/runtime/syntax/testdir/input/vim9_ex_special_method_definitions.vim b/runtime/syntax/testdir/input/vim9_builtin_object_methods.vim
similarity index 96%
rename from runtime/syntax/testdir/input/vim9_ex_special_method_definitions.vim
rename to runtime/syntax/testdir/input/vim9_builtin_object_methods.vim
index 79a0626ff42895abfbdaa3b9620a1b39bc8cc97a..5b49ae91f81d1625f6c4bea9e0d768f3f42408cb 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_ex_special_method_definitions.vim
+++ b/runtime/syntax/testdir/input/vim9_builtin_object_methods.vim
@@ -1,5 +1,6 @@
 vim9script
-# Vim9 special methods new*(), empty(), len(), string()
+# Vim9 special methods - new*(), empty(), len(), string()
+
 
 def new()
 enddef

diff --git a/runtime/syntax/testdir/input/vim_object_methods.vim b/runtime/syntax/testdir/input/vim9_builtin_object_methods2.vim
similarity index 94%
rename from runtime/syntax/testdir/input/vim_object_methods.vim
rename to runtime/syntax/testdir/input/vim9_builtin_object_methods2.vim
index 11d01a6766914a7af5a02b45da8c6579bb471f58..61396c3ba2f81c9f2df28ad89cb25a879754733c 100644 (file)
--- a/runtime/syntax/testdir/input/vim_object_methods.vim
+++ b/runtime/syntax/testdir/input/vim9_builtin_object_methods2.vim
@@ -1,10 +1,9 @@
 vim9script
-
+# Vim |builtin-object-methods| and namesake builtin functions
 # VIM_TEST_SETUP hi link vim9MethodName Special
 # VIM_TEST_SETUP hi link vim9This Todo
 
 
-# Vim |builtin-object-methods| and namesake builtin functions.
 class PairClassTest
        public const a: any
        public const b: any
@@ -56,3 +55,4 @@ const s2: string = pair.string()
 echo b2 && !empty(pair)
 echo n2 == 2 && len(pair) == 2
 echo s2 == '(0, 1)' && string(pair) == '(0, 1)'
+

diff --git a/runtime/syntax/testdir/input/vim9_ex_comment_strings.vim b/runtime/syntax/testdir/input/vim9_comment_strings.vim
similarity index 83%
rename from runtime/syntax/testdir/input/vim9_ex_comment_strings.vim
rename to runtime/syntax/testdir/input/vim9_comment_strings.vim
index fd02c1a60a1aba63a0d23a26abe11e472ef03093..854f7d76bc7f7468c3f318be9ad307f3e33b39c0 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_ex_comment_strings.vim
+++ b/runtime/syntax/testdir/input/vim9_comment_strings.vim
@@ -1,8 +1,8 @@
 vim9script
-
-# Vim comment strings
+# Vim9 comment strings
 # VIM_TEST_SETUP let g:vimsyn_comment_strings = v:true
 
+
 # pre "string" post
 
 function Foo()
@@ -20,3 +20,8 @@ command Foo {
 autocmd BufNewFile * {
   # pre "string" post
 }
+
+{
+  # pre "string" post
+}
+

diff --git a/runtime/syntax/testdir/input/vim9_comment.vim b/runtime/syntax/testdir/input/vim9_comments.vim
similarity index 98%
rename from runtime/syntax/testdir/input/vim9_comment.vim
rename to runtime/syntax/testdir/input/vim9_comments.vim
index 590ddd869b7e38ed093126b2fd3a7dce0ed6ff4c..1842d7ef745c23e70883bcbb778b63b76872f990 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_comment.vim
+++ b/runtime/syntax/testdir/input/vim9_comments.vim
@@ -1,6 +1,6 @@
 vim9script
+# Vim9 comments
 
-# Vim comments
 
 # Vim9-script comment
 

diff --git a/runtime/syntax/testdir/input/vim9_constructor.vim b/runtime/syntax/testdir/input/vim9_constructors.vim
similarity index 92%
rename from runtime/syntax/testdir/input/vim9_constructor.vim
rename to runtime/syntax/testdir/input/vim9_constructors.vim
index 71a2ea422f51d930ce791999ee698bd6f0a0b32a..3b49969e27b30e2d92c353d36b74e7b82b281908 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_constructor.vim
+++ b/runtime/syntax/testdir/input/vim9_constructors.vim
@@ -1,6 +1,5 @@
 vim9script
-
-# Vim9 constructor
+# Vim9 constructors
 
 
 class A

diff --git a/runtime/syntax/testdir/input/vim9_def_variables.vim b/runtime/syntax/testdir/input/vim9_def_variables.vim
index 4580c0eefce01004a51190642f9ef329d94985c5..97f867c122c62190f3a5f03b226383659f2633be 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_def_variables.vim
+++ b/runtime/syntax/testdir/input/vim9_def_variables.vim
@@ -1,8 +1,9 @@
 vim9script
+# Vim9 function variables
 
-# Vim9 function variable highlighting
 
 def Foo()
+
   # Declarations
 
   var foo = expr

diff --git a/runtime/syntax/testdir/input/vim9_ex_class_fold.vim b/runtime/syntax/testdir/input/vim9_ex_class_fold.vim
index 3e5715fe0694086993ddd15088809cf54f17bd2a..ea89b9dfc03e5946b08e4113ff0d4abe67f9c25b 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_ex_class_fold.vim
+++ b/runtime/syntax/testdir/input/vim9_ex_class_fold.vim
@@ -1,8 +1,9 @@
 vim9script
 # Vim9 :class command
-# VIM_TEST_SETUP let g:vimsyn_folding = 'cf'
+# VIM_TEST_SETUP let g:vimsyn_folding = 'cfi'
 # VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
+
 interface Interface1
 endinterface
 interface Interface2

diff --git a/runtime/syntax/testdir/input/vim9_ex_commands.vim b/runtime/syntax/testdir/input/vim9_ex_commands.vim
index 86e063eed42ede2446e134dd5f9ef13e1802e8e9..c22fb7195278c82d74922dc0888beec12ac4aa9a 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_ex_commands.vim
+++ b/runtime/syntax/testdir/input/vim9_ex_commands.vim
@@ -1,7 +1,7 @@
 vim9script
-
 # Vim9 Ex commands
 
+
 # START NOT MATCHED
 :@
 :@@

diff --git a/runtime/syntax/testdir/input/vim9_ex_enum2.vim b/runtime/syntax/testdir/input/vim9_ex_enum2.vim
index e3b3d2dc0a2260656586a6a8c1e8b7b1904406dd..f602d794fecc00c9bea2bc3d18cf78f2da9421c2 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_ex_enum2.vim
+++ b/runtime/syntax/testdir/input/vim9_ex_enum2.vim
@@ -1,10 +1,9 @@
 vim9script
-# Vim :enum command
+# Vim9 :enum command
 # VIM_TEST_SETUP hi link vim9EnumValue Todo
-
-
 # See: https://github.com/vim/vim/pull/16365#issuecomment-2571420551
 
+
 enum Letter
     #
     #########################################

diff --git a/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim b/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim
index b6dfc4ea4f1581a0e8257ea59812716b95ac37df..b4769d581302f3175b71635ea7644206ed8788d2 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim
+++ b/runtime/syntax/testdir/input/vim9_ex_enum_fold.vim
@@ -1,6 +1,6 @@
 vim9script
-# Vim :enum command
-# VIM_TEST_SETUP let g:vimsyn_folding = 'ef'
+# Vim9 :enum command
+# VIM_TEST_SETUP let g:vimsyn_folding = 'efi'
 # VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 # VIM_TEST_SETUP hi link vim9EnumValue Todo
 

diff --git a/runtime/syntax/testdir/input/vim9_ex_for.vim b/runtime/syntax/testdir/input/vim9_ex_for.vim
index e3c303330a96b3a4d278f659642b784d9a59650f..e01afc6c43a9ff97556800b03ea5ef696a5c4c0f 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_ex_for.vim
+++ b/runtime/syntax/testdir/input/vim9_ex_for.vim
@@ -1,5 +1,4 @@
 vim9script
-
 # Vim9 :for command
 
 

diff --git a/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim b/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim
index b4b9f6de0f511eb36e5de4a228260374f1471bfc..dda144958426e32635795d61b3f59cf9a644fcde 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim
+++ b/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comment_errors.vim
@@ -1,8 +1,8 @@
 vim9script
-
 # Vim9 :function and :def tail comment errors
 # VIM_TEST_SETUP unlet! g:vimsyn_folding
 
+
 fun Test1() abort              # fun
   return 1
 endfun                         # endfun
@@ -42,3 +42,4 @@ endfun                                # endfun
 for d in range(1, 6)
   exec $'echo Test{d}()'
 endfor
+

diff --git a/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim b/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim
index 12f7942cf15358f8f71728e458f06a15b84d5be6..b2803854d4560a8aa1d7f3c2c727595ee1e50a2d 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim
+++ b/runtime/syntax/testdir/input/vim9_ex_function_def_tail_comments.vim
@@ -1,8 +1,8 @@
 vim9script
-
 # Vim9 :function and :def tail comments
 # VIM_TEST_SETUP unlet! g:vimsyn_folding
 
+
 fun Test1() abort              " fun
   return 1
 endfun                         " endfun
@@ -42,3 +42,4 @@ endfun                                " endfun
 for d in range(1, 6)
   exec $'echo Test{d}()'
 endfor
+

diff --git a/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim b/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim
index 232c3e279627d4e38fecb221dbc10a51ed683cb0..f108e749a0b417eda877b4fd74143e969bfe7ce5 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim
+++ b/runtime/syntax/testdir/input/vim9_ex_interface_fold.vim
@@ -1,8 +1,9 @@
 vim9script
-# Vim :interface command
+# Vim9 :interface command
 # VIM_TEST_SETUP let g:vimsyn_folding = 'i'
 # VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 
+
 interface Interface1
 endinterface
 
@@ -34,3 +35,4 @@ interface Interface5
   def Meth1(): number
   def Meth2(): number
 endinterface
+

diff --git a/runtime/syntax/testdir/input/vim9_ex_let_heredoc.vim b/runtime/syntax/testdir/input/vim9_ex_let_heredoc.vim
index f20d4b9421661fed4dcb355599d0dc43070e2b54..184089c8190ecab1e14ea0ee8cdb02ffcb59d335 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_ex_let_heredoc.vim
+++ b/runtime/syntax/testdir/input/vim9_ex_let_heredoc.vim
@@ -1,4 +1,5 @@
 vim9script
+# Vim9 heredoc
 # VIM_TEST_SETUP let g:vimsyn_folding = "h"
 # VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
 

diff --git a/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim b/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim
index 126c6dd38c34a98aef9e325eb3f45eca0305012e..fcae0a352fa28f7c8ddead58990ada5606c36291 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim
+++ b/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim
@@ -1,6 +1,6 @@
 vim9script
+# Vim9 :loadkeymap command
 
-# Vim :loadkeymap command
 
 scriptencoding utf-8
 
@@ -24,3 +24,4 @@ c              <char-0103>     Special notation allowed in RHS - octal
 \# <char-0x00a3>               Line should not match as a Vim9-script comment
 " “                            Line should not match as a legacy-script comment
 : #                            Line should not match as a Vim9-script comment
+

diff --git a/runtime/syntax/testdir/input/vim9_ex_type.vim b/runtime/syntax/testdir/input/vim9_ex_type.vim
index bfd9eb9a2674f2e7449ca9534f03ebbc98eb3fa4..1408ac85553269cb73f69bdf108f720038dd5afb 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_ex_type.vim
+++ b/runtime/syntax/testdir/input/vim9_ex_type.vim
@@ -1,5 +1,6 @@
 vim9script
-# Vim :type command
+# Vim9 :type command
+
 
 type Foo = string
 type Bar = list<string>

diff --git a/runtime/syntax/testdir/input/vim9_expr.vim b/runtime/syntax/testdir/input/vim9_expressions.vim
similarity index 98%
rename from runtime/syntax/testdir/input/vim9_expr.vim
rename to runtime/syntax/testdir/input/vim9_expressions.vim
index f42392c2d7ea8f78e9c0eda626f83ebae88a083f..aff8f369c51c998f0e1d6255ac38eced8aa4cb82 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_expr.vim
+++ b/runtime/syntax/testdir/input/vim9_expressions.vim
@@ -1,5 +1,5 @@
 vim9script
-# Vim9-script expressions
+# Vim9 expressions
 
 
 # Number
@@ -67,7 +67,7 @@ echo {
 # match as keys not scope dictionaries
 echo { b: 42, w: 42, t: 42, g: 42, l: 42, s: 42, a: 42, v: 42  }
 
-" Register
+# Register
 
 echo @" @@
 echo @0 @1 @2 @3 @4 @5 @6 @7 @8 @9

diff --git a/runtime/syntax/testdir/input/vim9_function_call.vim b/runtime/syntax/testdir/input/vim9_function_calls.vim
similarity index 94%
rename from runtime/syntax/testdir/input/vim9_function_call.vim
rename to runtime/syntax/testdir/input/vim9_function_calls.vim
index 751295025574d2f663381c0d25d8606300f15c89..c4245510ecb1ccf2e736904b5d430e63408e15e1 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_function_call.vim
+++ b/runtime/syntax/testdir/input/vim9_function_calls.vim
@@ -1,14 +1,14 @@
 vim9script
-# Vim function calls
-# VIM_TEST_SETUP highlight link vimUserFunc Todo
-# VIM_TEST_SETUP highlight link vim9UserFunc Todo
+# Vim9 function calls
+# VIM_TEST_SETUP hi link vimUserFunc Todo
+# VIM_TEST_SETUP hi link vim9UserFunc Todo
 
 
 call abs(42)
 abs(42)
 
 
-# command/function distinction
+# Command/function distinction
 
 # append browse call chdir confirm copy delete eval execute filter function
 # insert join map match mode sort split substitute swapname type
@@ -161,7 +161,7 @@ uniq(42)
 uniq (42)
 
 
-# errors
+# Errors
 
 var foo = foo(42)
 call foo(42)
@@ -182,7 +182,7 @@ echo(42)
 echo (42)
 
 
-# expressions
+# Expressions
 
 var foo = abs(42)
 
@@ -205,7 +205,7 @@ echo Foo() + bar
 echo bar + Foo()
 
 
-# scope modifiers and qualified names
+# Scope modifiers and qualified names
 
 var foo = g:foo(42)
 call g:foo(42)
@@ -257,7 +257,7 @@ call g:module#foo(42)
 g:module#foo(42)
 
 
-# not builtin functions
+# User, not builtin, functions
 
 call g:substitute()
 call b:substitute()
@@ -294,7 +294,7 @@ substitute#substitute()
 g:substitute#substitute()
 
 
-# chained function calls
+# Chained function calls
 
 module.foo().bar()
 module.foo().substitute()

diff --git a/runtime/syntax/testdir/input/vim9_generic_function_example_list.vim b/runtime/syntax/testdir/input/vim9_generic_function_example_list.vim
index 597c0277432c905bddb4282109973595bf704d5a..f1abbdb3b1c9b9df6f6f6e1dc347d87e337e4736 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_generic_function_example_list.vim
+++ b/runtime/syntax/testdir/input/vim9_generic_function_example_list.vim
@@ -1,7 +1,7 @@
 vim9script
-# VIM_TEST_SETUP highlight link vim9DefTypeParam Todo
-# VIM_TEST_SETUP let g:vimsyn_folding = "f"
+# VIM_TEST_SETUP let g:vimsyn_folding = "cfi"
 # VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+# VIM_TEST_SETUP hi link vim9DefTypeParam Todo
 # See: https://github.com/vim/vim/pull/17313#issuecomment-3046696820 (Aliaksei Budavei)
 
 

diff --git a/runtime/syntax/testdir/input/vim9_generic_function_example_set.vim b/runtime/syntax/testdir/input/vim9_generic_function_example_set.vim
index a4b11fadf43c518625b6da9dee8da2ef4a3aace3..fb8f65116e3f10dcc4bd0513cb570e730c5f8b26 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_generic_function_example_set.vim
+++ b/runtime/syntax/testdir/input/vim9_generic_function_example_set.vim
@@ -1,7 +1,7 @@
 vim9script
-# VIM_TEST_SETUP highlight link vim9DefTypeParam Todo
-# VIM_TEST_SETUP let g:vimsyn_folding = "f"
+# VIM_TEST_SETUP let g:vimsyn_folding = "cf"
 # VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+# VIM_TEST_SETUP hi link vim9DefTypeParam Todo
 # See: https://github.com/vim/vim/pull/17313#issuecomment-3046696820 (Aliaksei Budavei)
 
 # See https://github.com/vim/vim/issues/14330#issuecomment-2028938515 .

diff --git a/runtime/syntax/testdir/input/vim9_generic_functions.vim b/runtime/syntax/testdir/input/vim9_generic_functions.vim
index 01053248338d41a3b6143a127ccd0b83e37875d9..4800752d3ff19d6a44fe9353c16bb775f5fe2400 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_generic_functions.vim
+++ b/runtime/syntax/testdir/input/vim9_generic_functions.vim
@@ -1,8 +1,8 @@
 vim9script
 # Vim9 generic functions
-# VIM_TEST_SETUP highlight link vim9DefTypeParam Todo
-# VIM_TEST_SETUP let g:vimsyn_folding = "f"
+# VIM_TEST_SETUP let g:vimsyn_folding = "cf"
 # VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+# VIM_TEST_SETUP hi link vim9DefTypeParam Todo
 
 
 # :help generic-functions

diff --git a/runtime/syntax/testdir/input/vim9_lambda.vim b/runtime/syntax/testdir/input/vim9_lambdas.vim
similarity index 97%
rename from runtime/syntax/testdir/input/vim9_lambda.vim
rename to runtime/syntax/testdir/input/vim9_lambdas.vim
index 81d9dc27b1ab87c76cc38618701c8b49bdfd1c66..4f7d1cde3c5d9e295a8f75bde7281abc8bc18c01 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_lambda.vim
+++ b/runtime/syntax/testdir/input/vim9_lambdas.vim
@@ -1,10 +1,9 @@
 vim9script
+# Vim9 lambda expressions
 # VIM_TEST_SETUP hi link vim9LambdaOperator Todo
 # VIM_TEST_SETUP hi link vim9LambdaParen Todo
 
 
-# Vim 9 lambda expressions
-
 var Foo: func
 var expr = 0
 
@@ -72,7 +71,7 @@ Foo = (x: number, ...y: list<number>): list<number> => expr
 Foo = (x: number, y: number): list<number> => expr
 
 
-# post operator comments
+# Post-operator comments
 
 Foo = () => # comment
   expr
@@ -86,7 +85,7 @@ Foo = () =>
   expr
 
 
-# line continuations
+# Line continuations
 
 Foo = (x: string,
       \ y: number,
@@ -112,7 +111,7 @@ Foo = (x: string,
       \ number => expr
 
 
-# funcref call
+# Funcref call
 
 echo (() => 42)()
 echo ((x: string): number => 42)("foo")

diff --git a/runtime/syntax/testdir/input/vim9_legacy_header.vim b/runtime/syntax/testdir/input/vim9_legacy_header.vim
index 66aeb3961206edefecc6552bee67f9c2344f8570..75fde68c68c754e131b78a2871c71df2e2980872 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_legacy_header.vim
+++ b/runtime/syntax/testdir/input/vim9_legacy_header.vim
@@ -1,3 +1,6 @@
+" Vim9 legacy script header
+
+
 " comment
 
 if !has('vim9script')
@@ -14,3 +17,4 @@ vim9script noclear
 
  # string only recognised with leading char
  "useless string"
+

diff --git a/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim b/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim
index 6e0e71e24d377f5593e4c707e5ec44370670a2fe..db48abd9679ef466c544e92876bbdb8b7066e000 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim
+++ b/runtime/syntax/testdir/input/vim9_legacy_header_fold.vim
@@ -1,4 +1,8 @@
-" VIM_TEST_SETUP let g:vimsyn_folding = "H" | set fdm=syntax
+" Vim9 legacy script header
+" VIM_TEST_SETUP let g:vimsyn_folding = "H"
+" VIM_TEST_SETUP setl fdc=2 fdl=99 fdm=syntax
+
+
 " comment
 
 if !has('vim9script')
@@ -15,3 +19,4 @@ vim9script noclear
 
  # string only recognised with leading char
  "useless string"
+

diff --git a/runtime/syntax/testdir/input/vim9_ex_no_comment_strings.vim b/runtime/syntax/testdir/input/vim9_no_comment_strings.vim
similarity index 83%
rename from runtime/syntax/testdir/input/vim9_ex_no_comment_strings.vim
rename to runtime/syntax/testdir/input/vim9_no_comment_strings.vim
index dcea14d28d236a108646931adfa9320890317ea8..b9bdddb91447ceba68804d88cc2f454e9c0ed0bd 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_ex_no_comment_strings.vim
+++ b/runtime/syntax/testdir/input/vim9_no_comment_strings.vim
@@ -1,8 +1,8 @@
 vim9script
-
-# Vim comment strings
+# Vim9 no comment strings
 # VIM_TEST_SETUP let g:vimsyn_comment_strings = v:false
 
+
 # pre "string" post
 
 function Foo()
@@ -20,3 +20,8 @@ command Foo {
 autocmd BufNewFile * {
   # pre "string" post
 }
+
+{
+  # pre "string" post
+}
+

diff --git a/runtime/syntax/testdir/input/vim9_shebang.vim b/runtime/syntax/testdir/input/vim9_shebang.vim
index c012fd9fc9559766d144640bd36559977c68e582..bd5ca914fc281f6a6429b5535c89fcc7f495199a 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_shebang.vim
+++ b/runtime/syntax/testdir/input/vim9_shebang.vim
@@ -1,7 +1,8 @@
 #!/usr/bin/env vim -S
 vim9script
+# Vim9 shebang line
 
-# Vim shebang line
 
 # just a line comment
 #!/usr/bin/env vim -S
+

diff --git a/runtime/syntax/testdir/input/vim9_super_this_keywords.vim b/runtime/syntax/testdir/input/vim9_super_this_keywords.vim
index 0370dd7681095567fa7fea8aa50239d72add6191..43f29fedee77ea906ea887a6bcd1dab8be7a1210 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_super_this_keywords.vim
+++ b/runtime/syntax/testdir/input/vim9_super_this_keywords.vim
@@ -1,9 +1,9 @@
 vim9script
-
 # Vim9 this and super keywords
 # VIM_TEST_SETUP hi link vim9This Todo
 # VIM_TEST_SETUP hi link vim9Super Todo
 
+
 def Echo(...args: list<any>)
   echo args
 enddef

diff --git a/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim b/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim
index 326eaf099c8a8a56e4440a500d763401f2e5973f..8db05e5501b6db3a80c8a3d41100c5cec69d2d58 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim
+++ b/runtime/syntax/testdir/input/vim9_super_this_keywords2.vim
@@ -1,5 +1,5 @@
 vim9script
-
+# Vim9 this and super keywords
 # VIM_TEST_SETUP hi link vim9Super Todo
 # VIM_TEST_SETUP hi link vim9This Todo
 # See: https://github.com/vim/vim/pull/16476#issuecomment-2638191110

diff --git a/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim b/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim
index fb1f610f884dc3082805ffabafdff4506dd9536f..a80c8c8737eba584de351842d11dd25c761a976e 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim
+++ b/runtime/syntax/testdir/input/vim9_super_this_keywords3.vim
@@ -1,5 +1,5 @@
 vim9script
-
+# Vim9 this and super keywords
 # VIM_TEST_SETUP hi link vim9Super Todo
 # VIM_TEST_SETUP hi link vim9This Todo
 # See: https://github.com/vim/vim/pull/16476#issuecomment-2635119478

diff --git a/runtime/syntax/testdir/input/vim9_tuple.vim b/runtime/syntax/testdir/input/vim9_tuples.vim
similarity index 99%
rename from runtime/syntax/testdir/input/vim9_tuple.vim
rename to runtime/syntax/testdir/input/vim9_tuples.vim
index 99370a55d491aaa55fa89667b2a887b7478749d3..2470f38b2fff6586d1712a87ee25f2d6cfc97326 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_tuple.vim
+++ b/runtime/syntax/testdir/input/vim9_tuples.vim
@@ -1,5 +1,4 @@
 vim9script
-
 # Vim9 tuples
 
 

diff --git a/runtime/syntax/testdir/input/vim9_variables.vim b/runtime/syntax/testdir/input/vim9_variables.vim
index 352104529026f33e741ad9972d2e31c28c27c2db..8347bd7eee9d9db7d6698915ebca54808b67c05a 100644 (file)
--- a/runtime/syntax/testdir/input/vim9_variables.vim
+++ b/runtime/syntax/testdir/input/vim9_variables.vim
@@ -1,7 +1,7 @@
 vim9script
-
 # Vim9 variable highlighting
 
+
 # Declarations
 
 var foo = expr

diff --git a/runtime/syntax/testdir/input/vim_ex_comment_strings.vim b/runtime/syntax/testdir/input/vim_comment_strings.vim
similarity index 99%
rename from runtime/syntax/testdir/input/vim_ex_comment_strings.vim
rename to runtime/syntax/testdir/input/vim_comment_strings.vim
index 4214d6b3a06d8ca726da2f66cd63ce53e6603a94..0626403941928a85cc7690967c467a96b7838baa 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_comment_strings.vim
+++ b/runtime/syntax/testdir/input/vim_comment_strings.vim
@@ -1,6 +1,7 @@
 " Vim comment strings
 " VIM_TEST_SETUP let g:vimsyn_comment_strings = v:true
 
+
 " pre "string" post
 
 function Foo()
@@ -18,3 +19,4 @@ command Foo {
 autocmd BufNewFile * {
   # pre "string" post
 }
+

diff --git a/runtime/syntax/testdir/input/vim_comment.vim b/runtime/syntax/testdir/input/vim_comments.vim
similarity index 99%
rename from runtime/syntax/testdir/input/vim_comment.vim
rename to runtime/syntax/testdir/input/vim_comments.vim
index 2ca67875bb54863f42f2d7a1a7e0b826057ff1cb..0cababe11189f94466077c19527f1a0f7c1b8b1b 100644 (file)
--- a/runtime/syntax/testdir/input/vim_comment.vim
+++ b/runtime/syntax/testdir/input/vim_comments.vim
@@ -1,5 +1,6 @@
 " Vim comments
 
+
 " Legacy-script comment
 
 # 42 " comment
@@ -70,3 +71,4 @@ endif
 def CommentTitle()
   # Title: ...
 enddef
+

diff --git a/runtime/syntax/testdir/input/vim_ex_abbreviate.vim b/runtime/syntax/testdir/input/vim_ex_abbreviate.vim
index 7360e38317b68ab300073520e93787d22d3f319c..30fb32da09d4a3be3880b9f4c35e485758852e56 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_abbreviate.vim
+++ b/runtime/syntax/testdir/input/vim_ex_abbreviate.vim
@@ -1,5 +1,6 @@
 " Vim :abbreviate commands
 
+
 abbrev <buffer> foo foobar
 cabbrev <buffer> cfoo cfoobar
 iabbrev <buffer> ifoo cfoobar
@@ -23,3 +24,4 @@ iunabbrev <buffer> ifoo
 abclear <buffer>
 cabclear <buffer>
 iabclear <buffer>
+

diff --git a/runtime/syntax/testdir/input/vim_ex_augroup.vim b/runtime/syntax/testdir/input/vim_ex_augroup.vim
index 7f7f3463c3956931505ea0ed001751150f0e570a..f7022ecd881645546968fbc4927b9c72e8e4b643 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_augroup.vim
+++ b/runtime/syntax/testdir/input/vim_ex_augroup.vim
@@ -1,7 +1,7 @@
 " Vim :augroup command
 " VIM_TEST_SETUP let g:vimsyn_folding = "a"
 " VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
-" VIM_TEST_SETUP highlight link vimAugroupName Todo
+" VIM_TEST_SETUP hi link vimAugroupName Todo
 
 
 augroup foo

diff --git a/runtime/syntax/testdir/input/vim_ex_autocmd.vim b/runtime/syntax/testdir/input/vim_ex_autocmd.vim
index 8b5b53e0b496770ef966c578aadb49343d9ac6b7..2216a427ecf78d9f3b793472090390c454ee9ca3 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_autocmd.vim
+++ b/runtime/syntax/testdir/input/vim_ex_autocmd.vim
@@ -1,6 +1,6 @@
 " Vim :autocmd command
-" VIM_TEST_SETUP highlight vimAutoCmdGroup Todo
-" VIM_TEST_SETUP highlight vimUserAutoEvent Title
+" VIM_TEST_SETUP hi link vimAutoCmdGroup Todo
+" VIM_TEST_SETUP hi link vimUserAutoEvent Title
 
 
 " Define
@@ -211,7 +211,7 @@ doautocmd <nomodeline> foogroup BufRead *.txt | echo "Foo"
 doautocmd <nomodeline> foogroup BufRead *.txt | " comment
 
 
-" patterns
+" Patterns
 
 au BufRead */*.txt
 

diff --git a/runtime/syntax/testdir/input/vim_ex_behave.vim b/runtime/syntax/testdir/input/vim_ex_behave.vim
index a1e99f0d8ac6fa2424071a51ffe275f1551b3cfa..6f5e5ec1249f9376181d3df6daba879c5ded7035 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_behave.vim
+++ b/runtime/syntax/testdir/input/vim_ex_behave.vim
@@ -1,7 +1,9 @@
-" Vim behave command
+" Vim :behave command
+
 
 behave mswin
 behave xterm
 
 behave! mswin
 behave! xterm
+

diff --git a/runtime/syntax/testdir/input/vim_ex_call.vim b/runtime/syntax/testdir/input/vim_ex_call.vim
index ae6bdc99e831b944c8abd3f2c33ceac171ee8a34..809a4103f396eb420b000cd9d39ecac5241b2b44 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_call.vim
+++ b/runtime/syntax/testdir/input/vim_ex_call.vim
@@ -1,7 +1,7 @@
 " Vim :call command
 
 
-" functions for which there are same-named Ex commands
+" Functions with same-named Ex commands
 
 call browse(save, title, initdir, default)
 call call(func, arglist, dict)
@@ -49,3 +49,4 @@ call Foo(arg1, arg2)
 
 let res = call(func, arglist, dict)
 let res = call (func, arglist, dict)
+

diff --git a/runtime/syntax/testdir/input/vim_ex_catch.vim b/runtime/syntax/testdir/input/vim_ex_catch.vim
index f0e2a8fdc3d497871d07feb6860e08d7f01151c6..f7fad2672f1499637857f020472f7433f148473a 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_catch.vim
+++ b/runtime/syntax/testdir/input/vim_ex_catch.vim
@@ -1,5 +1,6 @@
 " Vim :catch command
 
+
 " :help :catch
 
 catch /^Vim:Interrupt$/                " catch interrupts (CTRL-C)
@@ -15,3 +16,4 @@ catch                         " same as /.*/
 
 try | sleep 100 | catch /^Vim:Interrupt$/ | endtry
 try | edit | catch /^Vim(edit):E\d\+/ | echo "error" | endtry
+

diff --git a/runtime/syntax/testdir/input/vim_ex_command.vim b/runtime/syntax/testdir/input/vim_ex_command.vim
index 8342b68de257cdd2bdfb2a6f060f4239d1605a33..b3b19e9e29b0df4565b7229984961b23747583d7 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_command.vim
+++ b/runtime/syntax/testdir/input/vim_ex_command.vim
@@ -1,15 +1,15 @@
 " Vim :command, :delcommand and :comclear commands
-" VIM_TEST_SETUP highlight link vimUserCmdName Todo
-" VIM_TEST_SETUP highlight link vimDelcommandName Todo
+" VIM_TEST_SETUP hi link vimUserCmdName Todo
+" VIM_TEST_SETUP hi link vimDelcommandName Todo
 
 
-" list
+" List
 
 command
 command F
 
 
-" define
+" Define
 
 command  Foo echo "Foo"
 command! Foo echo "Foo"
@@ -53,7 +53,7 @@ def Foo2()
 enddef
 
 
-" multiline define
+" Multiline define
 
 command! -addr=lines
       \ -bang
@@ -112,12 +112,12 @@ command!
       \ echo "Bar"
 
 
-" errors
+" Errors
 
 command! -badattr=arguments -bang -badattr -nargs=* Foo echo "Foo"
 
 
-" delete
+" Delete
 
 delcommand Foo
 delcommand -buffer Foo

diff --git a/runtime/syntax/testdir/input/vim_ex_command_modifiers.vim b/runtime/syntax/testdir/input/vim_ex_command_modifiers.vim
index 22fafb0db578c85222ed7e3b59d3aa0cfc5309d3..64b4782f692b64aaf6e8070dc69c45316f0b8d3d 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_command_modifiers.vim
+++ b/runtime/syntax/testdir/input/vim_ex_command_modifiers.vim
@@ -1,4 +1,4 @@
-" Vim ex command modifiers
+" Vim Ex command modifiers
 
 
  aboveleft        echo "Foo"

diff --git a/runtime/syntax/testdir/input/vim_ex_commands.vim b/runtime/syntax/testdir/input/vim_ex_commands.vim
index 3098606b115bb8b53d10cb3415f32ea91880ef17..351e20ad83b774679125d249cbb8bcffb7a7fe27 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_commands.vim
+++ b/runtime/syntax/testdir/input/vim_ex_commands.vim
@@ -1,5 +1,6 @@
 " Ex commands
 
+
 " START NOT MATCHED
 :@
 :@@

diff --git a/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim b/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim
index 965c543da8573aa924b54433ba10cbe97679dd56..27c93a0e6c051a356dd0000570d49e3f6cb5b22a 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim
+++ b/runtime/syntax/testdir/input/vim_ex_debuggreedy.vim
@@ -1,5 +1,6 @@
 " Vim :debuggreedy command
 
+
 debuggreedy
 0debuggreedy
 

diff --git a/runtime/syntax/testdir/input/vim_ex_def.vim b/runtime/syntax/testdir/input/vim_ex_def.vim
index 819a1ada2c5f0e27a44e01e111200165178caefd..7b1d39f4d1877b269fdadc50566a9a696cf968a0 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_def.vim
+++ b/runtime/syntax/testdir/input/vim_ex_def.vim
@@ -1,7 +1,7 @@
 " Vim :def command
 
 
-" list
+" List
 
 def
 def Foo
@@ -13,7 +13,7 @@ def Foo | echo "Foo"
 def Foo " comment
 
 
-" definition
+" Definition
 
 " empty definition
 def Foo()
@@ -60,7 +60,7 @@ def s:ls()
 enddef
 
 
-" return types
+" Return types
 
 def Foo(): void
 enddef
@@ -88,7 +88,7 @@ def Foo()
 enddef # comment
 
 
-" parameters
+" Parameters
 
 def Foo(x: bool, y = 42, z: string = "zed")
 enddef
@@ -105,7 +105,7 @@ def Test(lines: list<number> = [line('.'), line('.')]): void
 enddef
 
 
-" comments
+" Comments
 
 def Foo()
   # Vim9-script comment
@@ -113,13 +113,13 @@ def Foo()
 enddef
 
 
-" leading command separator
+" Leading command separator
 
 echo "Foo" | def Foo()
 enddef
 
 
-" command modifiers
+" Command modifiers
 
 silent! def Foo()
 enddef

diff --git a/runtime/syntax/testdir/input/vim_ex_def_fold.vim b/runtime/syntax/testdir/input/vim_ex_def_fold.vim
index 0d344ed99af49e8998f3844726bcaa580201a8d7..00aff00e89329b0be7e19484d02cc192c54bb547 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_def_fold.vim
+++ b/runtime/syntax/testdir/input/vim_ex_def_fold.vim
@@ -3,7 +3,7 @@
 " VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
 
 
-" list
+" List
 
 def
 def Foo
@@ -15,7 +15,7 @@ def Foo | echo "Foo"
 def Foo " comment
 
 
-" definition
+" Definition
 
 " empty definition
 def Foo()
@@ -62,7 +62,7 @@ def s:ls()
 enddef
 
 
-" return types
+" Return types
 
 def Foo(): void
 enddef
@@ -90,7 +90,7 @@ def Foo()
 enddef # comment
 
 
-" parameters
+" Parameters
 
 def Foo(x: bool, y = 42, z: string = "zed")
 enddef
@@ -102,7 +102,7 @@ def Foo(
 enddef
 
 
-" comments
+" Comments
 
 def Foo()
   # Vim9-script comment
@@ -110,19 +110,19 @@ def Foo()
 enddef
 
 
-" command modifiers
+" Command modifiers
 
 silent! def Foo()
 enddef
 
 
-" leading command separator
+" Leading command separator
 
 echo "Foo" | def Foo()
 enddef
 
 
-" fold-region ending
+" Fold-region ending
 
 def Foo()
   # enddef

diff --git a/runtime/syntax/testdir/input/vim_ex_def_nested.vim b/runtime/syntax/testdir/input/vim_ex_def_nested.vim
index 3b9302d94e89eb04cb289505da0cbf1a06331747..57800ebcd385c21284fe100de5623ada6c4292b6 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_def_nested.vim
+++ b/runtime/syntax/testdir/input/vim_ex_def_nested.vim
@@ -2,6 +2,7 @@ vim9script
 # Vim9 :def command (nested)
 # VIM_TEST_SETUP hi link vim9This Todo
 
+
 class Test
     const name: string
 
@@ -19,3 +20,4 @@ class Test
 endclass
 
 echo Test.new()
+

diff --git a/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim b/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim
index f21310754b2cd770f97fd510fddecee7201bc370..897d25e50f6fc34979f1c0bf3295955b7a38e0e2 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim
+++ b/runtime/syntax/testdir/input/vim_ex_def_nested_fold.vim
@@ -1,10 +1,10 @@
 vim9script
-
 # Vim9 :def command (nested)
 # VIM_TEST_SETUP let g:vimsyn_folding = 'f'
 # VIM_TEST_SETUP setl fdc=2 fdm=syntax
 # VIM_TEST_SETUP hi link vim9This Todo
 
+
 class Test
     const name: string
 
@@ -22,3 +22,4 @@ class Test
 endclass
 
 echo Test.new()
+

diff --git a/runtime/syntax/testdir/input/vim_ex_echo.vim b/runtime/syntax/testdir/input/vim_ex_echo.vim
index bebd28229d222dfb6f74dbaf18b7449c96b5ca87..7715df1cbcb4a76d07a4a5c1d875cdc768977642 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_echo.vim
+++ b/runtime/syntax/testdir/input/vim_ex_echo.vim
@@ -9,7 +9,7 @@ echoerr     "Answer = " 42
 echoconsole "Answer = " 42
 
 
-" trailing bar vs OR operator
+" Trailing bar vs OR operator
 
 " OR operator
 echo foo || bar
@@ -25,7 +25,7 @@ echo "Foo" ||
 echohl WarningMsg | echo "Don't panic!" | echohl None
 
 
-" line continuations
+" Line continuations
 
 echo "Answer = "
      "\ comment
@@ -37,7 +37,7 @@ echo
       \ 42
 
 
-" trailing bar and comments
+" Trailing bar and comments
 
 " :echo without {expr}
 echo| echo "Foo"

diff --git a/runtime/syntax/testdir/input/vim_ex_execute.vim b/runtime/syntax/testdir/input/vim_ex_execute.vim
index 0346781bf38941bb01ef1b6ece0eb695d27ccf31..a88e1f4645d19fb856193842a52c917317b8d7ff 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_execute.vim
+++ b/runtime/syntax/testdir/input/vim_ex_execute.vim
@@ -17,7 +17,7 @@ endif
 execute 'while i < 5 | echo i | let i = i + 1 | endwhile'
 
 
-" trailing bar vs OR operator
+" Trailing bar vs OR operator
 
 " OR operator
 execute foo || bar ? "Foo" : "NotFoo"
@@ -31,7 +31,7 @@ execute "Foo" | |
 execute "Foo" ||
 
 
-" line continuations
+" Line continuations
 
 execute "call"
       "\ comment
@@ -43,7 +43,7 @@ execute
       \ "Foo()"
 
 
-" trailing bar and comments
+" Trailing bar and comments
 
 " :execute without {expr}
 execute| echo "Foo"

diff --git a/runtime/syntax/testdir/input/vim_ex_filter.vim b/runtime/syntax/testdir/input/vim_ex_filter.vim
index 0c8947f1d79dc801acc43d23b4b38567e7cccbb8..79471c9f9fbad15658d3775341b0105703f9b9e2 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_filter.vim
+++ b/runtime/syntax/testdir/input/vim_ex_filter.vim
@@ -1,5 +1,5 @@
 " Vim :filter command
-" VIM_TEST_SETUP highlight link vimCmdSep Operator
+" VIM_TEST_SETUP hi link vimCmdSep Operator
 
 
 filter  pa\%(tt\)ern  oldfiles

diff --git a/runtime/syntax/testdir/input/vim_ex_function.vim b/runtime/syntax/testdir/input/vim_ex_function.vim
index cf070139d024140351a9b74ec193db44637916b9..ad57f641a51958811d25a080b16ea02785ad44d7 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_function.vim
+++ b/runtime/syntax/testdir/input/vim_ex_function.vim
@@ -1,7 +1,7 @@
 " Vim :function command
 
 
-" list
+" List
 
 function
 function Foo
@@ -13,7 +13,7 @@ function Foo | echo "Foo"
 function Foo " comment
 
 
-" definition
+" Definition
 
 " empty definition
 function Foo()
@@ -111,7 +111,7 @@ function s:ls()
 endfunction
 
 
-" modifiers
+" Modifiers
 
 function Foo() range
 endfunction
@@ -176,7 +176,7 @@ function Foo()
 endfunction " comment
 
 
-" parameters
+" Parameters
 
 function Foo(x, y, z, ...)
   return 42
@@ -217,7 +217,7 @@ function Foo(
 endfunction
 
 
-" arguments
+" Arguments
 
 function Foo(a, b, c)
   echo a:a a:b a:c
@@ -236,7 +236,7 @@ function Test(lines = [line('.'), line('.')])
 endfunction
 
 
-" comments
+" Comments
 
 function Foo()
   " Legacy-script comment
@@ -245,13 +245,13 @@ function Foo()
 endfunction
 
 
-" command modifiers
+" Command modifiers
 
 silent! function Foo()
 endfunction
 
 
-" leading command separator
+" Leading command separator
 
 echo "Foo" | function Foo()
 endfunction

diff --git a/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim b/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim
index e5d746439a13e8e777a536ee63ee39bf373e0156..dbcba980b8a43e40f63809e0bebdf8f90d296c84 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim
+++ b/runtime/syntax/testdir/input/vim_ex_function_def_tail_comment_errors.vim
@@ -1,6 +1,7 @@
 " Vim :function and :def tail comment errors
 " VIM_TEST_SETUP unlet! g:vimsyn_folding
 
+
 fun s:Test1() abort            # fun
   return 1
 endfun                         # endfun
@@ -41,3 +42,4 @@ for d in range(1, 6)->reverse()
   exec $'echo s:Test{d}()'
   exec $'delfunction s:Test{d}'
 endfor
+

diff --git a/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim b/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim
index e46bf752e6b7f54d24a3118df10256da53200cee..a29d3a99885e86b16ac5b14d76398a698dfbd677 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim
+++ b/runtime/syntax/testdir/input/vim_ex_function_def_tail_comments.vim
@@ -1,6 +1,7 @@
 " Vim :function and :def tail comments
 " VIM_TEST_SETUP unlet! g:vimsyn_folding
 
+
 fun s:Test1() abort            " fun
   return 1
 endfun                         " endfun
@@ -41,3 +42,4 @@ for d in range(1, 6)->reverse()
   exec $'echo s:Test{d}()'
   exec $'delfunction s:Test{d}'
 endfor
+

diff --git a/runtime/syntax/testdir/input/vim_ex_function_fold.vim b/runtime/syntax/testdir/input/vim_ex_function_fold.vim
index 37a8fa44392a8b6dc0c045e7ddbb664769c13c7c..3517506adb52e058030767288d15f7325feabb9e 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_function_fold.vim
+++ b/runtime/syntax/testdir/input/vim_ex_function_fold.vim
@@ -3,7 +3,7 @@
 " VIM_TEST_SETUP setl fdc=2 fdl=999 fdm=syntax
 
 
-" list
+" List
 
 function
 function Foo
@@ -15,7 +15,7 @@ function Foo | echo "Foo"
 function Foo " comment
 
 
-" definition
+" Definition
 
 " empty definition
 function Foo()
@@ -113,7 +113,7 @@ function s:ls()
 endfunction
 
 
-" modifiers
+" Modifiers
 
 function Foo() range
 endfunction
@@ -178,7 +178,7 @@ function Foo()
 endfunction " comment
 
 
-" parameters
+" Parameters
 
 function Foo(x, y, z, ...)
   return 42
@@ -219,7 +219,7 @@ function Foo(
 endfunction
 
 
-" arguments
+" Arguments
 
 function Foo(a, b, c)
   echo a:a a:b a:c
@@ -238,7 +238,7 @@ function Test(lines = [line('.'), line('.')])
 endfunction
 
 
-" comments
+" Comments
 
 function Foo()
   " Legacy-script comment
@@ -247,13 +247,13 @@ function Foo()
 endfunction
 
 
-" command modifiers
+" Command modifiers
 
 silent! function Foo()
 endfunction
 
 
-" leading command separator
+" Leading command separator
 
 echo "Foo" | function Foo()
 endfunction
@@ -267,7 +267,7 @@ func! s:func(_, func)
 endfunc
 
 
-" fold-region ending
+" Fold-region ending
 
 function Foo()
   " endfunction

diff --git a/runtime/syntax/testdir/input/vim_ex_function_nested.vim b/runtime/syntax/testdir/input/vim_ex_function_nested.vim
index 749b57238e5a86c72622062d3509da45aea83c40..0e0c36a1fa8767203cf40f2ae78f277368e7cb02 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_function_nested.vim
+++ b/runtime/syntax/testdir/input/vim_ex_function_nested.vim
@@ -1,5 +1,6 @@
 " Vim :def and :function commands (nested)
 
+
 def FunA(): string
     def DoFunA(): string
        return "."
@@ -36,3 +37,4 @@ echo FunA()
 echo FunB()
 echo FunC()
 echo FunD()
+

diff --git a/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim b/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim
index d966ef386d649bd7d90473584e18188185a6772b..a2563b8471cf952043e3871e6e2398c09be51bbb 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim
+++ b/runtime/syntax/testdir/input/vim_ex_function_nested_fold.vim
@@ -2,6 +2,7 @@
 " VIM_TEST_SETUP let g:vimsyn_folding = 'f'
 " VIM_TEST_SETUP setl fdc=2 fdm=syntax
 
+
 def FunA(): string
     def DoFunA(): string
        return "."
@@ -38,3 +39,4 @@ echo FunA()
 echo FunB()
 echo FunC()
 echo FunD()
+

diff --git a/runtime/syntax/testdir/input/vim_ex_grep.vim b/runtime/syntax/testdir/input/vim_ex_grep.vim
index 234f2d9620a33217e28375d72bc8166d100f9b8b..8e4e72df92e4002d809d105820f40f2384a9eced 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_grep.vim
+++ b/runtime/syntax/testdir/input/vim_ex_grep.vim
@@ -16,7 +16,7 @@ grepadd!  'pat\|tern' foo.txt
 lgrepadd! 'pat\|tern' foo.txt
 
 
-" special filename characters
+" Special filename characters
 
 grep  'pat\|tern' %
 lgrep 'pat\|tern' %
@@ -31,7 +31,7 @@ grepadd!  'pat\|tern' %
 lgrepadd! 'pat\|tern' %
 
 
-" trailing bar, no tail comment
+" Trailing bar, no tail comment
 
 grep  'pat\|tern' foo.txt | echo "Foo"
 lgrep 'pat\|tern' foo.txt | echo "Foo"

diff --git a/runtime/syntax/testdir/input/vim_ex_highlight.vim b/runtime/syntax/testdir/input/vim_ex_highlight.vim
index 51a618df4417e959ee394a409502ac3b0a01a0c4..1e53e176ce68c1a7a5998449ba365f808ed07693 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_highlight.vim
+++ b/runtime/syntax/testdir/input/vim_ex_highlight.vim
@@ -2,7 +2,7 @@
 " VIM_TEST_SETUP hi link vimHiGroup Todo
 
 
-" list
+" List
 
 highlight
 highlight Comment
@@ -11,12 +11,12 @@ highlight ErrorMsg
 highlight Foo
 
 
-" reset
+" Reset
 
 highlight clear
 
 
-" disable
+" Disable
 
 highlight clear Comment
 highlight clear Conceal
@@ -29,7 +29,7 @@ highlight ErrorMsg NONE
 highlight Foo NONE
 
 
-" add/modify
+" Add/modify
 
 highlight Comment cterm=underline
 highlight Conceal cterm=underline
@@ -42,7 +42,7 @@ highlight default ErrorMsg term=bold
 highlight Foo ErrorMsg term=bold
 
 
-" link
+" Link
 
 highlight link Foo Comment
 highlight! link Foo Comment
@@ -52,7 +52,7 @@ highlight link Foo ErrorMsg
 highlight! link Foo ErrorMsg
 
 
-" default link
+" Default link
 
 highlight default link Foo Comment
 highlight! default link Foo Comment
@@ -62,7 +62,7 @@ highlight default link Foo ErrorMsg
 highlight! default link Foo ErrorMsg
 
 
-" line continuation and command separator
+" Line continuation and command separator
 
 hi Comment
       "\ comment

diff --git a/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim b/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim
index adc59e675fc18abb0111163690fe51caa2561e82..7c45ab5e6ac620c9b61b6a401659e777523db2fc 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim
+++ b/runtime/syntax/testdir/input/vim_ex_let_heredoc.vim
@@ -68,7 +68,7 @@ line2
 EOS
 
 
-" trim
+" Trim
 
 let foo =<< trim END
   line1
@@ -81,7 +81,7 @@ END
   END
 
 
-" interpolation
+" Interpolation
 
 let foo =<< eval END
 line{1 + 0}
@@ -103,7 +103,7 @@ END
     line{1 + 1}
   END
 
-" no interpolation (escaped { and })
+" No interpolation (escaped { and })
 
 let foo =<< eval END
 line{{1 + 0}}
@@ -126,7 +126,7 @@ END
   END
 
 
-" no interpolation
+" No interpolation
 
 let foo =<< END
 line{1 + 0}
@@ -149,7 +149,7 @@ END
   END
 
 
-" end marker must not be followed by whitespace
+" End marker must not be followed by whitespace
 
 " assert_equal(foo, ["END "])
 let foo =<< END
@@ -225,7 +225,7 @@ END
 END
 
 
-" end markers
+" End markers
 
 let foo =<< !@#$%^&*()_+
 line1

diff --git a/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim b/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim
index 8f4484db5c8425dd5bd2d0c33941c6cf3c3df84f..4271e0eb121d23845efb6940bf79ea9c06f98938 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim
+++ b/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim
@@ -1,5 +1,6 @@
 " Vim :loadkeymap command
 
+
 scriptencoding utf-8
 
 let b:keymap_name = "syntax-test"
@@ -22,3 +23,4 @@ c              <char-0103>     Special notation allowed in RHS - octal
 # <char-0x00a3>                Line should not match as a Vim9-script comment
 \" “                           Line should not match as a legacy-script comment
 : "                            Line should not match as a legacy-script comment
+

diff --git a/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim b/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim
index 029af2cb3bfff168b35aaa328109376e90858bb9..4f4c5af40f72243d3e8de95a57a7a1ed980767ae 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim
+++ b/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_bar.vim
@@ -1,5 +1,6 @@
 " Vim :loadkeymap command (after "|")
 
+
 scriptencoding utf-8
 
 let b:keymap_name = "syntax-test"

diff --git a/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim b/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim
index 61578b6a0fa4a021f46e3b11ca969eaf47c17a45..9500cbd5bcd8c838d85b32a570da505e30d9c7e3 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim
+++ b/runtime/syntax/testdir/input/vim_ex_loadkeymap_after_colon.vim
@@ -1,5 +1,6 @@
 " Vim :loadkeymap command (after ":")
 
+
 scriptencoding utf-8
 
 let b:keymap_name = "syntax-test"

diff --git a/runtime/syntax/testdir/input/vim_ex_make.vim b/runtime/syntax/testdir/input/vim_ex_make.vim
index 7ce87f2e356307d84e8c865ba545d7d2933d046e..0ef3046d7d2d11c6f32e5ec667971495348c56d8 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_make.vim
+++ b/runtime/syntax/testdir/input/vim_ex_make.vim
@@ -1,6 +1,6 @@
 " Vim :*make commands
-" VIM_TEST_SETUP highlight link vimCmdSep Operator
-" VIM_TEST_SETUP highlight link vimMakeBarEscape Special
+" VIM_TEST_SETUP hi link vimCmdSep Operator
+" VIM_TEST_SETUP hi link vimMakeBarEscape Special
 
 
 make
@@ -16,13 +16,13 @@ make!  -options target
 lmake! -options target
 
 
-" special filename characters
+" Special filename characters
 
 make  %
 lmake %
 
 
-" trailing bar, no tail comment
+" Trailing bar, no tail comment
 
 make  tar\|get | echo "Foo"
 lmake tar\|get | echo "Foo"

diff --git a/runtime/syntax/testdir/input/vim_ex_map.vim b/runtime/syntax/testdir/input/vim_ex_map.vim
index 5d469b2c23603b8ace1b433b5e76da597bee4471..08833eb7127f4b0ff31ede502af3b4c5f6210853 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_map.vim
+++ b/runtime/syntax/testdir/input/vim_ex_map.vim
@@ -1,5 +1,6 @@
 " Vim :map commands
 
+
 map!
 map! lhs rhs
 map 
@@ -44,7 +45,7 @@ map _l :!ls \16| more^M:echo "rhs"<CR>
 map lhs :search('foo\\|bar')<CR>:echo "rhs"<CR>
 
 
-" multiline RHS
+" Multiline RHS
 
 map <Leader>baz 
   \ :echo (<Bar>
@@ -117,3 +118,4 @@ nnoremap <Leader>bar :echo (
 "   /autoload/netrw.vim
 
 if !hasmapto('<Plug>NetrwOpenFile')          |nmap <buffer> <silent> <nowait> %        <Plug>NetrwOpenFile|endif
+

diff --git a/runtime/syntax/testdir/input/vim_ex_menu.vim b/runtime/syntax/testdir/input/vim_ex_menu.vim
index f65493d519e47df0b02308ac1b7051ceee74182b..87098e031c61d9a464b0e3d813060ff08495033e 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_menu.vim
+++ b/runtime/syntax/testdir/input/vim_ex_menu.vim
@@ -1,5 +1,6 @@
 " Vim :menu commands
 
+
 " :help disable menus
 menu disable &File.&Open\.\.\.
 amenu enable *

diff --git a/runtime/syntax/testdir/input/vim_ex_menutranslate.vim b/runtime/syntax/testdir/input/vim_ex_menutranslate.vim
index 5e0289d65b650d0d1d278e392b0ff21296ad0bf5..8986cd36a75528aac4e5825b24d0e2f382854d59 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_menutranslate.vim
+++ b/runtime/syntax/testdir/input/vim_ex_menutranslate.vim
@@ -1,5 +1,6 @@
 " Vim :menutranslate command
 
+
 menutranslate clear
 menutranslate clear | echo "Foo"
 menutranslate clear " comment

diff --git a/runtime/syntax/testdir/input/vim_ex_normal.vim b/runtime/syntax/testdir/input/vim_ex_normal.vim
index 174a3c7fb326582e7d3a77d4b49ea4e30055ba4c..6bd73982bc9671de730365cc1e2ed2e212ca20df 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_normal.vim
+++ b/runtime/syntax/testdir/input/vim_ex_normal.vim
@@ -1,20 +1,30 @@
 " Vim :normal command
 
+
 normal j
 normal! j
 normal!j
 
-" no trailing bar
+
+" No trailing bar
+
 normal j 42|echo "not echo command"
 
-" no trailing comment
+
+" No trailing comment
+
 normal j "0p
 
-" multiline arg
+
+" Multiline arg
+
 normal j
       \k
       "\ comment
       \j
 
-" word-boundary required after name (old bug)
+
+" Issue: word-boundary required after name (old bug)
+
 normalj
+

diff --git a/runtime/syntax/testdir/input/vim_ex_profile.vim b/runtime/syntax/testdir/input/vim_ex_profile.vim
index b2ff571e272abe4945862d43ee33829b0099c4ba..ba80aaab7fa935ccdcdfef26d8e7dd40db90431f 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_profile.vim
+++ b/runtime/syntax/testdir/input/vim_ex_profile.vim
@@ -15,7 +15,7 @@ profdel  file MyScript.vim
 profdel  here
 
 
-" tail comment
+" Tail comment
 
 profile  start /tmp/myprofile " comment
 profile  stop                 " comment
@@ -31,7 +31,7 @@ profdel  file MyScript.vim    " comment
 profdel  here                 " comment
 
 
-" trailing command
+" Trailing command
 
 profile  start /tmp/myprofile | echo "Foo"
 profile  stop                 | echo "Foo"

diff --git a/runtime/syntax/testdir/input/vim_ex_sleep.vim b/runtime/syntax/testdir/input/vim_ex_sleep.vim
index 49fd31e80c60294fc4081d3ff99c490cd471cfcf..534550c503544b9fbf36749ba0ece0bd3d632869 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_sleep.vim
+++ b/runtime/syntax/testdir/input/vim_ex_sleep.vim
@@ -1,5 +1,6 @@
 " Vim :sleep command
 
+
 sleep       " sleep for one second
 5 sleep             " sleep for five seconds
 sleep 100m   " sleep for 100 milliseconds
@@ -9,3 +10,4 @@ sleep!      " sleep for one second
 5 sleep!     " sleep for five seconds
 sleep! 100m  " sleep for 100 milliseconds
 100 sleep! m " sleep for 100 milliseconds
+

diff --git a/runtime/syntax/testdir/input/vim_ex_throw.vim b/runtime/syntax/testdir/input/vim_ex_throw.vim
index 4adbc884859d9acbeeb11d052e81be0430cc9aab..c64afc8d71422a79c699a9297f38076d33b6569f 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_throw.vim
+++ b/runtime/syntax/testdir/input/vim_ex_throw.vim
@@ -1,5 +1,7 @@
 " Vim :throw command
 
+
 " :help :throw
 
 try | throw "oops" | catch /^oo/ | echo "caught" | endtry
+

diff --git a/runtime/syntax/testdir/input/vim_ex_vimgrep.vim b/runtime/syntax/testdir/input/vim_ex_vimgrep.vim
index 97b9b86f7d67cc4a50b44d830e30e12fcb8222bc..b7688a014ea464656977ab3580387443a82d44c8 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_vimgrep.vim
+++ b/runtime/syntax/testdir/input/vim_ex_vimgrep.vim
@@ -1,7 +1,7 @@
 " Vim :*vimgrep and :*vimgrepadd commands
-" VIM_TEST_SETUP highlight link vimVimgrepFile Todo
-" VIM_TEST_SETUP highlight link vimCmdSep Operator
-" VIM_TEST_SETUP highlight link vimVimgrepBarEscape Special
+" VIM_TEST_SETUP hi link vimVimgrepFile Todo
+" VIM_TEST_SETUP hi link vimCmdSep Operator
+" VIM_TEST_SETUP hi link vimVimgrepBarEscape Special
 
 
 vimgrep pa\%(tt\)ern   foo.txt

diff --git a/runtime/syntax/testdir/input/vim_expr.vim b/runtime/syntax/testdir/input/vim_expressions.vim
similarity index 99%
rename from runtime/syntax/testdir/input/vim_expr.vim
rename to runtime/syntax/testdir/input/vim_expressions.vim
index e2c0dcbad3ee2f951583f43777073da636cf25c7..ae146c021e9c516f32d435e81dd89f3e7d2b21cb 100644 (file)
--- a/runtime/syntax/testdir/input/vim_expr.vim
+++ b/runtime/syntax/testdir/input/vim_expressions.vim
@@ -1,3 +1,6 @@
+" Vim expressions
+
+
 " String
 
 echo 'It''s a string'

diff --git a/runtime/syntax/testdir/input/vim_function_call.vim b/runtime/syntax/testdir/input/vim_function_calls.vim
similarity index 94%
rename from runtime/syntax/testdir/input/vim_function_call.vim
rename to runtime/syntax/testdir/input/vim_function_calls.vim
index 50e4a3bf35f6ea18175ddd8e37ccd014a0d3bec4..eed260c8bd37f4c39ece0e8ebb684d421b9a1487 100644 (file)
--- a/runtime/syntax/testdir/input/vim_function_call.vim
+++ b/runtime/syntax/testdir/input/vim_function_calls.vim
@@ -1,11 +1,11 @@
 " Vim function calls
-" VIM_TEST_SETUP highlight link vimUserFunc Todo
+" VIM_TEST_SETUP hi link vimUserFunc Todo
 
 
 call abs(42)
 
 
-" command/function distinction
+" Command/function distinction
 
 " append browse call chdir confirm copy delete eval execute filter function
 " insert join map match mode sort split substitute swapname type
@@ -143,7 +143,7 @@ uniq(42)
 uniq (42)
 
 
-" errors
+" Errors
 
 let foo = foo(42)
 call foo(42)
@@ -161,7 +161,7 @@ echo(42)
 echo (42)
 
 
-" expressions
+" Expressions
 
 let foo = abs(42)
 
@@ -176,7 +176,7 @@ echo Foo() + bar
 echo bar + Foo()
 
 
-" scope modifiers and qualified names
+" Scope modifiers and qualified names
 
 let foo = s:foo(42)
 call s:foo(42)
@@ -238,7 +238,7 @@ let foo = g:module#foo(42)
 call g:module#foo(42)
 
 
-" not builtin functions
+" Not builtin functions
 
 call s:substitute()
 call g:substitute()
@@ -264,7 +264,7 @@ call substitute#substitute()
 call g:substitute#substitute()
 
 
-" chained function calls
+" Chained function calls
 
 call module.foo().bar()
 call module.foo().substitute()

diff --git a/runtime/syntax/testdir/input/vim_function_variables.vim b/runtime/syntax/testdir/input/vim_function_variables.vim
index 490896d283ee9ed5addf162bd4ead7e39a7f03ce..9a5fa140f559c41a842d5e47e62772fb80bbb066 100644 (file)
--- a/runtime/syntax/testdir/input/vim_function_variables.vim
+++ b/runtime/syntax/testdir/input/vim_function_variables.vim
@@ -1,5 +1,6 @@
 " Vim function variable highlighting
 
+
 function Foo()
   " :let
 

diff --git a/runtime/syntax/testdir/input/vim_key_notation.vim b/runtime/syntax/testdir/input/vim_key_notation.vim
index 857249929305530d8dd3c8cd1260b4137ea30323..5730e62bf65c658ea9f2c6fea88723301bd266bc 100644 (file)
--- a/runtime/syntax/testdir/input/vim_key_notation.vim
+++ b/runtime/syntax/testdir/input/vim_key_notation.vim
@@ -1,5 +1,6 @@
 " Key notation
  
+
 map foo 
       \ <Space>
       \ <Tab>

diff --git a/runtime/syntax/testdir/input/vim_lambda.vim b/runtime/syntax/testdir/input/vim_lambdas.vim
similarity index 94%
rename from runtime/syntax/testdir/input/vim_lambda.vim
rename to runtime/syntax/testdir/input/vim_lambdas.vim
index 47c194662efda7d0e3008b6f310bb10954f51978..5503e3fb323cf127757f6075c54ca69fafd1cb86 100644 (file)
--- a/runtime/syntax/testdir/input/vim_lambda.vim
+++ b/runtime/syntax/testdir/input/vim_lambdas.vim
@@ -1,7 +1,7 @@
 " Vim lambda expressions
 " VIM_TEST_SETUP hi link vimLambdaOperator Todo
-" VIM_TEST_SETUP hi link vimLambdaBrace    Todo
-" VIM_TEST_SETUP hi link vimFuncParam     Identifier
+" VIM_TEST_SETUP hi link vimLambdaBrace Todo
+" VIM_TEST_SETUP hi link vimFuncParam Identifier
 
 
 let expr = 42
@@ -15,7 +15,7 @@ let Foo = {x, ... -> expr}
 let Foo = {x, y -> expr}
 
 
-" line continuations
+" Line continuations
 
 let Foo = {->
       "\ comment

diff --git a/runtime/syntax/testdir/input/vim_line_continuation.vim b/runtime/syntax/testdir/input/vim_line_continuation.vim
index a32666af34b0bf6d3ce0a6511e5ed83f0fa45b14..b7a004b49bc03ae2587f931c660fbd3371483bfc 100644 (file)
--- a/runtime/syntax/testdir/input/vim_line_continuation.vim
+++ b/runtime/syntax/testdir/input/vim_line_continuation.vim
@@ -1,5 +1,6 @@
 " Vim line continuations with interspersed comments
 
+
 function Foo(
       "\ param a
       \ a,
@@ -47,3 +48,4 @@ let array = [
       "\ element 3
       \ 3
       \]
+

diff --git a/runtime/syntax/testdir/input/vim_new.vim b/runtime/syntax/testdir/input/vim_new.vim
index 985cfd3c11fa6e712b65bcc61db38e46e8d8dbfe..e7e18142bf9f963dd8224e64e797d872e1021b06 100644 (file)
--- a/runtime/syntax/testdir/input/vim_new.vim
+++ b/runtime/syntax/testdir/input/vim_new.vim
@@ -1,13 +1,16 @@
 vim9script
+# Vim :new command and class constructors
+# TODO: move to vim9_constructor and create new vim_ex_new and vim9_ex_new
+#       tests
+
 
-# Vim :new command and class constructors.
 class Test
-       def new()
-       enddef
-       def newOther()
-       enddef
-       def newyetanother()
-       enddef
+  def new()
+  enddef
+  def newOther()
+  enddef
+  def newyetanother()
+  enddef
 endclass
 
 Test.new()
@@ -15,3 +18,4 @@ Test.newOther()
 Test.newyetanother()
 new
 quit
+

diff --git a/runtime/syntax/testdir/input/vim_ex_no_comment_strings.vim b/runtime/syntax/testdir/input/vim_no_comment_strings.vim
similarity index 99%
rename from runtime/syntax/testdir/input/vim_ex_no_comment_strings.vim
rename to runtime/syntax/testdir/input/vim_no_comment_strings.vim
index d9b53b3a3096c426c2c9760d9d873b48a9df6fba..3a28ab101a7ccbb3b8b6754cf6d804815225318d 100644 (file)
--- a/runtime/syntax/testdir/input/vim_ex_no_comment_strings.vim
+++ b/runtime/syntax/testdir/input/vim_no_comment_strings.vim
@@ -1,6 +1,7 @@
 " Vim comment strings
 " VIM_TEST_SETUP let g:vimsyn_comment_strings = v:false
 
+
 " pre "string" post
 
 function Foo()
@@ -18,3 +19,4 @@ command Foo {
 autocmd BufNewFile * {
   # pre "string" post
 }
+

diff --git a/runtime/syntax/testdir/input/vim_nvim_variables.vim b/runtime/syntax/testdir/input/vim_nvim_variables.vim
index 661d0474c846b49bf0531926c5bc73f1aec9df81..e7e7f5004e45556268e0f87fdacf65caef4b8279 100644 (file)
--- a/runtime/syntax/testdir/input/vim_nvim_variables.vim
+++ b/runtime/syntax/testdir/input/vim_nvim_variables.vim
@@ -1,6 +1,7 @@
 " Neovim variable highlighting
 " VIM_TEST_SETUP let g:vimsyn_vim_features = ["nvim"]
 
+
 echo v:lua v:msgpack_types v:relnum v:stderr v:termrequest v:virtnum
 
 echo &channel &inccommand &mousescroll &pumblend &redrawdebug &scrollback

diff --git a/runtime/syntax/testdir/input/vim_shebang.vim b/runtime/syntax/testdir/input/vim_shebang.vim
index 47a550cf5adadb205278504e769bf0d7dc4b709c..fd91617ae027949491daad4e38177aaf104c44f5 100644 (file)
--- a/runtime/syntax/testdir/input/vim_shebang.vim
+++ b/runtime/syntax/testdir/input/vim_shebang.vim
@@ -1,5 +1,5 @@
 #!/usr/bin/env vim -S
-
 " Vim shebang line
 
+
 #!/usr/bin/env vim -S

diff --git a/runtime/syntax/testdir/input/vim_variables.vim b/runtime/syntax/testdir/input/vim_variables.vim
index da9e409ea8dc8f2605a780c08b42cec358dae70d..110a238f443e6d15b48f1a16cfa1f7158f7e83ea 100644 (file)
--- a/runtime/syntax/testdir/input/vim_variables.vim
+++ b/runtime/syntax/testdir/input/vim_variables.vim
@@ -1,5 +1,6 @@
 " Vim variable highlighting
 
+
 " :let
 
 let foo = expr