Fixing of bugs caused by the grammar merge:

- re-inserted LiftingTypeopt
- updated hard-coded constants in DiagnoseParser
- adjusted expected results in Syntax tests.

25 files changed, 28 insertions, 32 deletions

diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
index c4bc6dbb6..5653476f3 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
@@ -7804,15 +7804,15 @@ protected void consumeRule(int act) {
 		    consumeFormalParameterList();  
 			break;
  
-    case 241 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt Type..."); }  //$NON-NLS-1$
+    case 241 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt Type LiftingTypeopt..."); }  //$NON-NLS-1$
 		    consumeFormalParameter(false);  
 			break;
  
-    case 242 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt Type..."); }  //$NON-NLS-1$
+    case 242 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt Type LiftingTypeopt..."); }  //$NON-NLS-1$
 		    consumeFormalParameter(true);  
 			break;
  
-    case 243 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt Type AT308DOTDOTDOT..."); }  //$NON-NLS-1$
+    case 243 : if (DEBUG) { System.out.println("FormalParameter ::= Modifiersopt Type LiftingTypeopt..."); }  //$NON-NLS-1$
 		    consumeFormalParameter(true);  
 			break;
  
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 d99f3d3eb..8b10fb0bb 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 @@ public interface ParserBasicInformation {
 
       ERROR_SYMBOL      = 136,
       MAX_NAME_LENGTH   = 41,
-      NUM_STATES        = 1311,
+      NUM_STATES        = 1314,
 
       NT_OFFSET         = 136,
       SCOPE_UBOUND      = 357,
       SCOPE_SIZE        = 358,
-      LA_STATE_OFFSET   = 17581,
+      LA_STATE_OFFSET   = 17641,
       MAX_LA            = 1,
       NUM_RULES         = 936,
       NUM_TERMINALS     = 136,
       NUM_NON_TERMINALS = 417,
       NUM_SYMBOLS       = 553,
-      START_STATE       = 1332,
+      START_STATE       = 1186,
       EOFT_SYMBOL       = 65,
       EOLT_SYMBOL       = 65,
-      ACCEPT_ACTION     = 17580,
-      ERROR_ACTION      = 17581;
+      ACCEPT_ACTION     = 17640,
+      ERROR_ACTION      = 17641;
 }
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 c9b53087b..0c1c9532e 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
@@ -71,7 +71,7 @@ public interface TerminalTokens {
       TokenNamefor = 84,
       TokenNamegoto = 135,
       TokenNameif = 85,
-      TokenNameimplements = 130,
+      TokenNameimplements = 131,
       TokenNameimport = 118,
       TokenNameinstanceof = 16,
       TokenNameint = 110,
@@ -100,7 +100,7 @@ public interface TerminalTokens {
       TokenNamevoid = 113,
       TokenNamevolatile = 62,
       TokenNamewhile = 79,
-      TokenNameas = 131,
+      TokenNameas = 126,
       TokenNamebase = 32,
       TokenNamecallin = 63,
       TokenNameplayedBy = 132,
@@ -111,11 +111,11 @@ public interface TerminalTokens {
       TokenNamewhen = 114,
       TokenNamewith = 115,
       TokenNamewithin = 90,
-      TokenNamereplace = 126,
+      TokenNamereplace = 127,
       TokenNameafter = 124,
-      TokenNamebefore = 127,
-      TokenNameget = 128,
-      TokenNameset = 129,
+      TokenNamebefore = 128,
+      TokenNameget = 129,
+      TokenNameset = 130,
       TokenNameIntegerLiteral = 43,
       TokenNameLongLiteral = 44,
       TokenNameFloatingPointLiteral = 45,
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/diagnose/DiagnoseParser.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/diagnose/DiagnoseParser.java
index 303f9e8e1..b37c6bf70 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/diagnose/DiagnoseParser.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/diagnose/DiagnoseParser.java
@@ -461,9 +461,9 @@ public class DiagnoseParser implements ParserBasicInformation, TerminalTokens, C
 //{ObjectTeams: WATCHOUT: needs to be updated with each new grammar!!!!
 	private void setScannerState(int act) {
 		switch(act) {
-		case 183: this.lexStream.forceBaseIsIdentifier(); break; // ForceBaseIsIdentifier
-		case 184: this.lexStream.restoreBaseKeyword(); break;    // RestoreBaseKeyword
-		case 283: this.parser.scanner._insideParameterMapping = true; break;
+		case 188: this.lexStream.forceBaseIsIdentifier(); break; // ForceBaseIsIdentifier
+		case 189: this.lexStream.restoreBaseKeyword(); break;    // RestoreBaseKeyword
+		case 277: this.parser.scanner._insideParameterMapping = true; break; // NestedParamMappings
 		}
 	}
 //SH}
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 9b7151676..b51df76a4 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
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser10.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser10.rsc
index 35c275b78..ff6898ad0 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser10.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser10.rsc
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser11.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser11.rsc
index 912248c0c..df4e3eab5 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser11.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser11.rsc
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 8162b6d08..7edb99b03 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
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser13.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser13.rsc
index fc19ced40..30aca4cc0 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser13.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser13.rsc
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 f258ee713..37a88ac0f 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
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 087a2e15b..f81f37572 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
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 c03acf095..8d2951032 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
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser17.rsc b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser17.rsc
index 3ad02fa14..1d95980c0 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser17.rsc
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/parser17.rsc
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 506a02fd7..0b07dade8 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
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 895690da7..f4072b4aa 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
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 46c298bd8..1070ac7ac 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
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 7df4dd8e3..04568efc6 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
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 362857daa..3242b31ea 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
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 af168e354..d38866711 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
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 c43ec9950..a3da9462d 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
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 27b312584..595d4a6b8 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
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 606c74129..1fad9bb14 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
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 2ef738e86..ff59c1009 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
diff --git a/org.eclipse.jdt.core/grammar/java.g b/org.eclipse.jdt.core/grammar/java.g
index 306b3e799..fe5e76eb6 100644
--- a/org.eclipse.jdt.core/grammar/java.g
+++ b/org.eclipse.jdt.core/grammar/java.g
@@ -889,17 +889,13 @@ FormalParameterList ::= FormalParameterList ',' FormalParameter
 /:$readableName FormalParameterList:/
 
 --1.1 feature
-FormalParameter ::= Modifiersopt Type VariableDeclaratorIdOrThis
+--{ObjectTeams: inserted LiftingTypeopt:
+FormalParameter ::= Modifiersopt Type LiftingTypeopt VariableDeclaratorIdOrThis
 /.$putCase consumeFormalParameter(false); $break ./
-FormalParameter ::= Modifiersopt Type PushZeroTypeAnnotations '...' VariableDeclaratorIdOrThis
+FormalParameter ::= Modifiersopt Type LiftingTypeopt PushZeroTypeAnnotations '...' VariableDeclaratorIdOrThis
 /.$putCase consumeFormalParameter(true); $break ./
 /:$compliance 1.5:/
---{ObjectTeams: inserted LiftingTypeopt: FIXME
--- example:
---FormalParameter ::= Modifiersopt Name DimsoptAnnotsopt LiftingTypeopt PotentialNameArray VariableDeclaratorIdOrThis
---/.$putCase consumeFormalParameter(false); $break ./
--- real:
-FormalParameter ::= Modifiersopt Type @308... TypeAnnotations '...' VariableDeclaratorIdOrThis
+FormalParameter ::= Modifiersopt Type LiftingTypeopt @308... TypeAnnotations '...' VariableDeclaratorIdOrThis
 /.$putCase consumeFormalParameter(true); $break ./
 /:$readableName FormalParameter:/
 /:$compliance 1.8:/
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/syntax/Syntax.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/syntax/Syntax.java
index 0b9459230..f615d01c2 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/syntax/Syntax.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/syntax/Syntax.java
@@ -31,7 +31,7 @@ public class Syntax extends AbstractOTJLDTest {
 	// Static initializer to specify tests subset using TESTS_* static variables
 	// All specified tests which does not belong to the class are skipped...
 	static {
-//		TESTS_NAMES = new String[] { "test8133_incompleteBaseCall"};
+//		TESTS_NAMES = new String[] { "test881_buggyRole3"};
 //		TESTS_NUMBERS = new int[] { 1459 };
 //		TESTS_RANGE = new int[] { 1097, -1 };
 	}
@@ -859,7 +859,7 @@ public class Syntax extends AbstractOTJLDTest {
     		"2. ERROR in Team881br2.java (at line 8)\n" + 
     		"	abstract int wrong(noTypeGiven);\n" + 
     		"	                   ^^^^^^^^^^^\n" + 
-    		"Syntax error, insert \"VariableDeclaratorId\" to complete FormalParameterList\n" + 
+    		"Syntax error, insert \"... VariableDeclaratorId\" to complete FormalParameterList\n" + 
     		"----------\n" + 
     		"3. ERROR in Team881br2.java (at line 9)\n" + 
     		"	}\n" + 
@@ -912,7 +912,7 @@ public class Syntax extends AbstractOTJLDTest {
     		"2. ERROR in Team881br3.java (at line 14)\n" + 
     		"	abstract int wrong(noTypeGiven);\n" + 
     		"	                   ^^^^^^^^^^^\n" + 
-    		"Syntax error, insert \"VariableDeclaratorId\" to complete FormalParameterList\n" + 
+    		"Syntax error, insert \"... VariableDeclaratorId\" to complete FormalParameterList\n" + 
     		"----------\n" + 
     		"3. ERROR in Team881br3.java (at line 15)\n" + 
     		"	}\n" + 
@@ -1111,7 +1111,7 @@ public class Syntax extends AbstractOTJLDTest {
     // a declared lifting lacks an argument name
     // 8.11.2-otjld-declared-lifting-syntax-error-1
     public void test8112_declaredLiftingSyntaxError1() {
-        runNegativeTestMatching(
+        runNegativeTest(
             new String[] {
 		"Team8112dlse1.java",
 			    "\n" +
@@ -1131,7 +1131,7 @@ public class Syntax extends AbstractOTJLDTest {
     		"1. ERROR in Team8112dlse1.java (at line 7)\n" + 
     		"	void run(Object as R)  {\n" + 
     		"	                   ^\n" + 
-    		"Syntax error, insert \"VariableDeclaratorId\" to complete FormalParameterList\n" + 
+    		"Syntax error, insert \"... VariableDeclaratorId\" to complete FormalParameterList\n" + 
     		"----------\n");
     }
 
@@ -1159,7 +1159,7 @@ public class Syntax extends AbstractOTJLDTest {
     		"1. ERROR in Team8112dlse2.java (at line 8)\n" + 
     		"	callin void run(Object as R)  {\n" + 
     		"	                          ^\n" + 
-    		"Syntax error, insert \"VariableDeclaratorId\" to complete FormalParameterList\n" + 
+    		"Syntax error, insert \"... VariableDeclaratorId\" to complete FormalParameterList\n" + 
     		"----------\n" + 
     		"2. ERROR in Team8112dlse2.java (at line 11)\n" + 
     		"	}\n" + 
@@ -1209,7 +1209,7 @@ public class Syntax extends AbstractOTJLDTest {
     		"1. ERROR in Team8112dlse3.java (at line 7)\n" + 
     		"	callin void m(T8112dlse3_2 as R) {\n" + 
     		"	                              ^\n" + 
-    		"Syntax error, insert \"VariableDeclaratorId\" to complete FormalParameterList\n" + 
+    		"Syntax error, insert \"... VariableDeclaratorId\" to complete FormalParameterList\n" + 
     		"----------\n");
     }