Skip to content

Commit 05d0893

Browse files
zzzyxwvutchrisbra
zzzyxwvut
authored and
chrisbra
committed
runtime(java): Define javaBlockStart and javaBlockOtherStart hl groups
And do not link either to any group. Resolves zzzyxwvut/java-vim#2. Signed-off-by: Aliaksei Budavei <0x000c70@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent 1961caf commit 05d0893

15 files changed

Lines changed: 213 additions & 120 deletions

‎runtime/syntax/java.vim‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
" Maintainer: Aliaksei Budavei <0x000c70 AT gmail DOT com>
44
" Former Maintainer: Claudio Fleiner <claudio@fleiner.com>
55
" Repository: https://github.com/zzzyxwvut/java-vim.git
6-
" Last Change: 2024 Oct 03
6+
" Last Change: 2024 Oct 10
77

88
" Please check ":help java.vim" for comments on some of the options
99
" available.
@@ -724,10 +724,15 @@ if exists("g:java_highlight_debug")
724724
hi def link DebugType Type
725725
endif
726726

727+
" Complement javaBlock and javaInParen for highlighting.
728+
syn region javaBlockOther transparent matchgroup=javaBlockOtherStart start="{" end="}"
729+
727730
" Try not to fold top-level-type bodies under assumption that there is
728731
" but one such body.
729-
exec 'syn region javaBlock transparent start="\%(^\|^\S[^:]\+\)\@' . s:ff.Peek('120', '') . '<!{" end="}" fold'
732+
exec 'syn region javaBlock transparent matchgroup=javaBlockStart start="\%(^\|^\S[^:]\+\)\@' . s:ff.Peek('120', '') . '<!{" end="}" fold'
730733

734+
" See "D.2.1 Anonymous Classes" at
735+
" https://web.archive.org/web/20010821025330/java.sun.com/docs/books/jls/first_edition/html/1.1Update.html#12959.
731736
if exists("g:java_mark_braces_in_parens_as_errors")
732737
syn match javaInParen contained "[{}]"
733738
hi def link javaInParen javaError

‎runtime/syntax/testdir/dumps/java_annotations_04.dump‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
| +0#00e0e07&@7|@+0#e000e06&|L|a|b|e|l|(|/+0#0000e05&@1| |v|a|l|u|e| |=| |"|P|a|r|a|m|e|t|e|r|"|,| +0#0000000&@36
55
| +0#00e0e07&@11|t|y|p|e| |=| |A|n@1|o|t|a|t|i|o|n|s|T|e|s|t|s|.|c+0#00e0003&|l|a|s@1|,+0#00e0e07&| +0#0000000&@32
66
| +0#00e0e07&@11>h|e|a|d| |=| |@+0#e000e06&|T|a|g|(|v+0#00e0e07&|a|l|u|e| |=| |"+0#e000002&|@|L|a|b|e|l|"|)+0#e000e06&|,+0#00e0e07&| +0#0000000&@32
7-
| +0#00e0e07&@11|t|e|x|t| |=| |@+0#e000e06&|T|e|x|t|(|{+0#00e0e07&| |"+0#e000002&|)|{|"|,+0#00e0e07&| |"+0#e000002&|}|(|"| +0#00e0e07&|}|)+0#e000e06&@1| +0#0000000&@33
7+
| +0#00e0e07&@11|t|e|x|t| |=| |@+0#e000e06&|T|e|x|t|(|{+0#0000000&| +0#00e0e07&|"+0#e000002&|)|{|"|,+0#00e0e07&| |"+0#e000002&|}|(|"| +0#00e0e07&|}+0#0000000&|)+0#e000e06&@1| +0#0000000&@33
88
| +0#00e0e07&@7|O|b|j|e|c|t| |d|u|m@1|y|)| +0#0000000&@53
99
@4|{| @69
1010
@4|}| @69

‎runtime/syntax/testdir/dumps/java_enfoldment_00.dump‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
| +0#0000e05#a8a8a8255@1>/+0&#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l|o|c|a|l| |f|o|l|d|e|n|a|b|l|e| |f|o|l|d|c|o|l|u|m|n|=|2| |f|o|l|d|m|e|t|h|o|d|=|s|y|n|t|a|x| +0#0000000&@4
22
| +0#0000e05#a8a8a8255@1|/+0&#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|f|o|l|d|t|e|x|t|_|s|h|o|w|_|f|i|r|s|t|_|o|r|_|s|e|c|o|n|d|_|l|i|n|e| |=| |1| +0#0000000&@5
3+
| +0#0000e05#a8a8a8255@1|/+0&#ffffff0@1| |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| |j|a|v|a|B|l|o|c|k|O|t|h|e|r|S|t|a|r|t| |S|t|r|u|c|t|u|r|e| +0#0000000&@10
4+
| +0#0000e05#a8a8a8255@1|/+0&#ffffff0@1| |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| |j|a|v|a|B|l|o|c|k|S|t|a|r|t| |T|o|d|o| +0#0000000&@20
35
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
4-
|++0#0000e05#a8a8a8255| |+|-@1| |1|6| |l|i|n|e|s|:| |@|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|{|-@39
5-
| @1|c+0#00e0003#ffffff0|l|a|s@1| +0#0000000&|F|o|l|d|i|n|g|T|e|s|t|s| |{| @52
6+
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
7+
|++0#0000e05#a8a8a8255| |+|-@1| |1|9| |l|i|n|e|s|:| |@|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|{|-@39
8+
| @1|c+0#00e0003#ffffff0|l|a|s@1| +0#0000000&|F|o|l|d|i|n|g|T|e|s|t|s| |{+0#00e0003&| +0#0000000&@52
69
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|i+0#00e0003&|n|t|e|r|f|a|c|e| +0#0000000&|F|o|l|d|e|n|a|b|l|e| @48
710
|++0#0000e05#a8a8a8255| |+|-@1| @1|2| |l|i|n|e|s|:| |{|-@57
811
| @1| +0#0000000#ffffff0@72
912
|++0#0000e05#a8a8a8255| |+|-@1| |1|9| |l|i|n|e|s|:| |s|t|a|t|i|c| |{|-@50
1013
| @1| +0#0000000#ffffff0@72
11-
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| |O|b|j|e|c|t| |b@1| |=| |(@1|O|b|j|e|c|t|)| |n+0#af5f00255&|e|w| +0#0000000&|b+0#00e0003&|y|t|e|[+0#0000000&|]|{|}|)|;| |}| @28
14+
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{+0#0000001#ffff4012| +0#0000000#ffffff0|O|b|j|e|c|t| |b@1| |=| |(@1|O|b|j|e|c|t|)| |n+0#af5f00255&|e|w| +0#0000000&|b+0#00e0003&|y|t|e|[+0#0000000&|]|{+0#0000001#ffff4012|}|)+0#0000000#ffffff0|;| |}+0#0000001#ffff4012| +0#0000000#ffffff0@28
1215
|++0#0000e05#a8a8a8255| |+|-@1| @1|8| |l|i|n|e|s|:| |{|-@57
13-
| @1|/+0&#ffffff0|*|\@2|*|/| +0#0000000&|{| @63
16+
| @1|/+0&#ffffff0|*|\@2|*|/| +0#0000000&|{+0#00e0003&| +0#0000000&@63
1417
|++0#0000e05#a8a8a8255| |+|-@1| @1|5| |l|i|n|e|s|:| |(|n|e|w| |j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|O|b|j|e|c|t|,| |O|b|j|e|c|t|>|(|)| |{|-@6
1518
|+| |+|-@1| @1|5| |l|i|n|e|s|:| |(|n|e|w| |j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|O|b|j|e|c|t|,| |O|b|j|e|c|t|>|(|)| |{|-@6
16-
| @1| +0#0000000#ffffff0@3|}| @67
17-
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
18-
|++0#0000e05#a8a8a8255| |+|-@1| @1|3| |l|i|n|e|s|:| @2|*| |N|o| |o|p|e|r|a|t|i|o|n|.|-@41
19-
| @1| +0#0000000#ffffff0@3|v+0#00e0003&|o|i|d| +0#0000000&|n|o|O|p|1|(|)| |{| |}| @52
19+
| @1| +0#0000000#ffffff0@3|}+0#00e0003&| +0#0000000&@67
2020
@57|1|,|1| @10|T|o|p|

‎runtime/syntax/testdir/dumps/java_enfoldment_01.dump‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1+
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{+0#0000001#ffff4012| +0#0000000#ffffff0|O|b|j|e|c|t| |b@1| |=| |(@1|O|b|j|e|c|t|)| |n+0#af5f00255&|e|w| +0#0000000&|b+0#00e0003&|y|t|e|[+0#0000000&|]|{+0#0000001#ffff4012|}|)+0#0000000#ffffff0|;| |}+0#0000001#ffff4012| +0#0000000#ffffff0@28
2+
|++0#0000e05#a8a8a8255| |+|-@1| @1|8| |l|i|n|e|s|:| |{|-@57
3+
| @1|/+0&#ffffff0|*|\@2|*|/| +0#0000000&|{+0#00e0003&| +0#0000000&@63
14
|++0#0000e05#a8a8a8255| |+|-@1| @1|5| |l|i|n|e|s|:| |(|n|e|w| |j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|O|b|j|e|c|t|,| |O|b|j|e|c|t|>|(|)| |{|-@6
25
|+| |+|-@1| @1|5| |l|i|n|e|s|:| |(|n|e|w| |j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|O|b|j|e|c|t|,| |O|b|j|e|c|t|>|(|)| |{|-@6
3-
| @1| +0#0000000#ffffff0@3|}| @67
6+
| @1| +0#0000000#ffffff0@3>}+0#00e0003&| +0#0000000&@67
47
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
58
|++0#0000e05#a8a8a8255| |+|-@1| @1|3| |l|i|n|e|s|:| @2|*| |N|o| |o|p|e|r|a|t|i|o|n|.|-@41
6-
| @1| +0#0000000#ffffff0@3>v+0#00e0003&|o|i|d| +0#0000000&|n|o|O|p|1|(|)| |{| |}| @52
9+
| @1| +0#0000000#ffffff0@3|v+0#00e0003&|o|i|d| +0#0000000&|n|o|O|p|1|(|)| |{+0#0000001#ffff4012| +0#0000000#ffffff0|}+0#0000001#ffff4012| +0#0000000#ffffff0@52
710
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|/+0#0000e05&|*@1| +0#e000e06&|N|o| |o|p|e|r|a|t|i|o|n|.| +0#0000e05&|*|/| +0#0000000&@48
811
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|v+0#00e0003&|o|i|d| +0#0000000&|n|o|O|p|2|(|)| @56
912
|++0#0000e05#a8a8a8255| |+|-@1| @1|2| |l|i|n|e|s|:| |{|-@57
1013
| @1| +0#0000000#ffffff0@3|/+0#0000e05&|*@1| +0#e000e06&|N|o| |o|p|e|r|a|t|i|o|n|.| +0#0000e05&|*|/| +0#0000000&@48
1114
|++0#0000e05#a8a8a8255| |+|-@1| @1|2| |l|i|n|e|s|:| |v|o|i|d| |n|o|O|p|3|(|)| |{|-@44
1215
| @1| +0#0000000#ffffff0@3|/+0#0000e05&|*@1| +0#e000e06&|N|o| |o|p|e|r|a|t|i|o|n|.| +0#0000e05&|*|/| +0#0000000&@48
1316
|++0#0000e05#a8a8a8255| |+|-@1| @1|2| |l|i|n|e|s|:| |v|o|i|d| |n|o|O|p|4|(|)| |{|-@44
14-
| @1|}+0#0000000#ffffff0| @71
15-
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
16-
|++0#0000e05#a8a8a8255| |+|-@1| @1|5| |l|i|n|e|s|:| @1|*| |S|o|m|e| |n|o|t|e|.|-@45
17-
|+| |+|-@1| @1|5| |l|i|n|e|s|:| @1|*| |A| |s|u|m@1|a|r|y|.|-@45
18-
| @1|/+0&#ffffff0@1| +0#0000000&@70
19-
| +0#0000e05#a8a8a8255@1|/+0&#ffffff0@1| |{| +0#0000000&@68
20-
@57|7|0|,|2|-|5| @7|9|3|%|
17+
| @1| +0#0000000#ffffff0@72
18+
|++0#0000e05#a8a8a8255| |+|-@1| @1|3| |l|i|n|e|s|:| |/| |N|o| |o|p|e|r|a|t|i|o|n|.|-@43
19+
| @1| +0#0000000#ffffff0@3|v+0#00e0003&|o|i|d| +0#0000000&|n|o|O|p|5|(|)| |{+0#0000001#ffff4012| +0#0000000#ffffff0|}+0#0000001#ffff4012| +0#0000000#ffffff0@52
20+
@57|7|1|,|2|-|5| @7|6|1|%|

‎runtime/syntax/testdir/dumps/java_enfoldment_02.dump‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1+
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|v+0#00e0003&|o|i|d| +0#0000000&|n|o|O|p|5|(|)| |{+0#0000001#ffff4012| +0#0000000#ffffff0|}+0#0000001#ffff4012| +0#0000000#ffffff0@52
2+
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|/+0#0000e05&@2| +0#e000e06&|N|o| |o|p|e|r|a|t|i|o|n|.| +0#0000000&@51
3+
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|v+0#00e0003&|o|i|d| +0#0000000&|n|o|O|p|6|(|)| @56
4+
|++0#0000e05#a8a8a8255| |+|-@1| @1|2| |l|i|n|e|s|:| |{|-@57
5+
| @1| +0#0000000#ffffff0@3|/+0#0000e05&@2| +0#e000e06&|N|o| |o|p|e|r|a|t|i|o|n|.| +0#0000000&@51
6+
|++0#0000e05#a8a8a8255| >+|-@1| @1|2| |l|i|n|e|s|:| |v|o|i|d| |n|o|O|p|7|(|)| |{|-@44
7+
| @1| +0#0000000#ffffff0@3|/+0#0000e05&@2| +0#e000e06&|N|o| |o|p|e|r|a|t|i|o|n|.| +0#0000000&@51
8+
|++0#0000e05#a8a8a8255| |+|-@1| @1|2| |l|i|n|e|s|:| |v|o|i|d| |n|o|O|p|8|(|)| |{|-@44
9+
| @1|}+0#00e0003#ffffff0| +0#0000000&@71
10+
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
11+
|++0#0000e05#a8a8a8255| |+|-@1| @1|5| |l|i|n|e|s|:| @1|*| |S|o|m|e| |n|o|t|e|.|-@45
12+
|+| |+|-@1| @1|5| |l|i|n|e|s|:| @1|*| |A| |s|u|m@1|a|r|y|.|-@45
13+
|+| |+|-@1| @1|3| |l|i|n|e|s|:| |/| |A| |s|u|m@1|a|r|y|.|-@46
14+
| @1|/+0&#ffffff0@1| +0#0000000&@70
115
| +0#0000e05#a8a8a8255@1|/+0&#ffffff0@1| |{| +0#0000000&@68
216
| +0#0000e05#a8a8a8255@1|/+0&#ffffff0@1| |}| +0#0000000&@68
317
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
4-
|++0#0000e05#a8a8a8255| >+|-@1| @1|2| |l|i|n|e|s|:| |1|2@1|||.@54
18+
|++0#0000e05#a8a8a8255| |+|-@1| @1|2| |l|i|n|e|s|:| |1|2@1|||.@54
519
|~+0#4040ff13#ffffff0| @73
6-
|~| @73
7-
|~| @73
8-
|~| @73
9-
|~| @73
10-
|~| @73
11-
|~| @73
12-
|~| @73
13-
|~| @73
14-
|~| @73
15-
|~| @73
16-
|~| @73
17-
|~| @73
18-
|~| @73
19-
|~| @73
20-
| +0#0000000&@56|9|8|,|1| @9|B|o|t|
20+
| +0#0000000&@56|9|7|,|2|-|1| @7|B|o|t|

‎runtime/syntax/testdir/dumps/java_unfoldment_00.dump‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
>/+0#0000e05#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|l|o|c|a|l| |n|o|f|o|l|d|e|n|a|b|l|e| +0#0000000&@35
22
|/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|m|a|r|k|_|b|r|a|c|e|s|_|i|n|_|p|a|r|e|n|s|_|a|s|_|e|r@1|o|r|s| |=| |1| +0#0000000&@10
3+
|/+0#0000e05&@1| |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| |j|a|v|a|B|l|o|c|k|O|t|h|e|r|S|t|a|r|t| |S|t|r|u|c|t|u|r|e| +0#0000000&@12
4+
|/+0#0000e05&@1| |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| |j|a|v|a|B|l|o|c|k|S|t|a|r|t| |T|o|d|o| +0#0000000&@22
35
@75
4-
@4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|{+0#0000000&| @51
6+
@75
7+
@4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|{+0#0000001#ffff4012| +0#0000000#ffffff0@51
58
@4|"@2| @67
69
| +0#e000002&@3|b|e|s|p|o|k|e| +0#0000000&@63
710
| +0#e000002&@3|/|*| +0#0000000&@68
@@ -10,11 +13,8 @@
1013
| +0#e000002&@3|/|*@1| +0#0000000&@67
1114
| +0#e000002&@4|*| +0#0000000&@68
1215
| +0#e000002&@4|*|/| +0#0000000&@67
16+
| +0#e000002&@3|/@2| +0#0000000&@67
17+
| +0#e000002&@3|/@2| +0#0000000&@67
18+
| +0#e000002&@3|/@2| +0#0000000&@67
1319
| +0#e000002&@3|/@1| +0#0000000&@68
14-
| +0#e000002&@3|/@1| +0#0000000&@68
15-
| +0#e000002&@3|/@1| +0#0000000&@68
16-
| +0#e000002&@3|{| +0#0000000&@69
17-
| +0#e000002&@3|}| +0#0000000&@69
18-
|"@2| @71
19-
|}|)+0#e000e06&| +0#0000000&@72
2020
@57|1|,|1| @10|T|o|p|

‎runtime/syntax/testdir/dumps/java_unfoldment_01.dump‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
| +0#e000002#ffffff0@3|/@1| +0#0000000&@68
1+
| +0#e000002#ffffff0@4|*| +0#0000000&@68
2+
| +0#e000002&@4|*|/| +0#0000000&@67
3+
| +0#e000002&@3|/@2| +0#0000000&@67
4+
| +0#e000002&@3|/@2| +0#0000000&@67
5+
| +0#e000002&@3|/@2| +0#0000000&@67
6+
| +0#e000002&@3>/@1| +0#0000000&@68
7+
| +0#e000002&@3|/@1| +0#0000000&@68
28
| +0#e000002&@3|/@1| +0#0000000&@68
39
| +0#e000002&@3|{| +0#0000000&@69
410
| +0#e000002&@3|}| +0#0000000&@69
511
|"@2| @71
6-
>}|)+0#e000e06&| +0#0000000&@72
7-
|c+0#00e0003&|l|a|s@1| +0#0000000&|U|n|f|o|l|d|i|n|g|T|e|s|t|s| |{| @52
12+
|}+0#0000001#ffff4012|)+0#e000e06#ffffff0| +0#0000000&@72
13+
|c+0#00e0003&|l|a|s@1| +0#0000000&|U|n|f|o|l|d|i|n|g|T|e|s|t|s| |{+0#00e0003&| +0#0000000&@52
814
@4|i+0#00e0003&|n|t|e|r|f|a|c|e| +0#0000000&|U|n|f|o|l|d|e|n|a|b|l|e| @48
9-
@4|{| @69
10-
@4|}| @69
15+
@4|{+0#0000001#ffff4012| +0#0000000#ffffff0@69
16+
@4|}+0#0000001#ffff4012| +0#0000000#ffffff0@69
1117
@75
12-
@4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|{| @62
13-
@8|n+0#af5f00255&|e|w| +0#0000000&|O|b|j|e|c|t|(|)| |{| @52
14-
@12|{| @61
15-
@16|{| @57
16-
@20|n+0#af5f00255&|e|w| +0#0000000&|O|b|j|e|c|t|(|)| |{@2| @38
17-
@24|n+0#af5f00255&|e|w| +0#0000000&|O|b|j|e|c|t|(|)| |{@2|}@2|;| @30
18-
@20|}@2|;| @50
19-
@16|}| @57
20-
@57|1|9|,|1| @9|1|6|%|
18+
@4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|{+0#0000001#ffff4012| +0#0000000#ffffff0@62
19+
@8|n+0#af5f00255&|e|w| +0#0000000&|O|b|j|e|c|t|(|)| |{+0#0000001#ffff4012| +0#0000000#ffffff0@52
20+
@57|1|9|,|2|-|5| @7|1|2|%|

‎runtime/syntax/testdir/dumps/java_unfoldment_02.dump‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
| +0&#ffffff0@15|}| @57
2-
@12|}| @61
3-
@8|}|;| @64
1+
| +0&#ffffff0@7|n+0#af5f00255&|e|w| +0#0000000&|O|b|j|e|c|t|(|)| |{+0#0000001#ffff4012| +0#0000000#ffffff0@52
2+
@12|{+0#0000001#ffff4012| +0#0000000#ffffff0@61
3+
@16|{+0#0000001#ffff4012| +0#0000000#ffffff0@57
4+
@20|n+0#af5f00255&|e|w| +0#0000000&|O|b|j|e|c|t|(|)| |{+0#0000001#ffff4012@2| +0#0000000#ffffff0@38
5+
@24|n+0#af5f00255&|e|w| +0#0000000&|O|b|j|e|c|t|(|)| |{+0#0000001#ffff4012@2|}@2|;+0#0000000#ffffff0| @30
6+
@20>}+0#0000001#ffff4012@2|;+0#0000000#ffffff0| @50
7+
@16|}+0#0000001#ffff4012| +0#0000000#ffffff0@57
8+
@12|}+0#0000001#ffff4012| +0#0000000#ffffff0@61
9+
@8|}+0#0000001#ffff4012|;+0#0000000#ffffff0| @64
410
@75
5-
@8|s+0#af5f00255&|w|i|t|c|h| +0#0000000&|(|0+0#e000002&|)+0#0000000&| |{| @54
6-
@12>c+0#af5f00255&|a|s|e| +0#0000000&|0+0#e000002&|:+0#0000000&| @55
7-
@12|c+0#af5f00255&|a|s|e| +0#0000000&|1+0#e000002&|:+0#0000000&| |{| @53
11+
@8|s+0#af5f00255&|w|i|t|c|h| +0#0000000&|(|0+0#e000002&|)+0#0000000&| |{+0#0000001#ffff4012| +0#0000000#ffffff0@54
12+
@12|c+0#af5f00255&|a|s|e| +0#0000000&|0+0#e000002&|:+0#0000000&| @55
13+
@12|c+0#af5f00255&|a|s|e| +0#0000000&|1+0#e000002&|:+0#0000000&| |{+0#0000001#ffff4012| +0#0000000#ffffff0@53
814
@16|b+0#af5f00255&|r|e|a|k|;+0#0000000&| @52
9-
@12|}| @61
15+
@12|}+0#0000001#ffff4012| +0#0000000#ffffff0@61
1016
@12|d+0#af5f00255&|e|f|a|u|l|t|:+0#0000000&| |;| @52
11-
@8|}| @65
12-
@4|}| @69
17+
@8|}+0#0000001#ffff4012| +0#0000000#ffffff0@65
18+
@4|}+0#0000001#ffff4012| +0#0000000#ffffff0@69
1319
@75
14-
@4|{| |O|b|j|e|c|t| |b@1| |=| |(@1|O|b|j|e|c|t|)| |n+0#af5f00255&|e|w| +0#0000000&|b+0#00e0003&|y|t|e|[+0#0000000&|]|{+0#ffffff16#ff404010|}|)+0#0000000#ffffff0|;| |}| @30
15-
@4|{| @69
16-
|o+0#af5f00255&|u|t|:+0#0000000&| |{| @68
17-
@8|d+0#af5f00255&|o| +0#0000000&|{| @62
18-
@12|i+0#af5f00255&|f| +0#0000000&|(|t+0#e000002&|r|u|e|)+0#0000000&| @53
19-
@16|b+0#af5f00255&|r|e|a|k| +0#0000000&|o+0#af5f00255&|u|t|;+0#0000000&| @48
20-
@57|3|7|,|4|-|1|3| @6|3|9|%|
20+
@57|3|7|,|6|-|2|1| @6|3|0|%|

‎runtime/syntax/testdir/dumps/java_unfoldment_03.dump‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
| +0&#ffffff0@15|b+0#af5f00255&|r|e|a|k| +0#0000000&|o+0#af5f00255&|u|t|;+0#0000000&| @48
2-
@8|}| |w+0#af5f00255&|h|i|l|e| +0#0000000&|(|f+0#e000002&|a|l|s|e|)+0#0000000&|;| @50
3-
|}| @73
4-
@4|}| @69
5-
|/+0#0000e05&|*|\@2|*|/| +0#0000000&|{| @65
6-
@8>(|n+0#af5f00255&|e|w| +0#0000000&|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|O|b|j|e|c|t|,| |O|b|j|e|c|t|>|(|)| |{+0#ffffff16#ff404010| +0#0000000#ffffff0@14
1+
| +0&#ffffff0@74
2+
@4|{+0#0000001#ffff4012| +0#0000000#ffffff0|O|b|j|e|c|t| |b@1| |=| |(@1|O|b|j|e|c|t|)| |n+0#af5f00255&|e|w| +0#0000000&|b+0#00e0003&|y|t|e|[+0#0000000&|]|{+0#ffffff16#ff404010|}|)+0#0000000#ffffff0|;| |}+0#0000001#ffff4012| +0#0000000#ffffff0@30
3+
@4|{+0#0000001#ffff4012| +0#0000000#ffffff0@69
4+
|o+0#af5f00255&|u|t|:+0#0000000&| |{+0#0000001#ffff4012| +0#0000000#ffffff0@68
5+
@8|d+0#af5f00255&|o| +0#0000000&|{+0#0000001#ffff4012| +0#0000000#ffffff0@62
6+
@12>i+0#af5f00255&|f| +0#0000000&|(|t+0#e000002&|r|u|e|)+0#0000000&| @53
7+
@16|b+0#af5f00255&|r|e|a|k| +0#0000000&|o+0#af5f00255&|u|t|;+0#0000000&| @48
8+
@8|}+0#0000001#ffff4012| +0#0000000#ffffff0|w+0#af5f00255&|h|i|l|e| +0#0000000&|(|f+0#e000002&|a|l|s|e|)+0#0000000&|;| @50
9+
|}+0#0000001#ffff4012| +0#0000000#ffffff0@73
10+
@4|}+0#0000001#ffff4012| +0#0000000#ffffff0@69
11+
|/+0#0000e05&|*|\@2|*|/| +0#0000000&|{+0#00e0003&| +0#0000000&@65
12+
@8|(|n+0#af5f00255&|e|w| +0#0000000&|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|O|b|j|e|c|t|,| |O|b|j|e|c|t|>|(|)| |{+0#ffffff16#ff404010| +0#0000000#ffffff0@14
713
@12|/+0#0000e05&|*@1| +0#0000000&@59
814
| +0#0000e05&@12|*| +0#e000e06&|{|@|i|n|h|e|r|i|t|D|o|c|}| |*+0#0000e05&|/| +0#0000000&@43
915
@12|p+0#00e0003&|u|b|l|i|c| +0#0000000&|O|b|j|e|c|t| |a|p@1|l|y|(|O|b|j|e|c|t| |o|)| |{+0#ffffff16#ff404010| +0#0000000#ffffff0|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|o|;| |}+0#ffffff16#ff404010|;+0#0000000#ffffff0| @18
1016
@8|}+0#ffffff16#ff404010|)+0#0000000#ffffff0|.|a|p@1|l|y|(| @57
1117
@8|(|n+0#af5f00255&|e|w| +0#0000000&|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|O|b|j|e|c|t|,| |O|b|j|e|c|t|>|(|)| |{+0#ffffff16#ff404010| +0#0000000#ffffff0@14
1218
@12|/+0#0000e05&|*@1| +0#e000e06&|{|@|i|n|h|e|r|i|t|D|o|c|}| +0#0000000&@45
1319
| +0#e000e06&@12|*+0#0000e05&|/| +0#0000000&@59
14-
@12|p+0#00e0003&|u|b|l|i|c| +0#0000000&|O|b|j|e|c|t| |a|p@1|l|y|(|O|b|j|e|c|t| |o|)| |{+0#ffffff16#ff404010| +0#0000000#ffffff0|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|o|;| |}+0#ffffff16#ff404010|;+0#0000000#ffffff0| @18
15-
@8|}+0#ffffff16#ff404010|)+0#0000000#ffffff0@1|;| @62
16-
@4|}| @69
17-
@75
18-
@4|/+0#0000e05&|*@1| +0#0000000&@67
19-
| +0#0000e05&@4|*| +0#e000e06&|N|o| |o|p|e|r|a|t|i|o|n|.| +0#0000000&@54
20-
@57|5@1|,|3|-|9| @7|6|2|%|
20+
@57|5@1|,|4|-|1|3| @6|4|7|%|

‎runtime/syntax/testdir/dumps/java_unfoldment_04.dump‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
| +0#0000e05#ffffff0@4|*| +0#e000e06&|N|o| |o|p|e|r|a|t|i|o|n|.| +0#0000000&@54
1+
| +0#e000e06#ffffff0@12|*+0#0000e05&|/| +0#0000000&@59
2+
@12|p+0#00e0003&|u|b|l|i|c| +0#0000000&|O|b|j|e|c|t| |a|p@1|l|y|(|O|b|j|e|c|t| |o|)| |{+0#ffffff16#ff404010| +0#0000000#ffffff0|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|o|;| |}+0#ffffff16#ff404010|;+0#0000000#ffffff0| @18
3+
@8|}+0#ffffff16#ff404010|)+0#0000000#ffffff0@1|;| @62
4+
@4|}+0#00e0003&| +0#0000000&@69
5+
@75
6+
@4>/+0#0000e05&|*@1| +0#0000000&@67
7+
| +0#0000e05&@4|*| +0#e000e06&|N|o| |o|p|e|r|a|t|i|o|n|.| +0#0000000&@54
28
| +0#0000e05&@4|*|/| +0#0000000&@67
3-
@4|v+0#00e0003&|o|i|d| +0#0000000&|n|o|O|p|1|(|)| |{| |}| @54
9+
@4|v+0#00e0003&|o|i|d| +0#0000000&|n|o|O|p|1|(|)| |{+0#0000001#ffff4012| +0#0000000#ffffff0|}+0#0000001#ffff4012| +0#0000000#ffffff0@54
410
@4|/+0#0000e05&|*@1| +0#e000e06&|N|o| |o|p|e|r|a|t|i|o|n|.| +0#0000e05&|*|/| +0#0000000&@50
511
@4|v+0#00e0003&|o|i|d| +0#0000000&|n|o|O|p|2|(|)| @58
6-
@4>{| @69
7-
@4|}| @69
12+
@4|{+0#0000001#ffff4012| +0#0000000#ffffff0@69
13+
@4|}+0#0000001#ffff4012| +0#0000000#ffffff0@69
814
@4|/+0#0000e05&|*@1| +0#e000e06&|N|o| |o|p|e|r|a|t|i|o|n|.| +0#0000e05&|*|/| +0#0000000&@50
9-
@4|v+0#00e0003&|o|i|d| +0#0000000&|n|o|O|p|3|(|)| |{| @56
10-
@4|}| @69
15+
@4|v+0#00e0003&|o|i|d| +0#0000000&|n|o|O|p|3|(|)| |{+0#0000001#ffff4012| +0#0000000#ffffff0@56
16+
@4|}+0#0000001#ffff4012| +0#0000000#ffffff0@69
1117
@4|/+0#0000e05&|*@1| +0#e000e06&|N|o| |o|p|e|r|a|t|i|o|n|.| +0#0000e05&|*|/| +0#0000000&@50
12-
@4|v+0#00e0003&|o|i|d| +0#0000000&|n|o|O|p|4|(|)| |{| @56
13-
@4|/+0#0000e05&|*|/|\|/|\|/|\|*|/| +0#0000000&|;| |}| @56
14-
|}| @73
15-
@75
16-
|/+0#0000e05&|*| +0#0000000&@72
17-
| +0#0000e05&|*| |S|o|m|e| |n|o|t|e|.| +0#0000000&@61
18-
| +0#0000e05&|*| |{| +0#0000000&@70
19-
| +0#0000e05&|*| |}| +0#0000000&@70
20-
@57|7|3|,|2|-|5| @7|8|4|%|
18+
@4|v+0#00e0003&|o|i|d| +0#0000000&|n|o|O|p|4|(|)| |{+0#0000001#ffff4012| +0#0000000#ffffff0@56
19+
@4|/+0#0000e05&|*|/|\|/|\|/|\|*|/| +0#0000000&|;| |}+0#0000001#ffff4012| +0#0000000#ffffff0@56
20+
@57|7|3|,|2|-|5| @7|6|5|%|

0 commit comments

Comments
 (0)