diff --git a/src/java_parser.tab.c b/src/java_parser.tab.c
index 25a515f86..84cb4054d 100644
--- a/src/java_parser.tab.c
+++ b/src/java_parser.tab.c
@@ -2015,8 +2015,8 @@ char *javayyrule[] = {
 "Literal : CHAR_LITERAL",
 "Literal : STRING_LITERAL",
 "Literal : NULL_LITERAL",
-"Type : PrimitiveType",
-"Type : ReferenceType",
+"JavaType : PrimitiveType",
+"JavaType : ReferenceType",
 "PrimitiveType : NumericType",
 "PrimitiveType : BOOLEAN",
 "NumericType : IntegralType",
@@ -2144,8 +2144,8 @@ char *javayyrule[] = {
 "ClassMemberDeclaration : InterfaceDeclaration",
 "ClassMemberDeclaration : FieldDeclaration",
 "ClassMemberDeclaration : MethodDeclaration",
-"AssignementType : Type",
-"FieldDeclaration : Modifiers_opt AssignementType VariableDeclarators ';'",
+"AssignmentType : JavaType",
+"FieldDeclaration : Modifiers_opt AssignmentType VariableDeclarators ';'",
 "VariableDeclarators : VariableDeclarator",
 "VariableDeclarators : VariableDeclarators ',' VariableDeclarator",
 "VariableDeclarator : VariableDeclaratorId",
@@ -2158,7 +2158,7 @@ char *javayyrule[] = {
 "VariableInitializer : ArrayInitializer",
 "$$10 :",
 "MethodDeclaration : MethodHeader Start_block $$10 MethodBody Stop_block",
-"MethodHeader : Modifiers_opt AssignementType MethodDeclarator Throws_opt",
+"MethodHeader : Modifiers_opt AssignmentType MethodDeclarator Throws_opt",
 "MethodHeader : Modifiers_opt VOID MethodDeclarator Throws_opt",
 "MethodHeader : COMPL_FULL_INHERITED_HEADER",
 "$$11 :",
@@ -2169,8 +2169,8 @@ char *javayyrule[] = {
 "FormalParameterList_opt : FormalParameterList",
 "FormalParameterList : FormalParameter",
 "FormalParameterList : FormalParameterList ',' FormalParameter",
-"FormalParameter : Type VariableDeclaratorId",
-"FormalParameter : FINAL Type VariableDeclaratorId",
+"FormalParameter : JavaType VariableDeclaratorId",
+"FormalParameter : FINAL JavaType VariableDeclaratorId",
 "FormalParameter : error",
 "Throws_opt :",
 "Throws_opt : THROWS ClassTypeList",
@@ -2238,8 +2238,8 @@ char *javayyrule[] = {
 "BlockStatement : Statement",
 "BlockStatement : error",
 "LocalVariableDeclarationStatement : LocalVariableDeclaration ';'",
-"LocalVarDeclUntilInit : Type VariableDeclaratorId",
-"LocalVarDeclUntilInit : FINAL Type VariableDeclaratorId",
+"LocalVarDeclUntilInit : JavaType VariableDeclaratorId",
+"LocalVarDeclUntilInit : FINAL JavaType VariableDeclaratorId",
 "LocalVarDeclUntilInit : LocalVariableDeclaration ',' VariableDeclaratorId",
 "LocalVariableDeclaration : LocalVarDeclUntilInit",
 "$$21 :",
@@ -2518,7 +2518,7 @@ YYSTYPE yyvs[YYSTACKSIZE];
 #include "recyacc.h"
 #endif
 #define yystacksize YYSTACKSIZE
-#line 4320 "java_parser.y"
+#line 4319 "java_parser.y"
 
 void javaParsingInitializations(void) {
     Symbol *symbol;
@@ -2927,7 +2927,7 @@ case 10:
         }
 break;
 case 11:
-#line 474 "java_parser.y"
+#line 473 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -2943,14 +2943,14 @@ case 11:
         }
 break;
 case 12:
-#line 487 "java_parser.y"
+#line 486 "java_parser.y"
 {
             yyval.ast_symbol.d = yyvsp[0].ast_symbol.d;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_symbol, yyvsp[0].ast_symbol, yyvsp[0].ast_symbol);
         }
 break;
 case 14:
-#line 495 "java_parser.y"
+#line 494 "java_parser.y"
 {
             yyval.ast_unsignedPositionPair.d.u  = TypeBoolean;
             if (regularPass()) {
@@ -2960,7 +2960,7 @@ case 14:
         }
 break;
 case 17:
-#line 510 "java_parser.y"
+#line 509 "java_parser.y"
 {
             yyval.ast_unsignedPositionPair.d.u  = TypeByte;
             if (regularPass()) SetPrimitiveTypePos(yyval.ast_unsignedPositionPair.d.p, yyvsp[0].ast_id.d);
@@ -2968,7 +2968,7 @@ case 17:
         }
 break;
 case 18:
-#line 515 "java_parser.y"
+#line 514 "java_parser.y"
 {
             yyval.ast_unsignedPositionPair.d.u  = TypeShort;
             if (regularPass()) SetPrimitiveTypePos(yyval.ast_unsignedPositionPair.d.p, yyvsp[0].ast_id.d);
@@ -2976,7 +2976,7 @@ case 18:
         }
 break;
 case 19:
-#line 520 "java_parser.y"
+#line 519 "java_parser.y"
 {
             yyval.ast_unsignedPositionPair.d.u  = TypeInt;
             if (regularPass()) SetPrimitiveTypePos(yyval.ast_unsignedPositionPair.d.p, yyvsp[0].ast_id.d);
@@ -2984,7 +2984,7 @@ case 19:
         }
 break;
 case 20:
-#line 525 "java_parser.y"
+#line 524 "java_parser.y"
 {
             yyval.ast_unsignedPositionPair.d.u  = TypeLong;
             if (regularPass()) SetPrimitiveTypePos(yyval.ast_unsignedPositionPair.d.p, yyvsp[0].ast_id.d);
@@ -2992,7 +2992,7 @@ case 20:
         }
 break;
 case 21:
-#line 530 "java_parser.y"
+#line 529 "java_parser.y"
 {
             yyval.ast_unsignedPositionPair.d.u  = TypeChar;
             if (regularPass()) SetPrimitiveTypePos(yyval.ast_unsignedPositionPair.d.p, yyvsp[0].ast_id.d);
@@ -3000,7 +3000,7 @@ case 21:
         }
 break;
 case 22:
-#line 538 "java_parser.y"
+#line 537 "java_parser.y"
 {
             yyval.ast_unsignedPositionPair.d.u  = TypeFloat;
             if (regularPass()) SetPrimitiveTypePos(yyval.ast_unsignedPositionPair.d.p, yyvsp[0].ast_id.d);
@@ -3008,7 +3008,7 @@ case 22:
         }
 break;
 case 23:
-#line 543 "java_parser.y"
+#line 542 "java_parser.y"
 {
             yyval.ast_unsignedPositionPair.d.u  = TypeDouble;
             if (regularPass()) SetPrimitiveTypePos(yyval.ast_unsignedPositionPair.d.p, yyvsp[0].ast_id.d);
@@ -3016,14 +3016,14 @@ case 23:
         }
 break;
 case 25:
-#line 552 "java_parser.y"
+#line 551 "java_parser.y"
 {
             yyval.ast_symbol.d = yyvsp[0].ast_symbolPositionPair.d.s;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_symbol, yyvsp[0].ast_symbolPositionPair, yyvsp[0].ast_symbolPositionPair);
         }
 break;
 case 26:
-#line 559 "java_parser.y"
+#line 558 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -3043,11 +3043,11 @@ case 26:
         }
 break;
 case 27:
-#line 576 "java_parser.y"
+#line 575 "java_parser.y"
 { /* rule never reduced */ }
 break;
 case 28:
-#line 581 "java_parser.y"
+#line 580 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -3065,11 +3065,11 @@ case 28:
         }
 break;
 case 29:
-#line 596 "java_parser.y"
+#line 595 "java_parser.y"
 { /* rule never reduced */ }
 break;
 case 32:
-#line 608 "java_parser.y"
+#line 607 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -3088,7 +3088,7 @@ case 32:
         }
 break;
 case 33:
-#line 624 "java_parser.y"
+#line 623 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -3111,7 +3111,7 @@ case 33:
         }
 break;
 case 34:
-#line 644 "java_parser.y"
+#line 643 "java_parser.y"
 {
             if (regularPass()) {
                 yyval.ast_symbolPositionPair.d = yyvsp[-2].ast_symbolPositionPair.d;
@@ -3128,74 +3128,74 @@ case 34:
         }
 break;
 case 35:
-#line 658 "java_parser.y"
+#line 657 "java_parser.y"
 { /* rule never used */ }
 break;
 case 36:
-#line 663 "java_parser.y"
+#line 662 "java_parser.y"
 {
                 if (regularPass()) AllocIdCopy(yyval.ast_id.d,yyvsp[0].ast_id.d);
                 PropagateBoundariesIfRegularSyntaxPass(yyval.ast_id, yyvsp[0].ast_id, yyvsp[0].ast_id);
             }
 break;
 case 37:
-#line 667 "java_parser.y"
+#line 666 "java_parser.y"
 {
                 if (regularPass()) AllocIdCopy(yyval.ast_id.d,yyvsp[0].ast_id.d);
                 PropagateBoundariesIfRegularSyntaxPass(yyval.ast_id, yyvsp[0].ast_id, yyvsp[0].ast_id);
             }
 break;
 case 38:
-#line 671 "java_parser.y"
+#line 670 "java_parser.y"
 {
                 if (regularPass()) AllocIdCopy(yyval.ast_id.d,yyvsp[0].ast_id.d);
                 PropagateBoundariesIfRegularSyntaxPass(yyval.ast_id, yyvsp[0].ast_id, yyvsp[0].ast_id);
             }
 break;
 case 39:
-#line 675 "java_parser.y"
+#line 674 "java_parser.y"
 {
                 if (regularPass()) AllocIdCopy(yyval.ast_id.d,yyvsp[0].ast_id.d);
                 PropagateBoundariesIfRegularSyntaxPass(yyval.ast_id, yyvsp[0].ast_id, yyvsp[0].ast_id);
             }
 break;
 case 40:
-#line 679 "java_parser.y"
+#line 678 "java_parser.y"
 {
                 if (regularPass()) AllocIdCopy(yyval.ast_id.d,yyvsp[0].ast_id.d);
                 PropagateBoundariesIfRegularSyntaxPass(yyval.ast_id, yyvsp[0].ast_id, yyvsp[0].ast_id);
             }
 break;
 case 41:
-#line 683 "java_parser.y"
+#line 682 "java_parser.y"
 {
                 if (regularPass()) AllocIdCopy(yyval.ast_id.d,yyvsp[0].ast_id.d);
                 PropagateBoundariesIfRegularSyntaxPass(yyval.ast_id, yyvsp[0].ast_id, yyvsp[0].ast_id);
             }
 break;
 case 42:
-#line 687 "java_parser.y"
+#line 686 "java_parser.y"
 {
                 if (regularPass()) AllocIdCopy(yyval.ast_id.d,yyvsp[0].ast_id.d);
                 PropagateBoundariesIfRegularSyntaxPass(yyval.ast_id, yyvsp[0].ast_id, yyvsp[0].ast_id);
             }
 break;
 case 43:
-#line 691 "java_parser.y"
+#line 690 "java_parser.y"
 {
                 if (regularPass()) AllocIdCopy(yyval.ast_id.d,yyvsp[0].ast_id.d);
                 PropagateBoundariesIfRegularSyntaxPass(yyval.ast_id, yyvsp[0].ast_id, yyvsp[0].ast_id);
             }
 break;
 case 44:
-#line 695 "java_parser.y"
+#line 694 "java_parser.y"
 {
                 if (regularPass()) AllocIdCopy(yyval.ast_id.d,yyvsp[0].ast_id.d);
                 PropagateBoundariesIfRegularSyntaxPass(yyval.ast_id, yyvsp[0].ast_id, yyvsp[0].ast_id);
             }
 break;
 case 45:
-#line 702 "java_parser.y"
+#line 701 "java_parser.y"
 {
             yyval.ast_idList.d = yyvsp[0].ast_idList.d;
             if (regularPass()) {
@@ -3211,7 +3211,7 @@ case 45:
         }
 break;
 case 46:
-#line 715 "java_parser.y"
+#line 714 "java_parser.y"
 {
             yyval.ast_idList.d = yyvsp[0].ast_idList.d;
             if (regularPass()) {
@@ -3227,7 +3227,7 @@ case 46:
         }
 break;
 case 47:
-#line 731 "java_parser.y"
+#line 730 "java_parser.y"
 {
             yyval.ast_idList.d = StackMemAlloc(S_idList);
             fillIdList(yyval.ast_idList.d, *yyvsp[0].ast_id.d, yyvsp[0].ast_id.d->name, TypeDefault, NULL);
@@ -3235,7 +3235,7 @@ case 47:
         }
 break;
 case 48:
-#line 739 "java_parser.y"
+#line 738 "java_parser.y"
 {
             yyval.ast_idList.d = StackMemAlloc(S_idList);
             fillIdList(yyval.ast_idList.d, *yyvsp[0].ast_id.d, yyvsp[0].ast_id.d->name, TypeDefault, yyvsp[-2].ast_idList.d);
@@ -3243,7 +3243,7 @@ case 48:
         }
 break;
 case 59:
-#line 781 "java_parser.y"
+#line 780 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -3255,11 +3255,11 @@ case 59:
         }
 break;
 case 60:
-#line 790 "java_parser.y"
+#line 789 "java_parser.y"
 { assert(0); /* token never used */ }
 break;
 case 61:
-#line 794 "java_parser.y"
+#line 793 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -3271,11 +3271,11 @@ case 61:
         }
 break;
 case 62:
-#line 803 "java_parser.y"
+#line 802 "java_parser.y"
 { assert(0); /* token never used */ }
 break;
 case 63:
-#line 808 "java_parser.y"
+#line 807 "java_parser.y"
 {
             if (regularPass()) {
                 assert(s_javaStat);
@@ -3285,7 +3285,7 @@ case 63:
         }
 break;
 case 64:
-#line 814 "java_parser.y"
+#line 813 "java_parser.y"
 {
             if (regularPass()) {
                 if (yyvsp[0].ast_idList.d == NULL) {	/* anonymous package */
@@ -3414,7 +3414,7 @@ case 64:
         }
 break;
 case 65:
-#line 939 "java_parser.y"
+#line 938 "java_parser.y"
 {
             if (regularPass()) {
                 /* add this package types after imports! */
@@ -3426,13 +3426,13 @@ case 65:
         }
 break;
 case 68:
-#line 952 "java_parser.y"
+#line 951 "java_parser.y"
 {
             SetNullBoundaries(yyval.ast_position);
         }
 break;
 case 70:
-#line 959 "java_parser.y"
+#line 958 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_idList, yyvsp[0].ast_idList);
             if (inSecondJslPass()) {
@@ -3441,7 +3441,7 @@ case 70:
         }
 break;
 case 71:
-#line 965 "java_parser.y"
+#line 964 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_idList, yyvsp[0].ast_idList);
             if (inSecondJslPass()) {
@@ -3450,7 +3450,7 @@ case 71:
         }
 break;
 case 72:
-#line 971 "java_parser.y"
+#line 970 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_position, yyvsp[0].ast_idList);
             if (inSecondJslPass()) {
@@ -3459,7 +3459,7 @@ case 72:
         }
 break;
 case 73:
-#line 977 "java_parser.y"
+#line 976 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_position, yyvsp[0].ast_idList);
             if (inSecondJslPass()) {
@@ -3468,7 +3468,7 @@ case 73:
         }
 break;
 case 74:
-#line 1000 "java_parser.y"
+#line 999 "java_parser.y"
 {
             yyval.ast_idList.d = yyvsp[-1].ast_idList.d;
             if (regularPass()) {
@@ -3490,15 +3490,15 @@ case 74:
         }
 break;
 case 75:
-#line 1019 "java_parser.y"
+#line 1018 "java_parser.y"
 { /* rule never used */ }
 break;
 case 76:
-#line 1020 "java_parser.y"
+#line 1019 "java_parser.y"
 { /* rule never used */ }
 break;
 case 77:
-#line 1024 "java_parser.y"
+#line 1023 "java_parser.y"
 {
             yyval.ast_idList.d = yyvsp[-3].ast_idList.d;
             if (regularPass()) {
@@ -3520,35 +3520,35 @@ case 77:
         }
 break;
 case 78:
-#line 1043 "java_parser.y"
+#line 1042 "java_parser.y"
 { /* rule never used */ }
 break;
 case 79:
-#line 1046 "java_parser.y"
+#line 1045 "java_parser.y"
 {
             SetNullBoundaries(yyval.ast_position);
         }
 break;
 case 80:
-#line 1049 "java_parser.y"
+#line 1048 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_position, yyvsp[-1].ast_position);
         }
 break;
 case 81:
-#line 1055 "java_parser.y"
+#line 1054 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 82:
-#line 1058 "java_parser.y"
+#line 1057 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-2].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 83:
-#line 1063 "java_parser.y"
+#line 1062 "java_parser.y"
 {
             yyval.ast_idList.d = NULL;
             if (regularPass()) {
@@ -3558,7 +3558,7 @@ case 83:
         }
 break;
 case 84:
-#line 1070 "java_parser.y"
+#line 1069 "java_parser.y"
 {
             yyval.ast_idList.d = yyvsp[-1].ast_idList.d;
             if (regularPass()) {
@@ -3568,7 +3568,7 @@ case 84:
         }
 break;
 case 85:
-#line 1077 "java_parser.y"
+#line 1076 "java_parser.y"
 {
             yyval.ast_idList.d = NULL;
             if (regularPass()) {
@@ -3578,15 +3578,15 @@ case 85:
         }
 break;
 case 86:
-#line 1084 "java_parser.y"
+#line 1083 "java_parser.y"
 { /* rule never used */ }
 break;
 case 87:
-#line 1085 "java_parser.y"
+#line 1084 "java_parser.y"
 { /* rule never used */ }
 break;
 case 88:
-#line 1089 "java_parser.y"
+#line 1088 "java_parser.y"
 {
             if (regularPass()) {
                 javaSetClassSourceInformation(s_javaThisPackageName, yyvsp[0].ast_id.d);
@@ -3595,7 +3595,7 @@ case 88:
         }
 break;
 case 89:
-#line 1095 "java_parser.y"
+#line 1094 "java_parser.y"
 {
             if (regularPass()) {
                 javaSetClassSourceInformation(s_javaThisPackageName, yyvsp[0].ast_id.d);
@@ -3604,80 +3604,80 @@ case 89:
         }
 break;
 case 90:
-#line 1101 "java_parser.y"
+#line 1100 "java_parser.y"
 {}
 break;
 case 91:
-#line 1102 "java_parser.y"
+#line 1101 "java_parser.y"
 {}
 break;
 case 92:
-#line 1107 "java_parser.y"
+#line 1106 "java_parser.y"
 {
             yyval.ast_unsigned.d = ACCESS_DEFAULT;
             SetNullBoundaries(yyval.ast_unsigned);
         }
 break;
 case 93:
-#line 1111 "java_parser.y"
+#line 1110 "java_parser.y"
 {
             yyval.ast_unsigned.d = yyvsp[0].ast_unsigned.d;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsigned, yyvsp[0].ast_unsigned, yyvsp[0].ast_unsigned);
         }
 break;
 case 95:
-#line 1119 "java_parser.y"
+#line 1118 "java_parser.y"
 {
             yyval.ast_unsigned.d = yyvsp[-1].ast_unsigned.d | yyvsp[0].ast_unsigned.d;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsigned, yyvsp[-1].ast_unsigned, yyvsp[0].ast_unsigned);
         }
 break;
 case 96:
-#line 1126 "java_parser.y"
+#line 1125 "java_parser.y"
 { yyval.ast_unsigned.d = ACCESS_PUBLIC; PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsigned, yyvsp[0].ast_position, yyvsp[0].ast_position);}
 break;
 case 97:
-#line 1127 "java_parser.y"
+#line 1126 "java_parser.y"
 { yyval.ast_unsigned.d = ACCESS_PROTECTED; PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsigned, yyvsp[0].ast_position, yyvsp[0].ast_position);}
 break;
 case 98:
-#line 1128 "java_parser.y"
+#line 1127 "java_parser.y"
 { yyval.ast_unsigned.d = ACCESS_PRIVATE; PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsigned, yyvsp[0].ast_position, yyvsp[0].ast_position);}
 break;
 case 99:
-#line 1129 "java_parser.y"
+#line 1128 "java_parser.y"
 { yyval.ast_unsigned.d = ACCESS_STATIC; PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsigned, yyvsp[0].ast_position, yyvsp[0].ast_position);}
 break;
 case 100:
-#line 1130 "java_parser.y"
+#line 1129 "java_parser.y"
 { yyval.ast_unsigned.d = ACCESS_ABSTRACT; PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsigned, yyvsp[0].ast_position, yyvsp[0].ast_position);}
 break;
 case 101:
-#line 1131 "java_parser.y"
+#line 1130 "java_parser.y"
 { yyval.ast_unsigned.d = ACCESS_FINAL; PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsigned, yyvsp[0].ast_position, yyvsp[0].ast_position);}
 break;
 case 102:
-#line 1132 "java_parser.y"
+#line 1131 "java_parser.y"
 { yyval.ast_unsigned.d = ACCESS_NATIVE; PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsigned, yyvsp[0].ast_position, yyvsp[0].ast_position);}
 break;
 case 103:
-#line 1133 "java_parser.y"
+#line 1132 "java_parser.y"
 { yyval.ast_unsigned.d = ACCESS_SYNCHRONIZED; PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsigned, yyvsp[0].ast_position, yyvsp[0].ast_position);}
 break;
 case 104:
-#line 1134 "java_parser.y"
+#line 1133 "java_parser.y"
 { yyval.ast_unsigned.d = 0; PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsigned, yyvsp[0].ast_position, yyvsp[0].ast_position);}
 break;
 case 105:
-#line 1135 "java_parser.y"
+#line 1134 "java_parser.y"
 { yyval.ast_unsigned.d = ACCESS_TRANSIENT; PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsigned, yyvsp[0].ast_position, yyvsp[0].ast_position);}
 break;
 case 106:
-#line 1136 "java_parser.y"
+#line 1135 "java_parser.y"
 { yyval.ast_unsigned.d = 0; PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsigned, yyvsp[0].ast_position, yyvsp[0].ast_position);}
 break;
 case 108:
-#line 1167 "java_parser.y"
+#line 1166 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -3690,7 +3690,7 @@ case 108:
             }
 break;
 case 109:
-#line 1176 "java_parser.y"
+#line 1175 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -3702,7 +3702,7 @@ case 109:
             }
 break;
 case 110:
-#line 1184 "java_parser.y"
+#line 1183 "java_parser.y"
 {
                 if (regularPass()) {
                     yyval.ast_id.d = yyvsp[-5].ast_id.d;
@@ -3725,7 +3725,7 @@ case 110:
             }
 break;
 case 111:
-#line 1205 "java_parser.y"
+#line 1204 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -3737,7 +3737,7 @@ case 111:
             }
 break;
 case 112:
-#line 1215 "java_parser.y"
+#line 1214 "java_parser.y"
 {
                 if (regularPass()) {
                     yyval.ast_id.d = yyvsp[-3].ast_id.d;
@@ -3753,11 +3753,11 @@ case 112:
             }
 break;
 case 113:
-#line 1228 "java_parser.y"
+#line 1227 "java_parser.y"
 { /* never used */ }
 break;
 case 114:
-#line 1233 "java_parser.y"
+#line 1232 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -3769,7 +3769,7 @@ case 114:
             }
 break;
 case 115:
-#line 1241 "java_parser.y"
+#line 1240 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -3781,7 +3781,7 @@ case 115:
             }
 break;
 case 116:
-#line 1249 "java_parser.y"
+#line 1248 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -3800,7 +3800,7 @@ case 116:
             }
 break;
 case 117:
-#line 1266 "java_parser.y"
+#line 1265 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -3812,7 +3812,7 @@ case 117:
             }
 break;
 case 118:
-#line 1276 "java_parser.y"
+#line 1275 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -3827,11 +3827,11 @@ case 118:
             }
 break;
 case 119:
-#line 1288 "java_parser.y"
+#line 1287 "java_parser.y"
 { /* never used */ }
 break;
 case 120:
-#line 1294 "java_parser.y"
+#line 1293 "java_parser.y"
 {
             if (inSecondJslPass()) {
                 if (strcmp(s_jsl->classStat->thisClass->linkName,
@@ -3845,7 +3845,7 @@ case 120:
         }
 break;
 case 121:
-#line 1305 "java_parser.y"
+#line 1304 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -3865,19 +3865,19 @@ case 121:
         }
 break;
 case 122:
-#line 1324 "java_parser.y"
+#line 1323 "java_parser.y"
 {
             SetNullBoundaries(yyval.ast_position);
         }
 break;
 case 123:
-#line 1327 "java_parser.y"
+#line 1326 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 124:
-#line 1333 "java_parser.y"
+#line 1332 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -3897,7 +3897,7 @@ case 124:
         }
 break;
 case 125:
-#line 1350 "java_parser.y"
+#line 1349 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -3917,7 +3917,7 @@ case 125:
         }
 break;
 case 126:
-#line 1369 "java_parser.y"
+#line 1368 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -3964,51 +3964,51 @@ case 126:
         }
 break;
 case 127:
-#line 1416 "java_parser.y"
+#line 1415 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 128:
-#line 1419 "java_parser.y"
+#line 1418 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-3].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 129:
-#line 1425 "java_parser.y"
+#line 1424 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 130:
-#line 1428 "java_parser.y"
+#line 1427 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-2].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 135:
-#line 1438 "java_parser.y"
+#line 1437 "java_parser.y"
 {SetNullBoundaries(yyval.ast_position);}
 break;
 case 136:
-#line 1442 "java_parser.y"
+#line 1441 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_id, yyvsp[0].ast_id);}
 break;
 case 137:
-#line 1443 "java_parser.y"
+#line 1442 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_id, yyvsp[0].ast_id);}
 break;
 case 138:
-#line 1444 "java_parser.y"
+#line 1443 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_symbol, yyvsp[0].ast_symbol);}
 break;
 case 139:
-#line 1445 "java_parser.y"
+#line 1444 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_position, yyvsp[0].ast_position);}
 break;
 case 140:
-#line 1451 "java_parser.y"
+#line 1450 "java_parser.y"
 {
             yyval.ast_symbol.d = yyvsp[0].ast_symbol.d;
             if (regularPass()) {
@@ -4021,7 +4021,7 @@ case 140:
     }
 break;
 case 141:
-#line 1464 "java_parser.y"
+#line 1463 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4107,7 +4107,7 @@ case 141:
         }
 break;
 case 142:
-#line 1550 "java_parser.y"
+#line 1549 "java_parser.y"
 {
             yyval.ast_symbol.d = yyvsp[0].ast_symbol.d;
             if (regularPass()) {
@@ -4120,7 +4120,7 @@ case 142:
         }
 break;
 case 143:
-#line 1560 "java_parser.y"
+#line 1559 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4149,14 +4149,14 @@ case 143:
         }
 break;
 case 145:
-#line 1590 "java_parser.y"
+#line 1589 "java_parser.y"
 {
             yyval.ast_symbol.d = yyvsp[-2].ast_symbol.d;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_symbol, yyvsp[-2].ast_symbol, yyvsp[0].ast_expressionType);
         }
 break;
 case 146:
-#line 1594 "java_parser.y"
+#line 1593 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4172,7 +4172,7 @@ case 146:
         }
 break;
 case 147:
-#line 1610 "java_parser.y"
+#line 1609 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4191,7 +4191,7 @@ case 147:
         }
 break;
 case 148:
-#line 1626 "java_parser.y"
+#line 1625 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4210,11 +4210,11 @@ case 148:
         }
 break;
 case 149:
-#line 1642 "java_parser.y"
+#line 1641 "java_parser.y"
 {/* rule never used */}
 break;
 case 152:
-#line 1654 "java_parser.y"
+#line 1653 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -4224,7 +4224,7 @@ case 152:
             }
 break;
 case 153:
-#line 1662 "java_parser.y"
+#line 1661 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -4240,7 +4240,7 @@ case 153:
             }
 break;
 case 154:
-#line 1678 "java_parser.y"
+#line 1677 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4262,7 +4262,7 @@ case 154:
         }
 break;
 case 155:
-#line 1697 "java_parser.y"
+#line 1696 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4283,11 +4283,11 @@ case 155:
         }
 break;
 case 156:
-#line 1715 "java_parser.y"
+#line 1714 "java_parser.y"
 {assert(0);}
 break;
 case 157:
-#line 1720 "java_parser.y"
+#line 1719 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -4300,7 +4300,7 @@ case 157:
             }
 break;
 case 158:
-#line 1731 "java_parser.y"
+#line 1730 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -4320,7 +4320,7 @@ case 158:
             }
 break;
 case 159:
-#line 1748 "java_parser.y"
+#line 1747 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4337,11 +4337,11 @@ case 159:
         }
 break;
 case 160:
-#line 1762 "java_parser.y"
+#line 1761 "java_parser.y"
 { assert(0);}
 break;
 case 161:
-#line 1765 "java_parser.y"
+#line 1764 "java_parser.y"
 {
             yyval.ast_symbolPositionListPair.d.s = NULL;
             yyval.ast_symbolPositionListPair.d.p = NULL;
@@ -4349,7 +4349,7 @@ case 161:
         }
 break;
 case 163:
-#line 1774 "java_parser.y"
+#line 1773 "java_parser.y"
 {
             if (! SyntaxPassOnly()) {
                 yyval.ast_symbolPositionListPair.d.s = yyvsp[0].ast_symbol.d;
@@ -4361,7 +4361,7 @@ case 163:
         }
 break;
 case 164:
-#line 1783 "java_parser.y"
+#line 1782 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4379,7 +4379,7 @@ case 164:
         }
 break;
 case 165:
-#line 1801 "java_parser.y"
+#line 1800 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4396,7 +4396,7 @@ case 165:
         }
 break;
 case 166:
-#line 1815 "java_parser.y"
+#line 1814 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4413,7 +4413,7 @@ case 166:
         }
 break;
 case 167:
-#line 1829 "java_parser.y"
+#line 1828 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4429,21 +4429,21 @@ case 167:
         }
 break;
 case 168:
-#line 1844 "java_parser.y"
+#line 1843 "java_parser.y"
 {
             yyval.ast_symbolList.d = NULL;
             SetNullBoundaries(yyval.ast_symbolList);
         }
 break;
 case 169:
-#line 1848 "java_parser.y"
+#line 1847 "java_parser.y"
 {
             yyval.ast_symbolList.d = yyvsp[0].ast_symbolList.d;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_symbolList, yyvsp[-1].ast_position, yyvsp[0].ast_symbolList);
         }
 break;
 case 170:
-#line 1855 "java_parser.y"
+#line 1854 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_symbolList, yyvsp[0].ast_symbol, yyvsp[0].ast_symbol);
             if (inSecondJslPass()) {
@@ -4456,7 +4456,7 @@ case 170:
         }
 break;
 case 171:
-#line 1865 "java_parser.y"
+#line 1864 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_symbolList, yyvsp[-2].ast_symbolList, yyvsp[0].ast_symbol);
             if (inSecondJslPass()) {
@@ -4469,26 +4469,26 @@ case 171:
         }
 break;
 case 173:
-#line 1879 "java_parser.y"
+#line 1878 "java_parser.y"
 {
             yyval.ast_position.d = yyvsp[0].ast_position.d;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 174:
-#line 1888 "java_parser.y"
+#line 1887 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 175:
-#line 1891 "java_parser.y"
+#line 1890 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 176:
-#line 1898 "java_parser.y"
+#line 1897 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -4523,7 +4523,7 @@ case 176:
             }
 break;
 case 177:
-#line 1930 "java_parser.y"
+#line 1929 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4540,7 +4540,7 @@ case 177:
         }
 break;
 case 178:
-#line 1948 "java_parser.y"
+#line 1947 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -4569,7 +4569,7 @@ case 178:
             }
 break;
 case 179:
-#line 1975 "java_parser.y"
+#line 1974 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -4589,31 +4589,31 @@ case 179:
             }
 break;
 case 180:
-#line 1995 "java_parser.y"
+#line 1994 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-5].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 181:
-#line 1998 "java_parser.y"
+#line 1997 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-4].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 182:
-#line 2001 "java_parser.y"
+#line 2000 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-4].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 183:
-#line 2004 "java_parser.y"
+#line 2003 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 184:
-#line 2012 "java_parser.y"
+#line 2011 "java_parser.y"
 {
                 if (ComputingPossibleParameterCompletion()) {
                     s_cp.erfsForParamsComplet = javaCrErfsForConstructorInvocation(s_javaStat->thisClass, &yyvsp[-1].ast_id.d->p);
@@ -4621,7 +4621,7 @@ case 184:
             }
 break;
 case 185:
-#line 2016 "java_parser.y"
+#line 2015 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -4635,7 +4635,7 @@ case 185:
             }
 break;
 case 186:
-#line 2028 "java_parser.y"
+#line 2027 "java_parser.y"
 {
                 if (ComputingPossibleParameterCompletion()) {
                     s_cp.erfsForParamsComplet = javaCrErfsForConstructorInvocation(javaCurrentSuperClass(), &yyvsp[-1].ast_id.d->p);
@@ -4643,7 +4643,7 @@ case 186:
             }
 break;
 case 187:
-#line 2032 "java_parser.y"
+#line 2031 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -4659,7 +4659,7 @@ case 187:
             }
 break;
 case 188:
-#line 2046 "java_parser.y"
+#line 2045 "java_parser.y"
 {
                 if (ComputingPossibleParameterCompletion()) {
                     s_cp.erfsForParamsComplet = javaCrErfsForConstructorInvocation(javaCurrentSuperClass(), &(yyvsp[-1].ast_id.d->p));
@@ -4667,7 +4667,7 @@ case 188:
             }
 break;
 case 189:
-#line 2050 "java_parser.y"
+#line 2049 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -4683,31 +4683,31 @@ case 189:
             }
 break;
 case 190:
-#line 2063 "java_parser.y"
+#line 2062 "java_parser.y"
 {SetNullBoundaries(yyval.ast_position);}
 break;
 case 191:
-#line 2064 "java_parser.y"
+#line 2063 "java_parser.y"
 {SetNullBoundaries(yyval.ast_position);}
 break;
 case 192:
-#line 2065 "java_parser.y"
+#line 2064 "java_parser.y"
 {SetNullBoundaries(yyval.ast_position);}
 break;
 case 193:
-#line 2066 "java_parser.y"
+#line 2065 "java_parser.y"
 {assert(0);}
 break;
 case 194:
-#line 2067 "java_parser.y"
+#line 2066 "java_parser.y"
 {assert(0);}
 break;
 case 195:
-#line 2068 "java_parser.y"
+#line 2067 "java_parser.y"
 {assert(0);}
 break;
 case 196:
-#line 2075 "java_parser.y"
+#line 2074 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4719,7 +4719,7 @@ case 196:
         }
 break;
 case 197:
-#line 2083 "java_parser.y"
+#line 2082 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4731,7 +4731,7 @@ case 197:
         }
 break;
 case 198:
-#line 2091 "java_parser.y"
+#line 2090 "java_parser.y"
 {
             if (regularPass()) {
                 yyval.ast_id.d = yyvsp[-4].ast_id.d;
@@ -4754,7 +4754,7 @@ case 198:
         }
 break;
 case 199:
-#line 2112 "java_parser.y"
+#line 2111 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -4766,7 +4766,7 @@ case 199:
             }
 break;
 case 200:
-#line 2122 "java_parser.y"
+#line 2121 "java_parser.y"
 {
                 if (regularPass()) {
                     yyval.ast_id.d = yyvsp[-3].ast_id.d;
@@ -4782,11 +4782,11 @@ case 200:
             }
 break;
 case 201:
-#line 2135 "java_parser.y"
+#line 2134 "java_parser.y"
 { /* never used */ }
 break;
 case 202:
-#line 2138 "java_parser.y"
+#line 2137 "java_parser.y"
 {
             SetNullBoundaries(yyval.ast_position);
             if (inSecondJslPass()) {
@@ -4796,7 +4796,7 @@ case 202:
         }
 break;
 case 204:
-#line 2149 "java_parser.y"
+#line 2148 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4816,7 +4816,7 @@ case 204:
         }
 break;
 case 205:
-#line 2166 "java_parser.y"
+#line 2165 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4836,49 +4836,49 @@ case 205:
         }
 break;
 case 206:
-#line 2186 "java_parser.y"
+#line 2185 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 207:
-#line 2189 "java_parser.y"
+#line 2188 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-3].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 209:
-#line 2196 "java_parser.y"
+#line 2195 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-2].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 210:
-#line 2202 "java_parser.y"
+#line 2201 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_id, yyvsp[0].ast_id);}
 break;
 case 211:
-#line 2203 "java_parser.y"
+#line 2202 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_id, yyvsp[0].ast_id);}
 break;
 case 212:
-#line 2204 "java_parser.y"
+#line 2203 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_symbol, yyvsp[0].ast_symbol);}
 break;
 case 213:
-#line 2205 "java_parser.y"
+#line 2204 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_symbol, yyvsp[0].ast_symbol);}
 break;
 case 214:
-#line 2206 "java_parser.y"
+#line 2205 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_position, yyvsp[0].ast_position);}
 break;
 case 215:
-#line 2207 "java_parser.y"
+#line 2206 "java_parser.y"
 {SetNullBoundaries(yyval.ast_position);}
 break;
 case 217:
-#line 2216 "java_parser.y"
+#line 2215 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -4888,7 +4888,7 @@ case 217:
             }
 break;
 case 218:
-#line 2224 "java_parser.y"
+#line 2223 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -4900,65 +4900,65 @@ case 218:
             }
 break;
 case 219:
-#line 2238 "java_parser.y"
+#line 2237 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_expressionType, yyvsp[-3].ast_position, yyvsp[0].ast_position);}
 break;
 case 220:
-#line 2239 "java_parser.y"
+#line 2238 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_expressionType, yyvsp[-2].ast_position, yyvsp[0].ast_position);}
 break;
 case 221:
-#line 2240 "java_parser.y"
+#line 2239 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_expressionType, yyvsp[-2].ast_position, yyvsp[0].ast_position);}
 break;
 case 222:
-#line 2241 "java_parser.y"
+#line 2240 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_expressionType, yyvsp[-1].ast_position, yyvsp[0].ast_position);}
 break;
 case 223:
-#line 2245 "java_parser.y"
+#line 2244 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_expressionType, yyvsp[0].ast_expressionType);
         }
 break;
 case 224:
-#line 2248 "java_parser.y"
+#line 2247 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-2].ast_position, yyvsp[0].ast_expressionType);
         }
 break;
 case 225:
-#line 2256 "java_parser.y"
+#line 2255 "java_parser.y"
 {
             yyval.ast_position.d = yyvsp[0].ast_position.d;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-4].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 226:
-#line 2260 "java_parser.y"
+#line 2259 "java_parser.y"
 {
             yyval.ast_position.d = yyvsp[0].ast_position.d;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 228:
-#line 2268 "java_parser.y"
+#line 2267 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 232:
-#line 2277 "java_parser.y"
+#line 2276 "java_parser.y"
 {SetNullBoundaries(yyval.ast_position);}
 break;
 case 233:
-#line 2281 "java_parser.y"
+#line 2280 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_symbol, yyvsp[0].ast_position);
         }
 break;
 case 234:
-#line 2287 "java_parser.y"
+#line 2286 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4971,7 +4971,7 @@ case 234:
         }
 break;
 case 235:
-#line 2297 "java_parser.y"
+#line 2296 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4984,7 +4984,7 @@ case 235:
         }
 break;
 case 236:
-#line 2307 "java_parser.y"
+#line 2306 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -4999,14 +4999,14 @@ case 236:
         }
 break;
 case 237:
-#line 2322 "java_parser.y"
+#line 2321 "java_parser.y"
 {
             if (regularPass()) yyval.ast_symbol.d = yyvsp[0].ast_symbol.d;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_symbol, yyvsp[0].ast_symbol, yyvsp[0].ast_symbol);
         }
 break;
 case 238:
-#line 2326 "java_parser.y"
+#line 2325 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5016,7 +5016,7 @@ case 238:
         }
 break;
 case 239:
-#line 2332 "java_parser.y"
+#line 2331 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5029,87 +5029,87 @@ case 239:
         }
 break;
 case 263:
-#line 2383 "java_parser.y"
+#line 2382 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-2].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 264:
-#line 2386 "java_parser.y"
+#line 2385 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-4].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 265:
-#line 2392 "java_parser.y"
+#line 2391 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 266:
-#line 2398 "java_parser.y"
+#line 2397 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-2].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 267:
-#line 2404 "java_parser.y"
+#line 2403 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-2].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 268:
-#line 2410 "java_parser.y"
+#line 2409 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_expressionType, yyvsp[0].ast_position);
         }
 break;
 case 269:
-#line 2416 "java_parser.y"
+#line 2415 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_expressionType, yyvsp[0].ast_expressionType, yyvsp[0].ast_expressionType);}
 break;
 case 270:
-#line 2417 "java_parser.y"
+#line 2416 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_expressionType, yyvsp[0].ast_expressionType, yyvsp[0].ast_expressionType);}
 break;
 case 271:
-#line 2418 "java_parser.y"
+#line 2417 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_expressionType, yyvsp[0].ast_expressionType, yyvsp[0].ast_expressionType);}
 break;
 case 272:
-#line 2419 "java_parser.y"
+#line 2418 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_expressionType, yyvsp[0].ast_expressionType, yyvsp[0].ast_expressionType);}
 break;
 case 273:
-#line 2420 "java_parser.y"
+#line 2419 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_expressionType, yyvsp[0].ast_expressionType, yyvsp[0].ast_expressionType);}
 break;
 case 274:
-#line 2421 "java_parser.y"
+#line 2420 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_expressionType, yyvsp[0].ast_expressionType, yyvsp[0].ast_expressionType);}
 break;
 case 275:
-#line 2422 "java_parser.y"
+#line 2421 "java_parser.y"
 {PropagateBoundariesIfRegularSyntaxPass(yyval.ast_expressionType, yyvsp[0].ast_expressionType, yyvsp[0].ast_expressionType);}
 break;
 case 276:
-#line 2425 "java_parser.y"
+#line 2424 "java_parser.y"
 {if (regularPass()) EXTRACT_COUNTER_SEMACT(yyval.ast_integer.d);}
 break;
 case 277:
-#line 2428 "java_parser.y"
+#line 2427 "java_parser.y"
 {if (regularPass()) EXTRACT_LABEL_SEMACT(yyval.ast_integer.d);}
 break;
 case 278:
-#line 2431 "java_parser.y"
+#line 2430 "java_parser.y"
 {if (regularPass()) EXTRACT_GOTO_SEMACT(yyval.ast_integer.d);}
 break;
 case 279:
-#line 2434 "java_parser.y"
+#line 2433 "java_parser.y"
 {if (regularPass()) EXTRACT_FORK_SEMACT(yyval.ast_integer.d);}
 break;
 case 280:
-#line 2439 "java_parser.y"
+#line 2438 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5121,7 +5121,7 @@ case 280:
         }
 break;
 case 281:
-#line 2451 "java_parser.y"
+#line 2450 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5134,7 +5134,7 @@ case 281:
         }
 break;
 case 282:
-#line 2464 "java_parser.y"
+#line 2463 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5146,7 +5146,7 @@ case 282:
         }
 break;
 case 283:
-#line 2476 "java_parser.y"
+#line 2475 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5158,7 +5158,7 @@ case 283:
         }
 break;
 case 284:
-#line 2488 "java_parser.y"
+#line 2487 "java_parser.y"
 {/*6*/
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5168,7 +5168,7 @@ case 284:
         }
 break;
 case 285:
-#line 2494 "java_parser.y"
+#line 2493 "java_parser.y"
 {/*7*/
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5179,7 +5179,7 @@ case 285:
         }
 break;
 case 286:
-#line 2501 "java_parser.y"
+#line 2500 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5194,37 +5194,37 @@ case 286:
         }
 break;
 case 287:
-#line 2516 "java_parser.y"
+#line 2515 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-5].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 288:
-#line 2519 "java_parser.y"
+#line 2518 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-4].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 289:
-#line 2522 "java_parser.y"
+#line 2521 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-4].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 290:
-#line 2525 "java_parser.y"
+#line 2524 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 292:
-#line 2532 "java_parser.y"
+#line 2531 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 293:
-#line 2538 "java_parser.y"
+#line 2537 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5234,37 +5234,37 @@ case 293:
         }
 break;
 case 294:
-#line 2544 "java_parser.y"
+#line 2543 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-2].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 296:
-#line 2551 "java_parser.y"
+#line 2550 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 297:
-#line 2554 "java_parser.y"
+#line 2553 "java_parser.y"
 {
             SetNullBoundaries(yyval.ast_position);
         }
 break;
 case 298:
-#line 2560 "java_parser.y"
+#line 2559 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-2].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 299:
-#line 2563 "java_parser.y"
+#line 2562 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 300:
-#line 2569 "java_parser.y"
+#line 2568 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5284,7 +5284,7 @@ case 300:
         }
 break;
 case 301:
-#line 2589 "java_parser.y"
+#line 2588 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5301,7 +5301,7 @@ case 301:
         }
 break;
 case 302:
-#line 2606 "java_parser.y"
+#line 2605 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5318,7 +5318,7 @@ case 302:
         }
 break;
 case 303:
-#line 2623 "java_parser.y"
+#line 2622 "java_parser.y"
 { /*5*/
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5328,7 +5328,7 @@ case 303:
         }
 break;
 case 304:
-#line 2629 "java_parser.y"
+#line 2628 "java_parser.y"
 {/*6*/
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5338,7 +5338,7 @@ case 304:
         }
 break;
 case 305:
-#line 2635 "java_parser.y"
+#line 2634 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5350,7 +5350,7 @@ case 305:
         }
 break;
 case 306:
-#line 2643 "java_parser.y"
+#line 2642 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5363,19 +5363,19 @@ case 306:
         }
 break;
 case 307:
-#line 2655 "java_parser.y"
+#line 2654 "java_parser.y"
 {
             SetNullBoundaries(yyval.ast_position);
         }
 break;
 case 308:
-#line 2658 "java_parser.y"
+#line 2657 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_expressionType, yyvsp[0].ast_expressionType);
         }
 break;
 case 309:
-#line 2664 "java_parser.y"
+#line 2663 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5387,7 +5387,7 @@ case 309:
         }
 break;
 case 310:
-#line 2678 "java_parser.y"
+#line 2677 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5405,7 +5405,7 @@ case 310:
         }
 break;
 case 311:
-#line 2696 "java_parser.y"
+#line 2695 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5420,7 +5420,7 @@ case 311:
         }
 break;
 case 312:
-#line 2711 "java_parser.y"
+#line 2710 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5435,7 +5435,7 @@ case 312:
         }
 break;
 case 313:
-#line 2726 "java_parser.y"
+#line 2725 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5447,7 +5447,7 @@ case 313:
         }
 break;
 case 314:
-#line 2735 "java_parser.y"
+#line 2734 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5459,7 +5459,7 @@ case 314:
         }
 break;
 case 315:
-#line 2747 "java_parser.y"
+#line 2746 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5471,7 +5471,7 @@ case 315:
         }
 break;
 case 316:
-#line 2756 "java_parser.y"
+#line 2755 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5483,55 +5483,55 @@ case 316:
         }
 break;
 case 317:
-#line 2768 "java_parser.y"
+#line 2767 "java_parser.y"
 {
             SetNullBoundaries(yyval.ast_position);
         }
 break;
 case 318:
-#line 2771 "java_parser.y"
+#line 2770 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 319:
-#line 2774 "java_parser.y"
+#line 2773 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_symbol, yyvsp[0].ast_symbol);
         }
 break;
 case 320:
-#line 2779 "java_parser.y"
+#line 2778 "java_parser.y"
 {
             SetNullBoundaries(yyval.ast_position);
         }
 break;
 case 321:
-#line 2782 "java_parser.y"
+#line 2781 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 322:
-#line 2788 "java_parser.y"
+#line 2787 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[0].ast_expressionType, yyvsp[0].ast_expressionType);
         }
 break;
 case 323:
-#line 2791 "java_parser.y"
+#line 2790 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-2].ast_position, yyvsp[0].ast_expressionType);
         }
 break;
 case 324:
-#line 2797 "java_parser.y"
+#line 2796 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-2].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 325:
-#line 2800 "java_parser.y"
+#line 2799 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5543,13 +5543,13 @@ case 325:
         }
 break;
 case 326:
-#line 2812 "java_parser.y"
+#line 2811 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-2].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 327:
-#line 2815 "java_parser.y"
+#line 2814 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5561,7 +5561,7 @@ case 327:
         }
 break;
 case 328:
-#line 2827 "java_parser.y"
+#line 2826 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5573,7 +5573,7 @@ case 328:
         }
 break;
 case 329:
-#line 2836 "java_parser.y"
+#line 2835 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5585,7 +5585,7 @@ case 329:
         }
 break;
 case 330:
-#line 2848 "java_parser.y"
+#line 2847 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5599,19 +5599,19 @@ case 330:
         }
 break;
 case 331:
-#line 2862 "java_parser.y"
+#line 2861 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-4].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 334:
-#line 2870 "java_parser.y"
+#line 2869 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 335:
-#line 2877 "java_parser.y"
+#line 2876 "java_parser.y"
 {
                 if (s_opt.server_operation == OLO_EXTRACT) {
                     addTrivialCxReference("TryCatch", TypeTryCatchMarker,StorageDefault,
@@ -5620,7 +5620,7 @@ case 335:
             }
 break;
 case 336:
-#line 2884 "java_parser.y"
+#line 2883 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -5630,7 +5630,7 @@ case 336:
             }
 break;
 case 337:
-#line 2891 "java_parser.y"
+#line 2890 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-5].ast_id, yyvsp[0].ast_position);
             if (s_opt.server_operation == OLO_EXTRACT) {
@@ -5640,13 +5640,13 @@ case 337:
         }
 break;
 case 339:
-#line 2903 "java_parser.y"
+#line 2902 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-1].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 340:
-#line 2910 "java_parser.y"
+#line 2909 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -5663,7 +5663,7 @@ case 340:
             }
 break;
 case 341:
-#line 2925 "java_parser.y"
+#line 2924 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -5675,7 +5675,7 @@ case 341:
             }
 break;
 case 342:
-#line 2934 "java_parser.y"
+#line 2933 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5690,7 +5690,7 @@ case 342:
         }
 break;
 case 343:
-#line 2949 "java_parser.y"
+#line 2948 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5702,7 +5702,7 @@ case 343:
         }
 break;
 case 344:
-#line 2963 "java_parser.y"
+#line 2962 "java_parser.y"
 {
             if (regularPass()) {
                 yyval.ast_expressionType.d = yyvsp[0].ast_expressionType.d;
@@ -5715,7 +5715,7 @@ case 344:
         }
 break;
 case 345:
-#line 2973 "java_parser.y"
+#line 2972 "java_parser.y"
 {
             if (regularPass()) {
                 yyval.ast_expressionType.d = yyvsp[0].ast_expressionType.d;
@@ -5728,7 +5728,7 @@ case 345:
         }
 break;
 case 347:
-#line 2987 "java_parser.y"
+#line 2986 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5746,7 +5746,7 @@ case 347:
         }
 break;
 case 348:
-#line 3002 "java_parser.y"
+#line 3001 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5762,7 +5762,7 @@ case 348:
         }
 break;
 case 349:
-#line 3015 "java_parser.y"
+#line 3014 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5776,7 +5776,7 @@ case 349:
         }
 break;
 case 350:
-#line 3026 "java_parser.y"
+#line 3025 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5792,7 +5792,7 @@ case 350:
         }
 break;
 case 351:
-#line 3039 "java_parser.y"
+#line 3038 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5806,7 +5806,7 @@ case 351:
         }
 break;
 case 352:
-#line 3050 "java_parser.y"
+#line 3049 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5820,7 +5820,7 @@ case 352:
         }
 break;
 case 353:
-#line 3061 "java_parser.y"
+#line 3060 "java_parser.y"
 {
             if (regularPass()) {
                 yyval.ast_expressionType.d = yyvsp[-1].ast_expressionType.d;
@@ -5840,17 +5840,17 @@ case 353:
         }
 break;
 case 358:
-#line 3082 "java_parser.y"
+#line 3081 "java_parser.y"
 { assert(0); /* rule never used */ }
 break;
 case 359:
-#line 3085 "java_parser.y"
+#line 3084 "java_parser.y"
 {
             yyval.erfs = s_cp.erfsForParamsComplet;
         }
 break;
 case 360:
-#line 3092 "java_parser.y"
+#line 3091 "java_parser.y"
 {
                 if (ComputingPossibleParameterCompletion()) {
                     TypeModifier *mm;
@@ -5865,7 +5865,7 @@ case 360:
             }
 break;
 case 361:
-#line 3104 "java_parser.y"
+#line 3103 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5889,7 +5889,7 @@ case 361:
         }
 break;
 case 362:
-#line 3126 "java_parser.y"
+#line 3125 "java_parser.y"
 {
                 if (ComputingPossibleParameterCompletion()) {
                     TypeModifier *mm;
@@ -5902,7 +5902,7 @@ case 362:
             }
 break;
 case 363:
-#line 3136 "java_parser.y"
+#line 3135 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5921,7 +5921,7 @@ case 363:
         }
 break;
 case 364:
-#line 3155 "java_parser.y"
+#line 3154 "java_parser.y"
 {
             if (ComputingPossibleParameterCompletion()) {
                 Symbol            *ss;
@@ -5938,7 +5938,7 @@ case 364:
         }
 break;
 case 365:
-#line 3172 "java_parser.y"
+#line 3171 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -5990,7 +5990,7 @@ case 365:
         }
 break;
 case 366:
-#line 3222 "java_parser.y"
+#line 3221 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -6015,7 +6015,7 @@ case 366:
             }
 break;
 case 367:
-#line 3244 "java_parser.y"
+#line 3243 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -6025,7 +6025,7 @@ case 367:
             }
 break;
 case 368:
-#line 3251 "java_parser.y"
+#line 3250 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6043,7 +6043,7 @@ case 368:
         }
 break;
 case 369:
-#line 3266 "java_parser.y"
+#line 3265 "java_parser.y"
 {
             yyval.ast_expressionType.d.typeModifier = yyvsp[0].ast_nestedConstrTokenType.d.t;
             yyval.ast_expressionType.d.position = yyvsp[0].ast_nestedConstrTokenType.d.pp;
@@ -6052,7 +6052,7 @@ case 369:
         }
 break;
 case 370:
-#line 3273 "java_parser.y"
+#line 3272 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -6073,7 +6073,7 @@ case 370:
             }
 break;
 case 371:
-#line 3292 "java_parser.y"
+#line 3291 "java_parser.y"
 {
                 if (regularPass()) {
                     if (! SyntaxPassOnly()) {
@@ -6087,25 +6087,25 @@ case 371:
         }
 break;
 case 372:
-#line 3303 "java_parser.y"
+#line 3302 "java_parser.y"
 {
             assert(0); /* rule never used */
         }
 break;
 case 373:
-#line 3306 "java_parser.y"
+#line 3305 "java_parser.y"
 {
             assert(0); /* rule never used */
         }
 break;
 case 374:
-#line 3309 "java_parser.y"
+#line 3308 "java_parser.y"
 {
             assert(0); /* rule never used */
         }
 break;
 case 375:
-#line 3321 "java_parser.y"
+#line 3320 "java_parser.y"
 {
             yyval.ast_typeModifiersListPositionListPair.d.t = NULL;
             yyval.ast_typeModifiersListPositionListPair.d.p = NULL;
@@ -6113,7 +6113,7 @@ case 375:
         }
 break;
 case 377:
-#line 3330 "java_parser.y"
+#line 3329 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6130,7 +6130,7 @@ case 377:
         }
 break;
 case 378:
-#line 3344 "java_parser.y"
+#line 3343 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6147,15 +6147,15 @@ case 378:
         }
 break;
 case 379:
-#line 3358 "java_parser.y"
+#line 3357 "java_parser.y"
 {assert(0);}
 break;
 case 380:
-#line 3359 "java_parser.y"
+#line 3358 "java_parser.y"
 {assert(0);}
 break;
 case 381:
-#line 3364 "java_parser.y"
+#line 3363 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6173,7 +6173,7 @@ case 381:
         }
 break;
 case 382:
-#line 3379 "java_parser.y"
+#line 3378 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6190,7 +6190,7 @@ case 382:
         }
 break;
 case 383:
-#line 3393 "java_parser.y"
+#line 3392 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6209,7 +6209,7 @@ case 383:
         }
 break;
 case 384:
-#line 3409 "java_parser.y"
+#line 3408 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6227,48 +6227,48 @@ case 384:
         }
 break;
 case 385:
-#line 3428 "java_parser.y"
+#line 3427 "java_parser.y"
 {
             if (regularPass()) yyval.ast_integer.d = 1;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_integer, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 386:
-#line 3432 "java_parser.y"
+#line 3431 "java_parser.y"
 {
             if (regularPass()) yyval.ast_integer.d = yyvsp[-1].ast_integer.d+1;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_integer, yyvsp[-1].ast_integer, yyvsp[0].ast_position);
         }
 break;
 case 387:
-#line 3439 "java_parser.y"
+#line 3438 "java_parser.y"
 {
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_position, yyvsp[-2].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 388:
-#line 3445 "java_parser.y"
+#line 3444 "java_parser.y"
 {
         if (regularPass()) yyval.ast_integer.d = 0;
             SetNullBoundaries(yyval.ast_integer);
         }
 break;
 case 390:
-#line 3453 "java_parser.y"
+#line 3452 "java_parser.y"
 {
             if (regularPass()) yyval.ast_integer.d = 1;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_integer, yyvsp[-1].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 391:
-#line 3457 "java_parser.y"
+#line 3456 "java_parser.y"
 {
             if (regularPass()) yyval.ast_integer.d = yyvsp[-2].ast_integer.d+1;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_integer, yyvsp[-2].ast_integer, yyvsp[0].ast_position);
         }
 break;
 case 392:
-#line 3464 "java_parser.y"
+#line 3463 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6296,7 +6296,7 @@ case 392:
         }
 break;
 case 393:
-#line 3489 "java_parser.y"
+#line 3488 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6325,7 +6325,7 @@ case 393:
         }
 break;
 case 394:
-#line 3515 "java_parser.y"
+#line 3514 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6356,19 +6356,19 @@ case 394:
         }
 break;
 case 395:
-#line 3543 "java_parser.y"
+#line 3542 "java_parser.y"
 { assert(0); }
 break;
 case 396:
-#line 3544 "java_parser.y"
+#line 3543 "java_parser.y"
 { assert(0); }
 break;
 case 397:
-#line 3545 "java_parser.y"
+#line 3544 "java_parser.y"
 { assert(0); }
 break;
 case 398:
-#line 3549 "java_parser.y"
+#line 3548 "java_parser.y"
 {
             if (ComputingPossibleParameterCompletion()) {
                 s_cp.erfsForParamsComplet = javaCrErfsForMethodInvocationN(yyvsp[-1].ast_idList.d);
@@ -6376,7 +6376,7 @@ case 398:
         }
 break;
 case 399:
-#line 3553 "java_parser.y"
+#line 3552 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6394,7 +6394,7 @@ case 399:
         }
 break;
 case 400:
-#line 3568 "java_parser.y"
+#line 3567 "java_parser.y"
 {
             if (ComputingPossibleParameterCompletion()) {
                 s_cp.erfsForParamsComplet = javaCrErfsForMethodInvocationT(yyvsp[-3].ast_expressionType.d.typeModifier, yyvsp[-1].ast_id.d);
@@ -6402,7 +6402,7 @@ case 400:
         }
 break;
 case 401:
-#line 3572 "java_parser.y"
+#line 3571 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6419,7 +6419,7 @@ case 401:
         }
 break;
 case 402:
-#line 3586 "java_parser.y"
+#line 3585 "java_parser.y"
 {
             if (ComputingPossibleParameterCompletion()) {
                 s_cp.erfsForParamsComplet = javaCrErfsForMethodInvocationS(yyvsp[-3].ast_id.d, yyvsp[-1].ast_id.d);
@@ -6427,7 +6427,7 @@ case 402:
         }
 break;
 case 403:
-#line 3590 "java_parser.y"
+#line 3589 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6445,7 +6445,7 @@ case 403:
         }
 break;
 case 404:
-#line 3614 "java_parser.y"
+#line 3613 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6463,7 +6463,7 @@ case 404:
         }
 break;
 case 405:
-#line 3629 "java_parser.y"
+#line 3628 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6479,11 +6479,11 @@ case 405:
         }
 break;
 case 406:
-#line 3642 "java_parser.y"
+#line 3641 "java_parser.y"
 { /* rule never used */ }
 break;
 case 408:
-#line 3647 "java_parser.y"
+#line 3646 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6498,11 +6498,11 @@ case 408:
         }
 break;
 case 411:
-#line 3661 "java_parser.y"
+#line 3660 "java_parser.y"
 { /* rule never used */ }
 break;
 case 412:
-#line 3665 "java_parser.y"
+#line 3664 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6516,7 +6516,7 @@ case 412:
         }
 break;
 case 413:
-#line 3679 "java_parser.y"
+#line 3678 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6530,7 +6530,7 @@ case 413:
         }
 break;
 case 416:
-#line 3695 "java_parser.y"
+#line 3694 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6544,7 +6544,7 @@ case 416:
         }
 break;
 case 417:
-#line 3706 "java_parser.y"
+#line 3705 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6558,7 +6558,7 @@ case 417:
         }
 break;
 case 419:
-#line 3721 "java_parser.y"
+#line 3720 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6572,7 +6572,7 @@ case 419:
         }
 break;
 case 420:
-#line 3735 "java_parser.y"
+#line 3734 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6586,7 +6586,7 @@ case 420:
         }
 break;
 case 422:
-#line 3750 "java_parser.y"
+#line 3749 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6600,7 +6600,7 @@ case 422:
         }
 break;
 case 423:
-#line 3761 "java_parser.y"
+#line 3760 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6615,7 +6615,7 @@ case 423:
         }
 break;
 case 425:
-#line 3777 "java_parser.y"
+#line 3776 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6640,7 +6640,7 @@ case 425:
         }
 break;
 case 426:
-#line 3799 "java_parser.y"
+#line 3798 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6663,7 +6663,7 @@ case 426:
         }
 break;
 case 427:
-#line 3819 "java_parser.y"
+#line 3818 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6686,7 +6686,7 @@ case 427:
         }
 break;
 case 429:
-#line 3854 "java_parser.y"
+#line 3853 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6701,7 +6701,7 @@ case 429:
         }
 break;
 case 430:
-#line 3866 "java_parser.y"
+#line 3865 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6716,7 +6716,7 @@ case 430:
         }
 break;
 case 431:
-#line 3878 "java_parser.y"
+#line 3877 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6731,7 +6731,7 @@ case 431:
         }
 break;
 case 433:
-#line 3894 "java_parser.y"
+#line 3893 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6759,7 +6759,7 @@ case 433:
         }
 break;
 case 434:
-#line 3919 "java_parser.y"
+#line 3918 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6774,7 +6774,7 @@ case 434:
         }
 break;
 case 436:
-#line 3935 "java_parser.y"
+#line 3934 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6788,7 +6788,7 @@ case 436:
         }
 break;
 case 437:
-#line 3946 "java_parser.y"
+#line 3945 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6802,7 +6802,7 @@ case 437:
         }
 break;
 case 438:
-#line 3957 "java_parser.y"
+#line 3956 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6816,7 +6816,7 @@ case 438:
         }
 break;
 case 440:
-#line 3972 "java_parser.y"
+#line 3971 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6830,7 +6830,7 @@ case 440:
         }
 break;
 case 441:
-#line 3983 "java_parser.y"
+#line 3982 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6844,7 +6844,7 @@ case 441:
         }
 break;
 case 442:
-#line 3994 "java_parser.y"
+#line 3993 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6858,7 +6858,7 @@ case 442:
         }
 break;
 case 443:
-#line 4005 "java_parser.y"
+#line 4004 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6872,7 +6872,7 @@ case 443:
         }
 break;
 case 444:
-#line 4016 "java_parser.y"
+#line 4015 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6886,7 +6886,7 @@ case 444:
         }
 break;
 case 446:
-#line 4031 "java_parser.y"
+#line 4030 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6900,7 +6900,7 @@ case 446:
         }
 break;
 case 447:
-#line 4042 "java_parser.y"
+#line 4041 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6914,7 +6914,7 @@ case 447:
         }
 break;
 case 449:
-#line 4057 "java_parser.y"
+#line 4056 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6929,7 +6929,7 @@ case 449:
         }
 break;
 case 451:
-#line 4073 "java_parser.y"
+#line 4072 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6944,7 +6944,7 @@ case 451:
         }
 break;
 case 453:
-#line 4089 "java_parser.y"
+#line 4088 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6959,7 +6959,7 @@ case 453:
         }
 break;
 case 455:
-#line 4105 "java_parser.y"
+#line 4104 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6973,7 +6973,7 @@ case 455:
         }
 break;
 case 457:
-#line 4120 "java_parser.y"
+#line 4119 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -6987,7 +6987,7 @@ case 457:
         }
 break;
 case 459:
-#line 4135 "java_parser.y"
+#line 4134 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -7002,7 +7002,7 @@ case 459:
         }
 break;
 case 462:
-#line 4155 "java_parser.y"
+#line 4154 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -7015,7 +7015,7 @@ case 462:
         }
 break;
 case 463:
-#line 4164 "java_parser.y"
+#line 4163 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -7059,7 +7059,7 @@ case 463:
         }
 break;
 case 464:
-#line 4208 "java_parser.y"
+#line 4207 "java_parser.y"
 {
             if (regularPass()) {
                 yyval.ast_expressionType.d.position = javaGetNameStartingPosition(yyvsp[0].ast_idList.d);
@@ -7074,95 +7074,95 @@ case 464:
         }
 break;
 case 467:
-#line 4222 "java_parser.y"
+#line 4221 "java_parser.y"
 { /* rule never used */ }
 break;
 case 468:
-#line 4226 "java_parser.y"
+#line 4225 "java_parser.y"
 {
             if (regularPass()) yyval.ast_unsignedPositionPair.d.u = '=';
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsignedPositionPair, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 469:
-#line 4230 "java_parser.y"
+#line 4229 "java_parser.y"
 {
             if (regularPass()) yyval.ast_unsignedPositionPair.d.u = MUL_ASSIGN;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsignedPositionPair, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 470:
-#line 4234 "java_parser.y"
+#line 4233 "java_parser.y"
 {
             if (regularPass()) yyval.ast_unsignedPositionPair.d.u = DIV_ASSIGN;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsignedPositionPair, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 471:
-#line 4238 "java_parser.y"
+#line 4237 "java_parser.y"
 {
             if (regularPass()) yyval.ast_unsignedPositionPair.d.u = MOD_ASSIGN;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsignedPositionPair, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 472:
-#line 4242 "java_parser.y"
+#line 4241 "java_parser.y"
 {
             if (regularPass()) yyval.ast_unsignedPositionPair.d.u = ADD_ASSIGN;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsignedPositionPair, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 473:
-#line 4246 "java_parser.y"
+#line 4245 "java_parser.y"
 {
             if (regularPass()) yyval.ast_unsignedPositionPair.d.u = SUB_ASSIGN;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsignedPositionPair, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 474:
-#line 4250 "java_parser.y"
+#line 4249 "java_parser.y"
 {
             if (regularPass()) yyval.ast_unsignedPositionPair.d.u = LEFT_ASSIGN;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsignedPositionPair, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 475:
-#line 4254 "java_parser.y"
+#line 4253 "java_parser.y"
 {
             if (regularPass()) yyval.ast_unsignedPositionPair.d.u = RIGHT_ASSIGN;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsignedPositionPair, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 476:
-#line 4258 "java_parser.y"
+#line 4257 "java_parser.y"
 {
             if (regularPass()) yyval.ast_unsignedPositionPair.d.u = URIGHT_ASSIGN;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsignedPositionPair, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 477:
-#line 4262 "java_parser.y"
+#line 4261 "java_parser.y"
 {
             if (regularPass()) yyval.ast_unsignedPositionPair.d.u = AND_ASSIGN;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsignedPositionPair, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 478:
-#line 4266 "java_parser.y"
+#line 4265 "java_parser.y"
 {
             if (regularPass()) yyval.ast_unsignedPositionPair.d.u = XOR_ASSIGN;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsignedPositionPair, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 479:
-#line 4270 "java_parser.y"
+#line 4269 "java_parser.y"
 {
             if (regularPass()) yyval.ast_unsignedPositionPair.d.u = OR_ASSIGN;
             PropagateBoundariesIfRegularSyntaxPass(yyval.ast_unsignedPositionPair, yyvsp[0].ast_position, yyvsp[0].ast_position);
         }
 break;
 case 481:
-#line 4278 "java_parser.y"
+#line 4277 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -7176,7 +7176,7 @@ case 481:
         }
 break;
 case 483:
-#line 4298 "java_parser.y"
+#line 4297 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -7186,7 +7186,7 @@ case 483:
         }
 break;
 case 484:
-#line 4307 "java_parser.y"
+#line 4306 "java_parser.y"
 {
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
diff --git a/src/java_parser.y b/src/java_parser.y
index 826e08cd8..396f3dcd2 100644
--- a/src/java_parser.y
+++ b/src/java_parser.y
@@ -281,7 +281,7 @@ static S_whileExtractData *newWhileExtractData(int i1, int i2, Symbol *i3, Symbo
 %type <ast_unsigned> Modifier Modifiers Modifiers_opt
 %type <ast_idList> Name SimpleName QualifiedName PackageDeclaration_opt NewName
 %type <ast_idList> SingleTypeImportDeclaration TypeImportOnDemandDeclaration
-%type <ast_symbol> Type AssignmentType ReferenceType ClassOrInterfaceType
+%type <ast_symbol> JavaType AssignmentType ReferenceType ClassOrInterfaceType
 %type <ast_symbol> ExtendClassOrInterfaceType
 %type <ast_symbol> ClassType InterfaceType
 %type <ast_symbol> FormalParameter
@@ -468,9 +468,8 @@ Literal
     ;
 
 /* ************************* Types, Values, Variables ******************* */
-/* TODO: c-xref analysis somehow stops here. After this point no rules
-   or C variables are recognised. */
-Type
+
+JavaType
     :   PrimitiveType	{
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -1448,7 +1447,7 @@ ClassMemberDeclaration
 /* ****************** Field Declarations ****************** */
 
 AssignmentType
-    :   JAvaType					{
+    :   JavaType					{
             $$.d = $1.d;
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
@@ -1798,7 +1797,7 @@ FormalParameterList
     ;
 
 FormalParameter
-    :   Type VariableDeclaratorId			{
+    :   JavaType VariableDeclaratorId			{
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
                     $$.d = $2.d;
@@ -1812,7 +1811,7 @@ FormalParameter
                 completeDeclarator($1.d, $2.d);
             }
         }
-    |	FINAL JAvaType VariableDeclaratorId		{
+    |	FINAL JavaType VariableDeclaratorId		{
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
                     $$.d = $3.d;
@@ -2284,7 +2283,7 @@ LocalVariableDeclarationStatement
     ;
 
 LocalVarDeclUntilInit
-    :   Type VariableDeclaratorId							{
+    :   JavaType VariableDeclaratorId							{
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
                     addNewDeclaration($1.d,$2.d,NULL,StorageAuto,s_javaStat->locals);
@@ -2294,7 +2293,7 @@ LocalVarDeclUntilInit
                 }
             }
         }
-    |	FINAL Type VariableDeclaratorId						{
+    |	FINAL JavaType VariableDeclaratorId						{
             if (regularPass()) {
                 if (! SyntaxPassOnly()) {
                     addNewDeclaration($2.d,$3.d,NULL,StorageAuto,s_javaStat->locals);