Bug 384992 - [java8] adopt grammar changes for Java 8 from JDT/Core
7. fix regression in test3321_calloutToFieldAnchoredType1()
Could not recognize base anchored type in variable declaration
OTJLD tests: 0 Err, 47 Fail, remaining problems:
- callout parameter mappings
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java
index c41b526..5c77fa0 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java
@@ -25,20 +25,20 @@
ERROR_SYMBOL = 133,
MAX_NAME_LENGTH = 50,
- NUM_STATES = 1391,
+ NUM_STATES = 1390,
NT_OFFSET = 133,
SCOPE_UBOUND = 317,
SCOPE_SIZE = 318,
- LA_STATE_OFFSET = 19256,
+ LA_STATE_OFFSET = 19323,
MAX_LA = 1,
NUM_RULES = 979,
NUM_TERMINALS = 133,
NUM_NON_TERMINALS = 428,
NUM_SYMBOLS = 561,
- START_STATE = 1218,
+ START_STATE = 1118,
EOFT_SYMBOL = 72,
EOLT_SYMBOL = 72,
- ACCEPT_ACTION = 19255,
- ERROR_ACTION = 19256;
+ ACCEPT_ACTION = 19322,
+ ERROR_ACTION = 19323;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/TerminalTokens.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/TerminalTokens.java
index f68060d..9076463 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/TerminalTokens.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/TerminalTokens.java
@@ -49,34 +49,34 @@
TokenNameIdentifier = 16,
TokenNameabstract = 50,
TokenNameassert = 88,
- TokenNameboolean = 33,
+ TokenNameboolean = 34,
TokenNamebreak = 89,
- TokenNamebyte = 34,
+ TokenNamebyte = 35,
TokenNamecase = 118,
TokenNamecatch = 115,
- TokenNamechar = 35,
+ TokenNamechar = 36,
TokenNameclass = 81,
TokenNamecontinue = 90,
TokenNameconst = 131,
TokenNamedefault = 100,
TokenNamedo = 91,
- TokenNamedouble = 36,
+ TokenNamedouble = 37,
TokenNameelse = 121,
TokenNameenum = 99,
TokenNameextends = 101,
TokenNamefalse = 62,
TokenNamefinal = 51,
TokenNamefinally = 119,
- TokenNamefloat = 37,
+ TokenNamefloat = 38,
TokenNamefor = 92,
TokenNamegoto = 132,
TokenNameif = 93,
TokenNameimplements = 129,
TokenNameimport = 116,
TokenNameinstanceof = 18,
- TokenNameint = 38,
+ TokenNameint = 39,
TokenNameinterface = 85,
- TokenNamelong = 39,
+ TokenNamelong = 40,
TokenNamenative = 52,
TokenNamenew = 46,
TokenNamenull = 63,
@@ -85,7 +85,7 @@
TokenNameprotected = 54,
TokenNamepublic = 55,
TokenNamereturn = 94,
- TokenNameshort = 40,
+ TokenNameshort = 41,
TokenNamestatic = 47,
TokenNamestrictfp = 56,
TokenNamesuper = 45,
@@ -97,11 +97,11 @@
TokenNametransient = 57,
TokenNametrue = 64,
TokenNametry = 97,
- TokenNamevoid = 41,
+ TokenNamevoid = 42,
TokenNamevolatile = 58,
TokenNamewhile = 86,
TokenNameas = 124,
- TokenNamebase = 42,
+ TokenNamebase = 32,
TokenNamecallin = 59,
TokenNameplayedBy = 130,
TokenNameprecedence = 120,
@@ -122,8 +122,8 @@
TokenNameDoubleLiteral = 68,
TokenNameCharacterLiteral = 69,
TokenNameStringLiteral = 70,
- TokenNamePLUS_PLUS = 4,
- TokenNameMINUS_MINUS = 5,
+ TokenNamePLUS_PLUS = 5,
+ TokenNameMINUS_MINUS = 6,
TokenNameEQUAL_EQUAL = 20,
TokenNameLESS_EQUAL = 14,
TokenNameGREATER_EQUAL = 15,
@@ -160,12 +160,12 @@
TokenNameRPAREN = 25,
TokenNameLBRACE = 76,
TokenNameRBRACE = 43,
- TokenNameLBRACKET = 6,
+ TokenNameLBRACKET = 4,
TokenNameRBRACKET = 77,
TokenNameSEMICOLON = 28,
TokenNameQUESTION = 29,
TokenNameCOLON = 75,
- TokenNameCOMMA = 32,
+ TokenNameCOMMA = 33,
TokenNameDOT = 1,
TokenNameEQUAL = 83,
TokenNameAT = 26,
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser1.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser1.rsc
index 0e4cb1a..3f115dc 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser1.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser1.rsc
Binary files differ
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser12.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser12.rsc
index c3d7e75..4113ba7 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser12.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser12.rsc
Binary files differ
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser14.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser14.rsc
index a5ed53e..b9091d8 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser14.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser14.rsc
Binary files differ
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser15.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser15.rsc
index 16f0b5c..645861c 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser15.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser15.rsc
Binary files differ
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser16.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser16.rsc
index 7755f80..a2df199 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser16.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser16.rsc
Binary files differ
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser18.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser18.rsc
index 98ce7ae..1525025 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser18.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser18.rsc
Binary files differ
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser19.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser19.rsc
index e4fc4eb..bd00ce1 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser19.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser19.rsc
Binary files differ
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser2.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser2.rsc
index 7c8c192..4e21403 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser2.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser2.rsc
Binary files differ
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser3.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser3.rsc
index 21f53ab..0feed74 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser3.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser3.rsc
Binary files differ
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser4.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser4.rsc
index 70807a9..7bea03d 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser4.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser4.rsc
Binary files differ
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser5.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser5.rsc
index e5cb282..ab3c5c6 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser5.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser5.rsc
Binary files differ
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser6.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser6.rsc
index 119250f..9af70d7 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser6.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser6.rsc
Binary files differ
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser7.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser7.rsc
index a60aa80..0a27e96 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser7.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser7.rsc
Binary files differ
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser8.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser8.rsc
index f2caf50..09f09d1 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser8.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser8.rsc
Binary files differ
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser9.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser9.rsc
index f3c0a4b..032da07 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser9.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser9.rsc
Binary files differ
diff --git a/org.eclipse.jdt.core/grammar/java.g b/org.eclipse.jdt.core/grammar/java.g
index 833b341..ba5b460 100644
--- a/org.eclipse.jdt.core/grammar/java.g
+++ b/org.eclipse.jdt.core/grammar/java.g
@@ -402,11 +402,11 @@
-- Connecting BaseAnchoredType to other rules (2 variants):
-- 1.) connect via Type->ReferenceType->ClassOrInterfaceType
-- as well as via ClassType->ClassOrInterfaceType
-ClassOrInterfaceType -> BaseAnchoredType
+ClassOrInterfaceType0 -> BaseAnchoredType
/:$readableName BaseAnchoredType:/
-- 2.) via ReferenceType we may add dimensions:
-ReferenceType -> BaseAnchoredType Dims
+ReferenceType0 -> BaseAnchoredType Dims
/:$readableName ArrayOfBaseAnchoredType:/
-- SH}