diff options
38 files changed, 175 insertions, 173 deletions
diff --git a/src/testdir/dumps/Test_diff_01.dump b/src/testdir/dumps/Test_diff_01.dump index ba2efbd004..125c391b0f 100644 --- a/src/testdir/dumps/Test_diff_01.dump +++ b/src/testdir/dumps/Test_diff_01.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_02.dump b/src/testdir/dumps/Test_diff_02.dump index 12af175266..a2a185265e 100644 --- a/src/testdir/dumps/Test_diff_02.dump +++ b/src/testdir/dumps/Test_diff_02.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_03.dump b/src/testdir/dumps/Test_diff_03.dump index ba12b3d5df..5832eece09 100644 --- a/src/testdir/dumps/Test_diff_03.dump +++ b/src/testdir/dumps/Test_diff_03.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_04.dump b/src/testdir/dumps/Test_diff_04.dump index 5d959e7daf..84fa6f77d9 100644 --- a/src/testdir/dumps/Test_diff_04.dump +++ b/src/testdir/dumps/Test_diff_04.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_05.dump b/src/testdir/dumps/Test_diff_05.dump index 19a40f22f5..7bffa1afbf 100644 --- a/src/testdir/dumps/Test_diff_05.dump +++ b/src/testdir/dumps/Test_diff_05.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_06.0.dump b/src/testdir/dumps/Test_diff_06.0.dump index 2032fbadbf..458295b003 100644 --- a/src/testdir/dumps/Test_diff_06.0.dump +++ b/src/testdir/dumps/Test_diff_06.0.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|c|o|n|t|e|x|t|:|0| @51 diff --git a/src/testdir/dumps/Test_diff_06.1.dump b/src/testdir/dumps/Test_diff_06.1.dump index 8ba2ce9d3c..8f2d4fbbdf 100644 --- a/src/testdir/dumps/Test_diff_06.1.dump +++ b/src/testdir/dumps/Test_diff_06.1.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|c|o|n|t|e|x|t|:|1| @51 diff --git a/src/testdir/dumps/Test_diff_06.2.dump b/src/testdir/dumps/Test_diff_06.2.dump index e9d3f6b5fb..c7722706e1 100644 --- a/src/testdir/dumps/Test_diff_06.2.dump +++ b/src/testdir/dumps/Test_diff_06.2.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&@1|s|e|t| |d|i|f@1|o|p|t|+|=|c|o|n|t|e|x|t|:|2| @50 diff --git a/src/testdir/dumps/Test_diff_06.dump b/src/testdir/dumps/Test_diff_06.dump index e589fd7c6b..a5e6348a81 100644 --- a/src/testdir/dumps/Test_diff_06.dump +++ b/src/testdir/dumps/Test_diff_06.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_07.dump b/src/testdir/dumps/Test_diff_07.dump index 97864c68da..c8f2aa67fc 100644 --- a/src/testdir/dumps/Test_diff_07.dump +++ b/src/testdir/dumps/Test_diff_07.dump @@ -16,5 +16,5 @@ | +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|i+0#0000000#5fd7ff255|n|t| |f|r|o|b|n|i|t|z|(|i|n|t| |f|o@1|)| @13 | +0#0000e05#a8a8a8255@1|{+0#0000000#ffffff0| @33||+1&&| +0#0000e05#a8a8a8255@1|{+0#0000000#ffffff0| @33 | +0#0000e05#a8a8a8255@1| +0#0000000#ffd7ff255@3|i|f+2&#ff404010|(|n| |>| |1|)| +0&#ffd7ff255@21||+1&#ffffff0| +0#0000e05#a8a8a8255@1| +0#0000000#ffd7ff255@3|i|n+2&#ff404010|t| |i|;| +0&#ffd7ff255@24 -|X+3&#ffffff0|f|i|l|e|1| @12|1|,|1| @11|T|o|p| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|T|o|p +|X+3&#ffffff0|d|i|f|i|l|e|1| @10|1|,|1| @11|T|o|p| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|T|o|p |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|i|n|t|e|r|n|a|l| @52 diff --git a/src/testdir/dumps/Test_diff_08.dump b/src/testdir/dumps/Test_diff_08.dump index 6445a57767..a8392df423 100644 --- a/src/testdir/dumps/Test_diff_08.dump +++ b/src/testdir/dumps/Test_diff_08.dump @@ -16,5 +16,5 @@ | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f|o|r|(|i| |=| |0|;| |i| |<| |1|0|;| |i|+@1|)| @7||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f|o|r|(|i| |=| |0|;| |i| |<| |1|0|;| |i|+@1|)| @7 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| @29||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| @29 | +0#0000e05#a8a8a8255@1| +0#0000000#5fd7ff255@7|p|r|i|n|t|f|(|"|Y|o|u|r| |a|n|s|w|e|r| |i|s|:| |"|)|;||+1&#ffffff0| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34 -|X+3#0000000#ffffff0|f|i|l|e|1| @12|1|,|1| @11|T|o|p| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|T|o|p +|X+3#0000000#ffffff0|d|i|f|i|l|e|1| @10|1|,|1| @11|T|o|p| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|T|o|p |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|a|l|g|o|r|i|t|h|m|:|p|a|t|i|e|n|c|e| @42 diff --git a/src/testdir/dumps/Test_diff_09.dump b/src/testdir/dumps/Test_diff_09.dump index 95692b62aa..700d30c2e4 100644 --- a/src/testdir/dumps/Test_diff_09.dump +++ b/src/testdir/dumps/Test_diff_09.dump @@ -16,5 +16,5 @@ | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f|o|r|(|i| |=| |0|;| |i| |<| |1|0|;| |i|+@1|)| @7||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f|o|r|(|i| |=| |0|;| |i| |<| |1|0|;| |i|+@1|)| @7 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| @29||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| @29 | +0#0000e05#a8a8a8255@1| +0#0000000#5fd7ff255@7|p|r|i|n|t|f|(|"|Y|o|u|r| |a|n|s|w|e|r| |i|s|:| |"|)|;||+1&#ffffff0| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34 -|X+3#0000000#ffffff0|f|i|l|e|1| @12|1|,|1| @11|T|o|p| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|T|o|p +|X+3#0000000#ffffff0|d|i|f|i|l|e|1| @10|1|,|1| @11|T|o|p| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|T|o|p |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|a|l|g|o|r|i|t|h|m|:|h|i|s|t|o|g|r|a|m| @41 diff --git a/src/testdir/dumps/Test_diff_10.dump b/src/testdir/dumps/Test_diff_10.dump index 8eff1479cd..8bc91fb8ba 100644 --- a/src/testdir/dumps/Test_diff_10.dump +++ b/src/testdir/dumps/Test_diff_10.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|0|-|1| @9|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|0|-|1| @9|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|0|-|1| @9|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|0|-|1| @9|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|i|n|t|e|r|n|a|l| @52 diff --git a/src/testdir/dumps/Test_diff_11.dump b/src/testdir/dumps/Test_diff_11.dump index b424b88fba..216c66b51c 100644 --- a/src/testdir/dumps/Test_diff_11.dump +++ b/src/testdir/dumps/Test_diff_11.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|0|-|1| @9|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|0|-|1| @9|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|0|-|1| @9|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|0|-|1| @9|A|l@1 |:+0&&| @73 diff --git a/src/testdir/dumps/Test_diff_12.dump b/src/testdir/dumps/Test_diff_12.dump index 43d65d6413..dd29b9fe1f 100644 --- a/src/testdir/dumps/Test_diff_12.dump +++ b/src/testdir/dumps/Test_diff_12.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_13.dump b/src/testdir/dumps/Test_diff_13.dump index dbb9ffa8bc..b93fba7fb2 100644 --- a/src/testdir/dumps/Test_diff_13.dump +++ b/src/testdir/dumps/Test_diff_13.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|0|,|0|-|1| @9|A|l@1| |X+1&&|f|i|l|e|2| @12|0|,|0|-|1| @9|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|0|,|0|-|1| @9|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|0|,|0|-|1| @9|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_14.dump b/src/testdir/dumps/Test_diff_14.dump index 8f51b1904c..c2418982cd 100644 --- a/src/testdir/dumps/Test_diff_14.dump +++ b/src/testdir/dumps/Test_diff_14.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_15.dump b/src/testdir/dumps/Test_diff_15.dump index 3b880ebc56..6a65c2d4e8 100644 --- a/src/testdir/dumps/Test_diff_15.dump +++ b/src/testdir/dumps/Test_diff_15.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|&|v|i|m| |d|i|f@1|o|p|t|+|=|f|i|l@1|e|r| |d|i|f@1|o|p|t|+|=|i|w|h|i|t|e| @26 diff --git a/src/testdir/dumps/Test_diff_16.dump b/src/testdir/dumps/Test_diff_16.dump index 95d77a805e..5121bc98fb 100644 --- a/src/testdir/dumps/Test_diff_16.dump +++ b/src/testdir/dumps/Test_diff_16.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|i|n|t|e|r|n|a|l| @52 diff --git a/src/testdir/dumps/Test_diff_17.dump b/src/testdir/dumps/Test_diff_17.dump index 24432cd3c9..f1cd41f0b7 100644 --- a/src/testdir/dumps/Test_diff_17.dump +++ b/src/testdir/dumps/Test_diff_17.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_18.dump b/src/testdir/dumps/Test_diff_18.dump index 57ce82c3f2..5fd231c694 100644 --- a/src/testdir/dumps/Test_diff_18.dump +++ b/src/testdir/dumps/Test_diff_18.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_19.dump b/src/testdir/dumps/Test_diff_19.dump index 587544ae03..82543dfa72 100644 --- a/src/testdir/dumps/Test_diff_19.dump +++ b/src/testdir/dumps/Test_diff_19.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_20.dump b/src/testdir/dumps/Test_diff_20.dump index fc8ce15f6e..1180de6650 100644 --- a/src/testdir/dumps/Test_diff_20.dump +++ b/src/testdir/dumps/Test_diff_20.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_wildmenu_pum_14.dump b/src/testdir/dumps/Test_wildmenu_pum_14.dump index 78da67f409..7f5546b6ef 100644 --- a/src/testdir/dumps/Test_wildmenu_pum_14.dump +++ b/src/testdir/dumps/Test_wildmenu_pum_14.dump @@ -5,6 +5,6 @@ |~| @73 |~| @73 |~| @73 -|~| @5| +0#0000001#e0e0e08|X|d|i|r|A|/| @8| +0#4040ff13#ffffff0@51 -|~| @5| +0#0000001#ffd7ff255|X|f|i|l|e|A| @8| +0#4040ff13#ffffff0@51 -|:+0#0000000&|e| |X|d|i|r|/|X|d|i|r|A|/> @60 +|~| @9| +0#0000001#e0e0e08|X|d|i|r|A|/| @8| +0#4040ff13#ffffff0@47 +|~| @9| +0#0000001#ffd7ff255|X|f|i|l|e|A| @8| +0#4040ff13#ffffff0@47 +|:+0#0000000&|e| |X|n|a|m|e|d|i|r|/|X|d|i|r|A|/> @56 diff --git a/src/testdir/dumps/Test_wildmenu_pum_15.dump b/src/testdir/dumps/Test_wildmenu_pum_15.dump index fa4f50b2f6..59f1fc5cb8 100644 --- a/src/testdir/dumps/Test_wildmenu_pum_15.dump +++ b/src/testdir/dumps/Test_wildmenu_pum_15.dump @@ -5,6 +5,6 @@ |~| @73 |~| @73 |~| @73 -|~| @11| +0#0000001#e0e0e08|X|d|i|r|B|/| @8| +0#4040ff13#ffffff0@45 -|~| @11| +0#0000001#ffd7ff255|X|f|i|l|e|B| @8| +0#4040ff13#ffffff0@45 -|:+0#0000000&|e| |X|d|i|r|/|X|d|i|r|A|/|X|d|i|r|B|/> @54 +|~| @15| +0#0000001#e0e0e08|X|d|i|r|B|/| @8| +0#4040ff13#ffffff0@41 +|~| @15| +0#0000001#ffd7ff255|X|f|i|l|e|B| @8| +0#4040ff13#ffffff0@41 +|:+0#0000000&|e| |X|n|a|m|e|d|i|r|/|X|d|i|r|A|/|X|d|i|r|B|/> @50 diff --git a/src/testdir/dumps/Test_wildmenu_pum_16.dump b/src/testdir/dumps/Test_wildmenu_pum_16.dump index 78da67f409..7f5546b6ef 100644 --- a/src/testdir/dumps/Test_wildmenu_pum_16.dump +++ b/src/testdir/dumps/Test_wildmenu_pum_16.dump @@ -5,6 +5,6 @@ |~| @73 |~| @73 |~| @73 -|~| @5| +0#0000001#e0e0e08|X|d|i|r|A|/| @8| +0#4040ff13#ffffff0@51 -|~| @5| +0#0000001#ffd7ff255|X|f|i|l|e|A| @8| +0#4040ff13#ffffff0@51 -|:+0#0000000&|e| |X|d|i|r|/|X|d|i|r|A|/> @60 +|~| @9| +0#0000001#e0e0e08|X|d|i|r|A|/| @8| +0#4040ff13#ffffff0@47 +|~| @9| +0#0000001#ffd7ff255|X|f|i|l|e|A| @8| +0#4040ff13#ffffff0@47 +|:+0#0000000&|e| |X|n|a|m|e|d|i|r|/|X|d|i|r|A|/> @56 diff --git a/src/testdir/dumps/Test_wildmenu_pum_32.dump b/src/testdir/dumps/Test_wildmenu_pum_32.dump index a8a0dfe5ca..9bff1a57dc 100644 --- a/src/testdir/dumps/Test_wildmenu_pum_32.dump +++ b/src/testdir/dumps/Test_wildmenu_pum_32.dump @@ -4,7 +4,7 @@ |~| @73 |~| @73 |~| @73 -|~| @12| +0#0000001#e0e0e08|1|2|3| @11| +0#4040ff13#ffffff0@44 -|~| @12| +0#0000001#ffd7ff255|a|b|c| @11| +0#4040ff13#ffffff0@44 -|~| @12| +0#0000001#ffd7ff255|x|y|z| @11| +0#4040ff13#ffffff0@44 -|:+0#0000000&|e| |X|d|i|r|/|あ*&|い|う|/+&|1|2|3> @56 +|~| @16| +0#0000001#e0e0e08|1|2|3| @11| +0#4040ff13#ffffff0@40 +|~| @16| +0#0000001#ffd7ff255|a|b|c| @11| +0#4040ff13#ffffff0@40 +|~| @16| +0#0000001#ffd7ff255|x|y|z| @11| +0#4040ff13#ffffff0@40 +|:+0#0000000&|e| |X|n|a|m|e|d|i|r|/|あ*&|い|う|/+&|1|2|3> @52 diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index b3b4ec5a6f..737dd0bd05 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -2229,7 +2229,7 @@ function Test_dirchanged_auto() set acd cd .. call assert_equal([], s:li) - exe 'edit ' . s:dir_foo . '/Xfile' + exe 'edit ' . s:dir_foo . '/Xautofile' call assert_equal(s:dir_foo, getcwd()) let expected = ["pre cd " .. s:dir_foo, "auto:", s:dir_foo] call assert_equal(expected, s:li) @@ -2906,7 +2906,7 @@ func Test_FileChangedRO_winclose() augroup FileChangedROTest au! - autocmd FileChangedRO * edit Xfile + autocmd FileChangedRO * edit Xrofile augroup END new set readonly @@ -2982,13 +2982,13 @@ endfunc " Test for passing invalid arguments to autocmd func Test_autocmd_invalid_args() " Additional character after * for event - call assert_fails('autocmd *a Xfile set ff=unix', 'E215:') + call assert_fails('autocmd *a Xinvfile set ff=unix', 'E215:') augroup Test augroup END " Invalid autocmd event - call assert_fails('autocmd Bufabc Xfile set ft=vim', 'E216:') + call assert_fails('autocmd Bufabc Xinvfile set ft=vim', 'E216:') " Invalid autocmd event in a autocmd group - call assert_fails('autocmd Test Bufabc Xfile set ft=vim', 'E216:') + call assert_fails('autocmd Test Bufabc Xinvfile set ft=vim', 'E216:') augroup! Test " Execute all autocmds call assert_fails('doautocmd * BufEnter', 'E217:') @@ -2999,9 +2999,9 @@ endfunc " Test for deep nesting of autocmds func Test_autocmd_deep_nesting() - autocmd BufEnter Xfile doautocmd BufEnter Xfile - call assert_fails('doautocmd BufEnter Xfile', 'E218:') - autocmd! BufEnter Xfile + autocmd BufEnter Xdeepfile doautocmd BufEnter Xdeepfile + call assert_fails('doautocmd BufEnter Xdeepfile', 'E218:') + autocmd! BufEnter Xdeepfile endfunc " Tests for SigUSR1 autocmd event, which is only available on posix systems. diff --git a/src/testdir/test_buffer.vim b/src/testdir/test_buffer.vim index c7dd136883..0d1741d642 100644 --- a/src/testdir/test_buffer.vim +++ b/src/testdir/test_buffer.vim @@ -141,7 +141,7 @@ func Test_bdelete_cmd() call assert_fails('bdelete \)', 'E55:') " Deleting a unlisted and unloaded buffer - edit Xfile1 + edit Xbdelfile1 let bnr = bufnr() set nobuflisted enew @@ -315,8 +315,8 @@ endfunc " Test for trying to load a buffer with text locked " <C-\>e in the command line is used to lock the text func Test_load_buf_with_text_locked() - new Xfile1 - edit Xfile2 + new Xlockfile1 + edit Xlockfile2 let cmd = ":\<C-\>eexecute(\"normal \<C-O>\")\<CR>\<C-C>" call assert_fails("call feedkeys(cmd, 'xt')", 'E565:') %bw! diff --git a/src/testdir/test_changelist.vim b/src/testdir/test_changelist.vim index 3bb22a89b8..0d435590a9 100644 --- a/src/testdir/test_changelist.vim +++ b/src/testdir/test_changelist.vim @@ -37,13 +37,13 @@ endfunc " Tests for the getchangelist() function func Test_changelist_index() - edit Xfile1.txt + edit Xgclfile1.txt exe "normal iabc\<C-G>u\ndef\<C-G>u\nghi" call assert_equal(3, getchangelist('%')[1]) " Move one step back in the changelist. normal 2g; - hide edit Xfile2.txt + hide edit Xgclfile2.txt exe "normal iabcd\<C-G>u\ndefg\<C-G>u\nghij" call assert_equal(3, getchangelist('%')[1]) " Move to the beginning of the changelist. @@ -54,8 +54,8 @@ func Test_changelist_index() call assert_equal(1, getchangelist('#')[1]) bwipe! - call delete('Xfile1.txt') - call delete('Xfile2.txt') + call delete('Xgclfile1.txt') + call delete('Xgclfile2.txt') endfunc func Test_getchangelist() @@ -64,10 +64,10 @@ func Test_getchangelist() call assert_equal([], 10->getchangelist()) call assert_equal([[], 0], getchangelist()) - call writefile(['line1', 'line2', 'line3'], 'Xfile1.txt') - call writefile(['line1', 'line2', 'line3'], 'Xfile2.txt') + call writefile(['line1', 'line2', 'line3'], 'Xclistfile1.txt') + call writefile(['line1', 'line2', 'line3'], 'Xclistfile2.txt') - edit Xfile1.txt + edit Xclistfile1.txt let buf_1 = bufnr() exe "normal 1Goline\<C-G>u1.1" exe "normal 3Goline\<C-G>u2.1" @@ -79,7 +79,7 @@ func Test_getchangelist() \ {'lnum' : 6, 'col' : 4, 'coladd' : 0}], 2], \ getchangelist('%')) - hide edit Xfile2.txt + hide edit Xclistfile2.txt let buf_2 = bufnr() exe "normal 1GOline\<C-G>u1.0" exe "normal 2Goline\<C-G>u2.0" @@ -100,8 +100,8 @@ func Test_getchangelist() \ getchangelist(buf_2)) bwipe! - call delete('Xfile1.txt') - call delete('Xfile2.txt') + call delete('Xclistfile1.txt') + call delete('Xclistfile2.txt') endfunc " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim index aebbc2f6ec..64c9ab8e81 100644 --- a/src/testdir/test_clientserver.vim +++ b/src/testdir/test_clientserver.vim @@ -130,9 +130,9 @@ func Test_client_server() " Run a separate instance to send a command to the server call remote_expr(name, 'execute("only")') - call system(cmd .. ' --remote-send ":new Xfile<CR>"') + call system(cmd .. ' --remote-send ":new Xclientfile<CR>"') call assert_equal('2', remote_expr(name, 'winnr("$")')) - call assert_equal('Xfile', remote_expr(name, 'winbufnr(1)->bufname()')) + call assert_equal('Xclientfile', remote_expr(name, 'winbufnr(1)->bufname()')) call remote_expr(name, 'execute("only")') " Invoke a remote-expr. On MS-Windows, the returned value has a carriage @@ -141,24 +141,24 @@ func Test_client_server() call assert_equal(['4'], split(l, "\n")) " Edit multiple files using --remote - call system(cmd .. ' --remote Xfile1 Xfile2 Xfile3') - call assert_match(".*Xfile1\n.*Xfile2\n.*Xfile3\n", remote_expr(name, 'argv()')) + call system(cmd .. ' --remote Xclientfile1 Xclientfile2 Xclientfile3') + call assert_match(".*Xclientfile1\n.*Xclientfile2\n.*Xclientfile3\n", remote_expr(name, 'argv()')) eval name->remote_send(":%bw!\<CR>") " Edit files in separate tab pages - call system(cmd .. ' --remote-tab Xfile1 Xfile2 Xfile3') + call system(cmd .. ' --remote-tab Xclientfile1 Xclientfile2 Xclientfile3') call WaitForAssert({-> assert_equal('3', remote_expr(name, 'tabpagenr("$")'))}) - call assert_match('.*\<Xfile2', remote_expr(name, 'bufname(tabpagebuflist(2)[0])')) + call assert_match('.*\<Xclientfile2', remote_expr(name, 'bufname(tabpagebuflist(2)[0])')) eval name->remote_send(":%bw!\<CR>") " Edit a file using --remote-wait eval name->remote_send(":source $VIMRUNTIME/plugin/rrhelper.vim\<CR>") - call system(cmd .. ' --remote-wait +enew Xfile1') - call assert_match('.*\<Xfile1', remote_expr(name, 'bufname("#")')) + call system(cmd .. ' --remote-wait +enew Xclientfile1') + call assert_match('.*\<Xclientfile1', remote_expr(name, 'bufname("#")')) eval name->remote_send(":%bw!\<CR>") " Edit files using --remote-tab-wait - call system(cmd .. ' --remote-tabwait +tabonly\|enew Xfile1 Xfile2') + call system(cmd .. ' --remote-tabwait +tabonly\|enew Xclientfile1 Xclientfile2') call assert_equal('1', remote_expr(name, 'tabpagenr("$")')) eval name->remote_send(":%bw!\<CR>") diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index cad5f9b490..95db663bdf 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -1035,14 +1035,14 @@ func Test_cmdline_complete_various() call assert_equal("\"sI \<C-A>", @:) " completion for :write command - call mkdir('Xdir') - call writefile(['one'], 'Xdir/Xfile1') + call mkdir('Xcwdir') + call writefile(['one'], 'Xcwdir/Xfile1') let save_cwd = getcwd() - cd Xdir + cd Xcwdir call feedkeys(":w >> \<C-A>\<C-B>\"\<CR>", 'xt') call assert_equal("\"w >> Xfile1", @:) call chdir(save_cwd) - call delete('Xdir', 'rf') + call delete('Xcwdir', 'rf') " completion for :w ! and :r ! commands call feedkeys(":w !invalid_xyz_cmd\<C-A>\<C-B>\"\<CR>", 'xt') @@ -1121,12 +1121,12 @@ func Test_cmdline_complete_various() call assert_equal("\"doautocmd BufNew,BufEnter", @:) " completion of file name in :doautocmd - call writefile([], 'Xfile1') |