Skip to content

Commit e5e7e99

Browse files
srikanth-sankaransrikanth-sankaran
committed
Revert last change to see if that was the cause for the strange CI test
failures not locally reproducible
1 parent ddccf4f commit e5e7e99

File tree

20 files changed

+45
-46
lines changed

20 files changed

+45
-46
lines changed

‎org.eclipse.jdt.core.compiler.batch/grammar/java.g‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2857,7 +2857,6 @@ AssignmentExpression_NotName -> Assignment
28572857
/:$readableName Expression:/
28582858

28592859
Expression_NotName -> AssignmentExpression_NotName
2860-
Expression_NotName -> LambdaExpression
28612860
/:$readableName Expression:/
28622861
-----------------------------------------------
28632862
-- 1.5 features : end of generics

‎org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/Parser.java‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8096,118 +8096,118 @@ protected void consumeRule(int act) {
80968096
case 876 : if (DEBUG) { System.out.println("ConditionalExpression_NotName ::= Name QUESTION..."); } //$NON-NLS-1$
80978097
consumeConditionalExpressionWithName(OperatorIds.QUESTIONCOLON) ; break;
80988098

8099-
case 881 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= Modifiers AT..."); } //$NON-NLS-1$
8099+
case 880 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= Modifiers AT..."); } //$NON-NLS-1$
81008100
consumeAnnotationTypeDeclarationHeaderName() ; break;
81018101

8102-
case 882 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= Modifiers AT..."); } //$NON-NLS-1$
8102+
case 881 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= Modifiers AT..."); } //$NON-NLS-1$
81038103
consumeAnnotationTypeDeclarationHeaderNameWithTypeParameters() ; break;
81048104

8105-
case 883 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= AT..."); } //$NON-NLS-1$
8105+
case 882 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= AT..."); } //$NON-NLS-1$
81068106
consumeAnnotationTypeDeclarationHeaderNameWithTypeParameters() ; break;
81078107

8108-
case 884 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= AT..."); } //$NON-NLS-1$
8108+
case 883 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeaderName ::= AT..."); } //$NON-NLS-1$
81098109
consumeAnnotationTypeDeclarationHeaderName() ; break;
81108110

8111-
case 885 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeader ::=..."); } //$NON-NLS-1$
8111+
case 884 : if (DEBUG) { System.out.println("AnnotationTypeDeclarationHeader ::=..."); } //$NON-NLS-1$
81128112
consumeAnnotationTypeDeclarationHeader() ; break;
81138113

8114-
case 886 : if (DEBUG) { System.out.println("AnnotationTypeDeclaration ::=..."); } //$NON-NLS-1$
8114+
case 885 : if (DEBUG) { System.out.println("AnnotationTypeDeclaration ::=..."); } //$NON-NLS-1$
81158115
consumeAnnotationTypeDeclaration() ; break;
81168116

8117-
case 888 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarationsopt ::="); } //$NON-NLS-1$
8117+
case 887 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarationsopt ::="); } //$NON-NLS-1$
81188118
consumeEmptyAnnotationTypeMemberDeclarationsopt() ; break;
81198119

8120-
case 889 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarationsopt ::= NestedType..."); } //$NON-NLS-1$
8120+
case 888 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarationsopt ::= NestedType..."); } //$NON-NLS-1$
81218121
consumeAnnotationTypeMemberDeclarationsopt() ; break;
81228122

8123-
case 891 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarations ::=..."); } //$NON-NLS-1$
8123+
case 890 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclarations ::=..."); } //$NON-NLS-1$
81248124
consumeAnnotationTypeMemberDeclarations() ; break;
81258125

8126-
case 892 : if (DEBUG) { System.out.println("AnnotationMethodHeaderName ::= Modifiersopt..."); } //$NON-NLS-1$
8126+
case 891 : if (DEBUG) { System.out.println("AnnotationMethodHeaderName ::= Modifiersopt..."); } //$NON-NLS-1$
81278127
consumeMethodHeaderNameWithTypeParameters(true); break;
81288128

8129-
case 893 : if (DEBUG) { System.out.println("AnnotationMethodHeaderName ::= Modifiersopt Type..."); } //$NON-NLS-1$
8129+
case 892 : if (DEBUG) { System.out.println("AnnotationMethodHeaderName ::= Modifiersopt Type..."); } //$NON-NLS-1$
81308130
consumeMethodHeaderName(true); break;
81318131

8132-
case 894 : if (DEBUG) { System.out.println("AnnotationMethodHeaderDefaultValueopt ::="); } //$NON-NLS-1$
8132+
case 893 : if (DEBUG) { System.out.println("AnnotationMethodHeaderDefaultValueopt ::="); } //$NON-NLS-1$
81338133
consumeEmptyMethodHeaderDefaultValue() ; break;
81348134

8135-
case 895 : if (DEBUG) { System.out.println("AnnotationMethodHeaderDefaultValueopt ::= DefaultValue"); } //$NON-NLS-1$
8135+
case 894 : if (DEBUG) { System.out.println("AnnotationMethodHeaderDefaultValueopt ::= DefaultValue"); } //$NON-NLS-1$
81368136
consumeMethodHeaderDefaultValue(); break;
81378137

8138-
case 896 : if (DEBUG) { System.out.println("AnnotationMethodHeader ::= AnnotationMethodHeaderName..."); } //$NON-NLS-1$
8138+
case 895 : if (DEBUG) { System.out.println("AnnotationMethodHeader ::= AnnotationMethodHeaderName..."); } //$NON-NLS-1$
81398139
consumeMethodHeader(); break;
81408140

8141-
case 897 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclaration ::=..."); } //$NON-NLS-1$
8141+
case 896 : if (DEBUG) { System.out.println("AnnotationTypeMemberDeclaration ::=..."); } //$NON-NLS-1$
81428142
consumeAnnotationTypeMemberDeclaration() ; break;
81438143

8144-
case 905 : if (DEBUG) { System.out.println("AnnotationName ::= AT UnannotatableName"); } //$NON-NLS-1$
8144+
case 904 : if (DEBUG) { System.out.println("AnnotationName ::= AT UnannotatableName"); } //$NON-NLS-1$
81458145
consumeAnnotationName() ; break;
81468146

8147-
case 906 : if (DEBUG) { System.out.println("NormalAnnotation ::= AnnotationName LPAREN..."); } //$NON-NLS-1$
8147+
case 905 : if (DEBUG) { System.out.println("NormalAnnotation ::= AnnotationName LPAREN..."); } //$NON-NLS-1$
81488148
consumeNormalAnnotation(false) ; break;
81498149

8150-
case 907 : if (DEBUG) { System.out.println("MemberValuePairsopt ::="); } //$NON-NLS-1$
8150+
case 906 : if (DEBUG) { System.out.println("MemberValuePairsopt ::="); } //$NON-NLS-1$
81518151
consumeEmptyMemberValuePairsopt() ; break;
81528152

8153-
case 910 : if (DEBUG) { System.out.println("MemberValuePairs ::= MemberValuePairs COMMA..."); } //$NON-NLS-1$
8153+
case 909 : if (DEBUG) { System.out.println("MemberValuePairs ::= MemberValuePairs COMMA..."); } //$NON-NLS-1$
81548154
consumeMemberValuePairs() ; break;
81558155

8156-
case 911 : if (DEBUG) { System.out.println("MemberValuePair ::= SimpleName EQUAL EnterMemberValue..."); } //$NON-NLS-1$
8156+
case 910 : if (DEBUG) { System.out.println("MemberValuePair ::= SimpleName EQUAL EnterMemberValue..."); } //$NON-NLS-1$
81578157
consumeMemberValuePair() ; break;
81588158

8159-
case 912 : if (DEBUG) { System.out.println("EnterMemberValue ::="); } //$NON-NLS-1$
8159+
case 911 : if (DEBUG) { System.out.println("EnterMemberValue ::="); } //$NON-NLS-1$
81608160
consumeEnterMemberValue() ; break;
81618161

8162-
case 913 : if (DEBUG) { System.out.println("ExitMemberValue ::="); } //$NON-NLS-1$
8162+
case 912 : if (DEBUG) { System.out.println("ExitMemberValue ::="); } //$NON-NLS-1$
81638163
consumeExitMemberValue() ; break;
81648164

8165-
case 915 : if (DEBUG) { System.out.println("MemberValue ::= Name"); } //$NON-NLS-1$
8165+
case 914 : if (DEBUG) { System.out.println("MemberValue ::= Name"); } //$NON-NLS-1$
81668166
consumeMemberValueAsName() ; break;
81678167

8168-
case 918 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); } //$NON-NLS-1$
8168+
case 917 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); } //$NON-NLS-1$
81698169
consumeMemberValueArrayInitializer() ; break;
81708170

8171-
case 919 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); } //$NON-NLS-1$
8171+
case 918 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); } //$NON-NLS-1$
81728172
consumeMemberValueArrayInitializer() ; break;
81738173

8174-
case 920 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); } //$NON-NLS-1$
8174+
case 919 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); } //$NON-NLS-1$
81758175
consumeEmptyMemberValueArrayInitializer() ; break;
81768176

8177-
case 921 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); } //$NON-NLS-1$
8177+
case 920 : if (DEBUG) { System.out.println("MemberValueArrayInitializer ::=..."); } //$NON-NLS-1$
81788178
consumeEmptyMemberValueArrayInitializer() ; break;
81798179

8180-
case 922 : if (DEBUG) { System.out.println("EnterMemberValueArrayInitializer ::="); } //$NON-NLS-1$
8180+
case 921 : if (DEBUG) { System.out.println("EnterMemberValueArrayInitializer ::="); } //$NON-NLS-1$
81818181
consumeEnterMemberValueArrayInitializer() ; break;
81828182

8183-
case 924 : if (DEBUG) { System.out.println("MemberValues ::= MemberValues COMMA MemberValue"); } //$NON-NLS-1$
8183+
case 923 : if (DEBUG) { System.out.println("MemberValues ::= MemberValues COMMA MemberValue"); } //$NON-NLS-1$
81848184
consumeMemberValues() ; break;
81858185

8186-
case 925 : if (DEBUG) { System.out.println("MarkerAnnotation ::= AnnotationName"); } //$NON-NLS-1$
8186+
case 924 : if (DEBUG) { System.out.println("MarkerAnnotation ::= AnnotationName"); } //$NON-NLS-1$
81878187
consumeMarkerAnnotation(false) ; break;
81888188

8189-
case 926 : if (DEBUG) { System.out.println("SingleMemberAnnotationMemberValue ::= MemberValue"); } //$NON-NLS-1$
8189+
case 925 : if (DEBUG) { System.out.println("SingleMemberAnnotationMemberValue ::= MemberValue"); } //$NON-NLS-1$
81908190
consumeSingleMemberAnnotationMemberValue() ; break;
81918191

8192-
case 927 : if (DEBUG) { System.out.println("SingleMemberAnnotation ::= AnnotationName LPAREN..."); } //$NON-NLS-1$
8192+
case 926 : if (DEBUG) { System.out.println("SingleMemberAnnotation ::= AnnotationName LPAREN..."); } //$NON-NLS-1$
81938193
consumeSingleMemberAnnotation(false) ; break;
81948194

8195-
case 928 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= Modifiersopt TypeParameters"); } //$NON-NLS-1$
8195+
case 927 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= Modifiersopt TypeParameters"); } //$NON-NLS-1$
81968196
consumeRecoveryMethodHeaderNameWithTypeParameters(); break;
81978197

8198-
case 929 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= Modifiersopt Type..."); } //$NON-NLS-1$
8198+
case 928 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= Modifiersopt Type..."); } //$NON-NLS-1$
81998199
consumeRecoveryMethodHeaderName(); break;
82008200

8201-
case 930 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= ModifiersWithDefault..."); } //$NON-NLS-1$
8201+
case 929 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= ModifiersWithDefault..."); } //$NON-NLS-1$
82028202
consumeRecoveryMethodHeaderNameWithTypeParameters(); break;
82038203

8204-
case 931 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= ModifiersWithDefault Type"); } //$NON-NLS-1$
8204+
case 930 : if (DEBUG) { System.out.println("RecoveryMethodHeaderName ::= ModifiersWithDefault Type"); } //$NON-NLS-1$
82058205
consumeRecoveryMethodHeaderName(); break;
82068206

8207-
case 932 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); } //$NON-NLS-1$
8207+
case 931 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); } //$NON-NLS-1$
82088208
consumeMethodHeader(); break;
82098209

8210-
case 933 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); } //$NON-NLS-1$
8210+
case 932 : if (DEBUG) { System.out.println("RecoveryMethodHeader ::= RecoveryMethodHeaderName..."); } //$NON-NLS-1$
82118211
consumeMethodHeader(); break;
82128212

82138213
}

‎org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ public interface ParserBasicInformation {
2727
NT_OFFSET = 138,
2828
SCOPE_UBOUND = 320,
2929
SCOPE_SIZE = 321,
30-
LA_STATE_OFFSET = 17560,
30+
LA_STATE_OFFSET = 17611,
3131
MAX_LA = 1,
32-
NUM_RULES = 933,
32+
NUM_RULES = 932,
3333
NUM_TERMINALS = 138,
3434
NUM_NON_TERMINALS = 425,
3535
NUM_SYMBOLS = 563,
36-
START_STATE = 1486,
36+
START_STATE = 1485,
3737
EOFT_SYMBOL = 63,
3838
EOLT_SYMBOL = 63,
39-
ACCEPT_ACTION = 17559,
40-
ERROR_ACTION = 17560;
39+
ACCEPT_ACTION = 17610,
40+
ERROR_ACTION = 17611;
4141
}

‎org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/TerminalToken.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public enum TerminalToken {
167167
TokenNameARROW(126),
168168
TokenNameCOLON_COLON(8),
169169
TokenNameBeginLambda(75),
170-
TokenNameBeginIntersectionCast(67),
170+
TokenNameBeginIntersectionCast(66),
171171
TokenNameBeginTypeArguments(87),
172172
TokenNameElidedSemicolonAndRightBrace(88),
173173
TokenNameAT308(24),
@@ -179,7 +179,7 @@ public enum TerminalToken {
179179
TokenNameRestrictedIdentifierpermits(129),
180180
TokenNameBeginCasePattern(130),
181181
TokenNameRestrictedIdentifierWhen(131),
182-
TokenNameUNDERSCORE(66),
182+
TokenNameUNDERSCORE(67),
183183
TokenNameEOF(63),
184184
TokenNameERROR(138);
185185

‎org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/parser1.rsc‎

-10 Bytes
Binary file not shown.

‎org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/parser13.rsc‎

0 Bytes
Binary file not shown.

‎org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/parser14.rsc‎

0 Bytes
Binary file not shown.

‎org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/parser15.rsc‎

0 Bytes
Binary file not shown.

‎org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/parser16.rsc‎

0 Bytes
Binary file not shown.

‎org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/parser17.rsc‎

-1 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)