diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
index c0efe1db7..76c86bf2d 100644
--- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
+++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
@@ -2,7 +2,7 @@
 //  This CSharp output file generated by Gardens Point LEX
 //  Version:  1.1.3.301
 //  Machine:  SSM
-//  DateTime: 03.04.2016 22:20:08
+//  DateTime: 04.04.2016 21:37:32
 //  UserName: ?????????
 //  GPLEX input file <ABCPascal.lex>
 //  GPLEX frame file <embedded resource>
diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y
index 50e28a3c4..7ea8d34a1 100644
--- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y
+++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y
@@ -1922,19 +1922,19 @@ proc_func_decl_noclass
         {
             $$ = new procedure_definition($1 as procedure_header, $2 as proc_block, @$);
         }
-	| tkFunction func_name fp_list tkColon fptype tkAssign relop_expr tkSemiColon
+	| tkFunction func_name fp_list tkColon fptype optional_method_modificators1 tkAssign relop_expr tkSemiColon
 		{
-			$$ = SyntaxTreeBuilder.BuildShortFuncDefinition($3 as formal_parameters, new procedure_attributes_list(), $2 as method_name, $5 as type_definition, $7, @1.Merge(@5));
+			$$ = SyntaxTreeBuilder.BuildShortFuncDefinition($3 as formal_parameters, $6 as procedure_attributes_list, $2 as method_name, $5 as type_definition, $8, @1.Merge(@5));
 		}
-	| tkFunction func_name fp_list tkAssign relop_expr tkSemiColon
+	| tkFunction func_name fp_list optional_method_modificators1 tkAssign relop_expr tkSemiColon
 		{
-			$$ = SyntaxTreeBuilder.BuildShortFuncDefinition($3 as formal_parameters, new procedure_attributes_list(), $2 as method_name, null, $5, @1.Merge(@3));
+			$$ = SyntaxTreeBuilder.BuildShortFuncDefinition($3 as formal_parameters, $4 as procedure_attributes_list, $2 as method_name, null, $6, @1.Merge(@3));
 		}
-	| tkProcedure proc_name fp_list tkAssign unlabelled_stmt tkSemiColon
+	| tkProcedure proc_name fp_list optional_method_modificators1 tkAssign unlabelled_stmt tkSemiColon
 		{
-			if ($5 is empty_statement)
+			if ($6 is empty_statement)
 				parsertools.AddErrorFromResource("EMPTY_STATEMENT_IN_SHORT_PROC_DEFINITION",@6);
-			$$ = SyntaxTreeBuilder.BuildShortProcDefinition($3 as formal_parameters, new procedure_attributes_list(), $2 as method_name, $5 as statement, @1.Merge(@3));
+			$$ = SyntaxTreeBuilder.BuildShortProcDefinition($3 as formal_parameters, $4 as procedure_attributes_list, $2 as method_name, $6 as statement, @1.Merge(@3));
 		}
 	| proc_func_header tkForward tkSemiColon
 		{
diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
index 1af731b3a..f3ac221db 100644
--- a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
+++ b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
@@ -2,9 +2,9 @@
 
 // GPPG version 1.3.6
 // Machine:  SSM
-// DateTime: 03.04.2016 22:20:09
+// DateTime: 04.04.2016 21:37:33
 // UserName: ?????????
-// Input file <ABCPascal.y>
+// Input file <D:\PascalABC.NET\!PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.y>
 
 // options: no-lines gplex
 
@@ -56,7 +56,7 @@ public abstract class ScanBase : AbstractScanner<PascalABCSavParser.Union,LexLoc
 
 public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, LexLocation>
 {
-  // Verbatim content from ABCPascal.y
+  // Verbatim content from D:\PascalABC.NET\!PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.y
 // ��� ���������� ����������� � ����� GPPGParser, �������������� ����� ������, ������������ �������� gppg
     public syntax_tree_node root; // �������� ���� ��������������� ������ 
 
@@ -68,13 +68,13 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, Lex
 	public ParserLambdaHelper lambdaHelper = new ParserLambdaHelper();
 	
     public GPPGParser(AbstractScanner<PascalABCSavParser.Union, LexLocation> scanner) : base(scanner) { }
-  // End verbatim content from ABCPascal.y
+  // End verbatim content from D:\PascalABC.NET\!PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.y
 
 #pragma warning disable 649
   private static Dictionary<int, string> aliasses;
 #pragma warning restore 649
   private static Rule[] rules = new Rule[794];
-  private static State[] states = new State[1262];
+  private static State[] states = new State[1265];
   private static string[] nonTerms = new string[] {
       "parse_goal", "unit_key_word", "assignment", "optional_array_initializer", 
       "attribute_declarations", "ot_visibility_specifier", "one_attribute", "attribute_variable", 
@@ -150,11 +150,11 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, Lex
       "rem_lambda", "variable_list", "tkAssignOrEqual", "$accept", };
 
   static GPPGParser() {
-    states[0] = new State(new int[]{53,1175,11,646,77,1246,79,1248,78,1255,3,-24,44,-24,80,-24,51,-24,23,-24,59,-24,42,-24,45,-24,54,-24,36,-24,31,-24,21,-24,24,-24,25,-24,94,-195,95,-195},new int[]{-1,1,-204,3,-205,4,-267,1187,-5,1188,-219,658,-149,1245});
+    states[0] = new State(new int[]{53,1178,11,646,77,1249,79,1251,78,1258,3,-24,44,-24,80,-24,51,-24,23,-24,59,-24,42,-24,45,-24,54,-24,36,-24,31,-24,21,-24,24,-24,25,-24,94,-195,95,-195},new int[]{-1,1,-204,3,-205,4,-267,1190,-5,1191,-219,658,-149,1248});
     states[1] = new State(new int[]{2,2});
     states[2] = new State(-1);
     states[3] = new State(-2);
-    states[4] = new State(new int[]{3,1171,44,-11,80,-11,51,-11,23,-11,59,-11,42,-11,45,-11,54,-11,11,-11,36,-11,31,-11,21,-11,24,-11,25,-11},new int[]{-159,5,-160,1169,-158,1174});
+    states[4] = new State(new int[]{3,1174,44,-11,80,-11,51,-11,23,-11,59,-11,42,-11,45,-11,54,-11,11,-11,36,-11,31,-11,21,-11,24,-11,25,-11},new int[]{-159,5,-160,1172,-158,1177});
     states[5] = new State(-35,new int[]{-265,6});
     states[6] = new State(new int[]{44,14,51,-58,23,-58,59,-58,42,-58,45,-58,54,-58,11,-58,36,-58,31,-58,21,-58,24,-58,25,-58,80,-58},new int[]{-15,7,-32,108,-36,1116,-37,1117});
     states[7] = new State(new int[]{7,9,10,10,5,11,89,12,6,13,2,-23},new int[]{-162,8});
@@ -718,7 +718,7 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, Lex
     states[565] = new State(new int[]{8,579,10,-419},new int[]{-100,566});
     states[566] = new State(new int[]{10,568},new int[]{-179,567});
     states[567] = new State(-344);
-    states[568] = new State(new int[]{133,572,135,573,136,574,137,575,139,576,138,577,80,-632,51,-632,23,-632,59,-632,42,-632,45,-632,54,-632,11,-632,21,-632,36,-632,31,-632,24,-632,25,-632,38,-632,81,-632,74,-632,73,-632,72,-632,71,-632,18,-632,134,-632,96,-632,33,-632},new int[]{-178,569,-181,578});
+    states[568] = new State(new int[]{133,572,135,573,136,574,137,575,139,576,138,577,80,-632,51,-632,23,-632,59,-632,42,-632,45,-632,54,-632,11,-632,21,-632,36,-632,31,-632,24,-632,25,-632,38,-632,81,-632,74,-632,73,-632,72,-632,71,-632,18,-632,134,-632,33,-632},new int[]{-178,569,-181,578});
     states[569] = new State(new int[]{10,570});
     states[570] = new State(new int[]{133,572,135,573,136,574,137,575,139,576,138,577,80,-633,51,-633,23,-633,59,-633,42,-633,45,-633,54,-633,11,-633,21,-633,36,-633,31,-633,24,-633,25,-633,38,-633,81,-633,74,-633,73,-633,72,-633,71,-633,18,-633,134,-633,96,-633,33,-633},new int[]{-181,571});
     states[571] = new State(-637);
@@ -974,7 +974,7 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, Lex
     states[821] = new State(-461);
     states[822] = new State(new int[]{48,132,131,139,132,140,140,143,142,144,141,145,55,147,11,167,122,199,104,203,103,204,129,205,128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,263,8,265,16,273,17,278,31,284,36,288},new int[]{-85,823,-84,125,-86,226,-74,186,-83,198,-13,133,-138,136,-140,137,-139,141,-14,142,-51,146,-173,201,-93,207,-104,208,-92,216,-119,222,-124,24,-125,27,-165,233,-226,272,-259,277,-282,282,-283,283,-147,300,-234,301,-210,302});
     states[823] = new State(new int[]{13,121,81,-462,10,-462,87,-462,90,-462,27,-462,93,-462,106,-462,105,-462,118,-462,119,-462,120,-462,121,-462,117,-462,123,-462,125,-462,5,-462,104,-462,103,-462,115,-462,116,-462,113,-462,14,-462,107,-462,112,-462,110,-462,108,-462,111,-462,109,-462,124,-462,6,-462,89,-462,12,-462,9,-462,88,-462,26,-462,2,-462,74,-462,73,-462,72,-462,71,-462,43,-462,50,-462,128,-462,130,-462,75,-462,76,-462,70,-462,68,-462,37,-462,34,-462,8,-462,16,-462,17,-462,131,-462,132,-462,140,-462,142,-462,141,-462,49,-462,80,-462,32,-462,20,-462,86,-462,46,-462,29,-462,47,-462,91,-462,39,-462,30,-462,45,-462,52,-462,67,-462,63,-462,64,-462});
-    states[824] = new State(new int[]{133,572,135,573,136,574,137,575,139,576,138,577,18,-632,80,-632,51,-632,23,-632,59,-632,42,-632,45,-632,54,-632,11,-632,21,-632,36,-632,31,-632,24,-632,25,-632,38,-632,81,-632,74,-632,73,-632,72,-632,71,-632},new int[]{-178,825,-181,578});
+    states[824] = new State(new int[]{133,572,135,573,136,574,137,575,139,576,138,577,18,-632,80,-632,51,-632,23,-632,59,-632,42,-632,45,-632,54,-632,11,-632,21,-632,36,-632,31,-632,24,-632,25,-632,38,-632,81,-632,74,-632,73,-632,72,-632,71,-632,134,-632,96,-632},new int[]{-178,825,-181,578});
     states[825] = new State(new int[]{10,570,98,-635});
     states[826] = new State(-342);
     states[827] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,37,234},new int[]{-143,828,-114,662,-109,663,-106,664,-119,672,-124,24,-125,27,-165,673,-293,675,-121,679});
@@ -1275,7 +1275,7 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, Lex
     states[1122] = new State(new int[]{11,646,51,-72,23,-72,59,-72,42,-72,45,-72,54,-72,36,-72,31,-72,21,-72,24,-72,25,-72,80,-72,81,-72,92,-72,130,-195,75,-195,76,-195,70,-195,68,-195},new int[]{-43,746,-5,747,-219,658});
     states[1123] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,51,-73,23,-73,59,-73,42,-73,45,-73,54,-73,11,-73,36,-73,31,-73,21,-73,24,-73,25,-73,80,-73,81,-73,92,-73},new int[]{-271,927,-272,928,-131,403,-119,671,-124,24,-125,27});
     states[1124] = new State(-74);
-    states[1125] = new State(new int[]{36,1147,31,1153,21,1164,24,888,25,892,11,646},new int[]{-183,1126,-219,559,-184,1127,-191,1128,-198,1129,-195,780,-199,826,-187,1166,-197,1167});
+    states[1125] = new State(new int[]{36,1147,31,1154,21,1167,24,888,25,892,11,646},new int[]{-183,1126,-219,559,-184,1127,-191,1128,-198,1129,-195,780,-199,826,-187,1169,-197,1170});
     states[1126] = new State(-77);
     states[1127] = new State(-75);
     states[1128] = new State(-382);
@@ -1298,120 +1298,123 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, Lex
     states[1145] = new State(-413);
     states[1146] = new State(-414);
     states[1147] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,37,234},new int[]{-144,1148,-143,661,-114,662,-109,663,-106,664,-119,672,-124,24,-125,27,-165,673,-293,675,-121,679});
-    states[1148] = new State(new int[]{8,579,98,-419,10,-419},new int[]{-100,1149});
-    states[1149] = new State(new int[]{98,1150,10,568},new int[]{-179,784});
-    states[1150] = new State(new int[]{128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,330,8,293,16,273,17,278,131,139,132,140,140,143,142,144,141,145,49,333,80,110,32,324,20,341,86,353,46,362,29,367,47,377,91,383,39,390,30,393,45,401,52,817,67,822,10,-443},new int[]{-230,1151,-3,116,-93,117,-104,208,-92,216,-119,292,-124,24,-125,27,-165,233,-226,272,-259,277,-13,320,-138,136,-140,137,-139,141,-14,142,-182,331,-105,332,-224,338,-126,339,-30,340,-216,352,-278,361,-98,366,-279,376,-133,381,-264,382,-217,389,-97,392,-274,400,-52,813,-148,814,-147,815,-142,816,-99,821});
-    states[1151] = new State(new int[]{10,1152});
-    states[1152] = new State(-387);
-    states[1153] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,37,234},new int[]{-143,1154,-114,662,-109,663,-106,664,-119,672,-124,24,-125,27,-165,673,-293,675,-121,679});
-    states[1154] = new State(new int[]{8,579,5,-419,98,-419,10,-419},new int[]{-100,1155});
-    states[1155] = new State(new int[]{5,1156,98,1161,10,568},new int[]{-179,830});
-    states[1156] = new State(new int[]{130,512,75,25,76,26,70,28,68,29,140,143,142,144,141,145,104,203,103,204,131,139,132,140,8,516,129,530,19,535,40,543,41,593,28,603,66,607,57,610,36,615,31,617},new int[]{-241,1157,-242,475,-238,476,-80,477,-87,506,-88,499,-154,507,-119,164,-124,24,-125,27,-14,495,-173,496,-138,498,-140,137,-139,141,-225,528,-218,529,-246,532,-247,533,-244,534,-236,541,-26,542,-233,592,-102,602,-103,606,-196,612,-194,613,-193,614,-263,621});
-    states[1157] = new State(new int[]{98,1158,10,568},new int[]{-179,834});
-    states[1158] = new State(new int[]{48,132,131,139,132,140,140,143,142,144,141,145,55,147,11,167,122,199,104,203,103,204,129,205,128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,263,8,265,16,273,17,278,31,284,36,288},new int[]{-84,1159,-86,226,-74,186,-83,198,-13,133,-138,136,-140,137,-139,141,-14,142,-51,146,-173,201,-93,207,-104,208,-92,216,-119,222,-124,24,-125,27,-165,233,-226,272,-259,277,-282,282,-283,283,-147,300,-234,301});
-    states[1159] = new State(new int[]{10,1160,14,840,107,842,112,843,110,844,108,845,111,846,109,847,124,848},new int[]{-170,126});
-    states[1160] = new State(-385);
-    states[1161] = new State(new int[]{48,132,131,139,132,140,140,143,142,144,141,145,55,147,11,167,122,199,104,203,103,204,129,205,128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,263,8,265,16,273,17,278,31,284,36,288},new int[]{-84,1162,-86,226,-74,186,-83,198,-13,133,-138,136,-140,137,-139,141,-14,142,-51,146,-173,201,-93,207,-104,208,-92,216,-119,222,-124,24,-125,27,-165,233,-226,272,-259,277,-282,282,-283,283,-147,300,-234,301});
-    states[1162] = new State(new int[]{10,1163,14,840,107,842,112,843,110,844,108,845,111,846,109,847,124,848},new int[]{-170,126});
-    states[1163] = new State(-386);
-    states[1164] = new State(new int[]{24,564,36,1147,31,1153},new int[]{-191,1165,-198,1129,-195,780,-199,826});
-    states[1165] = new State(-383);
-    states[1166] = new State(-76);
-    states[1167] = new State(-58,new int[]{-151,1168,-36,1134,-37,1117});
-    states[1168] = new State(-380);
-    states[1169] = new State(new int[]{3,1171,44,-12,80,-12,51,-12,23,-12,59,-12,42,-12,45,-12,54,-12,11,-12,36,-12,31,-12,21,-12,24,-12,25,-12,35,-12,81,-12,92,-12},new int[]{-158,1170});
-    states[1170] = new State(-14);
-    states[1171] = new State(new int[]{130,1172,131,1173});
-    states[1172] = new State(-15);
-    states[1173] = new State(-16);
-    states[1174] = new State(-13);
-    states[1175] = new State(new int[]{130,23,75,25,76,26,70,28,68,29},new int[]{-119,1176,-124,24,-125,27});
-    states[1176] = new State(new int[]{10,1178,8,1179},new int[]{-161,1177});
-    states[1177] = new State(-25);
-    states[1178] = new State(-26);
-    states[1179] = new State(new int[]{130,23,75,25,76,26,70,28,68,29},new int[]{-163,1180,-118,1186,-119,1185,-124,24,-125,27});
-    states[1180] = new State(new int[]{9,1181,89,1183});
-    states[1181] = new State(new int[]{10,1182});
-    states[1182] = new State(-27);
-    states[1183] = new State(new int[]{130,23,75,25,76,26,70,28,68,29},new int[]{-118,1184,-119,1185,-124,24,-125,27});
-    states[1184] = new State(-29);
-    states[1185] = new State(-30);
-    states[1186] = new State(-28);
-    states[1187] = new State(-3);
-    states[1188] = new State(new int[]{94,1243,95,1244,11,646},new int[]{-269,1189,-219,559,-2,1238});
-    states[1189] = new State(new int[]{35,1210,44,-35,51,-35,23,-35,59,-35,42,-35,45,-35,54,-35,11,-35,36,-35,31,-35,21,-35,24,-35,25,-35,81,-35,92,-35,80,-35},new int[]{-135,1190,-136,1207,-265,1236});
-    states[1190] = new State(new int[]{33,1204},new int[]{-134,1191});
-    states[1191] = new State(new int[]{81,1194,92,1195,80,1201},new int[]{-127,1192});
-    states[1192] = new State(new int[]{7,1193});
-    states[1193] = new State(-41);
-    states[1194] = new State(-50);
-    states[1195] = new State(new int[]{128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,330,8,293,16,273,17,278,131,139,132,140,140,359,142,144,141,360,49,333,80,110,32,324,20,341,86,353,46,362,29,367,47,377,91,383,39,390,30,393,45,401,52,817,67,822,81,-443,93,-443,10,-443},new int[]{-221,1196,-231,357,-230,115,-3,116,-93,117,-104,208,-92,216,-119,358,-124,24,-125,27,-165,233,-226,272,-259,277,-13,320,-138,136,-140,137,-139,141,-14,142,-182,331,-105,332,-224,338,-126,339,-30,340,-216,352,-278,361,-98,366,-279,376,-133,381,-264,382,-217,389,-97,392,-274,400,-52,813,-148,814,-147,815,-142,816,-99,821,-115,978});
-    states[1196] = new State(new int[]{81,1197,93,1198,10,113});
-    states[1197] = new State(-51);
-    states[1198] = new State(new int[]{128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,330,8,293,16,273,17,278,131,139,132,140,140,359,142,144,141,360,49,333,80,110,32,324,20,341,86,353,46,362,29,367,47,377,91,383,39,390,30,393,45,401,52,817,67,822,81,-443,10,-443},new int[]{-221,1199,-231,357,-230,115,-3,116,-93,117,-104,208,-92,216,-119,358,-124,24,-125,27,-165,233,-226,272,-259,277,-13,320,-138,136,-140,137,-139,141,-14,142,-182,331,-105,332,-224,338,-126,339,-30,340,-216,352,-278,361,-98,366,-279,376,-133,381,-264,382,-217,389,-97,392,-274,400,-52,813,-148,814,-147,815,-142,816,-99,821,-115,978});
-    states[1199] = new State(new int[]{81,1200,10,113});
-    states[1200] = new State(-52);
+    states[1148] = new State(new int[]{8,579,10,-419,98,-419},new int[]{-100,1149});
+    states[1149] = new State(new int[]{10,824,98,-634},new int[]{-179,784,-180,1150});
+    states[1150] = new State(new int[]{98,1151});
+    states[1151] = new State(new int[]{128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,330,8,293,16,273,17,278,131,139,132,140,140,143,142,144,141,145,49,333,80,110,32,324,20,341,86,353,46,362,29,367,47,377,91,383,39,390,30,393,45,401,52,817,67,822,10,-443},new int[]{-230,1152,-3,116,-93,117,-104,208,-92,216,-119,292,-124,24,-125,27,-165,233,-226,272,-259,277,-13,320,-138,136,-140,137,-139,141,-14,142,-182,331,-105,332,-224,338,-126,339,-30,340,-216,352,-278,361,-98,366,-279,376,-133,381,-264,382,-217,389,-97,392,-274,400,-52,813,-148,814,-147,815,-142,816,-99,821});
+    states[1152] = new State(new int[]{10,1153});
+    states[1153] = new State(-387);
+    states[1154] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,37,234},new int[]{-143,1155,-114,662,-109,663,-106,664,-119,672,-124,24,-125,27,-165,673,-293,675,-121,679});
+    states[1155] = new State(new int[]{8,579,5,-419,10,-419,98,-419},new int[]{-100,1156});
+    states[1156] = new State(new int[]{5,1157,10,824,98,-634},new int[]{-179,830,-180,1163});
+    states[1157] = new State(new int[]{130,512,75,25,76,26,70,28,68,29,140,143,142,144,141,145,104,203,103,204,131,139,132,140,8,516,129,530,19,535,40,543,41,593,28,603,66,607,57,610,36,615,31,617},new int[]{-241,1158,-242,475,-238,476,-80,477,-87,506,-88,499,-154,507,-119,164,-124,24,-125,27,-14,495,-173,496,-138,498,-140,137,-139,141,-225,528,-218,529,-246,532,-247,533,-244,534,-236,541,-26,542,-233,592,-102,602,-103,606,-196,612,-194,613,-193,614,-263,621});
+    states[1158] = new State(new int[]{10,824,98,-634},new int[]{-179,834,-180,1159});
+    states[1159] = new State(new int[]{98,1160});
+    states[1160] = new State(new int[]{48,132,131,139,132,140,140,143,142,144,141,145,55,147,11,167,122,199,104,203,103,204,129,205,128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,263,8,265,16,273,17,278,31,284,36,288},new int[]{-84,1161,-86,226,-74,186,-83,198,-13,133,-138,136,-140,137,-139,141,-14,142,-51,146,-173,201,-93,207,-104,208,-92,216,-119,222,-124,24,-125,27,-165,233,-226,272,-259,277,-282,282,-283,283,-147,300,-234,301});
+    states[1161] = new State(new int[]{10,1162,14,840,107,842,112,843,110,844,108,845,111,846,109,847,124,848},new int[]{-170,126});
+    states[1162] = new State(-385);
+    states[1163] = new State(new int[]{98,1164});
+    states[1164] = new State(new int[]{48,132,131,139,132,140,140,143,142,144,141,145,55,147,11,167,122,199,104,203,103,204,129,205,128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,263,8,265,16,273,17,278,31,284,36,288},new int[]{-84,1165,-86,226,-74,186,-83,198,-13,133,-138,136,-140,137,-139,141,-14,142,-51,146,-173,201,-93,207,-104,208,-92,216,-119,222,-124,24,-125,27,-165,233,-226,272,-259,277,-282,282,-283,283,-147,300,-234,301});
+    states[1165] = new State(new int[]{10,1166,14,840,107,842,112,843,110,844,108,845,111,846,109,847,124,848},new int[]{-170,126});
+    states[1166] = new State(-386);
+    states[1167] = new State(new int[]{24,564,36,1147,31,1154},new int[]{-191,1168,-198,1129,-195,780,-199,826});
+    states[1168] = new State(-383);
+    states[1169] = new State(-76);
+    states[1170] = new State(-58,new int[]{-151,1171,-36,1134,-37,1117});
+    states[1171] = new State(-380);
+    states[1172] = new State(new int[]{3,1174,44,-12,80,-12,51,-12,23,-12,59,-12,42,-12,45,-12,54,-12,11,-12,36,-12,31,-12,21,-12,24,-12,25,-12,35,-12,81,-12,92,-12},new int[]{-158,1173});
+    states[1173] = new State(-14);
+    states[1174] = new State(new int[]{130,1175,131,1176});
+    states[1175] = new State(-15);
+    states[1176] = new State(-16);
+    states[1177] = new State(-13);
+    states[1178] = new State(new int[]{130,23,75,25,76,26,70,28,68,29},new int[]{-119,1179,-124,24,-125,27});
+    states[1179] = new State(new int[]{10,1181,8,1182},new int[]{-161,1180});
+    states[1180] = new State(-25);
+    states[1181] = new State(-26);
+    states[1182] = new State(new int[]{130,23,75,25,76,26,70,28,68,29},new int[]{-163,1183,-118,1189,-119,1188,-124,24,-125,27});
+    states[1183] = new State(new int[]{9,1184,89,1186});
+    states[1184] = new State(new int[]{10,1185});
+    states[1185] = new State(-27);
+    states[1186] = new State(new int[]{130,23,75,25,76,26,70,28,68,29},new int[]{-118,1187,-119,1188,-124,24,-125,27});
+    states[1187] = new State(-29);
+    states[1188] = new State(-30);
+    states[1189] = new State(-28);
+    states[1190] = new State(-3);
+    states[1191] = new State(new int[]{94,1246,95,1247,11,646},new int[]{-269,1192,-219,559,-2,1241});
+    states[1192] = new State(new int[]{35,1213,44,-35,51,-35,23,-35,59,-35,42,-35,45,-35,54,-35,11,-35,36,-35,31,-35,21,-35,24,-35,25,-35,81,-35,92,-35,80,-35},new int[]{-135,1193,-136,1210,-265,1239});
+    states[1193] = new State(new int[]{33,1207},new int[]{-134,1194});
+    states[1194] = new State(new int[]{81,1197,92,1198,80,1204},new int[]{-127,1195});
+    states[1195] = new State(new int[]{7,1196});
+    states[1196] = new State(-41);
+    states[1197] = new State(-50);
+    states[1198] = new State(new int[]{128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,330,8,293,16,273,17,278,131,139,132,140,140,359,142,144,141,360,49,333,80,110,32,324,20,341,86,353,46,362,29,367,47,377,91,383,39,390,30,393,45,401,52,817,67,822,81,-443,93,-443,10,-443},new int[]{-221,1199,-231,357,-230,115,-3,116,-93,117,-104,208,-92,216,-119,358,-124,24,-125,27,-165,233,-226,272,-259,277,-13,320,-138,136,-140,137,-139,141,-14,142,-182,331,-105,332,-224,338,-126,339,-30,340,-216,352,-278,361,-98,366,-279,376,-133,381,-264,382,-217,389,-97,392,-274,400,-52,813,-148,814,-147,815,-142,816,-99,821,-115,978});
+    states[1199] = new State(new int[]{81,1200,93,1201,10,113});
+    states[1200] = new State(-51);
     states[1201] = new State(new int[]{128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,330,8,293,16,273,17,278,131,139,132,140,140,359,142,144,141,360,49,333,80,110,32,324,20,341,86,353,46,362,29,367,47,377,91,383,39,390,30,393,45,401,52,817,67,822,81,-443,10,-443},new int[]{-221,1202,-231,357,-230,115,-3,116,-93,117,-104,208,-92,216,-119,358,-124,24,-125,27,-165,233,-226,272,-259,277,-13,320,-138,136,-140,137,-139,141,-14,142,-182,331,-105,332,-224,338,-126,339,-30,340,-216,352,-278,361,-98,366,-279,376,-133,381,-264,382,-217,389,-97,392,-274,400,-52,813,-148,814,-147,815,-142,816,-99,821,-115,978});
     states[1202] = new State(new int[]{81,1203,10,113});
-    states[1203] = new State(-53);
-    states[1204] = new State(-35,new int[]{-265,1205});
-    states[1205] = new State(new int[]{44,14,51,-58,23,-58,59,-58,42,-58,45,-58,54,-58,11,-58,36,-58,31,-58,21,-58,24,-58,25,-58,81,-58,92,-58,80,-58},new int[]{-36,1206,-37,1117});
-    states[1206] = new State(-48);
-    states[1207] = new State(new int[]{81,1194,92,1195,80,1201},new int[]{-127,1208});
-    states[1208] = new State(new int[]{7,1209});
-    states[1209] = new State(-42);
-    states[1210] = new State(-35,new int[]{-265,1211});
-    states[1211] = new State(new int[]{44,14,23,-55,59,-55,42,-55,45,-55,54,-55,11,-55,36,-55,31,-55,33,-55},new int[]{-35,1212,-33,1213});
-    states[1212] = new State(-47);
-    states[1213] = new State(new int[]{23,739,59,743,42,924,45,930,54,932,11,646,33,-54,36,-195,31,-195},new int[]{-42,1214,-24,1215,-46,1216,-253,1217,-270,1218,-202,1219,-5,1220,-219,658,-201,1235});
-    states[1214] = new State(-56);
-    states[1215] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,23,-63,59,-63,42,-63,45,-63,54,-63,11,-63,36,-63,31,-63,33,-63},new int[]{-22,697,-23,698,-113,700,-119,738,-124,24,-125,27});
-    states[1216] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,23,-64,59,-64,42,-64,45,-64,54,-64,11,-64,36,-64,31,-64,33,-64},new int[]{-22,742,-23,698,-113,700,-119,738,-124,24,-125,27});
-    states[1217] = new State(new int[]{11,646,23,-65,59,-65,42,-65,45,-65,54,-65,36,-65,31,-65,33,-65,130,-195,75,-195,76,-195,70,-195,68,-195},new int[]{-43,746,-5,747,-219,658});
-    states[1218] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,23,-66,59,-66,42,-66,45,-66,54,-66,11,-66,36,-66,31,-66,33,-66},new int[]{-271,927,-272,928,-131,403,-119,671,-124,24,-125,27});
-    states[1219] = new State(-67);
-    states[1220] = new State(new int[]{36,1227,11,646,31,1230},new int[]{-195,1221,-219,559,-199,1224});
-    states[1221] = new State(new int[]{134,1222,23,-83,59,-83,42,-83,45,-83,54,-83,11,-83,36,-83,31,-83,33,-83});
-    states[1222] = new State(new int[]{10,1223});
-    states[1223] = new State(-84);
-    states[1224] = new State(new int[]{134,1225,23,-85,59,-85,42,-85,45,-85,54,-85,11,-85,36,-85,31,-85,33,-85});
+    states[1203] = new State(-52);
+    states[1204] = new State(new int[]{128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,330,8,293,16,273,17,278,131,139,132,140,140,359,142,144,141,360,49,333,80,110,32,324,20,341,86,353,46,362,29,367,47,377,91,383,39,390,30,393,45,401,52,817,67,822,81,-443,10,-443},new int[]{-221,1205,-231,357,-230,115,-3,116,-93,117,-104,208,-92,216,-119,358,-124,24,-125,27,-165,233,-226,272,-259,277,-13,320,-138,136,-140,137,-139,141,-14,142,-182,331,-105,332,-224,338,-126,339,-30,340,-216,352,-278,361,-98,366,-279,376,-133,381,-264,382,-217,389,-97,392,-274,400,-52,813,-148,814,-147,815,-142,816,-99,821,-115,978});
+    states[1205] = new State(new int[]{81,1206,10,113});
+    states[1206] = new State(-53);
+    states[1207] = new State(-35,new int[]{-265,1208});
+    states[1208] = new State(new int[]{44,14,51,-58,23,-58,59,-58,42,-58,45,-58,54,-58,11,-58,36,-58,31,-58,21,-58,24,-58,25,-58,81,-58,92,-58,80,-58},new int[]{-36,1209,-37,1117});
+    states[1209] = new State(-48);
+    states[1210] = new State(new int[]{81,1197,92,1198,80,1204},new int[]{-127,1211});
+    states[1211] = new State(new int[]{7,1212});
+    states[1212] = new State(-42);
+    states[1213] = new State(-35,new int[]{-265,1214});
+    states[1214] = new State(new int[]{44,14,23,-55,59,-55,42,-55,45,-55,54,-55,11,-55,36,-55,31,-55,33,-55},new int[]{-35,1215,-33,1216});
+    states[1215] = new State(-47);
+    states[1216] = new State(new int[]{23,739,59,743,42,924,45,930,54,932,11,646,33,-54,36,-195,31,-195},new int[]{-42,1217,-24,1218,-46,1219,-253,1220,-270,1221,-202,1222,-5,1223,-219,658,-201,1238});
+    states[1217] = new State(-56);
+    states[1218] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,23,-63,59,-63,42,-63,45,-63,54,-63,11,-63,36,-63,31,-63,33,-63},new int[]{-22,697,-23,698,-113,700,-119,738,-124,24,-125,27});
+    states[1219] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,23,-64,59,-64,42,-64,45,-64,54,-64,11,-64,36,-64,31,-64,33,-64},new int[]{-22,742,-23,698,-113,700,-119,738,-124,24,-125,27});
+    states[1220] = new State(new int[]{11,646,23,-65,59,-65,42,-65,45,-65,54,-65,36,-65,31,-65,33,-65,130,-195,75,-195,76,-195,70,-195,68,-195},new int[]{-43,746,-5,747,-219,658});
+    states[1221] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,23,-66,59,-66,42,-66,45,-66,54,-66,11,-66,36,-66,31,-66,33,-66},new int[]{-271,927,-272,928,-131,403,-119,671,-124,24,-125,27});
+    states[1222] = new State(-67);
+    states[1223] = new State(new int[]{36,1230,11,646,31,1233},new int[]{-195,1224,-219,559,-199,1227});
+    states[1224] = new State(new int[]{134,1225,23,-83,59,-83,42,-83,45,-83,54,-83,11,-83,36,-83,31,-83,33,-83});
     states[1225] = new State(new int[]{10,1226});
-    states[1226] = new State(-86);
-    states[1227] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,37,234},new int[]{-144,1228,-143,661,-114,662,-109,663,-106,664,-119,672,-124,24,-125,27,-165,673,-293,675,-121,679});
-    states[1228] = new State(new int[]{8,579,10,-419},new int[]{-100,1229});
-    states[1229] = new State(new int[]{10,568},new int[]{-179,784});
-    states[1230] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,37,234},new int[]{-143,1231,-114,662,-109,663,-106,664,-119,672,-124,24,-125,27,-165,673,-293,675,-121,679});
-    states[1231] = new State(new int[]{8,579,5,-419,10,-419},new int[]{-100,1232});
-    states[1232] = new State(new int[]{5,1233,10,568},new int[]{-179,830});
-    states[1233] = new State(new int[]{130,512,75,25,76,26,70,28,68,29,140,143,142,144,141,145,104,203,103,204,131,139,132,140,8,516,129,530,19,535,40,543,41,593,28,603,66,607,57,610,36,615,31,617},new int[]{-241,1234,-242,475,-238,476,-80,477,-87,506,-88,499,-154,507,-119,164,-124,24,-125,27,-14,495,-173,496,-138,498,-140,137,-139,141,-225,528,-218,529,-246,532,-247,533,-244,534,-236,541,-26,542,-233,592,-102,602,-103,606,-196,612,-194,613,-193,614,-263,621});
-    states[1234] = new State(new int[]{10,568},new int[]{-179,834});
-    states[1235] = new State(-68);
-    states[1236] = new State(new int[]{44,14,51,-58,23,-58,59,-58,42,-58,45,-58,54,-58,11,-58,36,-58,31,-58,21,-58,24,-58,25,-58,81,-58,92,-58,80,-58},new int[]{-36,1237,-37,1117});
-    states[1237] = new State(-49);
-    states[1238] = new State(new int[]{130,23,75,25,76,26,70,28,68,29},new int[]{-111,1239,-119,1242,-124,24,-125,27});
-    states[1239] = new State(new int[]{10,1240});
-    states[1240] = new State(new int[]{3,1171,35,-11,81,-11,92,-11,80,-11,44,-11,51,-11,23,-11,59,-11,42,-11,45,-11,54,-11,11,-11,36,-11,31,-11,21,-11,24,-11,25,-11},new int[]{-159,1241,-160,1169,-158,1174});
-    states[1241] = new State(-43);
-    states[1242] = new State(-46);
-    states[1243] = new State(-44);
-    states[1244] = new State(-45);
-    states[1245] = new State(-4);
-    states[1246] = new State(new int[]{48,132,131,139,132,140,140,143,142,144,141,145,55,147,11,167,122,199,104,203,103,204,129,205,128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,263,8,265,16,273,17,278,31,284,36,288,5,304},new int[]{-77,1247,-85,120,-84,125,-86,176,-74,186,-83,198,-13,133,-138,136,-140,137,-139,141,-14,142,-51,146,-173,201,-93,207,-104,208,-92,216,-119,222,-124,24,-125,27,-165,233,-226,272,-259,277,-282,282,-283,283,-147,300,-234,301,-210,302,-96,303});
-    states[1247] = new State(-5);
-    states[1248] = new State(new int[]{130,23,75,25,76,26,70,28,68,29},new int[]{-280,1249,-281,1250,-119,1254,-124,24,-125,27});
-    states[1249] = new State(-6);
-    states[1250] = new State(new int[]{7,1251,110,157,2,-604},new int[]{-262,1253});
-    states[1251] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,74,32,73,33,72,34,71,35,61,36,56,37,115,38,17,39,16,40,55,41,18,42,116,43,117,44,118,45,119,46,120,47,121,48,122,49,123,50,124,51,125,52,19,53,66,54,80,55,20,56,21,57,23,58,24,59,25,60,64,61,88,62,26,63,27,64,28,65,22,66,93,67,90,68,29,69,30,70,31,71,32,72,33,73,34,74,92,75,35,76,36,77,38,78,39,79,40,80,86,81,41,82,91,83,42,84,43,85,63,86,87,87,44,88,45,89,46,90,47,91,48,92,49,93,50,94,51,95,53,96,94,97,95,98,96,99,97,100,37,102,81,103},new int[]{-110,1252,-119,22,-124,24,-125,27,-257,30,-123,31,-258,101});
-    states[1252] = new State(-603);
-    states[1253] = new State(-605);
-    states[1254] = new State(-602);
-    states[1255] = new State(new int[]{48,132,131,139,132,140,140,143,142,144,141,145,55,147,11,167,122,199,104,203,103,204,129,205,128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,263,8,1259,16,273,17,278,31,284,36,288,5,304,45,401},new int[]{-229,1256,-77,1257,-85,120,-84,125,-86,176,-74,186,-83,198,-13,133,-138,136,-140,137,-139,141,-14,142,-51,146,-173,201,-93,1258,-104,208,-92,216,-119,222,-124,24,-125,27,-165,233,-226,272,-259,277,-282,282,-283,283,-147,300,-234,301,-210,302,-96,303,-3,1260,-274,1261});
-    states[1256] = new State(-7);
-    states[1257] = new State(-8);
-    states[1258] = new State(new int[]{98,258,99,259,100,260,101,261,102,262,106,-593,105,-593,118,-593,119,-593,120,-593,121,-593,117,-593,123,-593,125,-593,5,-593,104,-593,103,-593,115,-593,116,-593,113,-593,14,-593,107,-593,112,-593,110,-593,108,-593,111,-593,109,-593,124,-593,13,-593,2,-593},new int[]{-168,118});
-    states[1259] = new State(new int[]{9,268,48,132,131,139,132,140,140,143,142,144,141,145,55,147,11,167,122,199,104,203,103,204,129,205,128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,263,8,265,16,273,17,278,31,284,36,288,5,304},new int[]{-77,266,-119,1058,-85,1077,-92,294,-84,125,-86,176,-74,186,-83,198,-13,133,-138,136,-140,137,-139,141,-14,142,-51,146,-173,201,-93,207,-104,208,-124,24,-125,27,-165,233,-226,272,-259,277,-282,282,-283,283,-147,300,-234,301,-210,302,-96,303});
-    states[1260] = new State(-9);
-    states[1261] = new State(-10);
+    states[1226] = new State(-84);
+    states[1227] = new State(new int[]{134,1228,23,-85,59,-85,42,-85,45,-85,54,-85,11,-85,36,-85,31,-85,33,-85});
+    states[1228] = new State(new int[]{10,1229});
+    states[1229] = new State(-86);
+    states[1230] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,37,234},new int[]{-144,1231,-143,661,-114,662,-109,663,-106,664,-119,672,-124,24,-125,27,-165,673,-293,675,-121,679});
+    states[1231] = new State(new int[]{8,579,10,-419},new int[]{-100,1232});
+    states[1232] = new State(new int[]{10,568},new int[]{-179,784});
+    states[1233] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,37,234},new int[]{-143,1234,-114,662,-109,663,-106,664,-119,672,-124,24,-125,27,-165,673,-293,675,-121,679});
+    states[1234] = new State(new int[]{8,579,5,-419,10,-419},new int[]{-100,1235});
+    states[1235] = new State(new int[]{5,1236,10,568},new int[]{-179,830});
+    states[1236] = new State(new int[]{130,512,75,25,76,26,70,28,68,29,140,143,142,144,141,145,104,203,103,204,131,139,132,140,8,516,129,530,19,535,40,543,41,593,28,603,66,607,57,610,36,615,31,617},new int[]{-241,1237,-242,475,-238,476,-80,477,-87,506,-88,499,-154,507,-119,164,-124,24,-125,27,-14,495,-173,496,-138,498,-140,137,-139,141,-225,528,-218,529,-246,532,-247,533,-244,534,-236,541,-26,542,-233,592,-102,602,-103,606,-196,612,-194,613,-193,614,-263,621});
+    states[1237] = new State(new int[]{10,568},new int[]{-179,834});
+    states[1238] = new State(-68);
+    states[1239] = new State(new int[]{44,14,51,-58,23,-58,59,-58,42,-58,45,-58,54,-58,11,-58,36,-58,31,-58,21,-58,24,-58,25,-58,81,-58,92,-58,80,-58},new int[]{-36,1240,-37,1117});
+    states[1240] = new State(-49);
+    states[1241] = new State(new int[]{130,23,75,25,76,26,70,28,68,29},new int[]{-111,1242,-119,1245,-124,24,-125,27});
+    states[1242] = new State(new int[]{10,1243});
+    states[1243] = new State(new int[]{3,1174,35,-11,81,-11,92,-11,80,-11,44,-11,51,-11,23,-11,59,-11,42,-11,45,-11,54,-11,11,-11,36,-11,31,-11,21,-11,24,-11,25,-11},new int[]{-159,1244,-160,1172,-158,1177});
+    states[1244] = new State(-43);
+    states[1245] = new State(-46);
+    states[1246] = new State(-44);
+    states[1247] = new State(-45);
+    states[1248] = new State(-4);
+    states[1249] = new State(new int[]{48,132,131,139,132,140,140,143,142,144,141,145,55,147,11,167,122,199,104,203,103,204,129,205,128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,263,8,265,16,273,17,278,31,284,36,288,5,304},new int[]{-77,1250,-85,120,-84,125,-86,176,-74,186,-83,198,-13,133,-138,136,-140,137,-139,141,-14,142,-51,146,-173,201,-93,207,-104,208,-92,216,-119,222,-124,24,-125,27,-165,233,-226,272,-259,277,-282,282,-283,283,-147,300,-234,301,-210,302,-96,303});
+    states[1250] = new State(-5);
+    states[1251] = new State(new int[]{130,23,75,25,76,26,70,28,68,29},new int[]{-280,1252,-281,1253,-119,1257,-124,24,-125,27});
+    states[1252] = new State(-6);
+    states[1253] = new State(new int[]{7,1254,110,157,2,-604},new int[]{-262,1256});
+    states[1254] = new State(new int[]{130,23,75,25,76,26,70,28,68,29,74,32,73,33,72,34,71,35,61,36,56,37,115,38,17,39,16,40,55,41,18,42,116,43,117,44,118,45,119,46,120,47,121,48,122,49,123,50,124,51,125,52,19,53,66,54,80,55,20,56,21,57,23,58,24,59,25,60,64,61,88,62,26,63,27,64,28,65,22,66,93,67,90,68,29,69,30,70,31,71,32,72,33,73,34,74,92,75,35,76,36,77,38,78,39,79,40,80,86,81,41,82,91,83,42,84,43,85,63,86,87,87,44,88,45,89,46,90,47,91,48,92,49,93,50,94,51,95,53,96,94,97,95,98,96,99,97,100,37,102,81,103},new int[]{-110,1255,-119,22,-124,24,-125,27,-257,30,-123,31,-258,101});
+    states[1255] = new State(-603);
+    states[1256] = new State(-605);
+    states[1257] = new State(-602);
+    states[1258] = new State(new int[]{48,132,131,139,132,140,140,143,142,144,141,145,55,147,11,167,122,199,104,203,103,204,129,205,128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,263,8,1262,16,273,17,278,31,284,36,288,5,304,45,401},new int[]{-229,1259,-77,1260,-85,120,-84,125,-86,176,-74,186,-83,198,-13,133,-138,136,-140,137,-139,141,-14,142,-51,146,-173,201,-93,1261,-104,208,-92,216,-119,222,-124,24,-125,27,-165,233,-226,272,-259,277,-282,282,-283,283,-147,300,-234,301,-210,302,-96,303,-3,1263,-274,1264});
+    states[1259] = new State(-7);
+    states[1260] = new State(-8);
+    states[1261] = new State(new int[]{98,258,99,259,100,260,101,261,102,262,106,-593,105,-593,118,-593,119,-593,120,-593,121,-593,117,-593,123,-593,125,-593,5,-593,104,-593,103,-593,115,-593,116,-593,113,-593,14,-593,107,-593,112,-593,110,-593,108,-593,111,-593,109,-593,124,-593,13,-593,2,-593},new int[]{-168,118});
+    states[1262] = new State(new int[]{9,268,48,132,131,139,132,140,140,143,142,144,141,145,55,147,11,167,122,199,104,203,103,204,129,205,128,215,130,23,75,25,76,26,70,28,68,227,37,234,34,263,8,265,16,273,17,278,31,284,36,288,5,304},new int[]{-77,266,-119,1058,-85,1077,-92,294,-84,125,-86,176,-74,186,-83,198,-13,133,-138,136,-140,137,-139,141,-14,142,-51,146,-173,201,-93,207,-104,208,-124,24,-125,27,-165,233,-226,272,-259,277,-282,282,-283,283,-147,300,-234,301,-210,302,-96,303});
+    states[1263] = new State(-9);
+    states[1264] = new State(-10);
 
     rules[1] = new Rule(-297, new int[]{-1,2});
     rules[2] = new Rule(-1, new int[]{-204});
@@ -1797,9 +1800,9 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, Lex
     rules[382] = new Rule(-184, new int[]{-191});
     rules[383] = new Rule(-184, new int[]{21,-191});
     rules[384] = new Rule(-191, new int[]{-198,-152});
-    rules[385] = new Rule(-191, new int[]{31,-143,-100,5,-241,98,-84,10});
-    rules[386] = new Rule(-191, new int[]{31,-143,-100,98,-84,10});
-    rules[387] = new Rule(-191, new int[]{36,-144,-100,98,-230,10});
+    rules[385] = new Rule(-191, new int[]{31,-143,-100,5,-241,-180,98,-84,10});
+    rules[386] = new Rule(-191, new int[]{31,-143,-100,-180,98,-84,10});
+    rules[387] = new Rule(-191, new int[]{36,-144,-100,-180,98,-230,10});
     rules[388] = new Rule(-191, new int[]{-198,134,10});
     rules[389] = new Rule(-185, new int[]{-186});
     rules[390] = new Rule(-185, new int[]{21,-186});
@@ -3856,23 +3859,26 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, Lex
         }
         break;
       case 385: // proc_func_decl_noclass -> tkFunction, func_name, fp_list, tkColon, fptype, 
-                //                           tkAssign, relop_expr, tkSemiColon
-{
-			CurrentSemanticValue.stn = SyntaxTreeBuilder.BuildShortFuncDefinition(ValueStack[ValueStack.Depth-6].stn as formal_parameters, new procedure_attributes_list(), ValueStack[ValueStack.Depth-7].stn as method_name, ValueStack[ValueStack.Depth-4].td as type_definition, ValueStack[ValueStack.Depth-2].ex, LocationStack[LocationStack.Depth-8].Merge(LocationStack[LocationStack.Depth-4]));
-		}
-        break;
-      case 386: // proc_func_decl_noclass -> tkFunction, func_name, fp_list, tkAssign, relop_expr, 
+                //                           optional_method_modificators1, tkAssign, relop_expr, 
                 //                           tkSemiColon
 {
-			CurrentSemanticValue.stn = SyntaxTreeBuilder.BuildShortFuncDefinition(ValueStack[ValueStack.Depth-4].stn as formal_parameters, new procedure_attributes_list(), ValueStack[ValueStack.Depth-5].stn as method_name, null, ValueStack[ValueStack.Depth-2].ex, LocationStack[LocationStack.Depth-6].Merge(LocationStack[LocationStack.Depth-4]));
+			CurrentSemanticValue.stn = SyntaxTreeBuilder.BuildShortFuncDefinition(ValueStack[ValueStack.Depth-7].stn as formal_parameters, ValueStack[ValueStack.Depth-4].stn as procedure_attributes_list, ValueStack[ValueStack.Depth-8].stn as method_name, ValueStack[ValueStack.Depth-5].td as type_definition, ValueStack[ValueStack.Depth-2].ex, LocationStack[LocationStack.Depth-9].Merge(LocationStack[LocationStack.Depth-5]));
 		}
         break;
-      case 387: // proc_func_decl_noclass -> tkProcedure, proc_name, fp_list, tkAssign, 
+      case 386: // proc_func_decl_noclass -> tkFunction, func_name, fp_list, 
+                //                           optional_method_modificators1, tkAssign, relop_expr, 
+                //                           tkSemiColon
+{
+			CurrentSemanticValue.stn = SyntaxTreeBuilder.BuildShortFuncDefinition(ValueStack[ValueStack.Depth-5].stn as formal_parameters, ValueStack[ValueStack.Depth-4].stn as procedure_attributes_list, ValueStack[ValueStack.Depth-6].stn as method_name, null, ValueStack[ValueStack.Depth-2].ex, LocationStack[LocationStack.Depth-7].Merge(LocationStack[LocationStack.Depth-5]));
+		}
+        break;
+      case 387: // proc_func_decl_noclass -> tkProcedure, proc_name, fp_list, 
+                //                           optional_method_modificators1, tkAssign, 
                 //                           unlabelled_stmt, tkSemiColon
 {
 			if (ValueStack[ValueStack.Depth-2].stn is empty_statement)
-				parsertools.AddErrorFromResource("EMPTY_STATEMENT_IN_SHORT_PROC_DEFINITION",LocationStack[LocationStack.Depth-1]);
-			CurrentSemanticValue.stn = SyntaxTreeBuilder.BuildShortProcDefinition(ValueStack[ValueStack.Depth-4].stn as formal_parameters, new procedure_attributes_list(), ValueStack[ValueStack.Depth-5].stn as method_name, ValueStack[ValueStack.Depth-2].stn as statement, LocationStack[LocationStack.Depth-6].Merge(LocationStack[LocationStack.Depth-4]));
+				parsertools.AddErrorFromResource("EMPTY_STATEMENT_IN_SHORT_PROC_DEFINITION",LocationStack[LocationStack.Depth-2]);
+			CurrentSemanticValue.stn = SyntaxTreeBuilder.BuildShortProcDefinition(ValueStack[ValueStack.Depth-5].stn as formal_parameters, ValueStack[ValueStack.Depth-4].stn as procedure_attributes_list, ValueStack[ValueStack.Depth-6].stn as method_name, ValueStack[ValueStack.Depth-2].stn as statement, LocationStack[LocationStack.Depth-7].Merge(LocationStack[LocationStack.Depth-5]));
 		}
         break;
       case 388: // proc_func_decl_noclass -> proc_func_header, tkForward, tkSemiColon
diff --git a/Parsers/PascalABCParserNewSaushkin/PABC.ymc b/Parsers/PascalABCParserNewSaushkin/PABC.ymc
index 280f50291..74929954c 100644
--- a/Parsers/PascalABCParserNewSaushkin/PABC.ymc
+++ b/Parsers/PascalABCParserNewSaushkin/PABC.ymc
@@ -126,5 +126,6 @@ script=
 
 
 
+