From 159d39242743b849852f572f79769e60b4f273be Mon Sep 17 00:00:00 2001 From: Aliaksei Budavei <0x000c70@gmail.com> Date: Mon, 23 Jun 2025 20:02:14 +0200 Subject: [PATCH] runtime(java): Complement the recognition of type parameter sections In addition to matching type parameter sections of generic classes and records and interfaces, match such sections of generic methods and constructors. As before, opt for it by defining "g:java_highlight_generics"; the diamond form still does not qualify for this kind of recognition. And make section patterns agree with one another in syntax items. References: https://docs.oracle.com/javase/specs/jls/se21/html/jls-4.html#jls-4.5 https://docs.oracle.com/javase/specs/jls/se21/html/jls-8.html#jls-8.4.4 https://docs.oracle.com/javase/specs/jls/se21/html/jls-8.html#jls-8.8.4 Signed-off-by: Aliaksei Budavei <0x000c70@gmail.com> Signed-off-by: Christian Brabandt --- runtime/syntax/java.vim | 31 +++++++++++-------- .../testdir/dumps/java_generics_00.dump | 8 ++--- .../testdir/dumps/java_generics_01.dump | 8 ++--- .../testdir/dumps/java_generics_02.dump | 6 ++-- .../testdir/dumps/java_generics_03.dump | 18 +++++------ .../testdir/dumps/java_generics_04.dump | 8 ++--- .../testdir/dumps/java_generics_05.dump | 4 +-- .../testdir/dumps/java_generics_06.dump | 2 +- .../testdir/dumps/java_generics_07.dump | 14 ++++----- .../testdir/dumps/java_generics_08.dump | 18 +++++------ .../testdir/dumps/java_generics_09.dump | 20 ++++++++++++ .../dumps/java_generics_signature_00.dump | 6 ++-- .../dumps/java_generics_signature_01.dump | 8 ++--- .../dumps/java_generics_signature_02.dump | 6 ++-- .../dumps/java_generics_signature_03.dump | 18 +++++------ .../dumps/java_generics_signature_04.dump | 8 ++--- .../dumps/java_generics_signature_05.dump | 4 +-- .../dumps/java_generics_signature_06.dump | 2 +- .../dumps/java_generics_signature_07.dump | 14 ++++----- .../dumps/java_generics_signature_08.dump | 18 +++++------ .../dumps/java_generics_signature_09.dump | 20 ++++++++++++ .../dumps/java_lambda_expressions_04.dump | 4 +-- .../java_lambda_expressions_signature_04.dump | 4 +-- .../dumps/java_method_references_02.dump | 2 +- .../dumps/java_method_references_03.dump | 8 ++--- .../dumps/java_method_references_04.dump | 4 +-- .../dumps/java_method_references_05.dump | 6 ++-- .../dumps/java_method_references_06.dump | 8 ++--- .../dumps/java_method_references_07.dump | 4 +-- .../dumps/java_method_references_08.dump | 4 +-- .../dumps/java_method_references_09.dump | 10 +++--- .../dumps/java_method_references_10.dump | 14 ++++----- .../java_method_references_signature_02.dump | 2 +- .../java_method_references_signature_03.dump | 8 ++--- .../java_method_references_signature_04.dump | 4 +-- .../java_method_references_signature_05.dump | 6 ++-- .../java_method_references_signature_06.dump | 8 ++--- .../java_method_references_signature_07.dump | 4 +-- .../java_method_references_signature_08.dump | 4 +-- .../java_method_references_signature_09.dump | 10 +++--- .../java_method_references_signature_10.dump | 14 ++++----- .../dumps/java_methods_indent2_00.dump | 2 +- .../dumps/java_methods_indent2_01.dump | 2 +- .../dumps/java_methods_indent2_02.dump | 10 +++--- .../dumps/java_methods_indent2_03.dump | 10 +++--- .../dumps/java_methods_indent2_04.dump | 20 ++++++------ .../dumps/java_methods_indent2_05.dump | 22 ++++++------- .../dumps/java_methods_indent2_06.dump | 20 ++++++++++++ ...nt2_05.vim => java_methods_indent2_06.vim} | 0 .../dumps/java_methods_indent4_00.dump | 2 +- .../dumps/java_methods_indent4_01.dump | 2 +- .../dumps/java_methods_indent4_02.dump | 10 +++--- .../dumps/java_methods_indent4_03.dump | 10 +++--- .../dumps/java_methods_indent4_04.dump | 18 +++++------ .../dumps/java_methods_indent4_05.dump | 22 ++++++------- .../dumps/java_methods_indent4_06.dump | 22 ++++++------- ...nt4_05.vim => java_methods_indent4_06.vim} | 0 .../dumps/java_methods_indent8_00.dump | 2 +- .../dumps/java_methods_indent8_01.dump | 2 +- .../dumps/java_methods_indent8_02.dump | 10 +++--- .../dumps/java_methods_indent8_03.dump | 10 +++--- .../dumps/java_methods_indent8_04.dump | 16 +++++----- .../dumps/java_methods_indent8_05.dump | 24 +++++++------- .../dumps/java_methods_indent8_06.dump | 24 +++++++------- ...nt8_05.vim => java_methods_indent8_06.vim} | 0 .../testdir/dumps/java_methods_style_00.dump | 2 +- .../testdir/dumps/java_methods_style_01.dump | 2 +- .../testdir/dumps/java_methods_style_02.dump | 10 +++--- .../testdir/dumps/java_methods_style_03.dump | 10 +++--- .../testdir/dumps/java_methods_style_04.dump | 20 ++++++------ .../testdir/dumps/java_methods_style_05.dump | 20 ++++++++++++ .../syntax/testdir/input/java_generics.java | 12 +++++-- .../input/java_generics_signature.java | 10 ++++-- .../testdir/input/java_method_references.java | 6 ++++ .../java_method_references_signature.java | 6 ++++ .../testdir/input/java_methods_indent2.java | 10 +++++- .../testdir/input/java_methods_indent4.java | 10 +++++- .../testdir/input/java_methods_indent8.java | 10 +++++- .../testdir/input/java_methods_style.java | 10 +++++- 79 files changed, 454 insertions(+), 313 deletions(-) create mode 100644 runtime/syntax/testdir/dumps/java_generics_09.dump create mode 100644 runtime/syntax/testdir/dumps/java_generics_signature_09.dump create mode 100644 runtime/syntax/testdir/dumps/java_methods_indent2_06.dump rename runtime/syntax/testdir/dumps/{java_methods_indent2_05.vim => java_methods_indent2_06.vim} (100%) rename runtime/syntax/testdir/dumps/{java_methods_indent4_05.vim => java_methods_indent4_06.vim} (100%) rename runtime/syntax/testdir/dumps/{java_methods_indent8_05.vim => java_methods_indent8_06.vim} (100%) create mode 100644 runtime/syntax/testdir/dumps/java_methods_style_05.dump diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim index 7c58ef2223..5df1d4fa36 100644 --- a/runtime/syntax/java.vim +++ b/runtime/syntax/java.vim @@ -3,7 +3,7 @@ " Maintainer: Aliaksei Budavei <0x000c70 AT gmail DOT com> " Former Maintainer: Claudio Fleiner " Repository: https://github.com/zzzyxwvut/java-vim.git -" Last Change: 2025 Jun 10 +" Last Change: 2025 Jun 22 " Please check ":help java.vim" for comments on some of the options " available. @@ -297,23 +297,30 @@ endif runtime syntax/javaid.vim -" Type parameter sections of generic and parameterised types (JLS-17, -" §4.5). +" Type parameter sections (JLS-17, §4.4, §4.5). " " Note that false positives may elsewhere occur whenever an identifier " is butted against a less-than operator. Cf. (X\_s\+\%(\%(void\|\%(b\%(oolean\|yte\)\|char\|short\|int\|long\|float\|double\|\%(\<\K\k*\>\.\)*\<' . s:ff.UpperCase('[$_[:upper:]]', '[^a-z0-9]') . '\k*\>\%(<\%([^(){}]\|\n\)\+[[:space:]-]\@' . s:ff.Peek('1', '') . '\)\=\)\%(\[\]\)*\)\_s\+\)\=\<\K\k*\>\s*(\)\@=/ end=/>/ contains=javaGenerics,@javaTypeParams' + exec 'syn region javaTypeParamSection transparent matchgroup=javaGenericsCX start=/\%(\%(\\@!/ end=/>/ contains=javaGenerics,@javaTypeParams' for s:ctx in [{'gsg': 'javaGenerics', 'ghg': 'javaGenericsC1', 'csg': 'javaGenericsX', 'c': ''}, \ {'gsg': 'javaGenericsX', 'ghg': 'javaGenericsC2', 'csg': 'javaGenerics', 'c': ' contained'}] - exec 'syn region ' . s:ctx.gsg . s:ctx.c . ' transparent matchgroup=' . s:ctx.ghg . ' start=/' . s:ff.Engine('\%#=2', '') . '\%(\<\K\k*\>\.\)*\<' . s:ff.UpperCase('[$_[:upper:]]', '[^a-z0-9]') . '\k*\><\%([[:space:]\n]*\%([?@]\|\<\%(b\%(oolean\|yte\)\|char\|short\|int\|long\|float\|double\)\|\%(\<\K\k*\>\.\)*\<' . s:ff.UpperCase('[$_[:upper:]]', '[^a-z0-9]') . '\k*\>\)\)\@=/ end=/>/ contains=' . s:ctx.csg . ',javaAnnotation,javaWildcardBound,javaType,@javaClasses' + " Match sections of generic types and their parameterised use. + exec 'syn region ' . s:ctx.gsg . s:ctx.c . ' transparent matchgroup=' . s:ctx.ghg . ' start=/' . s:ff.Engine('\%#=2', '') . '\%(\<\K\k*\>\.\)*\<' . s:ff.UpperCase('[$_[:upper:]]', '[^a-z0-9]') . '\k*\><\%([[:space:]\n]*\%([?@]\|\<\%(b\%(oolean\|yte\)\|char\|short\|int\|long\|float\|double\)\|\%(\<\K\k*\>\.\)*\<' . s:ff.UpperCase('[$_[:upper:]]', '[^a-z0-9]') . '\k*\>\)\)\@=/ end=/>/ contains=' . s:ctx.csg . ',@javaTypeParams' endfor unlet s:ctx hi def link javaWildcardBound Question hi def link javaGenericsC1 Function hi def link javaGenericsC2 Type + hi def link javaGenericsCX javaGenericsC2 endif if exists("g:java_space_errors") @@ -679,7 +686,7 @@ if exists("g:java_highlight_functions") syn cluster javaFuncParams add=javaParamModifier hi def link javaFuncDefStart javaFuncDef else - syn cluster javaFuncParams add=javaScopeDecl,javaConceptKind,javaStorageClass,javaExternal + syn cluster javaFuncParams add=javaScopeDecl,javaConceptKind,javaStorageClass,javaExternal,javaTypeParamSection endif if g:java_highlight_functions =~# '^indent[1-8]\=$' @@ -692,11 +699,11 @@ if exists("g:java_highlight_functions") " definitions take care of constructor declarations and enum " constants (with no support for @Foo(value = "bar")). Also, " reject inlined declarations with "[^{]" for signature. - exec 'syn region javaFuncDef ' . s:ff.GroupArgs('transparent matchgroup=javaFuncDefStart', '') . ' start=/' . s:ff.PeekTo('\%(', '') . '^' . s:indent . '\%(<[^>]\+>\+\s\+\|\%(\%(@\%(\K\k*\.\)*\K\k*\>\)\s\+\)\+\)\=\%(\<\K\k*\>\.\)*\K\k*\>[^={]*\%(\\)\s\+\)*p\%(ublic\|rotected\|rivate\)\s\+\%(<[^>]\+>\+\s\+\)\=\K\k*\s*\ze(/ contains=javaAnnotation,javaScopeDecl,javaClassDecl,javaTypedef,javaGenerics' + " them. (Approximate "javaTypeParamSection" if necessary.) + exec 'syn match javaConstructorSkipDeclarator transparent "^' . s:indent . '\%(\%(@\%(\K\k*\.\)*\K\k*\>\)\s\+\)*p\%(ublic\|rotected\|rivate\)\s\+\%(<\%(/\*.\{-}\*/\|[^(){}>]\|\n\)\+>\+\s\+\)\=\K\k*\s*(\@=" contains=javaAnnotation,javaScopeDecl,javaTypeParamSection,javaClassDecl,javaTypedef,javaType,@javaClasses,javaGenerics,javaComment,javaLineComment' " With a zero-width span for signature applicable on demand to " javaFuncDef, make related adjustments: " (1) Claim all enum constants of a line as a unit. @@ -715,7 +722,7 @@ if exists("g:java_highlight_functions") " Match arbitrarily indented camelCasedName method declarations. " Match: [@ɐ] [abstract] [<α, β>] Τʬ[<γ>][[][]] μʭʭ(/* ... */); - exec 'syn region javaFuncDef ' . s:ff.GroupArgs('transparent matchgroup=javaFuncDefStart', '') . ' start=/' . s:ff.Engine('\%#=2', '') . s:ff.PeekTo('\%(', '') . '^\s\+\%(\%(@\%(\K\k*\.\)*\K\k*\>\)\s\+\)*\%(p\%(ublic\|rotected\|rivate\)\s\+\)\=\%(\%(abstract\|default\)\s\+\|\%(\%(final\|\%(native\|strictfp\)\|s\%(tatic\|ynchronized\)\)\s\+\)*\)\=\%(<.*[[:space:]-]\@' . s:ff.Peek('1', '') . '\s\+\)\=\%(void\|\%(b\%(oolean\|yte\)\|char\|short\|int\|long\|float\|double\|\%(\<\K\k*\>\.\)*\<' . s:ff.UpperCase('[$_[:upper:]]', '[^a-z0-9]') . '\k*\>\%(<[^(){}]*[[:space:]-]\@' . s:ff.Peek('1', '') . '\)\=\)\%(\[\]\)*\)\s\+' . s:ff.PeekFrom('\)\@' . s:ff.Peek('80', '') . '<=', '') . '\<' . s:ff.LowerCase('[$_[:lower:]]', '[^A-Z0-9]') . '\k*\>\s*(/ end=/)/ skip=/\/\*.\{-}\*\/\|\/\/.*$/ contains=@javaFuncParams' + exec 'syn region javaFuncDef ' . s:ff.GroupArgs('transparent matchgroup=javaFuncDefStart', '') . ' start=/' . s:ff.Engine('\%#=2', '') . s:ff.PeekTo('\%(', '') . '^\s\+\%(\%(@\%(\K\k*\.\)*\K\k*\>\)\s\+\)*\%(p\%(ublic\|rotected\|rivate\)\s\+\)\=\%(\%(abstract\|default\)\s\+\|\%(\%(final\|\%(native\|strictfp\)\|s\%(tatic\|ynchronized\)\)\s\+\)*\)\=\%(<\%([^(){}]\|\n\)\+[[:space:]-]\@' . s:ff.Peek('1', '') . '\s\+\)\=\%(void\|\%(b\%(oolean\|yte\)\|char\|short\|int\|long\|float\|double\|\%(\<\K\k*\>\.\)*\<' . s:ff.UpperCase('[$_[:upper:]]', '[^a-z0-9]') . '\k*\>\%(<\%([^(){}]\|\n\)\+[[:space:]-]\@' . s:ff.Peek('1', '') . '\)\=\)\%(\[\]\)*\)\s\+' . s:ff.PeekFrom('\)\@' . s:ff.Peek('80', '') . '<=', '') . '\<' . s:ff.LowerCase('[$_[:lower:]]', '[^A-Z0-9]') . '\k*\>\s*(/ end=/)/ skip=/\/\*.\{-}\*\/\|\/\/.*$/ contains=@javaFuncParams' endif endif @@ -818,10 +825,8 @@ if exists("g:java_highlight_functions") " " Match: ([@A [@B ...] final] var a[, var b, ...]) -> " | ([@A [@B ...] final] T[<α>][[][]] a[, T b, ...]) -> - " There is no recognition of expressions interspersed with comments - " or of expressions whose parameterised parameter types are written - " across multiple lines. - exec 'syn ' . s:ff.LambdaDef('region javaLambdaDef transparent matchgroup=javaLambdaDefStart start=/', 'match javaLambdaDef "') . '\k\@' . s:ff.Peek('4', '') . '\%((\_.\{-1,})\)\{-,1}[[:space:]\n]\+\)*\%(final[[:space:]\n]\+\)\=\%(\<\K\k*\>\.\)*\<\K\k*\>\%(<[^(){}]*[[:space:]-]\@' . s:ff.Peek('1', '') . '\)\=\%(\%(\%(\[\]\)\+\|\.\.\.\)\)\=[[:space:]\n]\+\<\K\k*\>\%(\[\]\)*\%(,[[:space:]\n]*\)\=\)\+)[[:space:]\n]*' . s:ff.LambdaDef('\z(->\)\)\@=/ end=/)[[:space:]\n]*\z1/', '->"') . ' contains=javaAnnotation,javaParamModifier,javaLambdaVarType,javaType,@javaClasses,javaGenerics,javaVarArg' + " Expressions interspersed with comments are not recognised. + exec 'syn ' . s:ff.LambdaDef('region javaLambdaDef transparent matchgroup=javaLambdaDefStart start=/', 'match javaLambdaDef "') . '\k\@' . s:ff.Peek('4', '') . '\%((\_.\{-1,})\)\{-,1}[[:space:]\n]\+\)*\%(final[[:space:]\n]\+\)\=\%(\<\K\k*\>\.\)*\<\K\k*\>\%(<\%([^(){}]\|\n\)\+[[:space:]-]\@' . s:ff.Peek('1', '') . '\)\=\%(\%(\%(\[\]\)\+\|\.\.\.\)\)\=[[:space:]\n]\+\<\K\k*\>\%(\[\]\)*\%(,[[:space:]\n]*\)\=\)\+)[[:space:]\n]*' . s:ff.LambdaDef('\z(->\)\)\@=/ end=/)[[:space:]\n]*\z1/', '->"') . ' contains=javaAnnotation,javaParamModifier,javaLambdaVarType,javaType,@javaClasses,javaGenerics,javaVarArg' " Match: () -> " | (a[, b, ...]) -> exec 'syn ' . s:ff.LambdaDef('region javaLambdaDef transparent matchgroup=javaLambdaDefStart start=/', 'match javaLambdaDef "') . '\k\@' . s:ff.Peek('4', '') . '\%(,[[:space:]\n]*\)\=\)*)[[:space:]\n]*' . s:ff.LambdaDef('\z(->\)\)\@=/ end=/)[[:space:]\n]*\z1/', '->"') diff --git a/runtime/syntax/testdir/dumps/java_generics_00.dump b/runtime/syntax/testdir/dumps/java_generics_00.dump index c9aa70c57b..5209d9cfc1 100644 --- a/runtime/syntax/testdir/dumps/java_generics_00.dump +++ b/runtime/syntax/testdir/dumps/java_generics_00.dump @@ -1,11 +1,11 @@ >/+0#0000e05#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|f|u|n|c|t|i|o|n|s| |=| |'|s|t|y|l|e|'| +0#0000000&@16 |/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|g|e|n|e|r|i|c|s| |=| |1| +0#0000000&@23 |/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|j|a|v|a|_|l|a|n|g| |=| |1| +0#0000000&@22 -|/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |j|a|v|a|G|e|n|e|r|i|c|s|C|1| |T|o|d|o| +0#0000000&@29 -|/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |j|a|v|a|G|e|n|e|r|i|c|s|C|2| |E|r@1|o|r| +0#0000000&@28 -@75 @75 @75 +|/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |j|a|v|a|G|e|n|e|r|i|c|s|C|1| |T|o|d|o| +0#0000000&@29 +|/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |j|a|v|a|G|e|n|e|r|i|c|s|C|2| |E|r@1|o|r| +0#0000000&@28 +|/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |j|a|v|a|W|i|l|d|c|a|r|d|B|o|u|n|d| |E|r@1|o|r| +0#0000000&@25 @75 @75 |i+0#e000e06&|m|p|o|r|t| +0#0000000&|j|a|v|a|.|m|a|t|h|.|B|i|g|I|n|t|e|g|e|r|;| @46 @@ -14,7 +14,7 @@ |i+0#e000e06&|m|p|o|r|t| +0#0000000&|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|L|o|n|g|F|u|n|c|t|i|o|n|;| @35 |i+0#e000e06&|m|p|o|r|t| +0#0000000&|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|P|r|e|d|i|c|a|t|e|;| @38 @75 -|c+0#00e0003&|l|a|s@1| +0#0000000&|G+0#0000001#ffff4012|e|n|e|r|i|c|s|T|e|s|t|s|<|T+0#0000000#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|N+0#e000002&|u|m|b|e|r| +0#0000000&|&| |C+0#ffffff16#ff404010|o|m|p|a|r|a|b|l|e|<|?+0#0000000#ffffff0| |s+0#00e0003&|u|p|e|r| +0#0000000&|T|>+0#ffffff16#ff404010|,+0#0000000#ffffff0| |U|>+0#0000001#ffff4012| +0#0000000#ffffff0@10 +|c+0#00e0003&|l|a|s@1| +0#0000000&|G+0#0000001#ffff4012|e|n|e|r|i|c|s|T|e|s|t|s|<|T+0#0000000#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|N+0#e000002&|u|m|b|e|r| +0#0000000&|&| |C+0#ffffff16#ff404010|o|m|p|a|r|a|b|l|e|<|?+0#0000000#ffffff0| |s+0#ffffff16#ff404010|u|p|e|r| +0#0000000#ffffff0|T|>+0#ffffff16#ff404010|,+0#0000000#ffffff0| |U|>+0#0000001#ffff4012| +0#0000000#ffffff0@10 |{| @2|/+0#0000e05&@1| |J|D|K| |2|1|+|.| +0#0000000&@59 @4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|F+0#0000001#ffff4012|u|n|c|t|i|o|n|<|F+0#ffffff16#ff404010|u|n|c|t|i|o|n|<|O+0#e000002#ffffff0|b|j|e|c|t|,+0#0000000&| |O+0#e000002&|b|j|e|c|t|>+0#ffffff16#ff404010|,+0#0000000#ffffff0| |O+0#e000002&|b|j|e|c|t|>+0#0000001#ffff4012| +0#0000000#ffffff0|P|A|R|T|I|A|L| |=| @5 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/java_generics_01.dump b/runtime/syntax/testdir/dumps/java_generics_01.dump index 6eb8eae39b..5a12fe3876 100644 --- a/runtime/syntax/testdir/dumps/java_generics_01.dump +++ b/runtime/syntax/testdir/dumps/java_generics_01.dump @@ -1,20 +1,20 @@ |i+0#e000e06#ffffff0|m|p|o|r|t| +0#0000000&|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|L|o|n|g|F|u|n|c|t|i|o|n|;| @35 |i+0#e000e06&|m|p|o|r|t| +0#0000000&|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|P|r|e|d|i|c|a|t|e|;| @38 @75 -|c+0#00e0003&|l|a|s@1| +0#0000000&|G+0#0000001#ffff4012|e|n|e|r|i|c|s|T|e|s|t|s|<|T+0#0000000#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|N+0#e000002&|u|m|b|e|r| +0#0000000&|&| |C+0#ffffff16#ff404010|o|m|p|a|r|a|b|l|e|<|?+0#0000000#ffffff0| |s+0#00e0003&|u|p|e|r| +0#0000000&|T|>+0#ffffff16#ff404010|,+0#0000000#ffffff0| |U|>+0#0000001#ffff4012| +0#0000000#ffffff0@10 +|c+0#00e0003&|l|a|s@1| +0#0000000&|G+0#0000001#ffff4012|e|n|e|r|i|c|s|T|e|s|t|s|<|T+0#0000000#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|N+0#e000002&|u|m|b|e|r| +0#0000000&|&| |C+0#ffffff16#ff404010|o|m|p|a|r|a|b|l|e|<|?+0#0000000#ffffff0| |s+0#ffffff16#ff404010|u|p|e|r| +0#0000000#ffffff0|T|>+0#ffffff16#ff404010|,+0#0000000#ffffff0| |U|>+0#0000001#ffff4012| +0#0000000#ffffff0@10 |{| @2|/+0#0000e05&@1| |J|D|K| |2|1|+|.| +0#0000000&@59 @4>s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|F+0#0000001#ffff4012|u|n|c|t|i|o|n|<|F+0#ffffff16#ff404010|u|n|c|t|i|o|n|<|O+0#e000002#ffffff0|b|j|e|c|t|,+0#0000000&| |O+0#e000002&|b|j|e|c|t|>+0#ffffff16#ff404010|,+0#0000000#ffffff0| |O+0#e000002&|b|j|e|c|t|>+0#0000001#ffff4012| +0#0000000#ffffff0|P|A|R|T|I|A|L| |=| @5 @24|G|e|n|e|r|i|c|s|T|e|s|t|s|.|y|0|(|)|;| @31 @4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|F+0#0000001#ffff4012|u|n|c|t|i|o|n|<|B+0#0000000#ffffff0|i|g|I|n|t|e|g|e|r|,| |B|i|g|I|n|t|e|g|e|r|>+0#0000001#ffff4012| +0#0000000#ffffff0|F|A|C|T|O|R|I|A|L|_|2|0@2| |=| @8 -@16|G|e|n|e|r|i|c|s|T|e|s|t|s|.|<|B|i|g|I|n|t|e|g|e|r|,| |B|i|g|I|n|t|e|g|e|r|>|y|1|(|)| @16 +@16|G|e|n|e|r|i|c|s|T|e|s|t|s|.|<+0#ffffff16#ff404010|B+0#0000000#ffffff0|i|g|I|n|t|e|g|e|r|,| |B|i|g|I|n|t|e|g|e|r|>+0#ffffff16#ff404010|y+0#0000000#ffffff0|1|(|)| @16 @8|.|a|p@1|l|y|(|f+0#00e0e07&| |-|>| +0#0000000&|x+0#00e0e07&| |-|>| +0#0000000&|(|x|.|c|o|m|p|a|r|e|T|o|(|B|i|g|I|n|t|e|g|e|r|.|O|N|E|)| |<| |1+0#e000002&|)+0#0000000&| @16 @12|?| |B|i|g|I|n|t|e|g|e|r|.|O|N|E| @46 @12|:| |x|.|m|u|l|t|i|p|l|y|(|f|.|a|p@1|l|y|(|x|.|s|u|b|t|r|a|c|t|(|B|i|g|I|n|t|e|g|e|r|.|O|N|E|)@3|;| @11 @75 -| +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|<|T|1|>| |Y+0#0000001#ffff4012|0|<|T+0#00e0e07#ffffff0|1|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|y|0|(|)| +0#0000000&@47 +| +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|<+0#ffffff16#ff404010|T+0#00e0e07#ffffff0|1|>+0#ffffff16#ff404010| +0#00e0e07#ffffff0|Y+0#0000001#ffff4012|0|<|T+0#00e0e07#ffffff0|1|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|y|0|(|)| +0#0000000&@47 @4|{| @69 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#00e0e07&|F+0#0000001#ffff4012|u|n|c|t|i|o|n|<|T+0#00e0e07#ffffff0|1|,| |T|1|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|f|)| |-|>| +0#0000000&|f|.|a|p@1|l|y|(| @27 -@20|G|e|n|e|r|i|c|s|T|e|s|t|s|.|<|T|1|>|y|0|(|)| @32 +@20|G|e|n|e|r|i|c|s|T|e|s|t|s|.|<+0#ffffff16#ff404010|T+0#0000000#ffffff0|1|>+0#ffffff16#ff404010|y+0#0000000#ffffff0|0|(|)| @32 @24|.|a|p@1|l|y|(|f|)@1|;| @39 @4|}| @69 @57|1|9|,|2|-|5| @8|9|%| diff --git a/runtime/syntax/testdir/dumps/java_generics_02.dump b/runtime/syntax/testdir/dumps/java_generics_02.dump index 89242a6c93..e3f1c7fb69 100644 --- a/runtime/syntax/testdir/dumps/java_generics_02.dump +++ b/runtime/syntax/testdir/dumps/java_generics_02.dump @@ -1,9 +1,9 @@ | +0&#ffffff0@3|}| @69 @75 -| +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|<|T|1|,| |T|2|>| |Y+0#0000001#ffff4012|1|<|T+0#00e0e07#ffffff0|1|,| |T|2|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|y|1|(|)| +0#0000000&@39 +| +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|<+0#ffffff16#ff404010|T+0#00e0e07#ffffff0|1|,| |T|2|>+0#ffffff16#ff404010| +0#00e0e07#ffffff0|Y+0#0000001#ffff4012|1|<|T+0#00e0e07#ffffff0|1|,| |T|2|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|y|1|(|)| +0#0000000&@39 @4|{| @69 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#00e0e07&|F+0#0000001#ffff4012|u|n|c|t|i|o|n|<|F+0#ffffff16#ff404010|u|n|c|t|i|o|n|<|T+0#00e0e07#ffffff0|1|,| |T|2|>+0#ffffff16#ff404010|,+0#00e0e07#ffffff0| |F+0#ffffff16#ff404010|u|n|c|t|i|o|n|<|T+0#00e0e07#ffffff0|1|,| |T|2|>+0#ffffff16#ff404010|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|f|)| |-|>| +0#0000000&@8 -@12>(+0#00e0e07&|T|1| |x|)| |-|>| +0#0000000&|f|.|a|p@1|l|y|(|G|e|n|e|r|i|c|s|T|e|s|t|s|.|<|T|1|,| |T|2|>|y|1|(|)| @18 +@12>(+0#00e0e07&|T|1| |x|)| |-|>| +0#0000000&|f|.|a|p@1|l|y|(|G|e|n|e|r|i|c|s|T|e|s|t|s|.|<+0#ffffff16#ff404010|T+0#0000000#ffffff0|1|,| |T|2|>+0#ffffff16#ff404010|y+0#0000000#ffffff0|1|(|)| @18 @24|.|a|p@1|l|y|(|f|)@1| @40 @16|.|a|p@1|l|y|(|x|)|;| @48 @4|}| @69 @@ -17,4 +17,4 @@ @4|i+0#00e0003&|n|t|e|r|f|a|c|e| +0#0000000&|Y+0#0000001#ffff4012|1|<|T+0#0000000#ffffff0|1|,| |T|2|>+0#0000001#ffff4012| +0#0000000#ffffff0|e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|F+0#0000001#ffff4012|u|n|c|t|i|o|n|<|F+0#ffffff16#ff404010|u|n|c|t|i|o|n|<|F+0#0000001#ffff4012|u|n|c|t|i|o|n|<|T+0#0000000#ffffff0|1|,| |T|2|>+0#0000001#ffff4012|,+0#0000000#ffffff0| @6 @20|F+0#0000001#ffff4012|u|n|c|t|i|o|n|<|T+0#0000000#ffffff0|1|,| |T|2|>+0#0000001#ffff4012|>+0#ffffff16#ff404010|,+0#0000000#ffffff0| @36 @20|F+0#ffffff16#ff404010|u|n|c|t|i|o|n|<|T+0#0000000#ffffff0|1|,| |T|2|>+0#ffffff16#ff404010|>+0#0000001#ffff4012| +0#0000000#ffffff0|{| |}| @33 -@57|3|7|,|4|-|1|3| @6|2@1|%| +@57|3|7|,|4|-|1|3| @6|2|1|%| diff --git a/runtime/syntax/testdir/dumps/java_generics_03.dump b/runtime/syntax/testdir/dumps/java_generics_03.dump index 5a61dddcfe..216edb0d5d 100644 --- a/runtime/syntax/testdir/dumps/java_generics_03.dump +++ b/runtime/syntax/testdir/dumps/java_generics_03.dump @@ -5,16 +5,16 @@ | +0#00e0e07&@7|b+0#00e0003&|o@1|l|e|a|n| +0#00e0e07&|i|s|E|m|p|t|y|(|)|;+0#0000000&| @48 | +0#00e0e07&@7>E| |p|e@1|k|(|)|;+0#0000000&| @57 | +0#00e0e07&@7|E| |p|o|p|(|)|;+0#0000000&| @58 -| +0#00e0e07&@7|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#00e0e07#ffffff0|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|p|o|p|A|l@1|(|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|?+0#00e0e07#ffffff0| |s+0#00e0003&|u|p|e|r| +0#00e0e07&|E|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|e|l|e|m|e|n|t|s|)|;+0#0000000&| @15 -| +0#00e0e07&@7|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#00e0e07#ffffff0|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|p|o|p|S|o|m|e|(|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|?+0#00e0e07#ffffff0| |s+0#00e0003&|u|p|e|r| +0#00e0e07&|E|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|e|l|e|m|e|n|t|s|,| +0#0000000&@15 -| +0#00e0e07&@19|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|?+0#00e0e07#ffffff0| |s+0#00e0003&|u|p|e|r| +0#00e0e07&|E|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|f|i|l|t|e|r|)|;+0#0000000&| @25 +| +0#00e0e07&@7|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#00e0e07#ffffff0|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|p|o|p|A|l@1|(|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|?+0#00e0e07#ffffff0| |s+0#ffffff16#ff404010|u|p|e|r| +0#00e0e07#ffffff0|E|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|e|l|e|m|e|n|t|s|)|;+0#0000000&| @15 +| +0#00e0e07&@7|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#00e0e07#ffffff0|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|p|o|p|S|o|m|e|(|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|?+0#00e0e07#ffffff0| |s+0#ffffff16#ff404010|u|p|e|r| +0#00e0e07#ffffff0|E|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|e|l|e|m|e|n|t|s|,| +0#0000000&@15 +| +0#00e0e07&@19|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|?+0#00e0e07#ffffff0| |s+0#ffffff16#ff404010|u|p|e|r| +0#00e0e07#ffffff0|E|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|f|i|l|t|e|r|)|;+0#0000000&| @25 | +0#00e0e07&@7|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#00e0e07#ffffff0|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|p|u|s|h|(|E| |e|l|e|m|e|n|t|)|;+0#0000000&| @37 -| +0#00e0e07&@7|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#00e0e07#ffffff0|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|p|u|s|h|A|l@1|(|I+0#0000001#ffff4012|t|e|r|a|b|l|e|<|?+0#00e0e07#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#00e0e07&|E|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|e|l|e|m|e|n|t|s|)|;+0#0000000&| @13 -| +0#00e0e07&@7|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#00e0e07#ffffff0|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|p|u|s|h|S|o|m|e|(|I+0#0000001#ffff4012|t|e|r|a|b|l|e|<|?+0#00e0e07#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#00e0e07&|E|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|e|l|e|m|e|n|t|s|,| +0#0000000&@13 -| +0#00e0e07&@19|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|?+0#00e0e07#ffffff0| |s+0#00e0003&|u|p|e|r| +0#00e0e07&|E|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|f|i|l|t|e|r|)|;+0#0000000&| @25 -| +0#00e0e07&@7|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#00e0e07#ffffff0|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|w|i|n|d|(|C+0#0000001#ffff4012|o|n|s|u|m|e|r|<|?+0#00e0e07#ffffff0| |s+0#00e0003&|u|p|e|r| +0#00e0e07&|S+0#ffffff16#ff404010|t|a|c|k|a|b|l|e|<|E+0#00e0e07#ffffff0|>+0#ffffff16#ff404010|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|a|c|t|i|o|n|)|;+0#0000000&| @9 +| +0#00e0e07&@7|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#00e0e07#ffffff0|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|p|u|s|h|A|l@1|(|I+0#0000001#ffff4012|t|e|r|a|b|l|e|<|?+0#00e0e07#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#00e0e07#ffffff0|E|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|e|l|e|m|e|n|t|s|)|;+0#0000000&| @13 +| +0#00e0e07&@7|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#00e0e07#ffffff0|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|p|u|s|h|S|o|m|e|(|I+0#0000001#ffff4012|t|e|r|a|b|l|e|<|?+0#00e0e07#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#00e0e07#ffffff0|E|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|e|l|e|m|e|n|t|s|,| +0#0000000&@13 +| +0#00e0e07&@19|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|?+0#00e0e07#ffffff0| |s+0#ffffff16#ff404010|u|p|e|r| +0#00e0e07#ffffff0|E|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|f|i|l|t|e|r|)|;+0#0000000&| @25 +| +0#00e0e07&@7|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#00e0e07#ffffff0|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|w|i|n|d|(|C+0#0000001#ffff4012|o|n|s|u|m|e|r|<|?+0#00e0e07#ffffff0| |s+0#ffffff16#ff404010|u|p|e|r| +0#00e0e07#ffffff0|S+0#ffffff16#ff404010|t|a|c|k|a|b|l|e|<|E+0#00e0e07#ffffff0|>+0#ffffff16#ff404010|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|a|c|t|i|o|n|)|;+0#0000000&| @9 @4|}| @69 @75 -@4|s+0#00e0003&|e|a|l|e|d| +0#0000000&|i+0#00e0003&|n|t|e|r|f|a|c|e| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012| +0#0000000#ffffff0@32 +@4|s+0#00e0003&|e|a|l|e|d| +0#0000000&|i+0#00e0003&|n|t|e|r|f|a|c|e| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012| +0#0000000#ffffff0@32 @4|{| @69 -@57|5@1|,|3|-|9| @7|3|5|%| +@57|5@1|,|3|-|9| @7|3|4|%| diff --git a/runtime/syntax/testdir/dumps/java_generics_04.dump b/runtime/syntax/testdir/dumps/java_generics_04.dump index 116e565b04..3ed23572ba 100644 --- a/runtime/syntax/testdir/dumps/java_generics_04.dump +++ b/runtime/syntax/testdir/dumps/java_generics_04.dump @@ -3,18 +3,18 @@ | +0#00e0e07&@7|N| |v|a|l|u|e|(|)|;+0#0000000&| @56 @4|}| @69 @75 -@4>r+0#00e0003&|e|c|o|r|d| +0#0000000&|B+0#0000001#ffff4012|i|n|<|N+0#0000000#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012|(+0#0000000#ffffff0|N| |v|a|l|u|e|)| |i+0#00e0003&|m|p|l|e|m|e|n|t|s| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0@15 +@4>r+0#00e0003&|e|c|o|r|d| +0#0000000&|B+0#0000001#ffff4012|i|n|<|N+0#0000000#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012|(+0#0000000#ffffff0|N| |v|a|l|u|e|)| |i+0#00e0003&|m|p|l|e|m|e|n|t|s| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0@15 @4|{| @69 | +0#00e0e07&@7|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|i+0#00e0003&|n|t| +0#00e0e07&|r|a|d|i|x|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|2+0#e000002&|;+0#0000000&| |}| @34 @4|}| @69 @75 -@4|r+0#00e0003&|e|c|o|r|d| +0#0000000&|D+0#0000001#ffff4012|e|c|<|N+0#0000000#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012|(+0#0000000#ffffff0|N| |v|a|l|u|e|)| |i+0#00e0003&|m|p|l|e|m|e|n|t|s| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0@15 +@4|r+0#00e0003&|e|c|o|r|d| +0#0000000&|D+0#0000001#ffff4012|e|c|<|N+0#0000000#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012|(+0#0000000#ffffff0|N| |v|a|l|u|e|)| |i+0#00e0003&|m|p|l|e|m|e|n|t|s| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0@15 @4|{| @69 | +0#00e0e07&@7|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|i+0#00e0003&|n|t| +0#00e0e07&|r|a|d|i|x|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|1+0#e000002&|0|;+0#0000000&| |}| @33 @4|}| @69 @75 -@4|r+0#00e0003&|e|c|o|r|d| +0#0000000&|H+0#0000001#ffff4012|e|x|<|N+0#0000000#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012|(+0#0000000#ffffff0|N| |v|a|l|u|e|)| |i+0#00e0003&|m|p|l|e|m|e|n|t|s| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0@15 +@4|r+0#00e0003&|e|c|o|r|d| +0#0000000&|H+0#0000001#ffff4012|e|x|<|N+0#0000000#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012|(+0#0000000#ffffff0|N| |v|a|l|u|e|)| |i+0#00e0003&|m|p|l|e|m|e|n|t|s| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0@15 @4|{| @69 | +0#00e0e07&@7|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|i+0#00e0003&|n|t| +0#00e0e07&|r|a|d|i|x|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|1+0#e000002&|6|;+0#0000000&| |}| @33 @4|}| @69 -@57|7|3|,|2|-|5| @7|4|8|%| +@57|7|3|,|2|-|5| @7|4|6|%| diff --git a/runtime/syntax/testdir/dumps/java_generics_05.dump b/runtime/syntax/testdir/dumps/java_generics_05.dump index 54eabb1435..4c2baabb66 100644 --- a/runtime/syntax/testdir/dumps/java_generics_05.dump +++ b/runtime/syntax/testdir/dumps/java_generics_05.dump @@ -1,6 +1,6 @@ | +0&#ffffff0@3|}| @69 @75 -@4|r+0#00e0003&|e|c|o|r|d| +0#0000000&|O+0#0000001#ffff4012|c|t|<|N+0#0000000#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012|(+0#0000000#ffffff0|N| |v|a|l|u|e|)| |i+0#00e0003&|m|p|l|e|m|e|n|t|s| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0@15 +@4|r+0#00e0003&|e|c|o|r|d| +0#0000000&|O+0#0000001#ffff4012|c|t|<|N+0#0000000#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012|(+0#0000000#ffffff0|N| |v|a|l|u|e|)| |i+0#00e0003&|m|p|l|e|m|e|n|t|s| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0@15 @4|{| @69 | +0#00e0e07&@7|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|i+0#00e0003&|n|t| +0#00e0e07&|r|a|d|i|x|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|8+0#e000002&|;+0#0000000&| |}| @34 @4>}| @69 @@ -17,4 +17,4 @@ @24|y+0#00e0e07&| |-|>| +0#0000000&|L+0#e000002&|o|n|g|.+0#0000000&|t+0#e000002&|o|S|t|r|i|n|g|(+0#0000000&|y|)@1|;| @27 @8|}|;| @64 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|p|.|a|(|)|.|a|p@1|l|y|(|L+0#e000002&|o|n|g|.+0#0000000&|p|a|r|s|e|L|o|n|g|(|p|.|b|(|)|.|a|p@1|l|y|(|x|)|,| |r|a|d|i|x|)@1|;| @8 -@57|9|1|,|2|-|5| @7|6|2|%| +@57|9|1|,|2|-|5| @7|5|9|%| diff --git a/runtime/syntax/testdir/dumps/java_generics_06.dump b/runtime/syntax/testdir/dumps/java_generics_06.dump index 83543d1bee..adefc22d8c 100644 --- a/runtime/syntax/testdir/dumps/java_generics_06.dump +++ b/runtime/syntax/testdir/dumps/java_generics_06.dump @@ -17,4 +17,4 @@ @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(@1|c|o|m|p|a|r|a|b|l|e| |=| |o| |i+0#af5f00255&|n|s|t|a|n|c|e|o|f| +0#0000000&|C+0#00e0003&|o|m|p|a|r|a|b|l|e|)+0#0000000&| |^| @18 @24|o| |i+0#af5f00255&|n|s|t|a|n|c|e|o|f| +0#0000000&|I+0#00e0003&|t|e|r|a|b|l|e|)+0#0000000&| @28 @12|?| |(|c|o|m|p|a|r|a|b|l|e|)| @48 -@57|1|0|9|,|3|-|9| @6|7|5|%| +@57|1|0|9|,|3|-|9| @6|7|2|%| diff --git a/runtime/syntax/testdir/dumps/java_generics_07.dump b/runtime/syntax/testdir/dumps/java_generics_07.dump index b0dbedcb4d..69d3dc8a2c 100644 --- a/runtime/syntax/testdir/dumps/java_generics_07.dump +++ b/runtime/syntax/testdir/dumps/java_generics_07.dump @@ -4,6 +4,12 @@ @12|:| |j|a|v|a|.|l|a|n|g|.|C+0#e000002&|l|a|s@1|.+0#0000000&|c+0#00e0003&|l|a|s@1|;+0#0000000&| @38 @4|}| @69 > @74 +| +0#00e0e07&@3|<+0#ffffff16#ff404010|A+0#00e0e07#ffffff0|,| |T| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#00e0e07#ffffff0|j+0#0000001#ffff4012|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|S|u|p@1|l|i|e|r|<|A+0#00e0e07#ffffff0|>+0#0000001#ffff4012|,+0#00e0e07#ffffff0| +0#0000000&@25 +| +0#00e0e07&@7|B|,| |U| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#00e0e07#ffffff0|j+0#0000001#ffff4012|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|S|u|p@1|l|i|e|r|<|B+0#00e0e07#ffffff0|>+0#0000001#ffff4012|>+0#ffffff16#ff404010| +0#00e0e07#ffffff0|U| |c|o|n|v|e|r|t|(|T| |o|)| +0#0000000&@7 +@4|{| @69 +@8|t+0#af5f00255&|h|r|o|w| +0#0000000&|n+0#af5f00255&|e|w| +0#0000000&|U+0#af5f00255&|n|s|u|p@1|o|r|t|e|d|O|p|e|r|a|t|i|o|n|E|x|c|e|p|t|i|o|n|(+0#0000000&|"+0#e000002&|T|O|D|O|"|)+0#0000000&|;| @18 +@4|}| @69 +@75 @4|@+0#e000e06&|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|T|a|r|g|e|t|(| +0#0000000&@41 @16|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|E|l|e|m|e|n|t|T|y|p|e|.|T|Y|P|E|_|U|S|E|)+0#e000e06&| +0#0000000&@16 @4|@+0#00e0003&|i|n|t|e|r|f|a|c|e| +0#0000000&|T|a|g@1|a|b|l|e| @51 @@ -11,10 +17,4 @@ | +0#00e0e07&@7|S+0#e000002&|t|r|i|n|g| +0#00e0e07&|v|a|l|u|e|(|)| +0#0000000&|d+0#00e0003&|e|f|a|u|l|t| +0#0000000&|"+0#e000002&@1|;+0#0000000&| @40 @4|}| @69 @75 -@4|{| @69 -@8|i+0#00e0003&|n|t| +0#0000000&|N| |=| |0+0#e000002&|,+0#0000000&| |X| |=| |1+0#e000002&|,+0#0000000&| |Y| |=| |2+0#e000002&|;+0#0000000&| @42 -@8|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|T+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|f| |=| |y+0#00e0e07&|-|>|N+0#0000000&|<|y|.|i|n|t|V|a|l|u|e|(|)|;| @31 -@8|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|T+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|g| |=| |y+0#00e0e07&|-|>|X+0#0000001#ffff4012|<|N+0#0000000#ffffff0|&@1|(|I+0#e000002&|n|t|e|g|e|r|)+0#0000000&|y|>+0#0000001#ffff4012|N+0#0000000#ffffff0|;| @28 -@8|b+0#00e0003&|o@1|l|e|a|n|[+0#0000000&|]| |b@1| |=| |{| @50 -@12|X+0#0000001#ffff4012|<|N+0#0000000#ffffff0||@1|N|>+0#0000001#ffff4012|Y+0#0000000#ffffff0|,| |X| |<| |Y|,| |X| |<|Y|,| |X| |<|(|Y|)|,| |X|<|(|Y|)|,| |(|X|)|<|Y|,| @18 -@57|1|2|7|,|0|-|1| @6|8@1|%| +@57|1|2|7|,|0|-|1| @6|8|4|%| diff --git a/runtime/syntax/testdir/dumps/java_generics_08.dump b/runtime/syntax/testdir/dumps/java_generics_08.dump index d41b751f78..acfa165cf8 100644 --- a/runtime/syntax/testdir/dumps/java_generics_08.dump +++ b/runtime/syntax/testdir/dumps/java_generics_08.dump @@ -1,9 +1,15 @@ -| +0&#ffffff0@11|X+0#0000001#ffff4012|<|N+0#0000000#ffffff0||@1|N|>+0#0000001#ffff4012|Y+0#0000000#ffffff0|,| |X| |<| |Y|,| |X| |<|Y|,| |X| |<|(|Y|)|,| |X|<|(|Y|)|,| |(|X|)|<|Y|,| @18 +| +0&#ffffff0@74 +@4|{| @69 +@8|i+0#00e0003&|n|t| +0#0000000&|N| |=| |0+0#e000002&|,+0#0000000&| |X| |=| |1+0#e000002&|,+0#0000000&| |Y| |=| |2+0#e000002&|;+0#0000000&| @42 +@8|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|T+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|f| |=| |y+0#00e0e07&|-|>|N+0#0000000&|<|y|.|i|n|t|V|a|l|u|e|(|)|;| @31 +@8|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|T+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|g| |=| |y+0#00e0e07&|-|>|X+0#0000001#ffff4012|<|N+0#0000000#ffffff0|&@1|(|I+0#e000002&|n|t|e|g|e|r|)+0#0000000&|y|>+0#0000001#ffff4012|N+0#0000000#ffffff0|;| @28 +@8>b+0#00e0003&|o@1|l|e|a|n|[+0#0000000&|]| |b@1| |=| |{| @50 +@12|X+0#0000001#ffff4012|<|N+0#0000000#ffffff0||@1|N|>+0#0000001#ffff4012|Y+0#0000000#ffffff0|,| |X| |<| |Y|,| |X| |<|Y|,| |X| |<|(|Y|)|,| |X|<|(|Y|)|,| |(|X|)|<|Y|,| @18 @12|D+0#e000002&|o|u|b|l|e|.+0#0000000&|i|s|F|i|n|i|t|e|(|X|<@1|Y|)|,| @40 @12|X|<|=|Y|,| |X|<|(|i+0#00e0003&|n|t|)+0#0000000&|(|b+0#00e0003&|y|t|e|)+0#0000000&|Y|,| |X|<|~|Y|,| |X|<|-|Y|,| |X|<|+|Y|,| @23 @8|}|;| @64 @8|C+0#0000001#ffff4012|l|a|s@1|<|?+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|k|l|a|s@1| |=| |G|e|n|e|r|i|c|s|T|e|s|t|s|.|c+0#00e0003&|l|a|s@1|;+0#0000000&| @29 -@8>C+0#0000001#ffff4012|l|a|s@1|<| +0#0000000#ffffff0|j+0#ffffff16#ff404010|a|v|a|.|l|a|n|g|.|C|l|a|s@1|<|@+0#e000e06#ffffff0|T|a|g@1|a|b|l|e|(|"+0#e000002&|<|>|"|)+0#e000e06&|i+0#00e0003&|n|t|[+0#0000000&|]|[|]|>+0#ffffff16#ff404010| +0#0000000#ffffff0|[|]| |[|]| |>+0#0000001#ffff4012| +0#0000000#ffffff0@12 +@8|C+0#0000001#ffff4012|l|a|s@1|<| +0#0000000#ffffff0|j+0#ffffff16#ff404010|a|v|a|.|l|a|n|g|.|C|l|a|s@1|<|@+0#e000e06#ffffff0|T|a|g@1|a|b|l|e|(|"+0#e000002&|<|>|"|)+0#e000e06&|i+0#00e0003&|n|t|[+0#0000000&|]|[|]|>+0#ffffff16#ff404010| +0#0000000#ffffff0|[|]| |[|]| |>+0#0000001#ffff4012| +0#0000000#ffffff0@12 @8|[| |]| |[| |]| |$| |[| |]| |[| |]|;| @48 @8|i+0#af5f00255&|f| +0#0000000&|(|f+0#e000002&|a|l|s|e|)+0#0000000&| |{| |n+0#af5f00255&|e|w| +0#0000000&|G|e|n|e|r|i|c|s|T|e|s|t|s|<|>|(|)|;| |}| @29 @8|a|l|p|h|a|<|?|>| |a|o|;| @54 @@ -11,10 +17,4 @@ @8|a|l|p|h|a|<|a|l|p|h|a|<|U|>@1| |a@1|u|;| @46 @8|a|l|p|h|a|<|Y+0#0000001#ffff4012|0|<|?+0#0000000#ffffff0|>+0#0000001#ffff4012|>+0#0000000#ffffff0| |a|y|0|o|;| @48 @8|a|l|p|h|a|<|Y+0#0000001#ffff4012|0|<|U+0#0000000#ffffff0|>+0#0000001#ffff4012|>+0#0000000#ffffff0| |a|y|0|u|;| @48 -@8|Y|0|<|a|l|p|h|a|<|?|>@1| |y|0|a|o|;| @48 -@8|Y|0|<|a|l|p|h|a|<|U|>@1| |y|0|a|u|;| @48 -@4|}| @69 -|}| @73 -|~+0#4040ff13&| @73 -|~| @73 -| +0#0000000&@56|1|4|5|,|3|-|9| @6|B|o|t| +@57|1|4|5|,|3|-|9| @6|9|7|%| diff --git a/runtime/syntax/testdir/dumps/java_generics_09.dump b/runtime/syntax/testdir/dumps/java_generics_09.dump new file mode 100644 index 0000000000..610316b8ce --- /dev/null +++ b/runtime/syntax/testdir/dumps/java_generics_09.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@7|a|l|p|h|a|<|Y+0#0000001#ffff4012|0|<|U+0#0000000#ffffff0|>+0#0000001#ffff4012|>+0#0000000#ffffff0| |a|y|0|u|;| @48 +@8|Y|0|<|a|l|p|h|a|<|?|>@1| |y|0|a|o|;| @48 +@8|Y|0|<|a|l|p|h|a|<|U|>@1| |y|0|a|u|;| @48 +@4|}| @69 +>}| @73 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|6|2|,|1| @8|B|o|t| diff --git a/runtime/syntax/testdir/dumps/java_generics_signature_00.dump b/runtime/syntax/testdir/dumps/java_generics_signature_00.dump index b2b6e6b508..d1155b4348 100644 --- a/runtime/syntax/testdir/dumps/java_generics_signature_00.dump +++ b/runtime/syntax/testdir/dumps/java_generics_signature_00.dump @@ -2,10 +2,10 @@ |/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|s|i|g|n|a|t|u|r|e| |=| |1| +0#0000000&@22 |/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|g|e|n|e|r|i|c|s| |=| |1| +0#0000000&@23 |/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|j|a|v|a|_|l|a|n|g| |=| |1| +0#0000000&@22 +@75 |/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |j|a|v|a|G|e|n|e|r|i|c|s|C|1| |T|o|d|o| +0#0000000&@29 |/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |j|a|v|a|G|e|n|e|r|i|c|s|C|2| |E|r@1|o|r| +0#0000000&@28 -@75 -@75 +|/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i| |l|i|n|k| |j|a|v|a|W|i|l|d|c|a|r|d|B|o|u|n|d| |E|r@1|o|r| +0#0000000&@25 @75 @75 |i+0#e000e06&|m|p|o|r|t| +0#0000000&|j|a|v|a|.|m|a|t|h|.|B|i|g|I|n|t|e|g|e|r|;| @46 @@ -14,7 +14,7 @@ |i+0#e000e06&|m|p|o|r|t| +0#0000000&|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|L|o|n|g|F|u|n|c|t|i|o|n|;| @35 |i+0#e000e06&|m|p|o|r|t| +0#0000000&|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|P|r|e|d|i|c|a|t|e|;| @38 @75 -|c+0#00e0003&|l|a|s@1| +0#0000000&|G+0#0000001#ffff4012|e|n|e|r|i|c|s|$|T|e|s|t|s|<|T+0#0000000#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|N+0#e000002&|u|m|b|e|r| +0#0000000&|&| |C+0#ffffff16#ff404010|o|m|p|a|r|a|b|l|e|<|?+0#0000000#ffffff0| |s+0#00e0003&|u|p|e|r| +0#0000000&|T|>+0#ffffff16#ff404010|,+0#0000000#ffffff0| |U|>+0#0000001#ffff4012| +0#0000000#ffffff0@9 +|c+0#00e0003&|l|a|s@1| +0#0000000&|G+0#0000001#ffff4012|e|n|e|r|i|c|s|$|T|e|s|t|s|<|T+0#0000000#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|N+0#e000002&|u|m|b|e|r| +0#0000000&|&| |C+0#ffffff16#ff404010|o|m|p|a|r|a|b|l|e|<|?+0#0000000#ffffff0| |s+0#ffffff16#ff404010|u|p|e|r| +0#0000000#ffffff0|T|>+0#ffffff16#ff404010|,+0#0000000#ffffff0| |U|>+0#0000001#ffff4012| +0#0000000#ffffff0@9 |{| @2|/+0#0000e05&@1| |J|D|K| |2|1|+|.| +0#0000000&@59 @4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|F+0#0000001#ffff4012|u|n|c|t|i|o|n|<|F+0#ffffff16#ff404010|u|n|c|t|i|o|n|<|O+0#e000002#ffffff0|b|j|e|c|t|,+0#0000000&| |O+0#e000002&|b|j|e|c|t|>+0#ffffff16#ff404010|,+0#0000000#ffffff0| |O+0#e000002&|b|j|e|c|t|>+0#0000001#ffff4012| +0#0000000#ffffff0|P|A|R|T|I|A|L| |=| @5 @57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/java_generics_signature_01.dump b/runtime/syntax/testdir/dumps/java_generics_signature_01.dump index c1e943a4cb..0685a4af58 100644 --- a/runtime/syntax/testdir/dumps/java_generics_signature_01.dump +++ b/runtime/syntax/testdir/dumps/java_generics_signature_01.dump @@ -1,20 +1,20 @@ |i+0#e000e06#ffffff0|m|p|o|r|t| +0#0000000&|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|L|o|n|g|F|u|n|c|t|i|o|n|;| @35 |i+0#e000e06&|m|p|o|r|t| +0#0000000&|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|P|r|e|d|i|c|a|t|e|;| @38 @75 -|c+0#00e0003&|l|a|s@1| +0#0000000&|G+0#0000001#ffff4012|e|n|e|r|i|c|s|$|T|e|s|t|s|<|T+0#0000000#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|N+0#e000002&|u|m|b|e|r| +0#0000000&|&| |C+0#ffffff16#ff404010|o|m|p|a|r|a|b|l|e|<|?+0#0000000#ffffff0| |s+0#00e0003&|u|p|e|r| +0#0000000&|T|>+0#ffffff16#ff404010|,+0#0000000#ffffff0| |U|>+0#0000001#ffff4012| +0#0000000#ffffff0@9 +|c+0#00e0003&|l|a|s@1| +0#0000000&|G+0#0000001#ffff4012|e|n|e|r|i|c|s|$|T|e|s|t|s|<|T+0#0000000#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|N+0#e000002&|u|m|b|e|r| +0#0000000&|&| |C+0#ffffff16#ff404010|o|m|p|a|r|a|b|l|e|<|?+0#0000000#ffffff0| |s+0#ffffff16#ff404010|u|p|e|r| +0#0000000#ffffff0|T|>+0#ffffff16#ff404010|,+0#0000000#ffffff0| |U|>+0#0000001#ffff4012| +0#0000000#ffffff0@9 |{| @2|/+0#0000e05&@1| |J|D|K| |2|1|+|.| +0#0000000&@59 @4>s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|F+0#0000001#ffff4012|u|n|c|t|i|o|n|<|F+0#ffffff16#ff404010|u|n|c|t|i|o|n|<|O+0#e000002#ffffff0|b|j|e|c|t|,+0#0000000&| |O+0#e000002&|b|j|e|c|t|>+0#ffffff16#ff404010|,+0#0000000#ffffff0| |O+0#e000002&|b|j|e|c|t|>+0#0000001#ffff4012| +0#0000000#ffffff0|P|A|R|T|I|A|L| |=| @5 @24|G|e|n|e|r|i|c|s|$|T|e|s|t|s|.|y|0|(|)|;| @30 @4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|F+0#0000001#ffff4012|u|n|c|t|i|o|n|<|B+0#0000000#ffffff0|i|g|I|n|t|e|g|e|r|,| |B|i|g|I|n|t|e|g|e|r|>+0#0000001#ffff4012| +0#0000000#ffffff0|F|A|C|T|O|R|I|A|L|_|2|0@2| |=| @8 -@16|G|e|n|e|r|i|c|s|$|T|e|s|t|s|.|<|B|i|g|I|n|t|e|g|e|r|,| |B|i|g|I|n|t|e|g|e|r|>|y|1|(|)| @15 +@16|G|e|n|e|r|i|c|s|$|T|e|s|t|s|.|<+0#ffffff16#ff404010|B+0#0000000#ffffff0|i|g|I|n|t|e|g|e|r|,| |B|i|g|I|n|t|e|g|e|r|>+0#ffffff16#ff404010|y+0#0000000#ffffff0|1|(|)| @15 @8|.|a|p@1|l|y|(|f| |-+0#00e0e07&|>| +0#0000000&|x| |-+0#00e0e07&|>| +0#0000000&|(|x|.|c|o|m|p|a|r|e|T|o|(|B|i|g|I|n|t|e|g|e|r|.|O|N|E|)| |<| |1+0#e000002&|)+0#0000000&| @16 @12|?| |B|i|g|I|n|t|e|g|e|r|.|O|N|E| @46 @12|:| |x|.|m|u|l|t|i|p|l|y|(|f|.|a|p@1|l|y|(|x|.|s|u|b|t|r|a|c|t|(|B|i|g|I|n|t|e|g|e|r|.|O|N|E|)@3|;| @11 @75 -@4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|<|T|1|>| |Y+0#0000001#ffff4012|0|<|T+0#0000000#ffffff0|1|>+0#0000001#ffff4012| +0#0000000#ffffff0|y+0#00e0e07&|0|(|)| +0#0000000&@47 +@4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|<+0#ffffff16#ff404010|T+0#0000000#ffffff0|1|>+0#ffffff16#ff404010| +0#0000000#ffffff0|Y+0#0000001#ffff4012|0|<|T+0#0000000#ffffff0|1|>+0#0000001#ffff4012| +0#0000000#ffffff0|y+0#00e0e07&|0|(|)| +0#0000000&@47 @4|{| @69 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#00e0e07&|F+0#0000001#ffff4012|u|n|c|t|i|o|n|<|T+0#0000000#ffffff0|1|,| |T|1|>+0#0000001#ffff4012| +0#0000000#ffffff0|f|)+0#00e0e07&| |-|>| +0#0000000&|f|.|a|p@1|l|y|(| @27 -@20|G|e|n|e|r|i|c|s|$|T|e|s|t|s|.|<|T|1|>|y|0|(|)| @31 +@20|G|e|n|e|r|i|c|s|$|T|e|s|t|s|.|<+0#ffffff16#ff404010|T+0#0000000#ffffff0|1|>+0#ffffff16#ff404010|y+0#0000000#ffffff0|0|(|)| @31 @24|.|a|p@1|l|y|(|f|)@1|;| @39 @4|}| @69 @57|1|9|,|2|-|5| @8|9|%| diff --git a/runtime/syntax/testdir/dumps/java_generics_signature_02.dump b/runtime/syntax/testdir/dumps/java_generics_signature_02.dump index 6754ede611..27d0b8de80 100644 --- a/runtime/syntax/testdir/dumps/java_generics_signature_02.dump +++ b/runtime/syntax/testdir/dumps/java_generics_signature_02.dump @@ -1,9 +1,9 @@ | +0&#ffffff0@3|}| @69 @75 -@4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|<|T|1|,| |T|2|>| |Y+0#0000001#ffff4012|1|<|T+0#0000000#ffffff0|1|,| |T|2|>+0#0000001#ffff4012| +0#0000000#ffffff0|y+0#00e0e07&|1|(|)| +0#0000000&@39 +@4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|<+0#ffffff16#ff404010|T+0#0000000#ffffff0|1|,| |T|2|>+0#ffffff16#ff404010| +0#0000000#ffffff0|Y+0#0000001#ffff4012|1|<|T+0#0000000#ffffff0|1|,| |T|2|>+0#0000001#ffff4012| +0#0000000#ffffff0|y+0#00e0e07&|1|(|)| +0#0000000&@39 @4|{| @69 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#00e0e07&|F+0#0000001#ffff4012|u|n|c|t|i|o|n|<|F+0#ffffff16#ff404010|u|n|c|t|i|o|n|<|T+0#0000000#ffffff0|1|,| |T|2|>+0#ffffff16#ff404010|,+0#0000000#ffffff0| |F+0#ffffff16#ff404010|u|n|c|t|i|o|n|<|T+0#0000000#ffffff0|1|,| |T|2|>+0#ffffff16#ff404010|>+0#0000001#ffff4012| +0#0000000#ffffff0|f|)+0#00e0e07&| |-|>| +0#0000000&@8 -@12>(+0#00e0e07&|T+0#0000000&|1| |x|)+0#00e0e07&| |-|>| +0#0000000&|f|.|a|p@1|l|y|(|G|e|n|e|r|i|c|s|$|T|e|s|t|s|.|<|T|1|,| |T|2|>|y|1|(|)| @17 +@12>(+0#00e0e07&|T+0#0000000&|1| |x|)+0#00e0e07&| |-|>| +0#0000000&|f|.|a|p@1|l|y|(|G|e|n|e|r|i|c|s|$|T|e|s|t|s|.|<+0#ffffff16#ff404010|T+0#0000000#ffffff0|1|,| |T|2|>+0#ffffff16#ff404010|y+0#0000000#ffffff0|1|(|)| @17 @24|.|a|p@1|l|y|(|f|)@1| @40 @16|.|a|p@1|l|y|(|x|)|;| @48 @4|}| @69 @@ -17,4 +17,4 @@ @4|i+0#00e0003&|n|t|e|r|f|a|c|e| +0#0000000&|Y+0#0000001#ffff4012|1|<|T+0#0000000#ffffff0|1|,| |T|2|>+0#0000001#ffff4012| +0#0000000#ffffff0|e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|F+0#0000001#ffff4012|u|n|c|t|i|o|n|<|F+0#ffffff16#ff404010|u|n|c|t|i|o|n|<|F+0#0000001#ffff4012|u|n|c|t|i|o|n|<|T+0#0000000#ffffff0|1|,| |T|2|>+0#0000001#ffff4012|,+0#0000000#ffffff0| @6 @20|F+0#0000001#ffff4012|u|n|c|t|i|o|n|<|T+0#0000000#ffffff0|1|,| |T|2|>+0#0000001#ffff4012|>+0#ffffff16#ff404010|,+0#0000000#ffffff0| @36 @20|F+0#ffffff16#ff404010|u|n|c|t|i|o|n|<|T+0#0000000#ffffff0|1|,| |T|2|>+0#ffffff16#ff404010|>+0#0000001#ffff4012| +0#0000000#ffffff0|{| |}| @33 -@57|3|7|,|4|-|1|3| @6|2@1|%| +@57|3|7|,|4|-|1|3| @6|2|1|%| diff --git a/runtime/syntax/testdir/dumps/java_generics_signature_03.dump b/runtime/syntax/testdir/dumps/java_generics_signature_03.dump index 4e66a401c3..8dc1ff54f0 100644 --- a/runtime/syntax/testdir/dumps/java_generics_signature_03.dump +++ b/runtime/syntax/testdir/dumps/java_generics_signature_03.dump @@ -5,16 +5,16 @@ @8|b+0#00e0003&|o@1|l|e|a|n| +0#0000000&|i+0#00e0e07&|s|E|m|p|t|y|(|)|;+0#0000000&| @48 @8>E| |p+0#00e0e07&|e@1|k|(|)|;+0#0000000&| @57 @8|E| |p+0#00e0e07&|o|p|(|)|;+0#0000000&| @58 -@8|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|p+0#00e0e07&|o|p|A|l@1|(|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|?+0#0000000#ffffff0| |s+0#00e0003&|u|p|e|r| +0#0000000&|E|>+0#0000001#ffff4012| +0#0000000#ffffff0|e|l|e|m|e|n|t|s|)+0#00e0e07&|;+0#0000000&| @15 -@8|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|p+0#00e0e07&|o|p|S|o|m|e|(|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|?+0#0000000#ffffff0| |s+0#00e0003&|u|p|e|r| +0#0000000&|E|>+0#0000001#ffff4012| +0#0000000#ffffff0|e|l|e|m|e|n|t|s|,| @15 -@20|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|?+0#0000000#ffffff0| |s+0#00e0003&|u|p|e|r| +0#0000000&|E|>+0#0000001#ffff4012| +0#0000000#ffffff0|f|i|l|t|e|r|)+0#00e0e07&|;+0#0000000&| @25 +@8|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|p+0#00e0e07&|o|p|A|l@1|(|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|?+0#0000000#ffffff0| |s+0#ffffff16#ff404010|u|p|e|r| +0#0000000#ffffff0|E|>+0#0000001#ffff4012| +0#0000000#ffffff0|e|l|e|m|e|n|t|s|)+0#00e0e07&|;+0#0000000&| @15 +@8|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|p+0#00e0e07&|o|p|S|o|m|e|(|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|?+0#0000000#ffffff0| |s+0#ffffff16#ff404010|u|p|e|r| +0#0000000#ffffff0|E|>+0#0000001#ffff4012| +0#0000000#ffffff0|e|l|e|m|e|n|t|s|,| @15 +@20|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|?+0#0000000#ffffff0| |s+0#ffffff16#ff404010|u|p|e|r| +0#0000000#ffffff0|E|>+0#0000001#ffff4012| +0#0000000#ffffff0|f|i|l|t|e|r|)+0#00e0e07&|;+0#0000000&| @25 @8|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|p+0#00e0e07&|u|s|h|(|E+0#0000000&| |e|l|e|m|e|n|t|)+0#00e0e07&|;+0#0000000&| @37 -@8|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|p+0#00e0e07&|u|s|h|A|l@1|(|I+0#0000001#ffff4012|t|e|r|a|b|l|e|<|?+0#0000000#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|E|>+0#0000001#ffff4012| +0#0000000#ffffff0|e|l|e|m|e|n|t|s|)+0#00e0e07&|;+0#0000000&| @13 -@8|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|p+0#00e0e07&|u|s|h|S|o|m|e|(|I+0#0000001#ffff4012|t|e|r|a|b|l|e|<|?+0#0000000#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|E|>+0#0000001#ffff4012| +0#0000000#ffffff0|e|l|e|m|e|n|t|s|,| @13 -@20|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|?+0#0000000#ffffff0| |s+0#00e0003&|u|p|e|r| +0#0000000&|E|>+0#0000001#ffff4012| +0#0000000#ffffff0|f|i|l|t|e|r|)+0#00e0e07&|;+0#0000000&| @25 -@8|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|w+0#00e0e07&|i|n|d|(|C+0#0000001#ffff4012|o|n|s|u|m|e|r|<|?+0#0000000#ffffff0| |s+0#00e0003&|u|p|e|r| +0#0000000&|S+0#ffffff16#ff404010|t|a|c|k|a|b|l|e|<|E+0#0000000#ffffff0|>+0#ffffff16#ff404010|>+0#0000001#ffff4012| +0#0000000#ffffff0|a|c|t|i|o|n|)+0#00e0e07&|;+0#0000000&| @9 +@8|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|p+0#00e0e07&|u|s|h|A|l@1|(|I+0#0000001#ffff4012|t|e|r|a|b|l|e|<|?+0#0000000#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|E|>+0#0000001#ffff4012| +0#0000000#ffffff0|e|l|e|m|e|n|t|s|)+0#00e0e07&|;+0#0000000&| @13 +@8|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|p+0#00e0e07&|u|s|h|S|o|m|e|(|I+0#0000001#ffff4012|t|e|r|a|b|l|e|<|?+0#0000000#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|E|>+0#0000001#ffff4012| +0#0000000#ffffff0|e|l|e|m|e|n|t|s|,| @13 +@20|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|?+0#0000000#ffffff0| |s+0#ffffff16#ff404010|u|p|e|r| +0#0000000#ffffff0|E|>+0#0000001#ffff4012| +0#0000000#ffffff0|f|i|l|t|e|r|)+0#00e0e07&|;+0#0000000&| @25 +@8|S+0#0000001#ffff4012|t|a|c|k|a|b|l|e|<|E+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|w+0#00e0e07&|i|n|d|(|C+0#0000001#ffff4012|o|n|s|u|m|e|r|<|?+0#0000000#ffffff0| |s+0#ffffff16#ff404010|u|p|e|r| +0#0000000#ffffff0|S+0#ffffff16#ff404010|t|a|c|k|a|b|l|e|<|E+0#0000000#ffffff0|>+0#ffffff16#ff404010|>+0#0000001#ffff4012| +0#0000000#ffffff0|a|c|t|i|o|n|)+0#00e0e07&|;+0#0000000&| @9 @4|}| @69 @75 -@4|s+0#00e0003&|e|a|l|e|d| +0#0000000&|i+0#00e0003&|n|t|e|r|f|a|c|e| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012| +0#0000000#ffffff0@32 +@4|s+0#00e0003&|e|a|l|e|d| +0#0000000&|i+0#00e0003&|n|t|e|r|f|a|c|e| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012| +0#0000000#ffffff0@32 @4|{| @69 -@57|5@1|,|3|-|9| @7|3|5|%| +@57|5@1|,|3|-|9| @7|3|4|%| diff --git a/runtime/syntax/testdir/dumps/java_generics_signature_04.dump b/runtime/syntax/testdir/dumps/java_generics_signature_04.dump index 6fa2386895..f76416505f 100644 --- a/runtime/syntax/testdir/dumps/java_generics_signature_04.dump +++ b/runtime/syntax/testdir/dumps/java_generics_signature_04.dump @@ -3,18 +3,18 @@ @8|N| |v+0#00e0e07&|a|l|u|e|(|)|;+0#0000000&| @56 @4|}| @69 @75 -@4>r+0#00e0003&|e|c|o|r|d| +0#0000000&|B+0#0000001#ffff4012|i|n|<|N+0#0000000#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012|(+0#0000000#ffffff0|N| |v|a|l|u|e|)| |i+0#00e0003&|m|p|l|e|m|e|n|t|s| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0@15 +@4>r+0#00e0003&|e|c|o|r|d| +0#0000000&|B+0#0000001#ffff4012|i|n|<|N+0#0000000#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012|(+0#0000000#ffffff0|N| |v|a|l|u|e|)| |i+0#00e0003&|m|p|l|e|m|e|n|t|s| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0@15 @4|{| @69 @8|p+0#00e0003&|u|b|l|i|c| +0#0000000&|i+0#00e0003&|n|t| +0#0000000&|r+0#00e0e07&|a|d|i|x|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|2+0#e000002&|;+0#0000000&| |}| @34 @4|}| @69 @75 -@4|r+0#00e0003&|e|c|o|r|d| +0#0000000&|D+0#0000001#ffff4012|e|c|<|N+0#0000000#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012|(+0#0000000#ffffff0|N| |v|a|l|u|e|)| |i+0#00e0003&|m|p|l|e|m|e|n|t|s| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0@15 +@4|r+0#00e0003&|e|c|o|r|d| +0#0000000&|D+0#0000001#ffff4012|e|c|<|N+0#0000000#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012|(+0#0000000#ffffff0|N| |v|a|l|u|e|)| |i+0#00e0003&|m|p|l|e|m|e|n|t|s| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0@15 @4|{| @69 @8|p+0#00e0003&|u|b|l|i|c| +0#0000000&|i+0#00e0003&|n|t| +0#0000000&|r+0#00e0e07&|a|d|i|x|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|1+0#e000002&|0|;+0#0000000&| |}| @33 @4|}| @69 @75 -@4|r+0#00e0003&|e|c|o|r|d| +0#0000000&|H+0#0000001#ffff4012|e|x|<|N+0#0000000#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012|(+0#0000000#ffffff0|N| |v|a|l|u|e|)| |i+0#00e0003&|m|p|l|e|m|e|n|t|s| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0@15 +@4|r+0#00e0003&|e|c|o|r|d| +0#0000000&|H+0#0000001#ffff4012|e|x|<|N+0#0000000#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012|(+0#0000000#ffffff0|N| |v|a|l|u|e|)| |i+0#00e0003&|m|p|l|e|m|e|n|t|s| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0@15 @4|{| @69 @8|p+0#00e0003&|u|b|l|i|c| +0#0000000&|i+0#00e0003&|n|t| +0#0000000&|r+0#00e0e07&|a|d|i|x|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|1+0#e000002&|6|;+0#0000000&| |}| @33 @4|}| @69 -@57|7|3|,|2|-|5| @7|4|8|%| +@57|7|3|,|2|-|5| @7|4|6|%| diff --git a/runtime/syntax/testdir/dumps/java_generics_signature_05.dump b/runtime/syntax/testdir/dumps/java_generics_signature_05.dump index 352fc4d1a7..0956436d92 100644 --- a/runtime/syntax/testdir/dumps/java_generics_signature_05.dump +++ b/runtime/syntax/testdir/dumps/java_generics_signature_05.dump @@ -1,6 +1,6 @@ | +0&#ffffff0@3|}| @69 @75 -@4|r+0#00e0003&|e|c|o|r|d| +0#0000000&|O+0#0000001#ffff4012|c|t|<|N+0#0000000#ffffff0| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012|(+0#0000000#ffffff0|N| |v|a|l|u|e|)| |i+0#00e0003&|m|p|l|e|m|e|n|t|s| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0@15 +@4|r+0#00e0003&|e|c|o|r|d| +0#0000000&|O+0#0000001#ffff4012|c|t|<|N+0#0000000#ffffff0| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|N+0#e000002&|u|m|b|e|r|>+0#0000001#ffff4012|(+0#0000000#ffffff0|N| |v|a|l|u|e|)| |i+0#00e0003&|m|p|l|e|m|e|n|t|s| +0#0000000&|N+0#0000001#ffff4012|u|m|<|N+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0@15 @4|{| @69 @8|p+0#00e0003&|u|b|l|i|c| +0#0000000&|i+0#00e0003&|n|t| +0#0000000&|r+0#00e0e07&|a|d|i|x|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|8+0#e000002&|;+0#0000000&| |}| @34 @4>}| @69 @@ -17,4 +17,4 @@ @24|y| |-+0#00e0e07&|>| +0#0000000&|L+0#e000002&|o|n|g|.+0#0000000&|t+0#e000002&|o|S|t|r|i|n|g|(+0#0000000&|y|)@1|;| @27 @8|}|;| @64 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|p|.|a|(|)|.|a|p@1|l|y|(|L+0#e000002&|o|n|g|.+0#0000000&|p|a|r|s|e|L|o|n|g|(|p|.|b|(|)|.|a|p@1|l|y|(|x|)|,| |r|a|d|i|x|)@1|;| @8 -@57|9|1|,|2|-|5| @7|6|2|%| +@57|9|1|,|2|-|5| @7|5|9|%| diff --git a/runtime/syntax/testdir/dumps/java_generics_signature_06.dump b/runtime/syntax/testdir/dumps/java_generics_signature_06.dump index bebb9d40f2..86b83f1dde 100644 --- a/runtime/syntax/testdir/dumps/java_generics_signature_06.dump +++ b/runtime/syntax/testdir/dumps/java_generics_signature_06.dump @@ -17,4 +17,4 @@ @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(@1|c|o|m|p|a|r|a|b|l|e| |=| |o| |i+0#af5f00255&|n|s|t|a|n|c|e|o|f| +0#0000000&|C+0#00e0003&|o|m|p|a|r|a|b|l|e|)+0#0000000&| |^| @18 @24|o| |i+0#af5f00255&|n|s|t|a|n|c|e|o|f| +0#0000000&|I+0#00e0003&|t|e|r|a|b|l|e|)+0#0000000&| @28 @12|?| |(|c|o|m|p|a|r|a|b|l|e|)| @48 -@57|1|0|9|,|3|-|9| @6|7|5|%| +@57|1|0|9|,|3|-|9| @6|7|2|%| diff --git a/runtime/syntax/testdir/dumps/java_generics_signature_07.dump b/runtime/syntax/testdir/dumps/java_generics_signature_07.dump index 11795d17e7..ccb69dc1ac 100644 --- a/runtime/syntax/testdir/dumps/java_generics_signature_07.dump +++ b/runtime/syntax/testdir/dumps/java_generics_signature_07.dump @@ -4,6 +4,12 @@ @12|:| |j|a|v|a|.|l|a|n|g|.|C+0#e000002&|l|a|s@1|.+0#0000000&|c+0#00e0003&|l|a|s@1|;+0#0000000&| @38 @4|}| @69 > @74 +@4|<+0#ffffff16#ff404010|A+0#0000000#ffffff0|,| |T| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|j+0#0000001#ffff4012|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|S|u|p@1|l|i|e|r|<|A+0#0000000#ffffff0|>+0#0000001#ffff4012|,+0#0000000#ffffff0| @25 +@8|B|,| |U| |e+0#ffffff16#ff404010|x|t|e|n|d|s| +0#0000000#ffffff0|j+0#0000001#ffff4012|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|S|u|p@1|l|i|e|r|<|B+0#0000000#ffffff0|>+0#0000001#ffff4012|>+0#ffffff16#ff404010| +0#0000000#ffffff0|U| |c+0#00e0e07&|o|n|v|e|r|t|(|T+0#0000000&| |o|)+0#00e0e07&| +0#0000000&@7 +@4|{| @69 +@8|t+0#af5f00255&|h|r|o|w| +0#0000000&|n+0#af5f00255&|e|w| +0#0000000&|U+0#af5f00255&|n|s|u|p@1|o|r|t|e|d|O|p|e|r|a|t|i|o|n|E|x|c|e|p|t|i|o|n|(+0#0000000&|"+0#e000002&|T|O|D|O|"|)+0#0000000&|;| @18 +@4|}| @69 +@75 @4|@+0#e000e06&|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|T|a|r|g|e|t|(| +0#0000000&@41 @16|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|E|l|e|m|e|n|t|T|y|p|e|.|T|Y|P|E|_|U|S|E|)+0#e000e06&| +0#0000000&@16 @4|@+0#00e0003&|i|n|t|e|r|f|a|c|e| +0#0000000&|T|a|g@1|a|b|l|e| @51 @@ -11,10 +17,4 @@ @8|S+0#e000002&|t|r|i|n|g| +0#0000000&|v+0#00e0e07&|a|l|u|e|(|)| +0#0000000&|d+0#00e0003&|e|f|a|u|l|t| +0#0000000&|"+0#e000002&@1|;+0#0000000&| @40 @4|}| @69 @75 -@4|{| @69 -@8|i+0#00e0003&|n|t| +0#0000000&|N| |=| |0+0#e000002&|,+0#0000000&| |X| |=| |1+0#e000002&|,+0#0000000&| |Y| |=| |2+0#e000002&|;+0#0000000&| @42 -@8|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|T+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|f| |=| |y|-+0#00e0e07&|>|N+0#0000000&|<|y|.|i|n|t|V|a|l|u|e|(|)|;| @31 -@8|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|T+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|g| |=| |y|-+0#00e0e07&|>|X+0#0000001#ffff4012|<|N+0#0000000#ffffff0|&@1|(|I+0#e000002&|n|t|e|g|e|r|)+0#0000000&|y|>+0#0000001#ffff4012|N+0#0000000#ffffff0|;| @28 -@8|b+0#00e0003&|o@1|l|e|a|n|[+0#0000000&|]| |b@1| |=| |{| @50 -@12|X+0#0000001#ffff4012|<|N+0#0000000#ffffff0||@1|N|>+0#0000001#ffff4012|Y+0#0000000#ffffff0|,| |X| |<| |Y|,| |X| |<|Y|,| |X| |<|(|Y|)|,| |X|<|(|Y|)|,| |(|X|)|<|Y|,| @18 -@57|1|2|7|,|0|-|1| @6|8@1|%| +@57|1|2|7|,|0|-|1| @6|8|4|%| diff --git a/runtime/syntax/testdir/dumps/java_generics_signature_08.dump b/runtime/syntax/testdir/dumps/java_generics_signature_08.dump index 606ff331ea..ee800269b2 100644 --- a/runtime/syntax/testdir/dumps/java_generics_signature_08.dump +++ b/runtime/syntax/testdir/dumps/java_generics_signature_08.dump @@ -1,9 +1,15 @@ -| +0&#ffffff0@11|X+0#0000001#ffff4012|<|N+0#0000000#ffffff0||@1|N|>+0#0000001#ffff4012|Y+0#0000000#ffffff0|,| |X| |<| |Y|,| |X| |<|Y|,| |X| |<|(|Y|)|,| |X|<|(|Y|)|,| |(|X|)|<|Y|,| @18 +| +0&#ffffff0@74 +@4|{| @69 +@8|i+0#00e0003&|n|t| +0#0000000&|N| |=| |0+0#e000002&|,+0#0000000&| |X| |=| |1+0#e000002&|,+0#0000000&| |Y| |=| |2+0#e000002&|;+0#0000000&| @42 +@8|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|T+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|f| |=| |y|-+0#00e0e07&|>|N+0#0000000&|<|y|.|i|n|t|V|a|l|u|e|(|)|;| @31 +@8|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|T+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|g| |=| |y|-+0#00e0e07&|>|X+0#0000001#ffff4012|<|N+0#0000000#ffffff0|&@1|(|I+0#e000002&|n|t|e|g|e|r|)+0#0000000&|y|>+0#0000001#ffff4012|N+0#0000000#ffffff0|;| @28 +@8>b+0#00e0003&|o@1|l|e|a|n|[+0#0000000&|]| |b@1| |=| |{| @50 +@12|X+0#0000001#ffff4012|<|N+0#0000000#ffffff0||@1|N|>+0#0000001#ffff4012|Y+0#0000000#ffffff0|,| |X| |<| |Y|,| |X| |<|Y|,| |X| |<|(|Y|)|,| |X|<|(|Y|)|,| |(|X|)|<|Y|,| @18 @12|D+0#e000002&|o|u|b|l|e|.+0#0000000&|i|s|F|i|n|i|t|e|(|X|<@1|Y|)|,| @40 @12|X|<|=|Y|,| |X|<|(|i+0#00e0003&|n|t|)+0#0000000&|(|b+0#00e0003&|y|t|e|)+0#0000000&|Y|,| |X|<|~|Y|,| |X|<|-|Y|,| |X|<|+|Y|,| @23 @8|}|;| @64 @8|C+0#0000001#ffff4012|l|a|s@1|<|?+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|k|l|a|s@1| |=| |G|e|n|e|r|i|c|s|$|T|e|s|t|s|.|c+0#00e0003&|l|a|s@1|;+0#0000000&| @28 -@8>C+0#0000001#ffff4012|l|a|s@1|<| +0#0000000#ffffff0|j+0#ffffff16#ff404010|a|v|a|.|l|a|n|g|.|C|l|a|s@1|<|@+0#e000e06#ffffff0|T|a|g@1|a|b|l|e|(|"+0#e000002&|<|>|"|)+0#e000e06&|i+0#00e0003&|n|t|[+0#0000000&|]|[|]|>+0#ffffff16#ff404010| +0#0000000#ffffff0|[|]| |[|]| |>+0#0000001#ffff4012| +0#0000000#ffffff0@12 +@8|C+0#0000001#ffff4012|l|a|s@1|<| +0#0000000#ffffff0|j+0#ffffff16#ff404010|a|v|a|.|l|a|n|g|.|C|l|a|s@1|<|@+0#e000e06#ffffff0|T|a|g@1|a|b|l|e|(|"+0#e000002&|<|>|"|)+0#e000e06&|i+0#00e0003&|n|t|[+0#0000000&|]|[|]|>+0#ffffff16#ff404010| +0#0000000#ffffff0|[|]| |[|]| |>+0#0000001#ffff4012| +0#0000000#ffffff0@12 @8|[| |]| |[| |]| |$| |[| |]| |[| |]|;| @48 @8|i+0#af5f00255&|f| +0#0000000&|(|f+0#e000002&|a|l|s|e|)+0#0000000&| |{| |n+0#af5f00255&|e|w| +0#0000000&|G|e|n|e|r|i|c|s|$|T|e|s|t|s|<|>|(|)|;| |}| @28 @8|a|l|p|h|a|<|?|>| |a|o|;| @54 @@ -11,10 +17,4 @@ @8|a|l|p|h|a|<|a|l|p|h|a|<|U|>@1| |a@1|u|;| @46 @8|a|l|p|h|a|<|Y+0#0000001#ffff4012|0|<|?+0#0000000#ffffff0|>+0#0000001#ffff4012|>+0#0000000#ffffff0| |a|y|0|o|;| @48 @8|a|l|p|h|a|<|Y+0#0000001#ffff4012|0|<|U+0#0000000#ffffff0|>+0#0000001#ffff4012|>+0#0000000#ffffff0| |a|y|0|u|;| @48 -@8|Y|0|<|a|l|p|h|a|<|?|>@1| |y|0|a|o|;| @48 -@8|Y|0|<|a|l|p|h|a|<|U|>@1| |y|0|a|u|;| @48 -@4|}| @69 -|}| @73 -|~+0#4040ff13&| @73 -|~| @73 -| +0#0000000&@56|1|4|5|,|3|-|9| @6|B|o|t| +@57|1|4|5|,|3|-|9| @6|9|7|%| diff --git a/runtime/syntax/testdir/dumps/java_generics_signature_09.dump b/runtime/syntax/testdir/dumps/java_generics_signature_09.dump new file mode 100644 index 0000000000..610316b8ce --- /dev/null +++ b/runtime/syntax/testdir/dumps/java_generics_signature_09.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@7|a|l|p|h|a|<|Y+0#0000001#ffff4012|0|<|U+0#0000000#ffffff0|>+0#0000001#ffff4012|>+0#0000000#ffffff0| |a|y|0|u|;| @48 +@8|Y|0|<|a|l|p|h|a|<|?|>@1| |y|0|a|o|;| @48 +@8|Y|0|<|a|l|p|h|a|<|U|>@1| |y|0|a|u|;| @48 +@4|}| @69 +>}| @73 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|6|2|,|1| @8|B|o|t| diff --git a/runtime/syntax/testdir/dumps/java_lambda_expressions_04.dump b/runtime/syntax/testdir/dumps/java_lambda_expressions_04.dump index 4f0e5a3834..201112770d 100644 --- a/runtime/syntax/testdir/dumps/java_lambda_expressions_04.dump +++ b/runtime/syntax/testdir/dumps/java_lambda_expressions_04.dump @@ -1,8 +1,8 @@ | +0&#ffffff0@7|B|i|n|a|r|y|O|p|e|r|a|t|o|r|<|I|1|>| |l|e|f|t|C|o|n|s|t| |=| |(+0#00e0e07&|x|,| |y|)| |-|>| +0#0000000&|x|;| @23 @8|I|<|I|1|>| |i|d|1| |=| |(+0#00e0e07&|x|)| |-|>| +0#0000000&|(|x|)|;| @43 @8|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|u|n|c|h|e|c|k|e|d|"|)+0#e000e06&| +0#0000000&|I|<|I|1|>| |i|d|2| |=| @24 -@16|(@1|I|<|I|<|I|1|>@1|)| |(|I|<|?|>|)| |(|F|u|n|c|t|i|o|n|<|I|1|,| @26 -@20|I|1|>| |x|)| |-|>| |x|)|.|a|p@1|l|y|(|s+0#af5f00255&|w|i|t|c|h| +0#0000000&|(|0+0#e000002&|)+0#0000000&| |{| @23 +@16|(@1|I|<|I|<|I|1|>@1|)| |(|I|<|?|>|)| |(+0#00e0e07&|F|u|n|c|t|i|o|n|<|I|1|,| +0#0000000&@26 +| +0#00e0e07&@19|I|1|>| |x|)| |-|>| +0#0000000&|x|)|.|a|p@1|l|y|(|s+0#af5f00255&|w|i|t|c|h| +0#0000000&|(|0+0#e000002&|)+0#0000000&| |{| @23 @16>c+0#af5f00255&|a|s|e| +0#0000000&|(@1|i+0#00e0003&|n|t|)+0#0000000&| |(|b+0#00e0003&|y|t|e|)+0#0000000&| |1+0#e000002&|)+0#0000000&| |-|>| |(+0#00e0e07&|I|1| |x|)| |-|>| +0#0000000&|x|;| @21 @16|d+0#af5f00255&|e|f|a|u|l|t| +0#0000000&|-|>| |(+0#00e0e07&|@+0#e000e06&|T|a|g@1|a|b|l|e| +0#00e0e07&|I|1| |x|)| |-|>| +0#0000000&|x|;| |}|)|;| @21 @8|C|<|C|1|,| |C|2|>| |c|o|n|s|t|1| |=| |(+0#00e0e07&|x|)| |-|>| +0#0000000&|(+0#00e0e07&|y|)| |-|>| +0#0000000&|(|x|)|;| @29 diff --git a/runtime/syntax/testdir/dumps/java_lambda_expressions_signature_04.dump b/runtime/syntax/testdir/dumps/java_lambda_expressions_signature_04.dump index c027118cdc..ca1de90a08 100644 --- a/runtime/syntax/testdir/dumps/java_lambda_expressions_signature_04.dump +++ b/runtime/syntax/testdir/dumps/java_lambda_expressions_signature_04.dump @@ -1,8 +1,8 @@ | +0&#ffffff0@7|B|i|n|a|r|y|O|p|e|r|a|t|o|r|<|I|1|>| |l|e|f|t|C|o|n|s|t| |=| |(+0#00e0e07&|x+0#0000000&|,| |y|)+0#00e0e07&| |-|>| +0#0000000&|x|;| @23 @8|I|<|I|1|>| |i|d|1| |=| |(+0#00e0e07&|x+0#0000000&|)+0#00e0e07&| |-|>| +0#0000000&|(|x|)|;| @43 @8|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|u|n|c|h|e|c|k|e|d|"|)+0#e000e06&| +0#0000000&|I|<|I|1|>| |i|d|2| |=| @24 -@16|(@1|I|<|I|<|I|1|>@1|)| |(|I|<|?|>|)| |(|F|u|n|c|t|i|o|n|<|I|1|,| @26 -@20|I|1|>| |x|)| |-|>| |x|)|.|a|p@1|l|y|(|s+0#af5f00255&|w|i|t|c|h| +0#0000000&|(|0+0#e000002&|)+0#0000000&| |{| @23 +@16|(@1|I|<|I|<|I|1|>@1|)| |(|I|<|?|>|)| |(+0#00e0e07&|F+0#0000000&|u|n|c|t|i|o|n|<|I|1|,| @26 +@20|I|1|>| |x|)+0#00e0e07&| |-|>| +0#0000000&|x|)|.|a|p@1|l|y|(|s+0#af5f00255&|w|i|t|c|h| +0#0000000&|(|0+0#e000002&|)+0#0000000&| |{| @23 @16>c+0#af5f00255&|a|s|e| +0#0000000&|(@1|i+0#00e0003&|n|t|)+0#0000000&| |(|b+0#00e0003&|y|t|e|)+0#0000000&| |1+0#e000002&|)+0#0000000&| |-|>| |(+0#00e0e07&|I+0#0000000&|1| |x|)+0#00e0e07&| |-|>| +0#0000000&|x|;| @21 @16|d+0#af5f00255&|e|f|a|u|l|t| +0#0000000&|-|>| |(+0#00e0e07&|@+0#e000e06&|T|a|g@1|a|b|l|e| +0#0000000&|I|1| |x|)+0#00e0e07&| |-|>| +0#0000000&|x|;| |}|)|;| @21 @8|C|<|C|1|,| |C|2|>| |c|o|n|s|t|1| |=| |(+0#00e0e07&|x+0#0000000&|)+0#00e0e07&| |-|>| +0#0000000&|(+0#00e0e07&|y+0#0000000&|)+0#00e0e07&| |-|>| +0#0000000&|(|x|)|;| @29 diff --git a/runtime/syntax/testdir/dumps/java_method_references_02.dump b/runtime/syntax/testdir/dumps/java_method_references_02.dump index 790c0e2b68..87ecbfc1bd 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_02.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_02.dump @@ -17,4 +17,4 @@ @75 @8|/+0#0000e05&@1| |E|x|p|r|e|s@1|i|o|n|N|a|m|e| |:@1| |[|T|y|p|e|A|r|g|u|m|e|n|t|s|]| |I|d|e|n|t|i|f|i|e|r| +0#0000000&@19 @8|/+0#0000e05&@1| |R|e|f|e|r|e|n|c|e|T|y|p|e| |:@1| |[|T|y|p|e|A|r|g|u|m|e|n|t|s|]| |I|d|e|n|t|i|f|i|e|r| +0#0000000&@20 -@57|3|7|,|3|-|9| @7|1|8|%| +@57|3|7|,|3|-|9| @7|1|7|%| diff --git a/runtime/syntax/testdir/dumps/java_method_references_03.dump b/runtime/syntax/testdir/dumps/java_method_references_03.dump index ead4c4f0da..2a3cf4f0f5 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_03.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_03.dump @@ -10,11 +10,11 @@ @75 @8|/+0#0000e05&@1| |C|l|a|s@1|T|y|p|e| |:@1| |[|T|y|p|e|A|r|g|u|m|e|n|t|s|]| |n|e|w| +0#0000000&@31 @8|/+0#0000e05&@1| |A|r@1|a|y|T|y|p|e| |:@1| |n|e|w| +0#0000000&@47 -@8|F+0#00e0e07&|u|n|c|t|i|o|n|<|O+0#0000000&|b|j|e|c|t|,| |C|2|>+0#00e0e07&| +0#0000000&|f|3| |=| |C|2|:+0#00e0e07&@1|<+0#0000000&|O|b|j|e|c|t|>|n+0#af5f00255&|e|w|;+0#0000000&| @24 +@8|F+0#00e0e07&|u|n|c|t|i|o|n|<|O+0#0000000&|b|j|e|c|t|,| |C|2|>+0#00e0e07&| +0#0000000&|f|3| |=| |C|2|:+0#00e0e07&@1|<+0#00e0003&|O+0#0000000&|b|j|e|c|t|>+0#00e0003&|n+0#af5f00255&|e|w|;+0#0000000&| @24 @8|F+0#00e0e07&|u|n|c|t|i|o|n|<|C+0#0000000&|2|,| |C|2|.|C|2|1|>+0#00e0e07&| +0#0000000&|f|4| |=| |p+0#00e0e07&|c|i| |-|>| +0#0000000&|p|c|i|.|n+0#af5f00255&|e|w| +0#0000000&@26 -@20|<|S|t|r|i|n|g|>|C|2|1|(|n+0#e000002&|u|l@1|)+0#0000000&|;| |/+0#0000e05&@1| |C|f|.| |"|d|"|.| +0#0000000&@24 +@20|<+0#00e0003&|S+0#0000000&|t|r|i|n|g|>+0#00e0003&|C+0#0000000&|2|1|(|n+0#e000002&|u|l@1|)+0#0000000&|;| |/+0#0000e05&@1| |C|f|.| |"|d|"|.| +0#0000000&@24 @8|S+0#00e0e07&|u|p@1|l|i|e|r|<|C+0#00e0003&|1|<|?+0#0000000&|>+0#00e0003&|>+0#00e0e07&| +0#0000000&|s|b| |=| |C|1|:+0#00e0e07&@1|n+0#af5f00255&|e|w|;+0#0000000&| @37 -@8|F+0#00e0e07&|u|n|c|t|i|o|n|<|B+0#0000000&|y|t|e|,| |C+0#00e0003&|1|<|?+0#0000000&|>+0#00e0003&|>+0#00e0e07&| +0#0000000&|f|5| |=| |C+0#00e0e07&|1|<|V+0#0000000&|o|i|d|>+0#00e0e07&| +0#0000000&|:+0#00e0e07&@1| +0#0000000&|<|B|y|t|e|>| |n+0#af5f00255&|e|w|;+0#0000000&| @16 +@8|F+0#00e0e07&|u|n|c|t|i|o|n|<|B+0#0000000&|y|t|e|,| |C+0#00e0003&|1|<|?+0#0000000&|>+0#00e0003&|>+0#00e0e07&| +0#0000000&|f|5| |=| |C+0#00e0e07&|1|<|V+0#0000000&|o|i|d|>+0#00e0e07&| +0#0000000&|:+0#00e0e07&@1| +0#0000000&|<+0#00e0003&|B+0#0000000&|y|t|e|>+0#00e0003&| +0#0000000&|n+0#af5f00255&|e|w|;+0#0000000&| @16 @8|I+0#00e0e07&|n|t|F|u|n|c|t|i|o|n|<|C+0#00e0003&|1|<|?+0#0000000&|>+0#00e0003&|[+0#0000000&|]|>+0#00e0e07&| +0#0000000&|i|f|1| |=| |C+0#00e0e07&|1|<|?+0#0000000&|>+0#00e0e07&|[+0#0000000&|]| |:+0#00e0e07&@1| +0#0000000&|n+0#af5f00255&|e|w|;+0#0000000&| @24 @8|I+0#00e0e07&|n|t|F|u|n|c|t|i|o|n|<|b+0#00e0003&|y|t|e|[+0#0000000&|]|>+0#00e0e07&| +0#0000000&|i|f|2| |=| |b+0#00e0003&|y|t|e|[+0#0000000&|]| |:+0#00e0e07&@1| +0#0000000&|n+0#af5f00255&|e|w|;+0#0000000&| @26 -@57|5@1|,|8|-|2|9| @6|2|9|%| +@57|5@1|,|8|-|2|9| @6|2|8|%| diff --git a/runtime/syntax/testdir/dumps/java_method_references_04.dump b/runtime/syntax/testdir/dumps/java_method_references_04.dump index d474574ebb..020ef172a8 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_04.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_04.dump @@ -5,7 +5,7 @@ @75 @4>/+0#0000e05&@1| |s|u|p|e|r| |:@1| |[|T|y|p|e|A|r|g|u|m|e|n|t|s|]| |I|d|e|n|t|i|f|i|e|r| +0#0000000&@32 @4|/+0#0000e05&@1| |T|y|p|e|N|a|m|e| |.| |s|u|p|e|r| |:@1| |[|T|y|p|e|A|r|g|u|m|e|n|t|s|]| |I|d|e|n|t|i|f|i|e|r| +0#0000000&@21 -@4|<|T|>| |M|e|t|h|o|d|R|e|f|e|r|e|n|c|e|s|T|e|s|t|s|(|)| @43 +@4|<+0#00e0003&|T+0#0000000&|>+0#00e0003&| +0#0000000&|M|e|t|h|o|d|R|e|f|e|r|e|n|c|e|s|T|e|s|t|s|(|)| @43 @4|{| @69 @8|P+0#00e0e07&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&|p|1| |=| |M|e|t|h|o|d|R|e|f|e|r|e|n|c|e|s|T|e|s|t|s|.|s+0#00e0003&|u|p|e|r|:+0#00e0e07&@1|e+0#0000000&|q|u|a|l|s|;| @12 @8|P+0#00e0e07&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&|p|2| |=| |M|e|t|h|o|d|R|e|f|e|r|e|n|c|e|s|T|e|s|t|s|.|t+0#00e0003&|h|i|s|:+0#00e0e07&@1|e+0#0000000&|q|u|a|l|s|;| @13 @@ -17,4 +17,4 @@ @8|{| @65 @12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|I|3| @53 @16|.|s+0#00e0003&|u|p|e|r|:+0#00e0e07&@1|e+0#0000000&|q|u|a|l|s|;| |/+0#0000e05&|*| |"|a|"| |*|/| +0#0000000&@33 -@57|7|3|,|2|-|5| @7|4|0|%| +@57|7|3|,|2|-|5| @7|3|8|%| diff --git a/runtime/syntax/testdir/dumps/java_method_references_05.dump b/runtime/syntax/testdir/dumps/java_method_references_05.dump index 498047ed51..62fc21853f 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_05.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_05.dump @@ -15,6 +15,6 @@ @4|{| @69 | +0#00e0e07&@7|d+0#00e0003&|e|f|a|u|l|t| +0#00e0e07&|P|r|e|d|i|c|a|t|e|<|T|>| |s|u|p|e|r|E|q|u|a|l|i|s|t|(|)| +0#0000000&@30 @8|{| @2|/+0#0000e05&|*| |N|o|n|-|c|a|p|t|u|r|i|n|g| |g|y|m|n|a|s|t|i|c|s| |f|o|r| |s|u|p|e|r|:@1|e|q|u|a|l|s|.| |*|/| +0#0000000&@13 -@12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|F|u|n|c|t|i|o|n|.|<|F+0#00e0e07&|u|n|c|t|i|o|n|<|M+0#0000000&|e|t|h|o|d|H|a|n|d|l|e|,| @23 -@28|P+0#00e0003&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0003&|>+0#00e0e07&|>+0#0000000&| @32 -@57|9|1|,|2|-|5| @7|5|0|%| +@12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|F|u|n|c|t|i|o|n|.|<+0#00e0003&|F+0#00e0e07&|u|n|c|t|i|o|n|<|M+0#0000000&|e|t|h|o|d|H|a|n|d|l|e|,| @23 +@28|P+0#00e0003&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0003&|>+0#00e0e07&|>+0#00e0003&| +0#0000000&@32 +@57|9|1|,|2|-|5| @7|4|9|%| diff --git a/runtime/syntax/testdir/dumps/java_method_references_06.dump b/runtime/syntax/testdir/dumps/java_method_references_06.dump index 4826e55811..e60662d4f9 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_06.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_06.dump @@ -1,4 +1,4 @@ -| +0&#ffffff0@27|P+0#00e0003&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0003&|>+0#00e0e07&|>+0#0000000&| @32 +| +0&#ffffff0@27|P+0#00e0003&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0003&|>+0#00e0e07&|>+0#00e0003&| +0#0000000&@32 @32|i|d|e|n|t|i|t|y|(|)| @32 @16|.|a|p@1|l|y|(|m+0#00e0e07&|h| |-|>| +0#0000000&|o+0#00e0e07&| |-|>| +0#0000000&|M|e|t|h|o|d|R|e|f|e|r|e|n|c|e|s|T|e|s|t|s| @19 @24|.|i|n|v|o|k|e|P|r|e|d|i|c|a|t|e|(|m|h|,| |o|)@1| @26 @@ -10,11 +10,11 @@ @4|{| @69 | +0#00e0e07&@7|d+0#00e0003&|e|f|a|u|l|t| +0#00e0e07&|P|r|e|d|i|c|a|t|e|<|T|>| |e|q|u|a|l|i|s|t|(|)| +0#0000000&@35 @8|{| @2|/+0#0000e05&|*| |N|o|n|-|c|a|p|t|u|r|i|n|g| |g|y|m|n|a|s|t|i|c|s| |f|o|r| |t|h|i|s|:@1|e|q|u|a|l|s|.| |*|/| +0#0000000&@14 -@12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|F|u|n|c|t|i|o|n|.|<|F+0#00e0e07&|u|n|c|t|i|o|n|<|I+0#00e0003&|1|<|T+0#0000000&|>+0#00e0003&|,+0#0000000&| |P+0#00e0003&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0003&|>+0#00e0e07&|>+0#0000000&| @15 +@12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|F|u|n|c|t|i|o|n|.|<+0#00e0003&|F+0#00e0e07&|u|n|c|t|i|o|n|<|I+0#00e0003&|1|<|T+0#0000000&|>+0#00e0003&|,+0#0000000&| |P+0#00e0003&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0003&|>+0#00e0e07&|>+0#00e0003&| +0#0000000&@15 @32|i|d|e|n|t|i|t|y|(|)| @32 @16|.|a|p@1|l|y|(|t+0#00e0e07&|h|a|t| |-|>| +0#0000000&|o+0#00e0e07&| |-|>| +0#0000000&|F|u|n|c|t|i|o|n| @30 -@24|.|<|B+0#00e0e07&|i|P|r|e|d|i|c|a|t|e|<|I+0#00e0003&|1|<|T+0#0000000&|>+0#00e0003&|,+0#0000000&| |T|>+0#00e0e07&|>+0#0000000&| @26 +@24|.|<+0#00e0003&|B+0#00e0e07&|i|P|r|e|d|i|c|a|t|e|<|I+0#00e0003&|1|<|T+0#0000000&|>+0#00e0003&|,+0#0000000&| |T|>+0#00e0e07&|>+0#00e0003&| +0#0000000&@26 @32|i|d|e|n|t|i|t|y|(|)| @32 @20|.|a|p@1|l|y|(|I+0#00e0e07&|1|<|T+0#0000000&|>+0#00e0e07&|:@1| +0#0000000&@1|/+0#0000e05&|*| |"|c|"| |*|/| +0#0000000&@29 @24|e|q|u|a|l|s|)| @43 -@57|1|0|9|,|3|-|9| @6|6|1|%| +@57|1|0|9|,|3|-|9| @6|5|9|%| diff --git a/runtime/syntax/testdir/dumps/java_method_references_07.dump b/runtime/syntax/testdir/dumps/java_method_references_07.dump index 96e85ab47e..7cdacb189a 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_07.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_07.dump @@ -4,7 +4,7 @@ @8|}| @65 @4|}| @69 > @74 -| +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|<|T|>| |b+0#00e0003&|o@1|l|e|a|n| +0#00e0e07&|i|n|v|o|k|e|P|r|e|d|i|c|a|t|e|(|M|e|t|h|o|d|H|a|n|d|l|e| |m|h|,| |T| |o|)| +0#0000000&@14 +| +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|<+0#00e0003&|T+0#00e0e07&|>+0#00e0003&| +0#00e0e07&|b+0#00e0003&|o@1|l|e|a|n| +0#00e0e07&|i|n|v|o|k|e|P|r|e|d|i|c|a|t|e|(|M|e|t|h|o|d|H|a|n|d|l|e| |m|h|,| |T| |o|)| +0#0000000&@14 @4|{| @69 @8|t+0#af5f00255&|r|y| +0#0000000&|{| @61 @12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|b+0#00e0003&|o@1|l|e|a|n|)+0#0000000&| |m|h|.|i|n|v|o|k|e|E|x|a|c|t|(|o|)|;| @27 @@ -17,4 +17,4 @@ @75 @4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|{| @62 @8|t+0#af5f00255&|r|y| +0#0000000&|{| @61 -@57|1|2|7|,|0|-|1| @6|7|2|%| +@57|1|2|7|,|0|-|1| @6|6|9|%| diff --git a/runtime/syntax/testdir/dumps/java_method_references_08.dump b/runtime/syntax/testdir/dumps/java_method_references_08.dump index 537c5d5c63..640b99453a 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_08.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_08.dump @@ -15,6 +15,6 @@ @4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|c+0#00e0003&|l|a|s@1| +0#0000000&|C+0#00e0e07&|1|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&@52 @4|{| @69 @8|C|1|(|)| |{| |}| @58 -@8|<|A|>| |C|1|(|A| |d|u|m@1|y|)| |{| |}| @47 +@8|<+0#00e0003&|A+0#0000000&|>+0#00e0003&| +0#0000000&|C|1|(|A| |d|u|m@1|y|)| |{| |}| @47 @4|}| @69 -@57|1|4|5|,|5|-|1|7| @5|8|3|%| +@57|1|4|5|,|5|-|1|7| @5|8|0|%| diff --git a/runtime/syntax/testdir/dumps/java_method_references_09.dump b/runtime/syntax/testdir/dumps/java_method_references_09.dump index d5110b62cb..920d629a38 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_09.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_09.dump @@ -2,9 +2,9 @@ @75 @4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|c+0#00e0003&|l|a|s@1| +0#0000000&|C|2| @55 @4|{| @69 -@8|C|2|(|)| |{| |<|S|t|r|i|n|g|>| |t+0#00e0003&|h|i|s|(+0#0000000&|"+0#e000002&@1|)+0#0000000&|;| |}| @39 +@8|C|2|(|)| |{| |<+0#00e0003&|S+0#0000000&|t|r|i|n|g|>+0#00e0003&| +0#0000000&|t+0#00e0003&|h|i|s|(+0#0000000&|"+0#e000002&@1|)+0#0000000&|;| |}| @39 > @74 -@8|<|A|>| |C|2|(|A| |d|u|m@1|y|)| @51 +@8|<+0#00e0003&|A+0#0000000&|>+0#00e0003&| +0#0000000&|C|2|(|A| |d|u|m@1|y|)| @51 @8|{| @65 @12|C|2|.|s|t|r|i|n|g|e|r|(|)|.|a|p@1|l|y|(@2|F+0#00e0e07&|u|n|c|t|i|o|n|<|C+0#0000000&|2|,| |C|2|.|C|2|1|>+0#00e0e07&|)+0#0000000&| @19 @24|C|2|.|C|2|1|:+0#00e0e07&@1|n+0#af5f00255&|e|w|)+0#0000000&| @3|/+0#0000e05&|*| |"|d|"| |*|/| +0#0000000&@25 @@ -13,8 +13,8 @@ @75 @4| +0#00e0003&@3|c|l|a|s@1| +0#0000000&|C|2|1| @57 @8|{| @65 -@12|C|2|1|(|)| |{| |<|S|t|r|i|n|g|>| |t+0#00e0003&|h|i|s|(+0#0000000&|"+0#e000002&@1|)+0#0000000&|;| |}| @34 +@12|C|2|1|(|)| |{| |<+0#00e0003&|S+0#0000000&|t|r|i|n|g|>+0#00e0003&| +0#0000000&|t+0#00e0003&|h|i|s|(+0#0000000&|"+0#e000002&@1|)+0#0000000&|;| |}| @34 @75 -@12|<|B|>| |C|2|1|(|B| |d|u|m@1|y|)| @46 +@12|<+0#00e0003&|B+0#0000000&|>+0#00e0003&| +0#0000000&|C|2|1|(|B| |d|u|m@1|y|)| @46 @12|{| @61 -@57|1|6|3|,|0|-|1| @6|9|4|%| +@57|1|6|3|,|0|-|1| @6|9|0|%| diff --git a/runtime/syntax/testdir/dumps/java_method_references_10.dump b/runtime/syntax/testdir/dumps/java_method_references_10.dump index 35efcca5ba..9f55150e2a 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_10.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_10.dump @@ -3,18 +3,18 @@ @12|}| @61 @8|}| @65 @75 -| +0#00e0e07&@7>s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|<|T| |e|x|t|e|n|d|s| |O|b|j|e|c|t|>| |F|u|n|c|t|i|o|n|<|T|,| |S|t|r|i|n|g|>| |s|t|r|i|n|g|e|r|(|)| +0#0000000&@10 +| +0#00e0e07&@7>s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|<+0#00e0003&|T+0#00e0e07&| |e+0#00e0003&|x|t|e|n|d|s| +0#00e0e07&|O|b|j|e|c|t|>+0#00e0003&| +0#00e0e07&|F|u|n|c|t|i|o|n|<|T|,| |S|t|r|i|n|g|>| |s|t|r|i|n|g|e|r|(|)| +0#0000000&@10 @8|{| @65 @12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|T|:+0#00e0e07&@1|t+0#0000000&|o|S|t|r|i|n|g|;| |/+0#0000e05&|*| |"|e|"| |*|/| +0#0000000&@33 @8|}| @65 @4|}| @69 +@75 +@4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|{| @62 +@8|(@1|S+0#00e0e07&|u|p@1|l|i|e|r|<|C+0#00e0003&|l|a|s@1|<|?+0#0000000&|>+0#00e0003&|>+0#00e0e07&|)+0#0000000&|(@1|S+0#00e0e07&|u|p@1|l|i|e|r|<|C+0#0000000&|2|.|C|2|1|>+0#00e0e07&|)+0#0000000&|(+0#00e0e07&|)|-|>|n+0#af5f00255&|e|w| +0#0000000&@19 +@12|<+0#00e0003&|O+0#0000000&|b|j|e|c|t|>+0#00e0003&|C+0#0000000&|2|(|)|.|n+0#af5f00255&|e|w| +0#0000000&|<+0#00e0003&|O+0#0000000&|b|j|e|c|t|>+0#00e0003&| +0#0000000&|C|2|1|(|n+0#af5f00255&|e|w|<+0#00e0003&|O+0#0000000&|b|j|e|c|t|>+0#00e0003&| +0#0000000&@21 +@16|C+0#00e0e07&|1|<| +0#0000000&|O|b|j|e|c|t| |>+0#00e0e07&|(+0#0000000&@1|C+0#00e0e07&|1|<|?+0#0000000&|>+0#00e0e07&|)+0#0000000&|n+0#e000002&|u|l@1|)+0#0000000&@2|:+0#00e0e07&@1|g+0#0000000&|e|t|C|l|a|s@1|)|.|g|e|t|(|)|;| @13 +@4|}| @69 |}| @73 |~+0#4040ff13&| @73 |~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 | +0#0000000&@56|1|8|1|,|3|-|9| @6|B|o|t| diff --git a/runtime/syntax/testdir/dumps/java_method_references_signature_02.dump b/runtime/syntax/testdir/dumps/java_method_references_signature_02.dump index a223c38b75..dfe5ebede7 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_signature_02.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_signature_02.dump @@ -17,4 +17,4 @@ @75 @8|/+0#0000e05&@1| |E|x|p|r|e|s@1|i|o|n|N|a|m|e| |:@1| |[|T|y|p|e|A|r|g|u|m|e|n|t|s|]| |I|d|e|n|t|i|f|i|e|r| +0#0000000&@19 @8|/+0#0000e05&@1| |R|e|f|e|r|e|n|c|e|T|y|p|e| |:@1| |[|T|y|p|e|A|r|g|u|m|e|n|t|s|]| |I|d|e|n|t|i|f|i|e|r| +0#0000000&@20 -@57|3|7|,|3|-|9| @7|1|8|%| +@57|3|7|,|3|-|9| @7|1|7|%| diff --git a/runtime/syntax/testdir/dumps/java_method_references_signature_03.dump b/runtime/syntax/testdir/dumps/java_method_references_signature_03.dump index 761fb979ef..c858348861 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_signature_03.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_signature_03.dump @@ -10,11 +10,11 @@ @75 @8|/+0#0000e05&@1| |C|l|a|s@1|T|y|p|e| |:@1| |[|T|y|p|e|A|r|g|u|m|e|n|t|s|]| |n|e|w| +0#0000000&@31 @8|/+0#0000e05&@1| |A|r@1|a|y|T|y|p|e| |:@1| |n|e|w| +0#0000000&@47 -@8|F+0#00e0e07&|u|n|c|t|i|o|n|<|O+0#0000000&|b|j|e|c|t|,| |C|2|>+0#00e0e07&| +0#0000000&|f|3| |=| |C|2|:+0#00e0e07&@1|<+0#0000000&|O|b|j|e|c|t|>|n+0#af5f00255&|e|w|;+0#0000000&| @24 +@8|F+0#00e0e07&|u|n|c|t|i|o|n|<|O+0#0000000&|b|j|e|c|t|,| |C|2|>+0#00e0e07&| +0#0000000&|f|3| |=| |C|2|:+0#00e0e07&@1|<+0#00e0003&|O+0#0000000&|b|j|e|c|t|>+0#00e0003&|n+0#af5f00255&|e|w|;+0#0000000&| @24 @8|F+0#00e0e07&|u|n|c|t|i|o|n|<|C+0#0000000&|2|,| |C|2|.|C|2|1|>+0#00e0e07&| +0#0000000&|f|4| |=| |p|c|i| |-+0#00e0e07&|>| +0#0000000&|p|c|i|.|n+0#af5f00255&|e|w| +0#0000000&@26 -@20|<|S|t|r|i|n|g|>|C|2|1|(|n+0#e000002&|u|l@1|)+0#0000000&|;| |/+0#0000e05&@1| |C|f|.| |"|d|"|.| +0#0000000&@24 +@20|<+0#00e0003&|S+0#0000000&|t|r|i|n|g|>+0#00e0003&|C+0#0000000&|2|1|(|n+0#e000002&|u|l@1|)+0#0000000&|;| |/+0#0000e05&@1| |C|f|.| |"|d|"|.| +0#0000000&@24 @8|S+0#00e0e07&|u|p@1|l|i|e|r|<|C+0#00e0003&|1|<|?+0#0000000&|>+0#00e0003&|>+0#00e0e07&| +0#0000000&|s|b| |=| |C|1|:+0#00e0e07&@1|n+0#af5f00255&|e|w|;+0#0000000&| @37 -@8|F+0#00e0e07&|u|n|c|t|i|o|n|<|B+0#0000000&|y|t|e|,| |C+0#00e0003&|1|<|?+0#0000000&|>+0#00e0003&|>+0#00e0e07&| +0#0000000&|f|5| |=| |C+0#00e0e07&|1|<|V+0#0000000&|o|i|d|>+0#00e0e07&| +0#0000000&|:+0#00e0e07&@1| +0#0000000&|<|B|y|t|e|>| |n+0#af5f00255&|e|w|;+0#0000000&| @16 +@8|F+0#00e0e07&|u|n|c|t|i|o|n|<|B+0#0000000&|y|t|e|,| |C+0#00e0003&|1|<|?+0#0000000&|>+0#00e0003&|>+0#00e0e07&| +0#0000000&|f|5| |=| |C+0#00e0e07&|1|<|V+0#0000000&|o|i|d|>+0#00e0e07&| +0#0000000&|:+0#00e0e07&@1| +0#0000000&|<+0#00e0003&|B+0#0000000&|y|t|e|>+0#00e0003&| +0#0000000&|n+0#af5f00255&|e|w|;+0#0000000&| @16 @8|I+0#00e0e07&|n|t|F|u|n|c|t|i|o|n|<|C+0#00e0003&|1|<|?+0#0000000&|>+0#00e0003&|[+0#0000000&|]|>+0#00e0e07&| +0#0000000&|i|f|1| |=| |C+0#00e0e07&|1|<|?+0#0000000&|>+0#00e0e07&|[+0#0000000&|]| |:+0#00e0e07&@1| +0#0000000&|n+0#af5f00255&|e|w|;+0#0000000&| @24 @8|I+0#00e0e07&|n|t|F|u|n|c|t|i|o|n|<|b+0#00e0003&|y|t|e|[+0#0000000&|]|>+0#00e0e07&| +0#0000000&|i|f|2| |=| |b+0#00e0003&|y|t|e|[+0#0000000&|]| |:+0#00e0e07&@1| +0#0000000&|n+0#af5f00255&|e|w|;+0#0000000&| @26 -@57|5@1|,|8|-|2|9| @6|2|9|%| +@57|5@1|,|8|-|2|9| @6|2|8|%| diff --git a/runtime/syntax/testdir/dumps/java_method_references_signature_04.dump b/runtime/syntax/testdir/dumps/java_method_references_signature_04.dump index 517b2772c5..a77e699b58 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_signature_04.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_signature_04.dump @@ -5,7 +5,7 @@ @75 @4>/+0#0000e05&@1| |s|u|p|e|r| |:@1| |[|T|y|p|e|A|r|g|u|m|e|n|t|s|]| |I|d|e|n|t|i|f|i|e|r| +0#0000000&@32 @4|/+0#0000e05&@1| |T|y|p|e|N|a|m|e| |.| |s|u|p|e|r| |:@1| |[|T|y|p|e|A|r|g|u|m|e|n|t|s|]| |I|d|e|n|t|i|f|i|e|r| +0#0000000&@21 -@4|<|T|>| |M|e|t|h|o|d|R|e|f|e|r|e|n|c|e|s|$|T|e|s|t|s|(|)| @42 +@4|<+0#00e0003&|T+0#0000000&|>+0#00e0003&| +0#0000000&|M|e|t|h|o|d|R|e|f|e|r|e|n|c|e|s|$|T|e|s|t|s|(|)| @42 @4|{| @69 @8|P+0#00e0e07&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&|p|1| |=| |M|e|t|h|o|d|R|e|f|e|r|e|n|c|e|s|$|T|e|s|t|s|.|s+0#00e0003&|u|p|e|r|:+0#00e0e07&@1|e+0#0000000&|q|u|a|l|s|;| @11 @8|P+0#00e0e07&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&|p|2| |=| |M|e|t|h|o|d|R|e|f|e|r|e|n|c|e|s|$|T|e|s|t|s|.|t+0#00e0003&|h|i|s|:+0#00e0e07&@1|e+0#0000000&|q|u|a|l|s|;| @12 @@ -17,4 +17,4 @@ @8|{| @65 @12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|I|3| @53 @16|.|s+0#00e0003&|u|p|e|r|:+0#00e0e07&@1|e+0#0000000&|q|u|a|l|s|;| |/+0#0000e05&|*| |"|a|"| |*|/| +0#0000000&@33 -@57|7|3|,|2|-|5| @7|4|0|%| +@57|7|3|,|2|-|5| @7|3|8|%| diff --git a/runtime/syntax/testdir/dumps/java_method_references_signature_05.dump b/runtime/syntax/testdir/dumps/java_method_references_signature_05.dump index d0c5c8c709..b61ea6b230 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_signature_05.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_signature_05.dump @@ -15,6 +15,6 @@ @4|{| @69 @8|d+0#00e0003&|e|f|a|u|l|t| +0#0000000&|P+0#00e0e07&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&|s+0#00e0e07&|u|p|e|r|E|q|u|a|l|i|s|t|(|)| +0#0000000&@30 @8|{| @2|/+0#0000e05&|*| |N|o|n|-|c|a|p|t|u|r|i|n|g| |g|y|m|n|a|s|t|i|c|s| |f|o|r| |s|u|p|e|r|:@1|e|q|u|a|l|s|.| |*|/| +0#0000000&@13 -@12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|F|u|n|c|t|i|o|n|.|<|F+0#00e0e07&|u|n|c|t|i|o|n|<|M+0#0000000&|e|t|h|o|d|H|a|n|d|l|e|,| @23 -@28|P+0#00e0003&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0003&|>+0#00e0e07&|>+0#0000000&| @32 -@57|9|1|,|2|-|5| @7|5|0|%| +@12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|F|u|n|c|t|i|o|n|.|<+0#00e0003&|F+0#00e0e07&|u|n|c|t|i|o|n|<|M+0#0000000&|e|t|h|o|d|H|a|n|d|l|e|,| @23 +@28|P+0#00e0003&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0003&|>+0#00e0e07&|>+0#00e0003&| +0#0000000&@32 +@57|9|1|,|2|-|5| @7|4|9|%| diff --git a/runtime/syntax/testdir/dumps/java_method_references_signature_06.dump b/runtime/syntax/testdir/dumps/java_method_references_signature_06.dump index a9662d4bf0..fd95c6652b 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_signature_06.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_signature_06.dump @@ -1,4 +1,4 @@ -| +0&#ffffff0@27|P+0#00e0003&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0003&|>+0#00e0e07&|>+0#0000000&| @32 +| +0&#ffffff0@27|P+0#00e0003&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0003&|>+0#00e0e07&|>+0#00e0003&| +0#0000000&@32 @32|i|d|e|n|t|i|t|y|(|)| @32 @16|.|a|p@1|l|y|(|m|h| |-+0#00e0e07&|>| +0#0000000&|o| |-+0#00e0e07&|>| +0#0000000&|M|e|t|h|o|d|R|e|f|e|r|e|n|c|e|s|$|T|e|s|t|s| @18 @24|.|i|n|v|o|k|e|P|r|e|d|i|c|a|t|e|(|m|h|,| |o|)@1| @26 @@ -10,11 +10,11 @@ @4|{| @69 @8|d+0#00e0003&|e|f|a|u|l|t| +0#0000000&|P+0#00e0e07&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&|e+0#00e0e07&|q|u|a|l|i|s|t|(|)| +0#0000000&@35 @8|{| @2|/+0#0000e05&|*| |N|o|n|-|c|a|p|t|u|r|i|n|g| |g|y|m|n|a|s|t|i|c|s| |f|o|r| |t|h|i|s|:@1|e|q|u|a|l|s|.| |*|/| +0#0000000&@14 -@12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|F|u|n|c|t|i|o|n|.|<|F+0#00e0e07&|u|n|c|t|i|o|n|<|I+0#00e0003&|1|<|T+0#0000000&|>+0#00e0003&|,+0#0000000&| |P+0#00e0003&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0003&|>+0#00e0e07&|>+0#0000000&| @15 +@12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|F|u|n|c|t|i|o|n|.|<+0#00e0003&|F+0#00e0e07&|u|n|c|t|i|o|n|<|I+0#00e0003&|1|<|T+0#0000000&|>+0#00e0003&|,+0#0000000&| |P+0#00e0003&|r|e|d|i|c|a|t|e|<|T+0#0000000&|>+0#00e0003&|>+0#00e0e07&|>+0#00e0003&| +0#0000000&@15 @32|i|d|e|n|t|i|t|y|(|)| @32 @16|.|a|p@1|l|y|(|t|h|a|t| |-+0#00e0e07&|>| +0#0000000&|o| |-+0#00e0e07&|>| +0#0000000&|F|u|n|c|t|i|o|n| @30 -@24|.|<|B+0#00e0e07&|i|P|r|e|d|i|c|a|t|e|<|I+0#00e0003&|1|<|T+0#0000000&|>+0#00e0003&|,+0#0000000&| |T|>+0#00e0e07&|>+0#0000000&| @26 +@24|.|<+0#00e0003&|B+0#00e0e07&|i|P|r|e|d|i|c|a|t|e|<|I+0#00e0003&|1|<|T+0#0000000&|>+0#00e0003&|,+0#0000000&| |T|>+0#00e0e07&|>+0#00e0003&| +0#0000000&@26 @32|i|d|e|n|t|i|t|y|(|)| @32 @20|.|a|p@1|l|y|(|I+0#00e0e07&|1|<|T+0#0000000&|>+0#00e0e07&|:@1| +0#0000000&@1|/+0#0000e05&|*| |"|c|"| |*|/| +0#0000000&@29 @24|e|q|u|a|l|s|)| @43 -@57|1|0|9|,|3|-|9| @6|6|1|%| +@57|1|0|9|,|3|-|9| @6|5|9|%| diff --git a/runtime/syntax/testdir/dumps/java_method_references_signature_07.dump b/runtime/syntax/testdir/dumps/java_method_references_signature_07.dump index 70301bd6f6..4c96e053ed 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_signature_07.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_signature_07.dump @@ -4,7 +4,7 @@ @8|}| @65 @4|}| @69 > @74 -@4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|<|T|>| |b+0#00e0003&|o@1|l|e|a|n| +0#0000000&|i+0#00e0e07&|n|v|o|k|e|P|r|e|d|i|c|a|t|e|(|M+0#0000000&|e|t|h|o|d|H|a|n|d|l|e| |m|h|,| |T| |o|)+0#00e0e07&| +0#0000000&@14 +@4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|<+0#00e0003&|T+0#0000000&|>+0#00e0003&| +0#0000000&|b+0#00e0003&|o@1|l|e|a|n| +0#0000000&|i+0#00e0e07&|n|v|o|k|e|P|r|e|d|i|c|a|t|e|(|M+0#0000000&|e|t|h|o|d|H|a|n|d|l|e| |m|h|,| |T| |o|)+0#00e0e07&| +0#0000000&@14 @4|{| @69 @8|t+0#af5f00255&|r|y| +0#0000000&|{| @61 @12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|b+0#00e0003&|o@1|l|e|a|n|)+0#0000000&| |m|h|.|i|n|v|o|k|e|E|x|a|c|t|(|o|)|;| @27 @@ -17,4 +17,4 @@ @75 @4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|{| @62 @8|t+0#af5f00255&|r|y| +0#0000000&|{| @61 -@57|1|2|7|,|0|-|1| @6|7|2|%| +@57|1|2|7|,|0|-|1| @6|6|9|%| diff --git a/runtime/syntax/testdir/dumps/java_method_references_signature_08.dump b/runtime/syntax/testdir/dumps/java_method_references_signature_08.dump index 537c5d5c63..640b99453a 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_signature_08.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_signature_08.dump @@ -15,6 +15,6 @@ @4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|c+0#00e0003&|l|a|s@1| +0#0000000&|C+0#00e0e07&|1|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&@52 @4|{| @69 @8|C|1|(|)| |{| |}| @58 -@8|<|A|>| |C|1|(|A| |d|u|m@1|y|)| |{| |}| @47 +@8|<+0#00e0003&|A+0#0000000&|>+0#00e0003&| +0#0000000&|C|1|(|A| |d|u|m@1|y|)| |{| |}| @47 @4|}| @69 -@57|1|4|5|,|5|-|1|7| @5|8|3|%| +@57|1|4|5|,|5|-|1|7| @5|8|0|%| diff --git a/runtime/syntax/testdir/dumps/java_method_references_signature_09.dump b/runtime/syntax/testdir/dumps/java_method_references_signature_09.dump index d5110b62cb..920d629a38 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_signature_09.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_signature_09.dump @@ -2,9 +2,9 @@ @75 @4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|c+0#00e0003&|l|a|s@1| +0#0000000&|C|2| @55 @4|{| @69 -@8|C|2|(|)| |{| |<|S|t|r|i|n|g|>| |t+0#00e0003&|h|i|s|(+0#0000000&|"+0#e000002&@1|)+0#0000000&|;| |}| @39 +@8|C|2|(|)| |{| |<+0#00e0003&|S+0#0000000&|t|r|i|n|g|>+0#00e0003&| +0#0000000&|t+0#00e0003&|h|i|s|(+0#0000000&|"+0#e000002&@1|)+0#0000000&|;| |}| @39 > @74 -@8|<|A|>| |C|2|(|A| |d|u|m@1|y|)| @51 +@8|<+0#00e0003&|A+0#0000000&|>+0#00e0003&| +0#0000000&|C|2|(|A| |d|u|m@1|y|)| @51 @8|{| @65 @12|C|2|.|s|t|r|i|n|g|e|r|(|)|.|a|p@1|l|y|(@2|F+0#00e0e07&|u|n|c|t|i|o|n|<|C+0#0000000&|2|,| |C|2|.|C|2|1|>+0#00e0e07&|)+0#0000000&| @19 @24|C|2|.|C|2|1|:+0#00e0e07&@1|n+0#af5f00255&|e|w|)+0#0000000&| @3|/+0#0000e05&|*| |"|d|"| |*|/| +0#0000000&@25 @@ -13,8 +13,8 @@ @75 @4| +0#00e0003&@3|c|l|a|s@1| +0#0000000&|C|2|1| @57 @8|{| @65 -@12|C|2|1|(|)| |{| |<|S|t|r|i|n|g|>| |t+0#00e0003&|h|i|s|(+0#0000000&|"+0#e000002&@1|)+0#0000000&|;| |}| @34 +@12|C|2|1|(|)| |{| |<+0#00e0003&|S+0#0000000&|t|r|i|n|g|>+0#00e0003&| +0#0000000&|t+0#00e0003&|h|i|s|(+0#0000000&|"+0#e000002&@1|)+0#0000000&|;| |}| @34 @75 -@12|<|B|>| |C|2|1|(|B| |d|u|m@1|y|)| @46 +@12|<+0#00e0003&|B+0#0000000&|>+0#00e0003&| +0#0000000&|C|2|1|(|B| |d|u|m@1|y|)| @46 @12|{| @61 -@57|1|6|3|,|0|-|1| @6|9|4|%| +@57|1|6|3|,|0|-|1| @6|9|0|%| diff --git a/runtime/syntax/testdir/dumps/java_method_references_signature_10.dump b/runtime/syntax/testdir/dumps/java_method_references_signature_10.dump index 7bc18d819d..d20ae784b1 100644 --- a/runtime/syntax/testdir/dumps/java_method_references_signature_10.dump +++ b/runtime/syntax/testdir/dumps/java_method_references_signature_10.dump @@ -3,18 +3,18 @@ @12|}| @61 @8|}| @65 @75 -@8>s+0#00e0003&|t|a|t|i|c| +0#0000000&|<|T| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|O|b|j|e|c|t|>| |F+0#00e0e07&|u|n|c|t|i|o|n|<|T+0#0000000&|,| |S|t|r|i|n|g|>+0#00e0e07&| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|e|r|(|)| +0#0000000&@10 +@8>s+0#00e0003&|t|a|t|i|c| +0#0000000&|<+0#00e0003&|T+0#0000000&| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|O|b|j|e|c|t|>+0#00e0003&| +0#0000000&|F+0#00e0e07&|u|n|c|t|i|o|n|<|T+0#0000000&|,| |S|t|r|i|n|g|>+0#00e0e07&| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|e|r|(|)| +0#0000000&@10 @8|{| @65 @12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|T|:+0#00e0e07&@1|t+0#0000000&|o|S|t|r|i|n|g|;| |/+0#0000e05&|*| |"|e|"| |*|/| +0#0000000&@33 @8|}| @65 @4|}| @69 +@75 +@4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|{| @62 +@8|(@1|S+0#00e0e07&|u|p@1|l|i|e|r|<|C+0#00e0003&|l|a|s@1|<|?+0#0000000&|>+0#00e0003&|>+0#00e0e07&|)+0#0000000&|(@1|S+0#00e0e07&|u|p@1|l|i|e|r|<|C+0#0000000&|2|.|C|2|1|>+0#00e0e07&|)+0#0000000&|(+0#00e0e07&|)|-|>|n+0#af5f00255&|e|w| +0#0000000&@19 +@12|<+0#00e0003&|O+0#0000000&|b|j|e|c|t|>+0#00e0003&|C+0#0000000&|2|(|)|.|n+0#af5f00255&|e|w| +0#0000000&|<+0#00e0003&|O+0#0000000&|b|j|e|c|t|>+0#00e0003&| +0#0000000&|C|2|1|(|n+0#af5f00255&|e|w|<+0#00e0003&|O+0#0000000&|b|j|e|c|t|>+0#00e0003&| +0#0000000&@21 +@16|C+0#00e0e07&|1|<| +0#0000000&|O|b|j|e|c|t| |>+0#00e0e07&|(+0#0000000&@1|C+0#00e0e07&|1|<|?+0#0000000&|>+0#00e0e07&|)+0#0000000&|n+0#e000002&|u|l@1|)+0#0000000&@2|:+0#00e0e07&@1|g+0#0000000&|e|t|C|l|a|s@1|)|.|g|e|t|(|)|;| @13 +@4|}| @69 |}| @73 |~+0#4040ff13&| @73 |~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 | +0#0000000&@56|1|8|1|,|3|-|9| @6|B|o|t| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_00.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_00.dump index 98d2d23aa7..2155eb6887 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_00.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent2_00.dump @@ -1,6 +1,6 @@ >/+0#0000e05#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|f|u|n|c|t|i|o|n|s| |=| |'|i|n|d|e|n|t|2|'| +0#0000000&@14 +|/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|g|e|n|e|r|i|c|s| |=| |1| +0#0000000&@23 |/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t| |e|n|c|o|d|i|n|g|=|u|t|f|-|8| |t|e|r|m|e|n|c|o|d|i|n|g|=|u|t|f|-|8| +0#0000000&@19 -@75 |i+0#e000e06&|m|p|o|r|t| +0#0000000&|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|E|l|e|m|e|n|t|T|y|p|e|;| @34 |i+0#e000e06&|m|p|o|r|t| +0#0000000&|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|T|a|r|g|e|t|;| @39 @75 diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_01.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_01.dump index 7108a8dae0..36fe19daa2 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_01.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent2_01.dump @@ -17,4 +17,4 @@ @4|T|ɐ|g@1|a|b|l|ɘ|[|]| |v|a|l|u|e|(|)|;| @51 @2|}| @71 @75 -@57|1|9|,|0|-|1| @7|1|5|%| +@57|1|9|,|0|-|1| @7|1|3|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_02.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_02.dump index 4108b58325..fbaf738978 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_02.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent2_02.dump @@ -1,20 +1,20 @@ | +0&#ffffff0@74 -@2|i+0#00e0003&|n|t|e|r|f|a|c|e| +0#0000000&|S|t|y|l|a|b|l|e|<|Α|>| @51 +@2|i+0#00e0003&|n|t|e|r|f|a|c|e| +0#0000000&|S+0#00e0e07&|t|y|l|a|b|l|e|<|Α+0#0000000&|>+0#00e0e07&| +0#0000000&@51 @2|{| @71 @4|d+0#00e0003&|e|f|a|u|l|t| +0#0000000&|v+0#00e0003&|o|i|d| +0#0000000&|a|s|c|i@1|$|0|_|(|)| |{| |}| @43 @4|d+0#00e0003&|e|f|a|u|l|t| +0#0000000&|Α| |μ|ʭ@1|$|0|_|(|)| |{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n+0#e000002&|u|l@1|;+0#0000000&| |}| @35 @2>}| @71 @75 @2|/+0#0000e05&@1| |F|I|E|L|D|S|.| +0#0000000&@62 -@2|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|C|l|a|s@1|<|?|>| |C|L|A|S@1|_|L|O|C|K| |=| |c|l|a|s@1|L|o|c|k|(|)|;| @17 +@2|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|C+0#00e0e07&|l|a|s@1|<|?+0#0000000&|>+0#00e0e07&| +0#0000000&|C|L|A|S@1|_|L|O|C|K| |=| |c|l|a|s@1|L|o|c|k|(|)|;| @17 @75 @2|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|O|b|j|e|c|t| |i|n|s|t|a|n|c|e|L|o|c|k| |=| |n+0#af5f00255&|e|w| +0#0000000&|O|b|j|e|c|t|(|)|;| @23 @75 @2|/+0#0000e05&@1| |C|O|N|S|T|R|U|C|T|O|R|S|.| +0#0000000&@56 @2|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#0000000&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#0000000&|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#0000000&|I|n|d|e|n|t|2|M|e|t|h|o|d|s|T|e|s|t|s|(|)| |{| |}| @17 -@2|<|T| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|C|o|m|p|a|r|a|b|l|e|<|T|>@1| |I|n|d|e|n|t|2|M|e|t|h|o|d|s|T|e|s|t|s|(|T| |t|,| |V|o|i|d| |v|)| |{| |}| @10 -@2|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<|T| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|C|o|m|p|a|r|a|b|l|e|<|T|>@1| |I|n|d|e|n|t|2|M|e|t|h|o|d|s|T|e|s|t|s|(|T| |t|)| |{| |}| @10 +@2|<+0#00e0003&|T+0#0000000&| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|C+0#00e0e07&|o|m|p|a|r|a|b|l|e|<|T+0#0000000&|>+0#00e0e07&|>+0#00e0003&| +0#0000000&|I|n|d|e|n|t|2|M|e|t|h|o|d|s|T|e|s|t|s|(|T| |t|,| |V|o|i|d| |v|)| |{| |}| @10 +@2|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<+0#00e0003&|T+0#0000000&| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|C+0#00e0e07&|o|m|p|a|r|a|b|l|e|<|T+0#0000000&|>+0#00e0e07&|>+0#00e0003&| +0#0000000&|I|n|d|e|n|t|2|M|e|t|h|o|d|s|T|e|s|t|s|(|T| |t|)| |{| |}| @10 @75 @2|/+0#0000e05&@1| |M|E|T|H|O|D|S|.| +0#0000000&@61 | +0#00e0e07&@1|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|a+0#00e0003&|b|s|t|r|a|c|t| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|0|_|(|/+0#0000e05&@15| +0#0000000&@13 -@57|3|7|,|3| @9|3|6|%| +@57|3|7|,|3| @9|3@1|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_03.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_03.dump index b756854859..598d994b5b 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_03.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent2_03.dump @@ -1,20 +1,20 @@ | +0#00e0e07#ffffff0@1|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|a+0#00e0003&|b|s|t|r|a|c|t| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|0|_|(|/+0#0000e05&@15| +0#0000000&@13 | +0#00e0e07&@63|)|;+0#0000000&| @8 -| +0#00e0e07&@1|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|a+0#00e0003&|b|s|t|r|a|c|t| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>| |μ|ʭ@1|$|0|_|(| +0#0000000&@23 +| +0#00e0e07&@1|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|a+0#00e0003&|b|s|t|r|a|c|t| +0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&| +0#00e0e07&|Τ|ʬ|<|α|>| |μ|ʭ@1|$|0|_|(| +0#0000000&@23 | +0#00e0e07&@31|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#e000e06&| +0#00e0e07&|β| |b|)|;+0#0000000&| @8 @75 | +0#00e0e07&@1>@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|1|_|(|/+0#0000e05&|*|/@10|/+0#ffffff16#ff404010|*+0#0000e05#ffffff0|/|)+0#00e0e07&|;+0#0000000&| @15 -| +0#00e0e07&@1|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|1|_|(| +0#0000000&@25 +| +0#00e0e07&@1|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&| +0#00e0e07&|Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|1|_|(| +0#0000000&@25 | +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,| |Τ|ʬ|<|α|>|[|]|>| |ƒ|)|;+0#0000000&| @7 @75 | +0#00e0e07&@1|v+0#00e0003&|o|i|d| +0#00e0e07&|A|s|c|i@1|$|2|_|(|)| +0#0000000&|{| |}| @53 -| +0#00e0e07&@1|<|T|,| |U| |e|x|t|e|n|d|s| |S|t|y|l|a|b|l|e|<|T|>@1| |v+0#00e0003&|o|i|d| +0#00e0e07&|Μ|ʭ@1|$|2|_|(|U| |u|)| +0#0000000&|{| |}| @25 +| +0#00e0e07&@1|<+0#00e0003&|T+0#00e0e07&|,| |U| |e+0#00e0003&|x|t|e|n|d|s| +0#00e0e07&|S|t|y|l|a|b|l|e|<|T|>|>+0#00e0003&| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|Μ|ʭ@1|$|2|_|(|U| |u|)| +0#0000000&|{| |}| @25 @75 | +0#00e0e07&@1|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|9|8|_|(|)|;+0#0000000&| @22 -| +0#00e0e07&@1|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|[|]|[|]| |μ|ʭ@1|$|9|8|_|(| +0#0000000&@14 +| +0#00e0e07&@1|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&| +0#00e0e07&|Τ|ʬ|<|α|>|[|]|[|]| |μ|ʭ@1|$|9|8|_|(| +0#0000000&@14 | +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,| |Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)|;+0#0000000&| @5 @75 @2|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&| +0#0000000&@43 | +0#00e0e07&@1|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|9@1|_|(|)| +0#0000000&@11 @2|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @56 -@57|5@1|,|3| @9|5|7|%| +@57|5@1|,|3| @9|5|2|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_04.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_04.dump index c6ecd55a3e..ef600debb3 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_04.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent2_04.dump @@ -1,20 +1,20 @@ | +0&#ffffff0@1|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @56 @75 @2|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&| +0#0000000&@43 -| +0#00e0e07&@1|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|9@1|_|(| +0#0000000&@4 +| +0#00e0e07&@1|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p| +0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&| +0#00e0e07&|Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|9@1|_|(| +0#0000000&@4 | +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,| |Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)| +0#0000000&@6 @2>{| @71 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@64 -@2|I|n|d|e|n|t|2|M|e|t|h|o|d|s|T|e|s|t|s|.|<|α|,| |β|>|μ|ʭ@1|$|9|8|_|(|ƒ|)|[|0+0#e000002&|]+0#0000000&|;| @32 +@2|I|n|d|e|n|t|2|M|e|t|h|o|d|s|T|e|s|t|s|.|<+0#00e0003&|α+0#0000000&|,| |β|>+0#00e0003&|μ+0#0000000&|ʭ@1|$|9|8|_|(|ƒ|)|[|0+0#e000002&|]+0#0000000&|;| @32 @2|}| @71 @75 | +0#00e0e07&@1|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|C|l|a|s@1|<|?|>| |c|l|a|s@1|L|o|c|k|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|I|n|d|e|n|t|2|M|e|t|h|o|d|s|T|e|s|t|s|.|c+0#00e0003&|l|a|s@1|;+0#0000000&| |}| @75 -@2|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#0000000&|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|c|a|s|t|"|)+0#e000e06&| +0#0000000&@37 -| +0#00e0e07&@1|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|S|t|r|i|n|g|)| |"+0#e000002&|I|n|d|e|n|t|2|M|e|t|h|o|d|s|T|e|s|t|s|"|;+0#0000000&| |}| @5 -|}| @73 -@75 -|e+0#00e0003&|n|u|m| +0#0000000&|E|2| @67 -|{| @73 -@2|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#e000e06&| +0#0000000&|A|(|"+0#e000002&|a|"|)+0#0000000&|,| @36 -@57|7|3|,|3| @9|7|8|%| +| +0#00e0e07&@1|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|<+0#00e0003&|E+0#00e0e07&| |e+0#00e0003&|x|t|e|n|d|s| +0#00e0e07&|C|o|m|p|a|r|a|b|l|e|<|?| |s+0#00e0003&|u|p|e|r| +0#00e0e07&|E|>|>+0#00e0003&| +0#00e0e07&|j|a|v|a|.|u|t|i|l|.|L|i|s|t|<|E|>| |f|i|l|t|e|r|(| +0#0000000&@6 +| +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|P|r|e|d|i|c|a|t|e|<|?| |s+0#00e0003&|u|p|e|r| +0#00e0e07&|E|>| |f|i|l|t|e|r|,| +0#0000000&@3 +| +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|L|i|s|t|<|?| |e+0#00e0003&|x|t|e|n|d|s| +0#00e0e07&|E|>| |c|s|)| +0#0000000&@19 +@2|{| @71 +@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|c|s|.|s|t|r|e|a|m|(|)|.|f|i|l|t|e|r|(|f|i|l|t|e|r|)| @37 +@6|.|c|o|l@1|e|c|t|(|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|C|o|l@1|e|c|t|o|r|s|.|t|o|U|n|m|o|d|i|f|i|a|b|l|e|L|i|s|t|(|)@1|;| @9 +@2|}| @71 +@57|7|3|,|3| @9|7|2|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_05.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_05.dump index 89140cc6af..d9e6540f57 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent2_05.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent2_05.dump @@ -1,20 +1,20 @@ -| +0&#ffffff0@1|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#e000e06&| +0#0000000&|A|(|"+0#e000002&|a|"|)+0#0000000&|,| @36 +| +0&#ffffff0@1|}| @71 +@75 +@2|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#0000000&|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|c|a|s|t|"|)+0#e000e06&| +0#0000000&@37 +| +0#00e0e07&@1|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|S|t|r|i|n|g|)| |"+0#e000002&|I|n|d|e|n|t|2|M|e|t|h|o|d|s|T|e|s|t|s|"|;+0#0000000&| |}| @5 +|}| @73 +> @74 +|e+0#00e0003&|n|u|m| +0#0000000&|E|2| @67 +|{| @73 +@2|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#e000e06&| +0#0000000&|A|(|"+0#e000002&|a|"|)+0#0000000&|,| @36 @2|B|(|"+0#e000002&|b|"| +0#0000000&@67 @4|/+0#0000e05&|*|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|*|/|)+0#0000000&|,| @9 @2|C|(|"+0#e000002&|c|"|,+0#0000000&| |n+0#af5f00255&|e|w| +0#0000000&|T|h|r|e|a|d|(| @54 @75 -@4>(+0#00e0e07&|)| |-|>| +0#0000000&|{| @63 +@4|(+0#00e0e07&|)| |-|>| +0#0000000&|{| @63 @2|}|)@1|,| |D|(|"+0#e000002&|d|"|,+0#0000000&| |(|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|B|o@1|l|e|a|n|S|u|p@1|l|i|e|r|)| |(+0#00e0e07&|)| |-|>| +0#0000000&|t+0#e000002&|r|u|e|)+0#0000000&|,| @11 @2|E|(|"+0#e000002&|e|"|,+0#0000000&| |n+0#af5f00255&|e|w| +0#0000000&|c+0#00e0003&|h|a|r|[+0#0000000&|]| |{| |'+0#e000002&|a|'|,+0#0000000&| |'+0#e000002&|b|'|,+0#0000000&| |'+0#e000002&|c|'|,+0#0000000&| |'+0#e000002&|d|'| +0#0000000&|}|)|,| |F|(|"+0#e000002&|f|"|,+0#0000000&| |n+0#af5f00255&|e|w| +0#0000000&|O|b|j|e|c|t|(|)| |{| @8 @4|t+0#00e0003&|r|a|n|s|i|e|n|t| +0#0000000&|S|t|r|i|n|g| |n|a|m|e| |=| |"+0#e000002&@1|;+0#0000000&| @43 @4|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#0000000&|p+0#00e0003&|u|b|l|i|c| +0#0000000&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| |{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|n|a|m|e|;| |}| @14 @2|}|)|,| |/+0#0000e05&@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1| +0#0000000&@6 -@2|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |@+0#e000e06&|D|e|p|r|e|c|a|t|e|d| +0#0000000&|H|(|"+0#e000002&|h|"|)+0#0000000&|;| @45 -@75 -@2|f+0#00e0003&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @57 -@2|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|2|(|S|t|r|i|n|g| |s|)| |{| |t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;| |}| @36 -@2|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<|δ|>| |E|2|(|S|t|r|i|n|g| |s|,| |δ| |d|u|m@1|y|)| |{| |t+0#00e0003&|h|i|s|(+0#0000000&|s|)|;| |}| @26 -@75 -| +0#00e0e07&@1|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#00e0e07&|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n|a|m|e|(|)|.|t|o|U|p@1|e|r|C|a|s|e|(|)|;| |}| @5 -|}| @73 -@57|9|1|,|5| @9|B|o|t| +@57|9|1|,|0|-|1| @7|9|1|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_06.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_06.dump new file mode 100644 index 0000000000..f0d7c5e6d8 --- /dev/null +++ b/runtime/syntax/testdir/dumps/java_methods_indent2_06.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@1|}|)|,| |/+0#0000e05&@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1| +0#0000000&@6 +@2|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |@+0#e000e06&|D|e|p|r|e|c|a|t|e|d| +0#0000000&|H|(|"+0#e000002&|h|"|)+0#0000000&|;| @45 +@75 +@2|f+0#00e0003&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @57 +@2|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|2|(|S|t|r|i|n|g| |s|)| |{| |t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;| |}| @36 +@2>p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<+0#00e0003&|δ+0#0000000&|>+0#00e0003&| +0#0000000&|E|2|(|S|t|r|i|n|g| |s|,| |δ| |d|u|m@1|y|)| |{| |t+0#00e0003&|h|i|s|(+0#0000000&|s|)|;| |}| @26 +@75 +| +0#00e0e07&@1|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#00e0e07&|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n|a|m|e|(|)|.|t|o|U|p@1|e|r|C|a|s|e|(|)|;| |}| @5 +|}| @73 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|1|0|9|,|3| @8|B|o|t| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_05.vim b/runtime/syntax/testdir/dumps/java_methods_indent2_06.vim similarity index 100% rename from runtime/syntax/testdir/dumps/java_methods_indent2_05.vim rename to runtime/syntax/testdir/dumps/java_methods_indent2_06.vim diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_00.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_00.dump index d996bc9e65..828e47d8ea 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_00.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent4_00.dump @@ -1,6 +1,6 @@ >/+0#0000e05#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|f|u|n|c|t|i|o|n|s| |=| |'|i|n|d|e|n|t|4|'| +0#0000000&@14 +|/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|g|e|n|e|r|i|c|s| |=| |1| +0#0000000&@23 |/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t| |e|n|c|o|d|i|n|g|=|u|t|f|-|8| |t|e|r|m|e|n|c|o|d|i|n|g|=|u|t|f|-|8| +0#0000000&@19 -@75 |i+0#e000e06&|m|p|o|r|t| +0#0000000&|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|E|l|e|m|e|n|t|T|y|p|e|;| @34 |i+0#e000e06&|m|p|o|r|t| +0#0000000&|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|T|a|r|g|e|t|;| @39 @75 diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_01.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_01.dump index 6f98ab866b..53d546dc95 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_01.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent4_01.dump @@ -17,4 +17,4 @@ @8|T|ɐ|g@1|a|b|l|ɘ|[|]| |v|a|l|u|e|(|)|;| @47 @4|}| @69 @75 -@57|1|9|,|0|-|1| @7|1|5|%| +@57|1|9|,|0|-|1| @7|1|3|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_02.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_02.dump index 4c9756995a..5793cb4fb0 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_02.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent4_02.dump @@ -1,20 +1,20 @@ | +0&#ffffff0@74 -@4|i+0#00e0003&|n|t|e|r|f|a|c|e| +0#0000000&|S|t|y|l|a|b|l|e|<|Α|>| @49 +@4|i+0#00e0003&|n|t|e|r|f|a|c|e| +0#0000000&|S+0#00e0e07&|t|y|l|a|b|l|e|<|Α+0#0000000&|>+0#00e0e07&| +0#0000000&@49 @4|{| @69 @8|d+0#00e0003&|e|f|a|u|l|t| +0#0000000&|v+0#00e0003&|o|i|d| +0#0000000&|a|s|c|i@1|$|0|_|(|)| |{| |}| @39 @8|d+0#00e0003&|e|f|a|u|l|t| +0#0000000&|Α| |μ|ʭ@1|$|0|_|(|)| |{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n+0#e000002&|u|l@1|;+0#0000000&| |}| @31 @4>}| @69 @75 @4|/+0#0000e05&@1| |F|I|E|L|D|S|.| +0#0000000&@60 -@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|C|l|a|s@1|<|?|>| |C|L|A|S@1|_|L|O|C|K| |=| |c|l|a|s@1|L|o|c|k|(|)|;| @15 +@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|C+0#00e0e07&|l|a|s@1|<|?+0#0000000&|>+0#00e0e07&| +0#0000000&|C|L|A|S@1|_|L|O|C|K| |=| |c|l|a|s@1|L|o|c|k|(|)|;| @15 @75 @4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|O|b|j|e|c|t| |i|n|s|t|a|n|c|e|L|o|c|k| |=| |n+0#af5f00255&|e|w| +0#0000000&|O|b|j|e|c|t|(|)|;| @21 @75 @4|/+0#0000e05&@1| |C|O|N|S|T|R|U|C|T|O|R|S|.| +0#0000000&@54 @4|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#0000000&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#0000000&|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#0000000&|I|n|d|e|n|t|4|M|e|t|h|o|d|s|T|e|s|t|s|(|)| |{| |}| @15 -@4|<|T| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|C|o|m|p|a|r|a|b|l|e|<|T|>@1| |I|n|d|e|n|t|4|M|e|t|h|o|d|s|T|e|s|t|s|(|T| |t|,| |V|o|i|d| |v|)| |{| |}| @8 -@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<|T| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|C|o|m|p|a|r|a|b|l|e|<|T|>@1| |I|n|d|e|n|t|4|M|e|t|h|o|d|s|T|e|s|t|s|(|T| |t|)| |{| |}| @8 +@4|<+0#00e0003&|T+0#0000000&| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|C+0#00e0e07&|o|m|p|a|r|a|b|l|e|<|T+0#0000000&|>+0#00e0e07&|>+0#00e0003&| +0#0000000&|I|n|d|e|n|t|4|M|e|t|h|o|d|s|T|e|s|t|s|(|T| |t|,| |V|o|i|d| |v|)| |{| |}| @8 +@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<+0#00e0003&|T+0#0000000&| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|C+0#00e0e07&|o|m|p|a|r|a|b|l|e|<|T+0#0000000&|>+0#00e0e07&|>+0#00e0003&| +0#0000000&|I|n|d|e|n|t|4|M|e|t|h|o|d|s|T|e|s|t|s|(|T| |t|)| |{| |}| @8 @75 @4|/+0#0000e05&@1| |M|E|T|H|O|D|S|.| +0#0000000&@59 | +0#00e0e07&@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|a+0#00e0003&|b|s|t|r|a|c|t| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|0|_|(|/+0#0000e05&@15| +0#0000000&@11 -@57|3|7|,|5| @9|3|6|%| +@57|3|7|,|5| @9|3@1|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_03.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_03.dump index 672fdb6f2f..7b3f96937c 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_03.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent4_03.dump @@ -1,20 +1,20 @@ | +0#00e0e07#ffffff0@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|a+0#00e0003&|b|s|t|r|a|c|t| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|0|_|(|/+0#0000e05&@15| +0#0000000&@11 | +0#00e0e07&@63|)|;+0#0000000&| @8 -| +0#00e0e07&@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|a+0#00e0003&|b|s|t|r|a|c|t| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>| |μ|ʭ@1|$|0|_|(| +0#0000000&@21 +| +0#00e0e07&@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|a+0#00e0003&|b|s|t|r|a|c|t| +0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&| +0#00e0e07&|Τ|ʬ|<|α|>| |μ|ʭ@1|$|0|_|(| +0#0000000&@21 | +0#00e0e07&@31|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#e000e06&| +0#00e0e07&|β| |b|)|;+0#0000000&| @8 @75 | +0#00e0e07&@3>@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|1|_|(|/+0#0000e05&|*|/@10|/+0#ffffff16#ff404010|*+0#0000e05#ffffff0|/|)+0#00e0e07&|;+0#0000000&| @13 -| +0#00e0e07&@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|1|_|(| +0#0000000&@23 +| +0#00e0e07&@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&| +0#00e0e07&|Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|1|_|(| +0#0000000&@23 | +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,| |Τ|ʬ|<|α|>|[|]|>| |ƒ|)|;+0#0000000&| @7 @75 | +0#00e0e07&@3|v+0#00e0003&|o|i|d| +0#00e0e07&|A|s|c|i@1|$|2|_|(|)| +0#0000000&|{| |}| @51 -| +0#00e0e07&@3|<|T|,| |U| |e|x|t|e|n|d|s| |S|t|y|l|a|b|l|e|<|T|>@1| |v+0#00e0003&|o|i|d| +0#00e0e07&|Μ|ʭ@1|$|2|_|(|U| |u|)| +0#0000000&|{| |}| @23 +| +0#00e0e07&@3|<+0#00e0003&|T+0#00e0e07&|,| |U| |e+0#00e0003&|x|t|e|n|d|s| +0#00e0e07&|S|t|y|l|a|b|l|e|<|T|>|>+0#00e0003&| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|Μ|ʭ@1|$|2|_|(|U| |u|)| +0#0000000&|{| |}| @23 @75 | +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|9|8|_|(|)|;+0#0000000&| @20 -| +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|[|]|[|]| |μ|ʭ@1|$|9|8|_|(| +0#0000000&@12 +| +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&| +0#00e0e07&|Τ|ʬ|<|α|>|[|]|[|]| |μ|ʭ@1|$|9|8|_|(| +0#0000000&@12 | +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,| |Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)|;+0#0000000&| @5 @75 @4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&| +0#0000000&@41 | +0#00e0e07&@3|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|9@1|_|(|)| +0#0000000&@9 @4|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @54 -@57|5@1|,|5| @9|5|7|%| +@57|5@1|,|5| @9|5|2|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_04.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_04.dump index 8190784b93..68661ea1bf 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_04.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent4_04.dump @@ -1,20 +1,20 @@ | +0&#ffffff0@3|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @54 @75 @4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&| +0#0000000&@41 -| +0#00e0e07&@3|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|9@1|_|(| +0#0000000&@2 +| +0#00e0e07&@3|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p| +0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&| +0#00e0e07&|Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|9@1|_|(| +0#0000000&@2 | +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,| |Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)| +0#0000000&@6 @4>{| @69 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@60 -@4|I|n|d|e|n|t|4|M|e|t|h|o|d|s|T|e|s|t|s|.|<|α|,| |β|>|μ|ʭ@1|$|9|8|_|(|ƒ|)|[|0+0#e000002&|]+0#0000000&|;| @30 +@4|I|n|d|e|n|t|4|M|e|t|h|o|d|s|T|e|s|t|s|.|<+0#00e0003&|α+0#0000000&|,| |β|>+0#00e0003&|μ+0#0000000&|ʭ@1|$|9|8|_|(|ƒ|)|[|0+0#e000002&|]+0#0000000&|;| @30 @4|}| @69 @75 | +0#00e0e07&@3|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|C|l|a|s@1|<|?|>| |c|l|a|s@1|L|o|c|k|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|I|n|d|e|n|t|4|M|e|t|h|o|d|s|T|e|s|t|s|.|c+0#00e0003&|l|a|s@1|;+0#0000000&| |}| @73 @75 -@4|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#0000000&|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|c|a|s|t|"|)+0#e000e06&| +0#0000000&@35 -| +0#00e0e07&@3|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|S|t|r|i|n|g|)| |"+0#e000002&|I|n|d|e|n|t|4|M|e|t|h|o|d|s|T|e|s|t|s|"|;+0#0000000&| |}| @3 -|}| @73 -@75 -|e+0#00e0003&|n|u|m| +0#0000000&|E|4| @67 -|{| @73 -@57|7|3|,|5| @9|7@1|%| +| +0#00e0e07&@3|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|<+0#00e0003&|E+0#00e0e07&| |e+0#00e0003&|x|t|e|n|d|s| +0#00e0e07&|C|o|m|p|a|r|a|b|l|e|<|?| |s+0#00e0003&|u|p|e|r| +0#00e0e07&|E|>|>+0#00e0003&| +0#00e0e07&|j|a|v|a|.|u|t|i|l|.|L|i|s|t|<|E|>| |f|i|l|t|e|r|(| +0#0000000&@4 +| +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|P|r|e|d|i|c|a|t|e|<|?| |s+0#00e0003&|u|p|e|r| +0#00e0e07&|E|>| |f|i|l|t|e|r|,| +0#0000000&@3 +| +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|L|i|s|t|<|?| |e+0#00e0003&|x|t|e|n|d|s| +0#00e0e07&|E|>| |c|s|)| +0#0000000&@19 +@4|{| @69 +@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|c|s|.|s|t|r|e|a|m|(|)|.|f|i|l|t|e|r|(|f|i|l|t|e|r|)| @33 +@12|.|c|o|l@1|e|c|t|(|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|C|o|l@1|e|c|t|o|r|s|.|t|o|U|n|m|o|d|i|f|i|a|b|l|e|L|i|s|t|(|)@1|;| @3 +@57|7|3|,|5| @9|7|1|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_05.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_05.dump index c0cb00bda1..e194e0fb3d 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_05.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent4_05.dump @@ -1,20 +1,20 @@ -|{+0&#ffffff0| @73 +| +0&#ffffff0@11|.|c|o|l@1|e|c|t|(|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|C|o|l@1|e|c|t|o|r|s|.|t|o|U|n|m|o|d|i|f|i|a|b|l|e|L|i|s|t|(|)@1|;| @3 +@4|}| @69 +@75 +@4|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#0000000&|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|c|a|s|t|"|)+0#e000e06&| +0#0000000&@35 +| +0#00e0e07&@3|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|S|t|r|i|n|g|)| |"+0#e000002&|I|n|d|e|n|t|4|M|e|t|h|o|d|s|T|e|s|t|s|"|;+0#0000000&| |}| @3 +>}| @73 +@75 +|e+0#00e0003&|n|u|m| +0#0000000&|E|4| @67 +|{| @73 @4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#e000e06&| +0#0000000&|A|(|"+0#e000002&|a|"|)+0#0000000&|,| @34 @4|B|(|"+0#e000002&|b|"| +0#0000000&@65 @8|/+0#0000e05&|*|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|*|/|)+0#0000000&|,| @5 @4|C|(|"+0#e000002&|c|"|,+0#0000000&| |n+0#af5f00255&|e|w| +0#0000000&|T|h|r|e|a|d|(| @52 -> @74 +@75 @8|(+0#00e0e07&|)| |-|>| +0#0000000&|{| @59 @4|}|)@1|,| |D|(|"+0#e000002&|d|"|,+0#0000000&| |(|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|B|o@1|l|e|a|n|S|u|p@1|l|i|e|r|)| |(+0#00e0e07&|)| |-|>| +0#0000000&|t+0#e000002&|r|u|e|)+0#0000000&|,| @9 @4|E|(|"+0#e000002&|e|"|,+0#0000000&| |n+0#af5f00255&|e|w| +0#0000000&|c+0#00e0003&|h|a|r|[+0#0000000&|]| |{| |'+0#e000002&|a|'|,+0#0000000&| |'+0#e000002&|b|'|,+0#0000000&| |'+0#e000002&|c|'|,+0#0000000&| |'+0#e000002&|d|'| +0#0000000&|}|)|,| |F|(|"+0#e000002&|f|"|,+0#0000000&| |n+0#af5f00255&|e|w| +0#0000000&|O|b|j|e|c|t|(|)| |{| @6 @8|t+0#00e0003&|r|a|n|s|i|e|n|t| +0#0000000&|S|t|r|i|n|g| |n|a|m|e| |=| |"+0#e000002&@1|;+0#0000000&| @39 @8|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#0000000&|p+0#00e0003&|u|b|l|i|c| +0#0000000&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| |{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|n|a|m|e|;| |}| @10 -@4|}|)|,| |/+0#0000e05&@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1| +0#0000000&@4 -@4|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |@+0#e000e06&|D|e|p|r|e|c|a|t|e|d| +0#0000000&|H|(|"+0#e000002&|h|"|)+0#0000000&|;| @43 -@75 -@4|f+0#00e0003&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @55 -@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|4|(|S|t|r|i|n|g| |s|)| |{| |t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;| |}| @34 -@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<|δ|>| |E|4|(|S|t|r|i|n|g| |s|,| |δ| |d|u|m@1|y|)| |{| |t+0#00e0003&|h|i|s|(+0#0000000&|s|)|;| |}| @24 -@75 -| +0#00e0e07&@3|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#00e0e07&|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n|a|m|e|(|)|.|t|o|U|p@1|e|r|C|a|s|e|(|)|;| |}| @3 -@57|9|0|,|0|-|1| @7|9|8|%| +@57|9|0|,|1| @9|9|0|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_06.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_06.dump index 6dfa528352..39f0d58b20 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent4_06.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent4_06.dump @@ -1,5 +1,13 @@ -| +0#00e0e07#ffffff0@3|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#00e0e07&|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n|a|m|e|(|)|.|t|o|U|p@1|e|r|C|a|s|e|(|)|;| |}| @3 ->}| @73 +| +0&#ffffff0@7|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#0000000&|p+0#00e0003&|u|b|l|i|c| +0#0000000&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| |{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|n|a|m|e|;| |}| @10 +@4|}|)|,| |/+0#0000e05&@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1| +0#0000000&@4 +@4|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |@+0#e000e06&|D|e|p|r|e|c|a|t|e|d| +0#0000000&|H|(|"+0#e000002&|h|"|)+0#0000000&|;| @43 +@75 +@4|f+0#00e0003&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @55 +@4>p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|4|(|S|t|r|i|n|g| |s|)| |{| |t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;| |}| @34 +@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<+0#00e0003&|δ+0#0000000&|>+0#00e0003&| +0#0000000&|E|4|(|S|t|r|i|n|g| |s|,| |δ| |d|u|m@1|y|)| |{| |t+0#00e0003&|h|i|s|(+0#0000000&|s|)|;| |}| @24 +@75 +| +0#00e0e07&@3|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#00e0e07&|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n|a|m|e|(|)|.|t|o|U|p@1|e|r|C|a|s|e|(|)|;| |}| @3 +|}| @73 |~+0#4040ff13&| @73 |~| @73 |~| @73 @@ -9,12 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -| +0#0000000&@56|1|0|4|,|1| @8|B|o|t| +| +0#0000000&@56|1|0|8|,|5| @8|B|o|t| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_05.vim b/runtime/syntax/testdir/dumps/java_methods_indent4_06.vim similarity index 100% rename from runtime/syntax/testdir/dumps/java_methods_indent4_05.vim rename to runtime/syntax/testdir/dumps/java_methods_indent4_06.vim diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_00.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_00.dump index a650fd3fa4..2a3091648f 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_00.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent8_00.dump @@ -1,6 +1,6 @@ >/+0#0000e05#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|f|u|n|c|t|i|o|n|s| |=| |'|i|n|d|e|n|t|8|'| +0#0000000&@14 +|/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|g|e|n|e|r|i|c|s| |=| |1| +0#0000000&@23 |/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t| |e|n|c|o|d|i|n|g|=|u|t|f|-|8| |t|e|r|m|e|n|c|o|d|i|n|g|=|u|t|f|-|8| +0#0000000&@19 -@75 |i+0#e000e06&|m|p|o|r|t| +0#0000000&|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|E|l|e|m|e|n|t|T|y|p|e|;| @34 |i+0#e000e06&|m|p|o|r|t| +0#0000000&|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|T|a|r|g|e|t|;| @39 @75 diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_01.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_01.dump index 405d699f43..016bcd5a2f 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_01.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent8_01.dump @@ -17,4 +17,4 @@ @16|T|ɐ|g@1|a|b|l|ɘ|[|]| |v|a|l|u|e|(|)|;| @39 @8|}| @65 @75 -@57|1|9|,|0|-|1| @7|1|5|%| +@57|1|9|,|0|-|1| @7|1|3|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_02.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_02.dump index 0713416a10..7eeb96539a 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_02.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent8_02.dump @@ -1,20 +1,20 @@ | +0&#ffffff0@74 -@8|i+0#00e0003&|n|t|e|r|f|a|c|e| +0#0000000&|S|t|y|l|a|b|l|e|<|Α|>| @45 +@8|i+0#00e0003&|n|t|e|r|f|a|c|e| +0#0000000&|S+0#00e0e07&|t|y|l|a|b|l|e|<|Α+0#0000000&|>+0#00e0e07&| +0#0000000&@45 @8|{| @65 @16|d+0#00e0003&|e|f|a|u|l|t| +0#0000000&|v+0#00e0003&|o|i|d| +0#0000000&|a|s|c|i@1|$|0|_|(|)| |{| |}| @31 @16|d+0#00e0003&|e|f|a|u|l|t| +0#0000000&|Α| |μ|ʭ@1|$|0|_|(|)| |{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n+0#e000002&|u|l@1|;+0#0000000&| |}| @23 @8>}| @65 @75 @8|/+0#0000e05&@1| |F|I|E|L|D|S|.| +0#0000000&@56 -@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|C|l|a|s@1|<|?|>| |C|L|A|S@1|_|L|O|C|K| |=| |c|l|a|s@1|L|o|c|k|(|)|;| @11 +@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|C+0#00e0e07&|l|a|s@1|<|?+0#0000000&|>+0#00e0e07&| +0#0000000&|C|L|A|S@1|_|L|O|C|K| |=| |c|l|a|s@1|L|o|c|k|(|)|;| @11 @75 @8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|O|b|j|e|c|t| |i|n|s|t|a|n|c|e|L|o|c|k| |=| |n+0#af5f00255&|e|w| +0#0000000&|O|b|j|e|c|t|(|)|;| @17 @75 @8|/+0#0000e05&@1| |C|O|N|S|T|R|U|C|T|O|R|S|.| +0#0000000&@50 @8|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#0000000&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#0000000&|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#0000000&|I|n|d|e|n|t|8|M|e|t|h|o|d|s|T|e|s|t|s|(|)| |{| |}| @11 -@8|<|T| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|C|o|m|p|a|r|a|b|l|e|<|T|>@1| |I|n|d|e|n|t|8|M|e|t|h|o|d|s|T|e|s|t|s|(|T| |t|,| |V|o|i|d| |v|)| |{| |}| @4 -@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<|T| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|C|o|m|p|a|r|a|b|l|e|<|T|>@1| |I|n|d|e|n|t|8|M|e|t|h|o|d|s|T|e|s|t|s|(|T| |t|)| |{| |}| @4 +@8|<+0#00e0003&|T+0#0000000&| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|C+0#00e0e07&|o|m|p|a|r|a|b|l|e|<|T+0#0000000&|>+0#00e0e07&|>+0#00e0003&| +0#0000000&|I|n|d|e|n|t|8|M|e|t|h|o|d|s|T|e|s|t|s|(|T| |t|,| |V|o|i|d| |v|)| |{| |}| @4 +@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<+0#00e0003&|T+0#0000000&| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|C+0#00e0e07&|o|m|p|a|r|a|b|l|e|<|T+0#0000000&|>+0#00e0e07&|>+0#00e0003&| +0#0000000&|I|n|d|e|n|t|8|M|e|t|h|o|d|s|T|e|s|t|s|(|T| |t|)| |{| |}| @4 @75 @8|/+0#0000e05&@1| |M|E|T|H|O|D|S|.| +0#0000000&@55 | +0#00e0e07&@7|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|a+0#00e0003&|b|s|t|r|a|c|t| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|0|_|(|/+0#0000e05&@15| +0#0000000&@7 -@57|3|7|,|9| @9|3|6|%| +@57|3|7|,|9| @9|3@1|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_03.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_03.dump index 64ff45961c..f43e30191b 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_03.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent8_03.dump @@ -1,20 +1,20 @@ | +0#00e0e07#ffffff0@7|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|a+0#00e0003&|b|s|t|r|a|c|t| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|0|_|(|/+0#0000e05&@15| +0#0000000&@7 | +0#00e0e07&@63|)|;+0#0000000&| @8 -| +0#00e0e07&@7|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|a+0#00e0003&|b|s|t|r|a|c|t| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>| |μ|ʭ@1|$|0|_|(| +0#0000000&@17 +| +0#00e0e07&@7|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|a+0#00e0003&|b|s|t|r|a|c|t| +0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&| +0#00e0e07&|Τ|ʬ|<|α|>| |μ|ʭ@1|$|0|_|(| +0#0000000&@17 | +0#00e0e07&@31|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#e000e06&| +0#00e0e07&|β| |b|)|;+0#0000000&| @8 @75 | +0#00e0e07&@7>@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|1|_|(|/+0#0000e05&|*|/@10|/+0#ffffff16#ff404010|*+0#0000e05#ffffff0|/|)+0#00e0e07&|;+0#0000000&| @9 -| +0#00e0e07&@7|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|1|_|(| +0#0000000&@19 +| +0#00e0e07&@7|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&| +0#00e0e07&|Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|1|_|(| +0#0000000&@19 | +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,| |Τ|ʬ|<|α|>|[|]|>| |ƒ|)|;+0#0000000&| @7 @75 | +0#00e0e07&@7|v+0#00e0003&|o|i|d| +0#00e0e07&|A|s|c|i@1|$|2|_|(|)| +0#0000000&|{| |}| @47 -| +0#00e0e07&@7|<|T|,| |U| |e|x|t|e|n|d|s| |S|t|y|l|a|b|l|e|<|T|>@1| |v+0#00e0003&|o|i|d| +0#00e0e07&|Μ|ʭ@1|$|2|_|(|U| |u|)| +0#0000000&|{| |}| @19 +| +0#00e0e07&@7|<+0#00e0003&|T+0#00e0e07&|,| |U| |e+0#00e0003&|x|t|e|n|d|s| +0#00e0e07&|S|t|y|l|a|b|l|e|<|T|>|>+0#00e0003&| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|Μ|ʭ@1|$|2|_|(|U| |u|)| +0#0000000&|{| |}| @19 @75 | +0#00e0e07&@7|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|9|8|_|(|)|;+0#0000000&| @16 -| +0#00e0e07&@7|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|[|]|[|]| |μ|ʭ@1|$|9|8|_|(| +0#0000000&@8 +| +0#00e0e07&@7|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&| +0#00e0e07&|Τ|ʬ|<|α|>|[|]|[|]| |μ|ʭ@1|$|9|8|_|(| +0#0000000&@8 | +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,| |Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)|;+0#0000000&| @5 @75 @8|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&| +0#0000000&@37 | +0#00e0e07&@7|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|9@1|_|(|)| +0#0000000&@5 @8|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @50 -@57|5@1|,|9| @9|5|7|%| +@57|5@1|,|9| @9|5|2|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_04.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_04.dump index 08e5e50335..5293743fa7 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_04.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent8_04.dump @@ -1,20 +1,20 @@ | +0&#ffffff0@7|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @50 @75 @8|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&| +0#0000000&@37 -| +0#00e0e07&@7|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|9@1|_ +| +0#00e0e07&@7|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p| +0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&| +0#00e0e07&|Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|9@1|_ |(| +0#0000000&@73 | +0#00e0e07&@23>j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,| |Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)| +0#0000000&@6 @8|{| @65 @16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@52 -@8|I|n|d|e|n|t|8|M|e|t|h|o|d|s|T|e|s|t|s|.|<|α|,| |β|>|μ|ʭ@1|$|9|8|_|(|ƒ|)|[|0+0#e000002&|]+0#0000000&|;| @26 +@8|I|n|d|e|n|t|8|M|e|t|h|o|d|s|T|e|s|t|s|.|<+0#00e0003&|α+0#0000000&|,| |β|>+0#00e0003&|μ+0#0000000&|ʭ@1|$|9|8|_|(|ƒ|)|[|0+0#e000002&|]+0#0000000&|;| @26 @8|}| @65 @75 | +0#00e0e07&@7|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|C|l|a|s@1|<|?|>| |c|l|a|s@1|L|o|c|k|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|I|n|d|e|n|t|8|M|e|t|h|o|d|s|T|e|s|t|s|.|c+0#00e0003&|l|a |s@1|;+0#0000000&| |}| @69 @75 -@8|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#0000000&|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|c|a|s|t|"|)+0#e000e06&| +0#0000000&@31 -| +0#00e0e07&@7|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|S|t|r|i|n|g|)| |"+0#e000002&|I|n|d|e|n|t|8|M|e|t|h|o|d|s|T|e|s|t|s|"|;+0#0000000&| |} -@1| @73 -@75 -|e+0#00e0003&|n|u|m| +0#0000000&|E|8| @67 -@57|7|2|,|2|5| @8|7@1|%| +| +0#00e0e07&@7|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|<+0#00e0003&|E+0#00e0e07&| |e+0#00e0003&|x|t|e|n|d|s| +0#00e0e07&|C|o|m|p|a|r|a|b|l|e|<|?| |s+0#00e0003&|u|p|e|r| +0#00e0e07&|E|>|>+0#00e0003&| +0#00e0e07&|j|a|v|a|.|u|t|i|l|.|L|i|s|t|<|E|>| |f|i|l|t|e|r|(| +0#0000000& +| +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|P|r|e|d|i|c|a|t|e|<|?| |s+0#00e0003&|u|p|e|r| +0#00e0e07&|E|>| |f|i|l|t|e|r|,| +0#0000000&@3 +| +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|L|i|s|t|<|?| |e+0#00e0003&|x|t|e|n|d|s| +0#00e0e07&|E|>| |c|s|)| +0#0000000&@19 +@8|{| @65 +@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|c|s|.|s|t|r|e|a|m|(|)|.|f|i|l|t|e|r|(|f|i|l|t|e|r|)| @25 +@57|7|2|,|2|5| @8|7|0|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_05.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_05.dump index a81a3f984f..d9341aa0d3 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_05.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent8_05.dump @@ -1,20 +1,20 @@ -|e+0#00e0003#ffffff0|n|u|m| +0#0000000&|E|8| @67 +| +0&#ffffff0@15|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|c|s|.|s|t|r|e|a|m|(|)|.|f|i|l|t|e|r|(|f|i|l|t|e|r|)| @25 +@24|.|c|o|l@1|e|c|t|(|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|C|o|l@1|e|c|t|o|r|s|.|t|o|U|n|m|o|d|i|f|i|a|b|l|e +|L|i|s|t|(|)@1|;| @66 +@8|}| @65 +@75 +@8>@+0#e000e06&|O|v|e|r@1|i|d|e| +0#0000000&|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|c|a|s|t|"|)+0#e000e06&| +0#0000000&@31 +| +0#00e0e07&@7|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|S|t|r|i|n|g|)| |"+0#e000002&|I|n|d|e|n|t|8|M|e|t|h|o|d|s|T|e|s|t|s|"|;+0#0000000&| |} +@1| @73 +@75 +|e+0#00e0003&|n|u|m| +0#0000000&|E|8| @67 |{| @73 @8|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#e000e06&| +0#0000000&|A|(|"+0#e000002&|a|"|)+0#0000000&|,| @30 @8|B|(|"+0#e000002&|b|"| +0#0000000&@61 @16|/+0#0000e05&|*|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|*|/|)+0#0000000&|, -| @7>C|(|"+0#e000002&|c|"|,+0#0000000&| |n+0#af5f00255&|e|w| +0#0000000&|T|h|r|e|a|d|(| @48 +| @7|C|(|"+0#e000002&|c|"|,+0#0000000&| |n+0#af5f00255&|e|w| +0#0000000&|T|h|r|e|a|d|(| @48 @75 @16|(+0#00e0e07&|)| |-|>| +0#0000000&|{| @51 @8|}|)@1|,| |D|(|"+0#e000002&|d|"|,+0#0000000&| |(|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|B|o@1|l|e|a|n|S|u|p@1|l|i|e|r|)| |(+0#00e0e07&|)| |-|>| +0#0000000&|t+0#e000002&|r|u|e|)+0#0000000&|,| @5 @8|E|(|"+0#e000002&|e|"|,+0#0000000&| |n+0#af5f00255&|e|w| +0#0000000&|c+0#00e0003&|h|a|r|[+0#0000000&|]| |{| |'+0#e000002&|a|'|,+0#0000000&| |'+0#e000002&|b|'|,+0#0000000&| |'+0#e000002&|c|'|,+0#0000000&| |'+0#e000002&|d|'| +0#0000000&|}|)|,| |F|(|"+0#e000002&|f|"|,+0#0000000&| |n+0#af5f00255&|e|w| +0#0000000&|O|b|j|e|c|t|(|)| |{| @2 -@16|t+0#00e0003&|r|a|n|s|i|e|n|t| +0#0000000&|S|t|r|i|n|g| |n|a|m|e| |=| |"+0#e000002&@1|;+0#0000000&| @31 -@16|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#0000000&|p+0#00e0003&|u|b|l|i|c| +0#0000000&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| |{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|n|a|m|e|;| |}| @2 -@8|}|)|,| |/+0#0000e05&@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1| +0#0000000& -@8|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |@+0#e000e06&|D|e|p|r|e|c|a|t|e|d| +0#0000000&|H|(|"+0#e000002&|h|"|)+0#0000000&|;| @39 -@75 -@8|f+0#00e0003&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @51 -@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|8|(|S|t|r|i|n|g| |s|)| |{| |t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;| |}| @30 -@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<|δ|>| |E|8|(|S|t|r|i|n|g| |s|,| |δ| |d|u|m@1|y|)| |{| |t+0#00e0003&|h|i|s|(+0#0000000&|s|)|;| |}| @20 -@75 -@57|8|9|,|9| @9|9|7|%| +@57|8@1|,|9| @9|8@1|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_06.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_06.dump index 0361794aac..930cfdb303 100644 --- a/runtime/syntax/testdir/dumps/java_methods_indent8_06.dump +++ b/runtime/syntax/testdir/dumps/java_methods_indent8_06.dump @@ -1,6 +1,15 @@ -| +0&#ffffff0@74 +| +0&#ffffff0@7|E|(|"+0#e000002&|e|"|,+0#0000000&| |n+0#af5f00255&|e|w| +0#0000000&|c+0#00e0003&|h|a|r|[+0#0000000&|]| |{| |'+0#e000002&|a|'|,+0#0000000&| |'+0#e000002&|b|'|,+0#0000000&| |'+0#e000002&|c|'|,+0#0000000&| |'+0#e000002&|d|'| +0#0000000&|}|)|,| |F|(|"+0#e000002&|f|"|,+0#0000000&| |n+0#af5f00255&|e|w| +0#0000000&|O|b|j|e|c|t|(|)| |{| @2 +@16|t+0#00e0003&|r|a|n|s|i|e|n|t| +0#0000000&|S|t|r|i|n|g| |n|a|m|e| |=| |"+0#e000002&@1|;+0#0000000&| @31 +@16|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#0000000&|p+0#00e0003&|u|b|l|i|c| +0#0000000&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| |{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|n|a|m|e|;| |}| @2 +@8|}|)|,| |/+0#0000e05&@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1| +0#0000000& +@8|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |@+0#e000e06&|D|e|p|r|e|c|a|t|e|d| +0#0000000&|H|(|"+0#e000002&|h|"|)+0#0000000&|;| @39 +> @74 +@8|f+0#00e0003&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @51 +@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|8|(|S|t|r|i|n|g| |s|)| |{| |t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;| |}| @30 +@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<+0#00e0003&|δ+0#0000000&|>+0#00e0003&| +0#0000000&|E|8|(|S|t|r|i|n|g| |s|,| |δ| |d|u|m@1|y|)| |{| |t+0#00e0003&|h|i|s|(+0#0000000&|s|)|;| |}| @20 +@75 | +0#00e0e07&@7|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#00e0e07&|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n|a|m|e|(|)|.|t|o|U|p@1|e|r|C|a|s|e|(|)|;| |} ->}| @73 +@1| @73 |~+0#4040ff13&| @73 |~| @73 |~| @73 @@ -8,13 +17,4 @@ |~| @73 |~| @73 |~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -|~| @73 -| +0#0000000&@56|1|0|4|,|1| @8|B|o|t| +| +0#0000000&@56|1|0|6|,|0|-|1| @6|B|o|t| diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_05.vim b/runtime/syntax/testdir/dumps/java_methods_indent8_06.vim similarity index 100% rename from runtime/syntax/testdir/dumps/java_methods_indent8_05.vim rename to runtime/syntax/testdir/dumps/java_methods_indent8_06.vim diff --git a/runtime/syntax/testdir/dumps/java_methods_style_00.dump b/runtime/syntax/testdir/dumps/java_methods_style_00.dump index c20fa6a6f9..53496f578d 100644 --- a/runtime/syntax/testdir/dumps/java_methods_style_00.dump +++ b/runtime/syntax/testdir/dumps/java_methods_style_00.dump @@ -1,6 +1,6 @@ >/+0#0000e05#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|f|u|n|c|t|i|o|n|s| |=| |'|s|t|y|l|e|'| +0#0000000&@16 +|/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|g|e|n|e|r|i|c|s| |=| |1| +0#0000000&@23 |/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t| |e|n|c|o|d|i|n|g|=|u|t|f|-|8| |t|e|r|m|e|n|c|o|d|i|n|g|=|u|t|f|-|8| +0#0000000&@19 -@75 |i+0#e000e06&|m|p|o|r|t| +0#0000000&|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|E|l|e|m|e|n|t|T|y|p|e|;| @34 |i+0#e000e06&|m|p|o|r|t| +0#0000000&|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|T|a|r|g|e|t|;| @39 @75 diff --git a/runtime/syntax/testdir/dumps/java_methods_style_01.dump b/runtime/syntax/testdir/dumps/java_methods_style_01.dump index 925f13efcc..0e350382fc 100644 --- a/runtime/syntax/testdir/dumps/java_methods_style_01.dump +++ b/runtime/syntax/testdir/dumps/java_methods_style_01.dump @@ -17,4 +17,4 @@ | +0#00e0e07&@7|T|ɐ|g@1|a|b|l|ɘ|[|]| |v|a|l|u|e|(|)|;+0#0000000&| @47 @4|}| @69 @75 -@57|1|9|,|0|-|1| @7|2|0|%| +@57|1|9|,|0|-|1| @7|1|8|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_style_02.dump b/runtime/syntax/testdir/dumps/java_methods_style_02.dump index 0a17143af0..bcbd5b5c2e 100644 --- a/runtime/syntax/testdir/dumps/java_methods_style_02.dump +++ b/runtime/syntax/testdir/dumps/java_methods_style_02.dump @@ -1,20 +1,20 @@ | +0&#ffffff0@74 -@4|i+0#00e0003&|n|t|e|r|f|a|c|e| +0#0000000&|S|t|y|l|a|b|l|e|<|Α|>| @49 +@4|i+0#00e0003&|n|t|e|r|f|a|c|e| +0#0000000&|S+0#00e0e07&|t|y|l|a|b|l|e|<|Α+0#0000000&|>+0#00e0e07&| +0#0000000&@49 @4|{| @69 | +0#00e0e07&@7|d+0#00e0003&|e|f|a|u|l|t| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|0|_|(|)| +0#0000000&|{| |}| @39 | +0#00e0e07&@7|d+0#00e0003&|e|f|a|u|l|t| +0#00e0e07&|Α| |μ|ʭ@1|$|0|_|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n+0#e000002&|u|l@1|;+0#0000000&| |}| @31 @4>}| @69 @75 @4|/+0#0000e05&@1| |F|I|E|L|D|S|.| +0#0000000&@60 -@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|C|l|a|s@1|<|?|>| |C|L|A|S@1|_|L|O|C|K| |=| |c|l|a|s@1|L|o|c|k|(|)|;| @15 +@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|C+0#00e0e07&|l|a|s@1|<|?+0#0000000&|>+0#00e0e07&| +0#0000000&|C|L|A|S@1|_|L|O|C|K| |=| |c|l|a|s@1|L|o|c|k|(|)|;| @15 @75 @4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|f+0#00e0003&|i|n|a|l| +0#0000000&|O|b|j|e|c|t| |i|n|s|t|a|n|c|e|L|o|c|k| |=| |n+0#af5f00255&|e|w| +0#0000000&|O|b|j|e|c|t|(|)|;| @21 @75 @4|/+0#0000e05&@1| |C|O|N|S|T|R|U|C|T|O|R|S|.| +0#0000000&@54 @4|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#0000000&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#0000000&|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#0000000&|S|t|y|l|e|M|e|t|h|o|d|s|T|e|s|t|s|(|)| |{| |}| @17 -@4|<|T| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|C|o|m|p|a|r|a|b|l|e|<|T|>@1| |S|t|y|l|e|M|e|t|h|o|d|s|T|e|s|t|s|(|T| |t|,| |V|o|i|d| |v|)| |{| |}| @10 -@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<|T| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|C|o|m|p|a|r|a|b|l|e|<|T|>@1| |S|t|y|l|e|M|e|t|h|o|d|s|T|e|s|t|s|(|T| |t|)| |{| |}| @10 +@4|<+0#00e0003&|T+0#0000000&| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|C+0#00e0e07&|o|m|p|a|r|a|b|l|e|<|T+0#0000000&|>+0#00e0e07&|>+0#00e0003&| +0#0000000&|S|t|y|l|e|M|e|t|h|o|d|s|T|e|s|t|s|(|T| |t|,| |V|o|i|d| |v|)| |{| |}| @10 +@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<+0#00e0003&|T+0#0000000&| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|C+0#00e0e07&|o|m|p|a|r|a|b|l|e|<|T+0#0000000&|>+0#00e0e07&|>+0#00e0003&| +0#0000000&|S|t|y|l|e|M|e|t|h|o|d|s|T|e|s|t|s|(|T| |t|)| |{| |}| @10 @75 @4|/+0#0000e05&@1| |M|E|T|H|O|D|S|.| +0#0000000&@59 | +0#00e0e07&@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|a+0#00e0003&|b|s|t|r|a|c|t| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|0|_|(|/+0#0000e05&@15| +0#0000000&@11 -@57|3|7|,|2|-|5| @7|4|9|%| +@57|3|7|,|2|-|5| @7|4|3|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_style_03.dump b/runtime/syntax/testdir/dumps/java_methods_style_03.dump index e8aa1b53b1..c47f958a93 100644 --- a/runtime/syntax/testdir/dumps/java_methods_style_03.dump +++ b/runtime/syntax/testdir/dumps/java_methods_style_03.dump @@ -1,20 +1,20 @@ | +0#00e0e07#ffffff0@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|a+0#00e0003&|b|s|t|r|a|c|t| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|0|_|(|/+0#0000e05&@15| +0#0000000&@11 | +0#00e0e07&@31|)|;+0#0000000&| @40 -| +0#00e0e07&@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|a+0#00e0003&|b|s|t|r|a|c|t| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>| |μ|ʭ@1|$|0|_|(| +0#0000000&@21 +| +0#00e0e07&@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|a+0#00e0003&|b|s|t|r|a|c|t| +0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&| +0#00e0e07&|Τ|ʬ|<|α|>| |μ|ʭ@1|$|0|_|(| +0#0000000&@21 | +0#00e0e07&@15|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#e000e06&| +0#00e0e07&|β| |b|)|;+0#0000000&| @24 @75 | +0#00e0e07&@3>@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|1|_|(|/+0#0000e05&|*|/@10|/+0#ffffff16#ff404010|*+0#0000e05#ffffff0|/|)+0#00e0e07&|;+0#0000000&| @13 -| +0#00e0e07&@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|1|_|(| +0#0000000&@23 +| +0#00e0e07&@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&| +0#00e0e07&|Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|1|_|(| +0#0000000&@23 | +0#00e0e07&@11|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,| |Τ|ʬ|<|α|>|[|]|>| |ƒ|)|;+0#0000000&| @19 @75 @4|v+0#00e0003&|o|i|d| +0#0000000&|A|s|c|i@1|$|2|_|(|)| |{| |}| @51 -@4|<|T|,| |U| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|S|t|y|l|a|b|l|e|<|T|>@1| |v+0#00e0003&|o|i|d| +0#0000000&|Μ|ʭ@1|$|2|_|(|U| |u|)| |{| |}| @23 +@4|<+0#00e0003&|T+0#0000000&|,| |U| |e+0#00e0003&|x|t|e|n|d|s| +0#0000000&|S+0#00e0e07&|t|y|l|a|b|l|e|<|T+0#0000000&|>+0#00e0e07&|>+0#00e0003&| +0#0000000&|v+0#00e0003&|o|i|d| +0#0000000&|Μ|ʭ@1|$|2|_|(|U| |u|)| |{| |}| @23 @75 | +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|9|8|_|(|)|;+0#0000000&| @20 -| +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|[|]|[|]| |μ|ʭ@1|$|9|8|_|(| +0#0000000&@12 +| +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&| +0#00e0e07&|Τ|ʬ|<|α|>|[|]|[|]| |μ|ʭ@1|$|9|8|_|(| +0#0000000&@12 | +0#00e0e07&@11|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,| |Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)|;+0#0000000&| @17 @75 @4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&| +0#0000000&@41 | +0#00e0e07&@3|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p| +0#00e0e07&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|9@1|_|(|)| +0#0000000&@9 @4|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @54 -@57|5@1|,|2|-|5| @7|7@1|%| +@57|5@1|,|2|-|5| @7|6|9|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_style_04.dump b/runtime/syntax/testdir/dumps/java_methods_style_04.dump index eb1231becb..288a11035c 100644 --- a/runtime/syntax/testdir/dumps/java_methods_style_04.dump +++ b/runtime/syntax/testdir/dumps/java_methods_style_04.dump @@ -1,20 +1,20 @@ | +0&#ffffff0@3|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @54 @75 @4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&| +0#0000000&@41 -| +0#00e0e07&@3|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|9@1|_|(| +0#0000000&@2 +| +0#00e0e07&@3|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l| +0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d| +0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p| +0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&| +0#00e0e07&|Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|9@1|_|(| +0#0000000&@2 | +0#00e0e07&@11|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,| |Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)| +0#0000000&@18 @4>{| @69 @8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@60 -@4|S|t|y|l|e|M|e|t|h|o|d|s|T|e|s|t|s|.|<|α|,| |β|>|μ|ʭ@1|$|9|8|_|(|ƒ|)|[|0+0#e000002&|]+0#0000000&|;| @32 +@4|S|t|y|l|e|M|e|t|h|o|d|s|T|e|s|t|s|.|<+0#00e0003&|α+0#0000000&|,| |β|>+0#00e0003&|μ+0#0000000&|ʭ@1|$|9|8|_|(|ƒ|)|[|0+0#e000002&|]+0#0000000&|;| @32 @4|}| @69 @75 | +0#00e0e07&@3|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|C|l|a|s@1|<|?|>| |c|l|a|s@1|L|o|c|k|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|S|t|y|l|e|M|e|t|h|o|d|s|T|e|s|t|s|.|c+0#00e0003&|l|a|s@1|;+0#0000000&| |}| @75 -@4|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#0000000&|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|c|a|s|t|"|)+0#e000e06&| +0#0000000&@35 -| +0#00e0e07&@3|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|S|t|r|i|n|g|)| |"+0#e000002&|S|t|y|l|e|M|e|t|h|o|d|s|T|e|s|t|s|"|;+0#0000000&| |}| @5 -|}| @73 -|~+0#4040ff13&| @73 -|~| @73 -|~| @73 -|~| @73 -| +0#0000000&@56|7|3|,|2|-|5| @7|B|o|t| +| +0#00e0e07&@3|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|<+0#00e0003&|E+0#00e0e07&| |e+0#00e0003&|x|t|e|n|d|s| +0#00e0e07&|C|o|m|p|a|r|a|b|l|e|<|?| |s+0#00e0003&|u|p|e|r| +0#00e0e07&|E|>|>+0#00e0003&| +0#00e0e07&|j|a|v|a|.|u|t|i|l|.|L|i|s|t|<|E|>| |f|i|l|t|e|r|(| +0#0000000&@4 +| +0#00e0e07&@11|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|P|r|e|d|i|c|a|t|e|<|?| |s+0#00e0003&|u|p|e|r| +0#00e0e07&|E|>| |f|i|l|t|e|r|,| +0#0000000&@15 +| +0#00e0e07&@11|j|a|v|a|.|u|t|i|l|.|L|i|s|t|<|?| |e+0#00e0003&|x|t|e|n|d|s| +0#00e0e07&|E|>| |c|s|)| +0#0000000&@31 +@4|{| @69 +@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|c|s|.|s|t|r|e|a|m|(|)|.|f|i|l|t|e|r|(|f|i|l|t|e|r|)| @33 +@12|.|c|o|l@1|e|c|t|(|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|C|o|l@1|e|c|t|o|r|s|.|t|o|U|n|m|o|d|i|f|i|a|b|l|e|L|i|s|t|(|)@1|;| @3 +@4|}| @69 +@57|7|3|,|2|-|5| @7|9|4|%| diff --git a/runtime/syntax/testdir/dumps/java_methods_style_05.dump b/runtime/syntax/testdir/dumps/java_methods_style_05.dump new file mode 100644 index 0000000000..09242dcfa3 --- /dev/null +++ b/runtime/syntax/testdir/dumps/java_methods_style_05.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0@3|}| @69 +@75 +@4|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#0000000&|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|c|a|s|t|"|)+0#e000e06&| +0#0000000&@35 +| +0#00e0e07&@3|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| +0#0000000&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|S|t|r|i|n|g|)| |"+0#e000002&|S|t|y|l|e|M|e|t|h|o|d|s|T|e|s|t|s|"|;+0#0000000&| |}| @5 +>}| @73 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|9|0|,|1| @9|B|o|t| diff --git a/runtime/syntax/testdir/input/java_generics.java b/runtime/syntax/testdir/input/java_generics.java index dc94cbe0e4..35f978e0ae 100644 --- a/runtime/syntax/testdir/input/java_generics.java +++ b/runtime/syntax/testdir/input/java_generics.java @@ -1,11 +1,11 @@ // VIM_TEST_SETUP let g:java_highlight_functions = 'style' // VIM_TEST_SETUP let g:java_highlight_generics = 1 // VIM_TEST_SETUP let g:java_highlight_java_lang = 1 -// VIM_TEST_SETUP hi link javaGenericsC1 Todo -// VIM_TEST_SETUP hi link javaGenericsC2 Error - +// VIM_TEST_SETUP hi link javaGenericsC1 Todo +// VIM_TEST_SETUP hi link javaGenericsC2 Error +// VIM_TEST_SETUP hi link javaWildcardBound Error import java.math.BigInteger; @@ -125,6 +125,12 @@ class GenericsTests, U> : java.lang.Class.class; } + , + B, U extends java.util.function.Supplier> U convert(T o) + { + throw new UnsupportedOperationException("TODO"); + } + @java.lang.annotation.Target( java.lang.annotation.ElementType.TYPE_USE) @interface Taggable diff --git a/runtime/syntax/testdir/input/java_generics_signature.java b/runtime/syntax/testdir/input/java_generics_signature.java index 23d8adb8ac..37617143a4 100644 --- a/runtime/syntax/testdir/input/java_generics_signature.java +++ b/runtime/syntax/testdir/input/java_generics_signature.java @@ -2,10 +2,10 @@ // VIM_TEST_SETUP let g:java_highlight_signature = 1 // VIM_TEST_SETUP let g:java_highlight_generics = 1 // VIM_TEST_SETUP let g:java_highlight_java_lang = 1 + // VIM_TEST_SETUP hi link javaGenericsC1 Todo // VIM_TEST_SETUP hi link javaGenericsC2 Error - - +// VIM_TEST_SETUP hi link javaWildcardBound Error import java.math.BigInteger; @@ -125,6 +125,12 @@ class Generics$Tests, U> : java.lang.Class.class; } + , + B, U extends java.util.function.Supplier> U convert(T o) + { + throw new UnsupportedOperationException("TODO"); + } + @java.lang.annotation.Target( java.lang.annotation.ElementType.TYPE_USE) @interface Taggable diff --git a/runtime/syntax/testdir/input/java_method_references.java b/runtime/syntax/testdir/input/java_method_references.java index d9cdf42248..640ab1edb0 100644 --- a/runtime/syntax/testdir/input/java_method_references.java +++ b/runtime/syntax/testdir/input/java_method_references.java @@ -183,4 +183,10 @@ class MethodReferencesTests return T::toString; /* "e" */ } } + + static { + ((Supplier>)((Supplier)()->new + C2().new C21(new + C1< Object >((C1)null)))::getClass).get(); + } } diff --git a/runtime/syntax/testdir/input/java_method_references_signature.java b/runtime/syntax/testdir/input/java_method_references_signature.java index a154b12c9a..61e4c0da3a 100644 --- a/runtime/syntax/testdir/input/java_method_references_signature.java +++ b/runtime/syntax/testdir/input/java_method_references_signature.java @@ -183,4 +183,10 @@ class MethodReferences$Tests return T::toString; /* "e" */ } } + + static { + ((Supplier>)((Supplier)()->new + C2().new C21(new + C1< Object >((C1)null)))::getClass).get(); + } } diff --git a/runtime/syntax/testdir/input/java_methods_indent2.java b/runtime/syntax/testdir/input/java_methods_indent2.java index 3754cc4d5e..5ab06635f8 100644 --- a/runtime/syntax/testdir/input/java_methods_indent2.java +++ b/runtime/syntax/testdir/input/java_methods_indent2.java @@ -1,6 +1,6 @@ // VIM_TEST_SETUP let g:java_highlight_functions = 'indent2' +// VIM_TEST_SETUP let g:java_highlight_generics = 1 // VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8 - import java.lang.annotation.ElementType; import java.lang.annotation.Target; @@ -77,6 +77,14 @@ abstract class Indent2MethodsTests public static Class classLock() { return Indent2MethodsTests.class; } + public > java.util.List filter( + java.util.function.Predicate filter, + java.util.List cs) + { + return cs.stream().filter(filter) + .collect(java.util.stream.Collectors.toUnmodifiableList()); + } + @Override @SuppressWarnings("cast") public String toString() { return (String) "Indent2MethodsTests"; } } diff --git a/runtime/syntax/testdir/input/java_methods_indent4.java b/runtime/syntax/testdir/input/java_methods_indent4.java index 8fc05c04be..092ded79cc 100644 --- a/runtime/syntax/testdir/input/java_methods_indent4.java +++ b/runtime/syntax/testdir/input/java_methods_indent4.java @@ -1,6 +1,6 @@ // VIM_TEST_SETUP let g:java_highlight_functions = 'indent4' +// VIM_TEST_SETUP let g:java_highlight_generics = 1 // VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8 - import java.lang.annotation.ElementType; import java.lang.annotation.Target; @@ -77,6 +77,14 @@ abstract class Indent4MethodsTests public static Class classLock() { return Indent4MethodsTests.class; } + public > java.util.List filter( + java.util.function.Predicate filter, + java.util.List cs) + { + return cs.stream().filter(filter) + .collect(java.util.stream.Collectors.toUnmodifiableList()); + } + @Override @SuppressWarnings("cast") public String toString() { return (String) "Indent4MethodsTests"; } } diff --git a/runtime/syntax/testdir/input/java_methods_indent8.java b/runtime/syntax/testdir/input/java_methods_indent8.java index d27830c878..ec17f5116b 100644 --- a/runtime/syntax/testdir/input/java_methods_indent8.java +++ b/runtime/syntax/testdir/input/java_methods_indent8.java @@ -1,6 +1,6 @@ // VIM_TEST_SETUP let g:java_highlight_functions = 'indent8' +// VIM_TEST_SETUP let g:java_highlight_generics = 1 // VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8 - import java.lang.annotation.ElementType; import java.lang.annotation.Target; @@ -77,6 +77,14 @@ abstract class Indent8MethodsTests public static Class classLock() { return Indent8MethodsTests.class; } + public > java.util.List filter( + java.util.function.Predicate filter, + java.util.List cs) + { + return cs.stream().filter(filter) + .collect(java.util.stream.Collectors.toUnmodifiableList()); + } + @Override @SuppressWarnings("cast") public String toString() { return (String) "Indent8MethodsTests"; } } diff --git a/runtime/syntax/testdir/input/java_methods_style.java b/runtime/syntax/testdir/input/java_methods_style.java index e2e7d3877d..af0c7af624 100644 --- a/runtime/syntax/testdir/input/java_methods_style.java +++ b/runtime/syntax/testdir/input/java_methods_style.java @@ -1,6 +1,6 @@ // VIM_TEST_SETUP let g:java_highlight_functions = 'style' +// VIM_TEST_SETUP let g:java_highlight_generics = 1 // VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8 - import java.lang.annotation.ElementType; import java.lang.annotation.Target; @@ -77,6 +77,14 @@ abstract class StyleMethodsTests public static Class classLock() { return StyleMethodsTests.class; } + public > java.util.List filter( + java.util.function.Predicate filter, + java.util.List cs) + { + return cs.stream().filter(filter) + .collect(java.util.stream.Collectors.toUnmodifiableList()); + } + @Override @SuppressWarnings("cast") public String toString() { return (String) "StyleMethodsTests"; } } -- 2.47.2