diff --git a/CodeCompletion/CodeFormatter.cs b/CodeCompletion/CodeFormatter.cs index 27b849457..38cda4b3f 100644 --- a/CodeCompletion/CodeFormatter.cs +++ b/CodeCompletion/CodeFormatter.cs @@ -3439,6 +3439,11 @@ namespace CodeFormatters visit_node(dn.left); visit_node(dn.right); } + public override void visit(bigint_const bi) + { + visit(new uint64_const(bi.val,bi.source_context)); + //sb.Append("bi"); + } #endregion } } \ No newline at end of file diff --git a/CodeCompletion/DomSyntaxTreeVisitor.cs b/CodeCompletion/DomSyntaxTreeVisitor.cs index 7573f744d..81bd86a5f 100644 --- a/CodeCompletion/DomSyntaxTreeVisitor.cs +++ b/CodeCompletion/DomSyntaxTreeVisitor.cs @@ -5612,6 +5612,18 @@ namespace CodeCompletion cnst_val.prim_val = null; } + + public override void visit(bigint_const bi) + { + /*method_call mc = new method_call(); + mc.parameters = new expression_list(new uint64_const(bi.val, bi.source_context),bi.source_context); + mc.dereferencing_value = new dot_node(new ident("System"), new ident("Numerics"), new ident("BigInteger"), new ident("Create")); + mc.visit(this);*/ + var names = new List { new ident("System"), new ident("Numerics"), new ident("BigInteger") }; + var ntr = new named_type_reference(names, bi.source_context); + var ne = new new_expr(ntr, new expression_list(new uint64_const(bi.val)), bi.source_context); + ne.visit(this); + } } } diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 2d742e032..a967a4731 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "7"; public const string Build = "1"; - public const string Revision = "2744"; + public const string Revision = "2746"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index 542b4ad9c..6b80f8bef 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %COREVERSION%=1 -%REVISION%=2744 +%REVISION%=2746 %MINOR%=7 %MAJOR%=3 diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs index 6aff554a9..3318b5737 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: DESKTOP-G8V08V4 -// DateTime: 16.11.2020 0:01:38 +// DateTime: 19.11.2020 11:17:32 // UserName: ????????? // GPLEX input file // GPLEX frame file @@ -124,8 +124,8 @@ namespace GPPGParserScanner enum Result {accept, noMatch, contextFound}; - const int maxAccept = 69; - const int initial = 70; + const int maxAccept = 70; + const int initial = 71; const int eofNum = 0; const int goStart = -1; const int INITIAL = 0; @@ -177,23 +177,23 @@ public PT parsertools; } }; - static int[] startState = new int[] {70, 106, 107, 108, 108, 109, + static int[] startState = new int[] {71, 108, 109, 110, 110, 111, 0}; #region TwoLevelCharacterMap // - // There are 48 equivalence classes + // There are 50 equivalence classes // There are 256 character sequence regions // There are 47 tables, 12032 entries // static sbyte[] mLo0 = new sbyte[256] { /* '\0' */ 5, 42, 5, 5, 5, 5, 5, 5, 5, 12, 0, 5, 5, 6, 5, 5, /* '\x10' */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, -/* '\x20' */ 12, 5, 5, 11, 4, 5, 13, 47, 7, 9, 8, 24, 14, 25, 16, 1, +/* '\x20' */ 12, 5, 5, 11, 4, 5, 13, 49, 7, 9, 8, 24, 14, 25, 16, 1, /* '0' */ 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 15, 17, 27, 23, 26, 20, -/* '@' */ 22, 45, 45, 45, 45, 46, 45, 43, 43, 43, 43, 43, 43, 43, 43, 43, +/* '@' */ 22, 47, 45, 47, 47, 48, 47, 43, 43, 46, 43, 43, 43, 43, 43, 43, /* 'P' */ 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 18, 5, 19, 28, 21, -/* '`' */ 5, 39, 45, 45, 45, 30, 45, 43, 43, 35, 43, 43, 43, 40, 37, 36, +/* '`' */ 5, 39, 45, 47, 47, 30, 47, 43, 43, 35, 43, 43, 43, 40, 37, 36, /* 'p' */ 32, 43, 33, 34, 38, 43, 43, 43, 31, 41, 43, 3, 10, 2, 5, 5, /* '\x80' */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, /* '\x90' */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, @@ -1008,7 +1008,7 @@ public PT parsertools; #region CompressedCharacterMap // - // There are 48 equivalence classes + // There are 50 equivalence classes // There are 21 character sequence regions // There are 6 tables, 1255 entries // There are 15 runs, 0 singletons @@ -1177,57 +1177,57 @@ public PT parsertools; return MapC(code); } - static Table[] NxS = new Table[111] { + static Table[] NxS = new Table[113] { /* NxS[ 0] */ new Table(0, 0, 0, null), -/* NxS[ 1] */ new Table(1, 23, -1, new sbyte[] {58, -1, -1, -1, -1, -1, +/* NxS[ 1] */ new Table(1, 23, -1, new sbyte[] {59, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 59}), + 60}), /* NxS[ 2] */ new Table(0, 0, -1, null), -/* NxS[ 3] */ new Table(4, 1, -1, new sbyte[] {105}), -/* NxS[ 4] */ new Table(30, 18, -1, new sbyte[] {55, -1, -1, -1, -1, -1, - -1, -1, -1, 55, -1, -1, -1, -1, 55, 55, 55, 104}), -/* NxS[ 5] */ new Table(8, 1, -1, new sbyte[] {54}), -/* NxS[ 6] */ new Table(8, 16, -1, new sbyte[] {52, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 53}), +/* NxS[ 3] */ new Table(4, 1, -1, new sbyte[] {107}), +/* NxS[ 4] */ new Table(30, 20, -1, new sbyte[] {56, -1, -1, -1, -1, -1, + -1, -1, -1, 56, -1, -1, -1, -1, 56, 56, -1, 56, 56, 106}), +/* NxS[ 5] */ new Table(8, 1, -1, new sbyte[] {55}), +/* NxS[ 6] */ new Table(8, 16, -1, new sbyte[] {53, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 54}), /* NxS[ 7] */ new Table(0, 0, -1, null), /* NxS[ 8] */ new Table(0, 0, -1, null), -/* NxS[ 9] */ new Table(42, 36, 48, new sbyte[] {-1, 48, 49, 48, 48, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 102, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 48, -1, -1, -1, -1, -1, -1, -1, -1}), -/* NxS[ 10] */ new Table(21, 26, -1, new sbyte[] {27, -1, -1, -1, -1, -1, +/* NxS[ 9] */ new Table(42, 38, 49, new sbyte[] {-1, 49, 50, 49, 49, 49, + 49, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 104, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 49, -1, -1, -1, -1, -1, -1, -1, -1}), +/* NxS[ 10] */ new Table(21, 28, -1, new sbyte[] {27, -1, -1, -1, -1, -1, -1, -1, -1, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, -1, - 27, -1, 27, 27}), + 27, -1, 27, 27, 27, 27}), /* NxS[ 11] */ new Table(0, 0, -1, null), -/* NxS[ 12] */ new Table(23, 1, -1, new sbyte[] {47}), -/* NxS[ 13] */ new Table(16, 1, -1, new sbyte[] {46}), +/* NxS[ 12] */ new Table(23, 1, -1, new sbyte[] {48}), +/* NxS[ 13] */ new Table(16, 1, -1, new sbyte[] {47}), /* NxS[ 14] */ new Table(0, 0, -1, null), /* NxS[ 15] */ new Table(0, 0, -1, null), /* NxS[ 16] */ new Table(0, 0, -1, null), -/* NxS[ 17] */ new Table(16, 5, -1, new sbyte[] {43, -1, 44, -1, 45}), -/* NxS[ 18] */ new Table(21, 26, -1, new sbyte[] {27, -1, -1, -1, -1, -1, +/* NxS[ 17] */ new Table(16, 5, -1, new sbyte[] {44, -1, 45, -1, 46}), +/* NxS[ 18] */ new Table(21, 28, -1, new sbyte[] {27, -1, -1, -1, -1, -1, -1, -1, -1, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, -1, - 27, 27, 27, 27}), + 27, 27, 27, 27, 27, 27}), /* NxS[ 19] */ new Table(0, 0, -1, null), /* NxS[ 20] */ new Table(0, 0, -1, null), -/* NxS[ 21] */ new Table(23, 1, -1, new sbyte[] {42}), -/* NxS[ 22] */ new Table(23, 4, -1, new sbyte[] {40, -1, -1, 41}), -/* NxS[ 23] */ new Table(23, 1, -1, new sbyte[] {39}), -/* NxS[ 24] */ new Table(23, 5, -1, new sbyte[] {34, -1, -1, 35, 75}), +/* NxS[ 21] */ new Table(23, 1, -1, new sbyte[] {43}), +/* NxS[ 22] */ new Table(23, 4, -1, new sbyte[] {41, -1, -1, 42}), +/* NxS[ 23] */ new Table(23, 1, -1, new sbyte[] {40}), +/* NxS[ 24] */ new Table(23, 5, -1, new sbyte[] {35, -1, -1, 36, 77}), /* NxS[ 25] */ new Table(0, 0, -1, null), /* NxS[ 26] */ new Table(0, 0, -1, null), -/* NxS[ 27] */ new Table(21, 26, -1, new sbyte[] {27, -1, -1, -1, -1, -1, +/* NxS[ 27] */ new Table(21, 28, -1, new sbyte[] {27, -1, -1, -1, -1, -1, -1, -1, -1, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, -1, - 27, 27, 27, 27}), + 27, 27, 27, 27, 27, 27}), /* NxS[ 28] */ new Table(0, 0, -1, null), -/* NxS[ 29] */ new Table(16, 31, -1, new sbyte[] {72, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 73, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 29, -1, 73}), -/* NxS[ 30] */ new Table(47, 2, 71, new sbyte[] {31, -1}), -/* NxS[ 31] */ new Table(47, 1, -1, new sbyte[] {71}), -/* NxS[ 32] */ new Table(44, 1, -1, new sbyte[] {32}), -/* NxS[ 33] */ new Table(30, 17, -1, new sbyte[] {73, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 33, -1, 73}), -/* NxS[ 34] */ new Table(0, 0, -1, null), +/* NxS[ 29] */ new Table(16, 33, -1, new sbyte[] {73, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 74, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 29, 75, -1, -1, 74}), +/* NxS[ 30] */ new Table(49, 2, 72, new sbyte[] {31, -1}), +/* NxS[ 31] */ new Table(49, 1, -1, new sbyte[] {72}), +/* NxS[ 32] */ new Table(0, 0, -1, null), +/* NxS[ 33] */ new Table(44, 1, -1, new sbyte[] {33}), +/* NxS[ 34] */ new Table(30, 19, -1, new sbyte[] {74, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 34, -1, -1, -1, 74}), /* NxS[ 35] */ new Table(0, 0, -1, null), /* NxS[ 36] */ new Table(0, 0, -1, null), /* NxS[ 37] */ new Table(0, 0, -1, null), @@ -1241,83 +1241,86 @@ public PT parsertools; /* NxS[ 45] */ new Table(0, 0, -1, null), /* NxS[ 46] */ new Table(0, 0, -1, null), /* NxS[ 47] */ new Table(0, 0, -1, null), -/* NxS[ 48] */ new Table(21, 26, -1, new sbyte[] {48, -1, -1, -1, -1, -1, - -1, -1, -1, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, -1, - 48, 48, 48, 48}), -/* NxS[ 49] */ new Table(44, 1, -1, new sbyte[] {49}), -/* NxS[ 50] */ new Table(0, 13, -1, new sbyte[] {50, -1, -1, -1, -1, -1, - 50, -1, -1, -1, -1, -1, 50}), +/* NxS[ 48] */ new Table(0, 0, -1, null), +/* NxS[ 49] */ new Table(21, 28, -1, new sbyte[] {49, -1, -1, -1, -1, -1, + -1, -1, -1, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, -1, + 49, 49, 49, 49, 49, 49}), +/* NxS[ 50] */ new Table(44, 1, -1, new sbyte[] {50}), /* NxS[ 51] */ new Table(0, 13, -1, new sbyte[] {51, -1, -1, -1, -1, -1, 51, -1, -1, -1, -1, -1, 51}), -/* NxS[ 52] */ new Table(0, 0, -1, null), +/* NxS[ 52] */ new Table(0, 13, -1, new sbyte[] {52, -1, -1, -1, -1, -1, + 52, -1, -1, -1, -1, -1, 52}), /* NxS[ 53] */ new Table(0, 0, -1, null), /* NxS[ 54] */ new Table(0, 0, -1, null), -/* NxS[ 55] */ new Table(30, 17, -1, new sbyte[] {55, -1, -1, -1, -1, -1, - -1, -1, -1, 55, -1, -1, -1, -1, 55, 55, 55}), -/* NxS[ 56] */ new Table(47, 1, -1, new sbyte[] {104}), -/* NxS[ 57] */ new Table(0, 0, -1, null), -/* NxS[ 58] */ new Table(0, 7, 58, new sbyte[] {-1, 58, 58, 58, 58, 58, +/* NxS[ 55] */ new Table(0, 0, -1, null), +/* NxS[ 56] */ new Table(30, 19, -1, new sbyte[] {56, -1, -1, -1, -1, -1, + -1, -1, -1, 56, -1, -1, -1, -1, 56, 56, -1, 56, 56}), +/* NxS[ 57] */ new Table(49, 1, -1, new sbyte[] {106}), +/* NxS[ 58] */ new Table(0, 0, -1, null), +/* NxS[ 59] */ new Table(0, 7, 59, new sbyte[] {-1, 59, 59, 59, 59, 59, -1}), -/* NxS[ 59] */ new Table(0, 0, -1, null), /* NxS[ 60] */ new Table(0, 0, -1, null), /* NxS[ 61] */ new Table(0, 0, -1, null), /* NxS[ 62] */ new Table(0, 0, -1, null), -/* NxS[ 63] */ new Table(9, 1, -1, new sbyte[] {64}), -/* NxS[ 64] */ new Table(0, 0, -1, null), +/* NxS[ 63] */ new Table(0, 0, -1, null), +/* NxS[ 64] */ new Table(9, 1, -1, new sbyte[] {65}), /* NxS[ 65] */ new Table(0, 0, -1, null), -/* NxS[ 66] */ new Table(1, 1, -1, new sbyte[] {69}), -/* NxS[ 67] */ new Table(4, 1, -1, new sbyte[] {110}), -/* NxS[ 68] */ new Table(0, 0, -1, null), -/* NxS[ 69] */ new Table(0, 7, 69, new sbyte[] {-1, 69, 69, 69, 69, 69, +/* NxS[ 66] */ new Table(0, 0, -1, null), +/* NxS[ 67] */ new Table(1, 1, -1, new sbyte[] {70}), +/* NxS[ 68] */ new Table(4, 1, -1, new sbyte[] {112}), +/* NxS[ 69] */ new Table(0, 0, -1, null), +/* NxS[ 70] */ new Table(0, 7, 70, new sbyte[] {-1, 70, 70, 70, 70, 70, -1}), -/* NxS[ 70] */ new Table(42, 36, 27, new sbyte[] {28, 27, 29, 27, 27, 30, - -1, 1, 2, 3, 4, 2, -1, 5, 6, 7, 8, 9, -1, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26}), -/* NxS[ 71] */ new Table(47, 2, 71, new sbyte[] {31, -1}), -/* NxS[ 72] */ new Table(44, 1, -1, new sbyte[] {33}), -/* NxS[ 73] */ new Table(24, 21, -1, new sbyte[] {74, 74, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 32}), -/* NxS[ 74] */ new Table(44, 1, -1, new sbyte[] {32}), -/* NxS[ 75] */ new Table(30, 9, -1, new sbyte[] {76, -1, -1, -1, 77, -1, - -1, -1, 78}), -/* NxS[ 76] */ new Table(31, 1, -1, new sbyte[] {92}), -/* NxS[ 77] */ new Table(38, 1, -1, new sbyte[] {83}), -/* NxS[ 78] */ new Table(41, 1, -1, new sbyte[] {79}), -/* NxS[ 79] */ new Table(32, 1, -1, new sbyte[] {80}), -/* NxS[ 80] */ new Table(30, 1, -1, new sbyte[] {81}), -/* NxS[ 81] */ new Table(26, 1, -1, new sbyte[] {82}), -/* NxS[ 82] */ new Table(26, 1, -1, new sbyte[] {36}), -/* NxS[ 83] */ new Table(39, 1, -1, new sbyte[] {84}), -/* NxS[ 84] */ new Table(38, 1, -1, new sbyte[] {85}), -/* NxS[ 85] */ new Table(30, 1, -1, new sbyte[] {86}), -/* NxS[ 86] */ new Table(40, 1, -1, new sbyte[] {87}), +/* NxS[ 71] */ new Table(42, 38, 27, new sbyte[] {28, 27, 29, 27, 27, 27, + 27, 30, -1, 1, 2, 3, 4, 2, -1, 5, 6, 7, 8, 9, -1, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26}), +/* NxS[ 72] */ new Table(49, 2, 72, new sbyte[] {31, -1}), +/* NxS[ 73] */ new Table(44, 1, -1, new sbyte[] {34}), +/* NxS[ 74] */ new Table(24, 21, -1, new sbyte[] {76, 76, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 33}), +/* NxS[ 75] */ new Table(35, 12, -1, new sbyte[] {32, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 32}), +/* NxS[ 76] */ new Table(44, 1, -1, new sbyte[] {33}), +/* NxS[ 77] */ new Table(30, 9, -1, new sbyte[] {78, -1, -1, -1, 79, -1, + -1, -1, 80}), +/* NxS[ 78] */ new Table(31, 1, -1, new sbyte[] {94}), +/* NxS[ 79] */ new Table(38, 1, -1, new sbyte[] {85}), +/* NxS[ 80] */ new Table(41, 1, -1, new sbyte[] {81}), +/* NxS[ 81] */ new Table(32, 1, -1, new sbyte[] {82}), +/* NxS[ 82] */ new Table(30, 1, -1, new sbyte[] {83}), +/* NxS[ 83] */ new Table(26, 1, -1, new sbyte[] {84}), +/* NxS[ 84] */ new Table(26, 1, -1, new sbyte[] {37}), +/* NxS[ 85] */ new Table(39, 1, -1, new sbyte[] {86}), +/* NxS[ 86] */ new Table(38, 1, -1, new sbyte[] {87}), /* NxS[ 87] */ new Table(30, 1, -1, new sbyte[] {88}), -/* NxS[ 88] */ new Table(37, 1, -1, new sbyte[] {89}), -/* NxS[ 89] */ new Table(38, 1, -1, new sbyte[] {90}), -/* NxS[ 90] */ new Table(26, 1, -1, new sbyte[] {91}), -/* NxS[ 91] */ new Table(26, 1, -1, new sbyte[] {37}), -/* NxS[ 92] */ new Table(32, 1, -1, new sbyte[] {93}), -/* NxS[ 93] */ new Table(33, 1, -1, new sbyte[] {94}), -/* NxS[ 94] */ new Table(30, 1, -1, new sbyte[] {95}), -/* NxS[ 95] */ new Table(34, 1, -1, new sbyte[] {96}), -/* NxS[ 96] */ new Table(34, 1, -1, new sbyte[] {97}), -/* NxS[ 97] */ new Table(35, 1, -1, new sbyte[] {98}), -/* NxS[ 98] */ new Table(36, 1, -1, new sbyte[] {99}), -/* NxS[ 99] */ new Table(37, 1, -1, new sbyte[] {100}), -/* NxS[ 100] */ new Table(26, 1, -1, new sbyte[] {101}), -/* NxS[ 101] */ new Table(26, 1, -1, new sbyte[] {38}), -/* NxS[ 102] */ new Table(0, 13, -1, new sbyte[] {50, -1, -1, -1, -1, -1, - 50, -1, -1, -1, -1, 103, 50}), -/* NxS[ 103] */ new Table(0, 13, -1, new sbyte[] {51, -1, -1, -1, -1, -1, - 51, -1, -1, -1, -1, -1, 51}), -/* NxS[ 104] */ new Table(47, 2, 104, new sbyte[] {56, -1}), -/* NxS[ 105] */ new Table(0, 7, 105, new sbyte[] {-1, 105, 57, 105, 105, 105, +/* NxS[ 88] */ new Table(40, 1, -1, new sbyte[] {89}), +/* NxS[ 89] */ new Table(30, 1, -1, new sbyte[] {90}), +/* NxS[ 90] */ new Table(37, 1, -1, new sbyte[] {91}), +/* NxS[ 91] */ new Table(38, 1, -1, new sbyte[] {92}), +/* NxS[ 92] */ new Table(26, 1, -1, new sbyte[] {93}), +/* NxS[ 93] */ new Table(26, 1, -1, new sbyte[] {38}), +/* NxS[ 94] */ new Table(32, 1, -1, new sbyte[] {95}), +/* NxS[ 95] */ new Table(33, 1, -1, new sbyte[] {96}), +/* NxS[ 96] */ new Table(30, 1, -1, new sbyte[] {97}), +/* NxS[ 97] */ new Table(34, 1, -1, new sbyte[] {98}), +/* NxS[ 98] */ new Table(34, 1, -1, new sbyte[] {99}), +/* NxS[ 99] */ new Table(35, 1, -1, new sbyte[] {100}), +/* NxS[ 100] */ new Table(36, 1, -1, new sbyte[] {101}), +/* NxS[ 101] */ new Table(37, 1, -1, new sbyte[] {102}), +/* NxS[ 102] */ new Table(26, 1, -1, new sbyte[] {103}), +/* NxS[ 103] */ new Table(26, 1, -1, new sbyte[] {39}), +/* NxS[ 104] */ new Table(0, 13, -1, new sbyte[] {51, -1, -1, -1, -1, -1, + 51, -1, -1, -1, -1, 105, 51}), +/* NxS[ 105] */ new Table(0, 13, -1, new sbyte[] {52, -1, -1, -1, -1, -1, + 52, -1, -1, -1, -1, -1, 52}), +/* NxS[ 106] */ new Table(49, 2, 106, new sbyte[] {57, -1}), +/* NxS[ 107] */ new Table(0, 7, 107, new sbyte[] {-1, 107, 58, 107, 107, 107, -1}), -/* NxS[ 106] */ new Table(2, 1, 60, new sbyte[] {61}), -/* NxS[ 107] */ new Table(8, 1, 62, new sbyte[] {63}), -/* NxS[ 108] */ new Table(0, 0, -1, null), -/* NxS[ 109] */ new Table(1, 3, 65, new sbyte[] {66, 65, 67}), -/* NxS[ 110] */ new Table(0, 7, 110, new sbyte[] {-1, 110, 68, 110, 110, 110, +/* NxS[ 108] */ new Table(2, 1, 61, new sbyte[] {62}), +/* NxS[ 109] */ new Table(8, 1, 63, new sbyte[] {64}), +/* NxS[ 110] */ new Table(0, 0, -1, null), +/* NxS[ 111] */ new Table(1, 3, 66, new sbyte[] {67, 66, 68}), +/* NxS[ 112] */ new Table(0, 7, 112, new sbyte[] {-1, 112, 69, 112, 112, 112, -1}), }; @@ -1328,7 +1331,7 @@ int NextState() { unchecked { int rslt; int idx = Map(code) - NxS[state].min; - if (idx < 0) idx += 48; + if (idx < 0) idx += 50; if ((uint)idx >= (uint)NxS[state].rng) rslt = NxS[state].dflt; else rslt = NxS[state].nxt[idx]; return rslt; @@ -2042,93 +2045,99 @@ yylval = new Union(); return (int)Tokens.tkStringLiteral; break; case 32: +yylval = new Union(); + currentLexLocation = CurrentLexLocation; + yylval.ex = parsertools.create_bigint_const(yytext,currentLexLocation); + return (int)Tokens.tkBigInteger; + break; case 33: + case 34: yylval = new Union(); currentLexLocation = CurrentLexLocation; yylval.ex = parsertools.create_double_const(yytext,currentLexLocation); return (int)Tokens.tkFloat; break; - case 34: + case 35: yylval = new Union(); yylval.op = new op_type_node(Operators.LessEqual); return (int)Tokens.tkLowerEqual; break; - case 35: + case 36: yylval = new Union(); yylval.op = new op_type_node(Operators.NotEqual); return (int)Tokens.tkNotEqual; break; - case 36: + case 37: return (int)Tokens.tkParseModeType; break; - case 37: + case 38: return (int)Tokens.tkParseModeStatement; break; - case 38: + case 39: return (int)Tokens.tkParseModeExpression; break; - case 39: + case 40: yylval = new Union(); yylval.op = new op_type_node(Operators.GreaterEqual); return (int)Tokens.tkGreaterEqual; break; - case 40: + case 41: yylval = new Union(); yylval.op = new op_type_node(Operators.AssignmentSubtraction); return (int)Tokens.tkMinusEqual; break; - case 41: + case 42: yylval = new Union(); yylval.ti = new token_info(yytext); return (int)Tokens.tkArrow; break; - case 42: + case 43: yylval = new Union(); yylval.op = new op_type_node(Operators.AssignmentAddition); return (int)Tokens.tkPlusEqual; break; - case 43: + case 44: return (int)Tokens.tkQuestionPoint; break; - case 44: + case 45: return (int)Tokens.tkQuestionSquareOpen; break; - case 45: + case 46: return (int)Tokens.tkDoubleQuestion; break; - case 46: + case 47: return (int)Tokens.tkDotDot; break; - case 47: + case 48: yylval = new Union(); yylval.op = new op_type_node(Operators.Assignment); return (int)Tokens.tkAssign; break; - case 48: + case 49: yylval = new Union(); yylval.id = new ident(yytext,CurrentLexLocation); return (int)Tokens.tkDirectiveName; break; - case 49: + case 50: yylval = new Union(); currentLexLocation = CurrentLexLocation; yylval.stn = parsertools.create_sharp_char_const(yytext,currentLexLocation); return (int)Tokens.tkAsciiChar; break; - case 50: + case 51: yylval = new Union(); yylval.ti = new token_info("##",CurrentLexLocation); return (int)Tokens.tkShortProgram; break; - case 51: + case 52: yylval = new Union(); yylval.ti = new token_info("###",CurrentLexLocation); return (int)Tokens.tkShortSFProgram; break; - case 52: + case 53: yylval = new Union(); yylval.op = new op_type_node(Operators.Power); return (int)Tokens.tkStarStar; break; - case 53: + case 54: yylval = new Union(); yylval.op = new op_type_node(Operators.AssignmentMultiplication); return (int)Tokens.tkMultEqual; break; - case 54: + case 55: BEGIN(COMMENT1); break; - case 55: + case 56: yylval = new Union(); currentLexLocation = CurrentLexLocation; yylval.ex = parsertools.create_hex_const(yytext,currentLexLocation); return (int)Tokens.tkHex; break; - case 56: + case 57: yylval = new Union(); currentLexLocation = CurrentLexLocation; yylval.stn = parsertools.create_format_string_const(yytext,currentLexLocation); return (int)Tokens.tkFormatStringLiteral; break; - case 57: + case 58: if (parsertools.build_tree_for_formatter) break; @@ -2184,36 +2193,36 @@ if (parsertools.build_tree_for_formatter) Defines.Remove(directiveparam); } break; - case 58: + case 59: { } break; - case 59: + case 60: yylval = new Union(); yylval.op = new op_type_node(Operators.AssignmentDivision); return (int)Tokens.tkDivEqual; break; - case 60: + case 61: { } break; - case 61: -BEGIN(INITIAL); - break; case 62: - case 63: -{ -} - break; - case 64: BEGIN(INITIAL); break; - case 65: - case 66: - case 67: + case 63: + case 64: { } break; + case 65: +BEGIN(INITIAL); + break; + case 66: + case 67: case 68: +{ +} + break; + case 69: parsertools.DivideDirectiveOn(yytext,out directivename,out directiveparam); parsertools.CheckDirectiveParams(directivename,directiveparam); // directivename in UPPERCASE! if (directivename == "IFDEF") @@ -2245,7 +2254,7 @@ parsertools.DivideDirectiveOn(yytext,out directivename,out directiveparam); BEGIN(INITIAL); } break; - case 69: + case 70: { } diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.lex b/Parsers/PascalABCParserNewSaushkin/ABCPascal.lex index 16effda02..4a37fac5e 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.lex +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.lex @@ -32,6 +32,7 @@ NOTASCII [^\x00-x7F] CHARACTERNUM '[^'\n]' INTNUM {Digit}+ +BIGINTNUM {INTNUM}[bB][iI] FLOATNUM {INTNUM}\.{INTNUM} EXPNUM ({INTNUM}\.)?{INTNUM}[eE][+\-]?{INTNUM} STRINGNUM \'([^\'\n]|\'\')*\' @@ -437,6 +438,14 @@ UNICODEARROW \x890 return (int)Tokens.tkInteger; } +{BIGINTNUM} { + yylval = new Union(); + currentLexLocation = CurrentLexLocation; + yylval.ex = parsertools.create_bigint_const(yytext,currentLexLocation); + return (int)Tokens.tkBigInteger; +} + + {HEXNUM} { yylval = new Union(); currentLexLocation = CurrentLexLocation; diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y index 56370c818..dc65e4d47 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y @@ -50,7 +50,7 @@ %token tkDirectiveName tkIdentifier %token tkStringLiteral tkFormatStringLiteral tkAsciiChar %token tkAbstract tkForward tkOverload tkReintroduce tkOverride tkVirtual tkExtensionMethod -%token tkInteger tkFloat tkHex +%token tkInteger tkBigInteger tkFloat tkHex %token tkUnknown %type unit_key_word class_or_static @@ -1043,6 +1043,8 @@ unsigned_number { $$ = $1; } | tkFloat { $$ = $1; } + | tkBigInteger + { $$ = $1; } ; typed_const diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalParserTools.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalParserTools.cs index 7ca99b27b..602e53104 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascalParserTools.cs +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascalParserTools.cs @@ -349,6 +349,22 @@ namespace PascalABCSavParser return create_int_const(text, sc, System.Globalization.NumberStyles.Integer); } + public const_node create_bigint_const(string text, SourceContext sc) + { + var txt = text.Substring(0, text.Length - 2); + const_node cn = new bigint_const(); + try + { + (cn as bigint_const).val = System.UInt64.Parse(txt); + } + catch (Exception) + { + errors.Add(new BadInt(CurrentFileName, sc, null)); + } + cn.source_context = sc; + return cn; + } + public const_node create_int_const(string text, SourceContext sc, System.Globalization.NumberStyles NumberStyles) { //таблица целых констант на уровне синтаксиса diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs index 9a215f12d..126f082eb 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs @@ -2,9 +2,9 @@ // GPPG version 1.3.6 // Machine: DESKTOP-G8V08V4 -// DateTime: 16.11.2020 0:01:39 +// DateTime: 19.11.2020 11:17:33 // UserName: ????????? -// Input file +// Input file // options: no-lines gplex @@ -48,7 +48,7 @@ public enum Tokens { tkAs=133,tkIn=134,tkIs=135,tkImplicit=136,tkExplicit=137,tkAddressOf=138, tkDeref=139,tkIdentifier=140,tkStringLiteral=141,tkFormatStringLiteral=142,tkAsciiChar=143,tkAbstract=144, tkForward=145,tkOverload=146,tkReintroduce=147,tkOverride=148,tkVirtual=149,tkExtensionMethod=150, - tkInteger=151,tkFloat=152,tkHex=153,tkUnknown=154}; + tkInteger=151,tkBigInteger=152,tkFloat=153,tkHex=154,tkUnknown=155}; // Abstract base class for GPLEX scanners public abstract class ScanBase : AbstractScanner { @@ -59,7 +59,7 @@ public abstract class ScanBase : AbstractScanner { - // Verbatim content from ABCPascal.y + // Verbatim content from D:\PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.y // ��� ���������� ����������� � ����� GPPGParser, �������������� ����� ������, ������������ �������� gppg public syntax_tree_node root; // �������� ���� ��������������� ������ @@ -71,13 +71,13 @@ public partial class GPPGParser: ShiftReduceParser scanner) : base(scanner) { } - // End verbatim content from ABCPascal.y + // End verbatim content from D:\PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.y #pragma warning disable 649 private static Dictionary aliasses; #pragma warning restore 649 - private static Rule[] rules = new Rule[983]; - private static State[] states = new State[1622]; + private static Rule[] rules = new Rule[984]; + private static State[] states = new State[1623]; private static string[] nonTerms = new string[] { "parse_goal", "unit_key_word", "class_or_static", "assignment", "optional_array_initializer", "attribute_declarations", "ot_visibility_specifier", "one_attribute", "attribute_variable", @@ -168,13 +168,13 @@ public partial class GPPGParser: ShiftReduceParser tkFloat { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 186: // typed_const -> const_expr + case 186: // unsigned_number -> tkBigInteger { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 187: // typed_const -> array_const + case 187: // typed_const -> const_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 188: // typed_const -> record_const + case 188: // typed_const -> array_const { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 189: // array_const -> tkRoundOpen, typed_const_list, tkRoundClose + case 189: // typed_const -> record_const +{ CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } + break; + case 190: // array_const -> tkRoundOpen, typed_const_list, tkRoundClose { CurrentSemanticValue.ex = new array_const(ValueStack[ValueStack.Depth-2].stn as expression_list, CurrentLocationSpan); } break; - case 191: // typed_const_list -> typed_const_list1 + case 192: // typed_const_list -> typed_const_list1 { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 192: // typed_const_list1 -> typed_const_plus + case 193: // typed_const_list1 -> typed_const_plus { CurrentSemanticValue.stn = new expression_list(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 193: // typed_const_list1 -> typed_const_list1, tkComma, typed_const_plus + case 194: // typed_const_list1 -> typed_const_list1, tkComma, typed_const_plus { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as expression_list).Add(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 194: // record_const -> tkRoundOpen, const_field_list, tkRoundClose + case 195: // record_const -> tkRoundOpen, const_field_list, tkRoundClose { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-2].ex; CurrentSemanticValue.ex.source_context = CurrentLocationSpan; } break; - case 195: // const_field_list -> const_field_list_1 + case 196: // const_field_list -> const_field_list_1 { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 196: // const_field_list -> const_field_list_1, tkSemiColon + case 197: // const_field_list -> const_field_list_1, tkSemiColon { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-2].ex; } break; - case 197: // const_field_list_1 -> const_field + case 198: // const_field_list_1 -> const_field { CurrentSemanticValue.ex = new record_const(ValueStack[ValueStack.Depth-1].stn as record_const_definition, CurrentLocationSpan); } break; - case 198: // const_field_list_1 -> const_field_list_1, tkSemiColon, const_field + case 199: // const_field_list_1 -> const_field_list_1, tkSemiColon, const_field { CurrentSemanticValue.ex = (ValueStack[ValueStack.Depth-3].ex as record_const).Add(ValueStack[ValueStack.Depth-1].stn as record_const_definition, CurrentLocationSpan); } break; - case 199: // const_field -> const_field_name, tkColon, typed_const + case 200: // const_field -> const_field_name, tkColon, typed_const { CurrentSemanticValue.stn = new record_const_definition(ValueStack[ValueStack.Depth-3].id, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 200: // const_field_name -> identifier + case 201: // const_field_name -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 201: // type_decl -> attribute_declarations, simple_type_decl + case 202: // type_decl -> attribute_declarations, simple_type_decl { (ValueStack[ValueStack.Depth-1].stn as declaration).attributes = ValueStack[ValueStack.Depth-2].stn as attribute_list; CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; CurrentSemanticValue.stn.source_context = LocationStack[LocationStack.Depth-1]; } break; - case 202: // attribute_declarations -> attribute_declaration + case 203: // attribute_declarations -> attribute_declaration { CurrentSemanticValue.stn = new attribute_list(ValueStack[ValueStack.Depth-1].stn as simple_attribute_list, CurrentLocationSpan); } break; - case 203: // attribute_declarations -> attribute_declarations, attribute_declaration + case 204: // attribute_declarations -> attribute_declarations, attribute_declaration { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-2].stn as attribute_list).Add(ValueStack[ValueStack.Depth-1].stn as simple_attribute_list, CurrentLocationSpan); } break; - case 204: // attribute_declarations -> /* empty */ + case 205: // attribute_declarations -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 205: // attribute_declaration -> tkSquareOpen, one_or_some_attribute, tkSquareClose + case 206: // attribute_declaration -> tkSquareOpen, one_or_some_attribute, tkSquareClose { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 206: // one_or_some_attribute -> one_attribute + case 207: // one_or_some_attribute -> one_attribute { CurrentSemanticValue.stn = new simple_attribute_list(ValueStack[ValueStack.Depth-1].stn as attribute, CurrentLocationSpan); } break; - case 207: // one_or_some_attribute -> one_or_some_attribute, tkComma, one_attribute + case 208: // one_or_some_attribute -> one_or_some_attribute, tkComma, one_attribute { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as simple_attribute_list).Add(ValueStack[ValueStack.Depth-1].stn as attribute, CurrentLocationSpan); } break; - case 208: // one_attribute -> attribute_variable + case 209: // one_attribute -> attribute_variable { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 209: // one_attribute -> identifier, tkColon, attribute_variable + case 210: // one_attribute -> identifier, tkColon, attribute_variable { (ValueStack[ValueStack.Depth-1].stn as attribute).qualifier = ValueStack[ValueStack.Depth-3].id; CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 210: // simple_type_decl -> type_decl_identifier, tkEqual, type_decl_type, tkSemiColon + case 211: // simple_type_decl -> type_decl_identifier, tkEqual, type_decl_type, tkSemiColon { CurrentSemanticValue.stn = new type_declaration(ValueStack[ValueStack.Depth-4].id, ValueStack[ValueStack.Depth-2].td, CurrentLocationSpan); } break; - case 211: // simple_type_decl -> template_identifier_with_equal, type_decl_type, tkSemiColon + case 212: // simple_type_decl -> template_identifier_with_equal, type_decl_type, tkSemiColon { CurrentSemanticValue.stn = new type_declaration(ValueStack[ValueStack.Depth-3].id, ValueStack[ValueStack.Depth-2].td, CurrentLocationSpan); } break; - case 212: // type_decl_identifier -> identifier + case 213: // type_decl_identifier -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 213: // type_decl_identifier -> identifier, template_arguments + case 214: // type_decl_identifier -> identifier, template_arguments { CurrentSemanticValue.id = new template_type_name(ValueStack[ValueStack.Depth-2].id.name, ValueStack[ValueStack.Depth-1].stn as ident_list, CurrentLocationSpan); } break; - case 214: // template_identifier_with_equal -> identifier, tkLower, ident_list, + case 215: // template_identifier_with_equal -> identifier, tkLower, ident_list, // tkGreaterEqual { CurrentSemanticValue.id = new template_type_name(ValueStack[ValueStack.Depth-4].id.name, ValueStack[ValueStack.Depth-2].stn as ident_list, CurrentLocationSpan); } break; - case 215: // type_decl_type -> type_ref + case 216: // type_decl_type -> type_ref { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 216: // type_decl_type -> object_type + case 217: // type_decl_type -> object_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 217: // simple_type_question -> simple_type, tkQuestion + case 218: // simple_type_question -> simple_type, tkQuestion { if (parsertools.build_tree_for_formatter) { @@ -3740,7 +3745,7 @@ public partial class GPPGParser: ShiftReduceParser template_type, tkQuestion + case 219: // simple_type_question -> template_type, tkQuestion { if (parsertools.build_tree_for_formatter) { @@ -3755,39 +3760,39 @@ public partial class GPPGParser: ShiftReduceParser simple_type + case 220: // type_ref -> simple_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 220: // type_ref -> simple_type_question + case 221: // type_ref -> simple_type_question { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 221: // type_ref -> string_type + case 222: // type_ref -> string_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 222: // type_ref -> pointer_type + case 223: // type_ref -> pointer_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 223: // type_ref -> structured_type + case 224: // type_ref -> structured_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 224: // type_ref -> procedural_type + case 225: // type_ref -> procedural_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 225: // type_ref -> template_type + case 226: // type_ref -> template_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 226: // template_type -> simple_type_identifier, template_type_params + case 227: // template_type -> simple_type_identifier, template_type_params { CurrentSemanticValue.td = new template_type_reference(ValueStack[ValueStack.Depth-2].td as named_type_reference, ValueStack[ValueStack.Depth-1].stn as template_param_list, CurrentLocationSpan); } break; - case 227: // template_type_params -> tkLower, template_param_list, tkGreater + case 228: // template_type_params -> tkLower, template_param_list, tkGreater { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 228: // template_type_empty_params -> tkNotEqual + case 229: // template_type_empty_params -> tkNotEqual { var ntr = new named_type_reference(new ident(""), CurrentLocationSpan); @@ -3795,42 +3800,42 @@ public partial class GPPGParser: ShiftReduceParser tkLower, template_empty_param_list, tkGreater + case 230: // template_type_empty_params -> tkLower, template_empty_param_list, tkGreater { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 230: // template_param_list -> template_param + case 231: // template_param_list -> template_param { CurrentSemanticValue.stn = new template_param_list(ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 231: // template_param_list -> template_param_list, tkComma, template_param + case 232: // template_param_list -> template_param_list, tkComma, template_param { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as template_param_list).Add(ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 232: // template_empty_param_list -> template_empty_param + case 233: // template_empty_param_list -> template_empty_param { CurrentSemanticValue.stn = new template_param_list(ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 233: // template_empty_param_list -> template_empty_param_list, tkComma, + case 234: // template_empty_param_list -> template_empty_param_list, tkComma, // template_empty_param { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as template_param_list).Add(ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 234: // template_empty_param -> /* empty */ + case 235: // template_empty_param -> /* empty */ { CurrentSemanticValue.td = new named_type_reference(new ident(""), CurrentLocationSpan); } break; - case 235: // template_param -> simple_type + case 236: // template_param -> simple_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 236: // template_param -> simple_type, tkQuestion + case 237: // template_param -> simple_type, tkQuestion { if (parsertools.build_tree_for_formatter) { @@ -3845,240 +3850,240 @@ public partial class GPPGParser: ShiftReduceParser structured_type + case 238: // template_param -> structured_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 238: // template_param -> procedural_type + case 239: // template_param -> procedural_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 239: // template_param -> template_type + case 240: // template_param -> template_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 240: // simple_type -> range_expr + case 241: // simple_type -> range_expr { CurrentSemanticValue.td = parsertools.ConvertDotNodeOrIdentToNamedTypeReference(ValueStack[ValueStack.Depth-1].ex); } break; - case 241: // simple_type -> range_expr, tkDotDot, range_expr + case 242: // simple_type -> range_expr, tkDotDot, range_expr { CurrentSemanticValue.td = new diapason(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 242: // simple_type -> tkRoundOpen, enumeration_id_list, tkRoundClose + case 243: // simple_type -> tkRoundOpen, enumeration_id_list, tkRoundClose { CurrentSemanticValue.td = new enum_type_definition(ValueStack[ValueStack.Depth-2].stn as enumerator_list, CurrentLocationSpan); } break; - case 243: // range_expr -> range_term + case 244: // range_expr -> range_term { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 244: // range_expr -> range_expr, const_addop, range_term + case 245: // range_expr -> range_expr, const_addop, range_term { CurrentSemanticValue.ex = new bin_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 245: // range_term -> range_factor + case 246: // range_term -> range_factor { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 246: // range_term -> range_term, const_mulop, range_factor + case 247: // range_term -> range_term, const_mulop, range_factor { CurrentSemanticValue.ex = new bin_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 247: // range_factor -> simple_type_identifier + case 248: // range_factor -> simple_type_identifier { CurrentSemanticValue.ex = parsertools.ConvertNamedTypeReferenceToDotNodeOrIdent(ValueStack[ValueStack.Depth-1].td as named_type_reference); } break; - case 248: // range_factor -> unsigned_number + case 249: // range_factor -> unsigned_number { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 249: // range_factor -> sign, range_factor + case 250: // range_factor -> sign, range_factor { CurrentSemanticValue.ex = new un_expr(ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 250: // range_factor -> literal + case 251: // range_factor -> literal { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 251: // range_factor -> range_factor, tkRoundOpen, const_elem_list, tkRoundClose + case 252: // range_factor -> range_factor, tkRoundOpen, const_elem_list, tkRoundClose { CurrentSemanticValue.ex = new method_call(ValueStack[ValueStack.Depth-4].ex as addressed_value, ValueStack[ValueStack.Depth-2].stn as expression_list, CurrentLocationSpan); } break; - case 252: // simple_type_identifier -> identifier + case 253: // simple_type_identifier -> identifier { CurrentSemanticValue.td = new named_type_reference(ValueStack[ValueStack.Depth-1].id, CurrentLocationSpan); } break; - case 253: // simple_type_identifier -> simple_type_identifier, tkPoint, + case 254: // simple_type_identifier -> simple_type_identifier, tkPoint, // identifier_or_keyword { CurrentSemanticValue.td = (ValueStack[ValueStack.Depth-3].td as named_type_reference).Add(ValueStack[ValueStack.Depth-1].id, CurrentLocationSpan); } break; - case 254: // enumeration_id_list -> enumeration_id, tkComma, enumeration_id + case 255: // enumeration_id_list -> enumeration_id, tkComma, enumeration_id { CurrentSemanticValue.stn = new enumerator_list(ValueStack[ValueStack.Depth-3].stn as enumerator, CurrentLocationSpan); (CurrentSemanticValue.stn as enumerator_list).Add(ValueStack[ValueStack.Depth-1].stn as enumerator, CurrentLocationSpan); } break; - case 255: // enumeration_id_list -> enumeration_id_list, tkComma, enumeration_id + case 256: // enumeration_id_list -> enumeration_id_list, tkComma, enumeration_id { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as enumerator_list).Add(ValueStack[ValueStack.Depth-1].stn as enumerator, CurrentLocationSpan); } break; - case 256: // enumeration_id -> type_ref + case 257: // enumeration_id -> type_ref { CurrentSemanticValue.stn = new enumerator(ValueStack[ValueStack.Depth-1].td, null, CurrentLocationSpan); } break; - case 257: // enumeration_id -> type_ref, tkEqual, expr + case 258: // enumeration_id -> type_ref, tkEqual, expr { CurrentSemanticValue.stn = new enumerator(ValueStack[ValueStack.Depth-3].td, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 258: // pointer_type -> tkDeref, fptype + case 259: // pointer_type -> tkDeref, fptype { CurrentSemanticValue.td = new ref_type(ValueStack[ValueStack.Depth-1].td,CurrentLocationSpan); } break; - case 259: // structured_type -> unpacked_structured_type + case 260: // structured_type -> unpacked_structured_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 260: // structured_type -> tkPacked, unpacked_structured_type + case 261: // structured_type -> tkPacked, unpacked_structured_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 261: // unpacked_structured_type -> array_type + case 262: // unpacked_structured_type -> array_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 262: // unpacked_structured_type -> record_type + case 263: // unpacked_structured_type -> record_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 263: // unpacked_structured_type -> set_type + case 264: // unpacked_structured_type -> set_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 264: // unpacked_structured_type -> file_type + case 265: // unpacked_structured_type -> file_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 265: // unpacked_structured_type -> sequence_type + case 266: // unpacked_structured_type -> sequence_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 266: // sequence_type -> tkSequence, tkOf, type_ref + case 267: // sequence_type -> tkSequence, tkOf, type_ref { CurrentSemanticValue.td = new sequence_type(ValueStack[ValueStack.Depth-1].td,CurrentLocationSpan); } break; - case 267: // array_type -> tkArray, tkSquareOpen, simple_type_list, tkSquareClose, tkOf, + case 268: // array_type -> tkArray, tkSquareOpen, simple_type_list, tkSquareClose, tkOf, // type_ref { CurrentSemanticValue.td = new array_type(ValueStack[ValueStack.Depth-4].stn as indexers_types, ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 268: // array_type -> unsized_array_type + case 269: // array_type -> unsized_array_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 269: // unsized_array_type -> tkArray, tkOf, type_ref + case 270: // unsized_array_type -> tkArray, tkOf, type_ref { CurrentSemanticValue.td = new array_type(null, ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 270: // simple_type_list -> simple_type_or_ + case 271: // simple_type_list -> simple_type_or_ { CurrentSemanticValue.stn = new indexers_types(ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 271: // simple_type_list -> simple_type_list, tkComma, simple_type_or_ + case 272: // simple_type_list -> simple_type_list, tkComma, simple_type_or_ { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as indexers_types).Add(ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 272: // simple_type_or_ -> simple_type + case 273: // simple_type_or_ -> simple_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 273: // simple_type_or_ -> /* empty */ + case 274: // simple_type_or_ -> /* empty */ { CurrentSemanticValue.td = null; } break; - case 274: // set_type -> tkSet, tkOf, type_ref + case 275: // set_type -> tkSet, tkOf, type_ref { CurrentSemanticValue.td = new set_type_definition(ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 275: // file_type -> tkFile, tkOf, type_ref + case 276: // file_type -> tkFile, tkOf, type_ref { CurrentSemanticValue.td = new file_type(ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 276: // file_type -> tkFile + case 277: // file_type -> tkFile { CurrentSemanticValue.td = new file_type(); CurrentSemanticValue.td.source_context = CurrentLocationSpan; } break; - case 277: // string_type -> tkIdentifier, tkSquareOpen, const_expr, tkSquareClose + case 278: // string_type -> tkIdentifier, tkSquareOpen, const_expr, tkSquareClose { CurrentSemanticValue.td = new string_num_definition(ValueStack[ValueStack.Depth-2].ex, ValueStack[ValueStack.Depth-4].id, CurrentLocationSpan); } break; - case 278: // procedural_type -> procedural_type_kind + case 279: // procedural_type -> procedural_type_kind { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 279: // procedural_type_kind -> proc_type_decl + case 280: // procedural_type_kind -> proc_type_decl { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 280: // proc_type_decl -> tkProcedure, fp_list + case 281: // proc_type_decl -> tkProcedure, fp_list { CurrentSemanticValue.td = new procedure_header(ValueStack[ValueStack.Depth-1].stn as formal_parameters,null,null,false,false,null,null,CurrentLocationSpan); } break; - case 281: // proc_type_decl -> tkFunction, fp_list, tkColon, fptype + case 282: // proc_type_decl -> tkFunction, fp_list, tkColon, fptype { CurrentSemanticValue.td = new function_header(ValueStack[ValueStack.Depth-3].stn as formal_parameters, null, null, null, ValueStack[ValueStack.Depth-1].td as type_definition, CurrentLocationSpan); } break; - case 282: // proc_type_decl -> simple_type_identifier, tkArrow, template_param + case 283: // proc_type_decl -> simple_type_identifier, tkArrow, template_param { CurrentSemanticValue.td = new modern_proc_type(ValueStack[ValueStack.Depth-3].td,null,ValueStack[ValueStack.Depth-1].td,CurrentLocationSpan); } break; - case 283: // proc_type_decl -> template_type, tkArrow, template_param + case 284: // proc_type_decl -> template_type, tkArrow, template_param { CurrentSemanticValue.td = new modern_proc_type(ValueStack[ValueStack.Depth-3].td,null,ValueStack[ValueStack.Depth-1].td,CurrentLocationSpan); } break; - case 284: // proc_type_decl -> tkRoundOpen, tkRoundClose, tkArrow, template_param + case 285: // proc_type_decl -> tkRoundOpen, tkRoundClose, tkArrow, template_param { CurrentSemanticValue.td = new modern_proc_type(null,null,ValueStack[ValueStack.Depth-1].td,CurrentLocationSpan); } break; - case 285: // proc_type_decl -> tkRoundOpen, enumeration_id_list, tkRoundClose, tkArrow, + case 286: // proc_type_decl -> tkRoundOpen, enumeration_id_list, tkRoundClose, tkArrow, // template_param { CurrentSemanticValue.td = new modern_proc_type(null,ValueStack[ValueStack.Depth-4].stn as enumerator_list,ValueStack[ValueStack.Depth-1].td,CurrentLocationSpan); } break; - case 286: // proc_type_decl -> simple_type_identifier, tkArrow, tkRoundOpen, tkRoundClose + case 287: // proc_type_decl -> simple_type_identifier, tkArrow, tkRoundOpen, tkRoundClose { CurrentSemanticValue.td = new modern_proc_type(ValueStack[ValueStack.Depth-4].td,null,null,CurrentLocationSpan); } break; - case 287: // proc_type_decl -> template_type, tkArrow, tkRoundOpen, tkRoundClose + case 288: // proc_type_decl -> template_type, tkArrow, tkRoundOpen, tkRoundClose { CurrentSemanticValue.td = new modern_proc_type(ValueStack[ValueStack.Depth-4].td,null,null,CurrentLocationSpan); } break; - case 288: // proc_type_decl -> tkRoundOpen, tkRoundClose, tkArrow, tkRoundOpen, tkRoundClose + case 289: // proc_type_decl -> tkRoundOpen, tkRoundClose, tkArrow, tkRoundOpen, tkRoundClose { CurrentSemanticValue.td = new modern_proc_type(null,null,null,CurrentLocationSpan); } break; - case 289: // proc_type_decl -> tkRoundOpen, enumeration_id_list, tkRoundClose, tkArrow, + case 290: // proc_type_decl -> tkRoundOpen, enumeration_id_list, tkRoundClose, tkArrow, // tkRoundOpen, tkRoundClose { CurrentSemanticValue.td = new modern_proc_type(null,ValueStack[ValueStack.Depth-5].stn as enumerator_list,null,CurrentLocationSpan); } break; - case 290: // object_type -> class_attributes, class_or_interface_keyword, + case 291: // object_type -> class_attributes, class_or_interface_keyword, // optional_base_classes, optional_where_section, // optional_component_list_seq_end { @@ -4086,7 +4091,7 @@ public partial class GPPGParser: ShiftReduceParser tkRecord, optional_base_classes, optional_where_section, + case 292: // record_type -> tkRecord, optional_base_classes, optional_where_section, // member_list_section, tkEnd { var nnrt = new class_definition(ValueStack[ValueStack.Depth-4].stn as named_type_reference_list, ValueStack[ValueStack.Depth-2].stn as class_body_list, class_keyword.Record, null, ValueStack[ValueStack.Depth-3].stn as where_definition_list, class_attribute.None, false, CurrentLocationSpan); @@ -4099,37 +4104,37 @@ public partial class GPPGParser: ShiftReduceParser tkSealed + case 293: // class_attribute -> tkSealed { CurrentSemanticValue.ob = class_attribute.Sealed; } break; - case 293: // class_attribute -> tkPartial + case 294: // class_attribute -> tkPartial { CurrentSemanticValue.ob = class_attribute.Partial; } break; - case 294: // class_attribute -> tkAbstract + case 295: // class_attribute -> tkAbstract { CurrentSemanticValue.ob = class_attribute.Abstract; } break; - case 295: // class_attribute -> tkAuto + case 296: // class_attribute -> tkAuto { CurrentSemanticValue.ob = class_attribute.Auto; } break; - case 296: // class_attribute -> tkStatic + case 297: // class_attribute -> tkStatic { CurrentSemanticValue.ob = class_attribute.Static; } break; - case 297: // class_attributes -> /* empty */ + case 298: // class_attributes -> /* empty */ { CurrentSemanticValue.ob = class_attribute.None; } break; - case 298: // class_attributes -> class_attributes1 + case 299: // class_attributes -> class_attributes1 { CurrentSemanticValue.ob = ValueStack[ValueStack.Depth-1].ob; } break; - case 299: // class_attributes1 -> class_attribute + case 300: // class_attributes1 -> class_attribute { CurrentSemanticValue.ob = ValueStack[ValueStack.Depth-1].ob; } break; - case 300: // class_attributes1 -> class_attributes1, class_attribute + case 301: // class_attributes1 -> class_attributes1, class_attribute { if (((class_attribute)ValueStack[ValueStack.Depth-2].ob & (class_attribute)ValueStack[ValueStack.Depth-1].ob) == (class_attribute)ValueStack[ValueStack.Depth-1].ob) parsertools.AddErrorFromResource("ATTRIBUTE_REDECLARED",LocationStack[LocationStack.Depth-1]); @@ -4137,123 +4142,123 @@ public partial class GPPGParser: ShiftReduceParser tkClass + case 302: // class_or_interface_keyword -> tkClass { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 302: // class_or_interface_keyword -> tkInterface + case 303: // class_or_interface_keyword -> tkInterface { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 303: // class_or_interface_keyword -> tkTemplate + case 304: // class_or_interface_keyword -> tkTemplate { CurrentSemanticValue.ti = NewClassOrInterfaceKeyword(ValueStack[ValueStack.Depth-1].ti); } break; - case 304: // class_or_interface_keyword -> tkTemplate, tkClass + case 305: // class_or_interface_keyword -> tkTemplate, tkClass { CurrentSemanticValue.ti = NewClassOrInterfaceKeyword(ValueStack[ValueStack.Depth-2].ti, "c", CurrentLocationSpan); } break; - case 305: // class_or_interface_keyword -> tkTemplate, tkRecord + case 306: // class_or_interface_keyword -> tkTemplate, tkRecord { CurrentSemanticValue.ti = NewClassOrInterfaceKeyword(ValueStack[ValueStack.Depth-2].ti, "r", CurrentLocationSpan); } break; - case 306: // class_or_interface_keyword -> tkTemplate, tkInterface + case 307: // class_or_interface_keyword -> tkTemplate, tkInterface { CurrentSemanticValue.ti = NewClassOrInterfaceKeyword(ValueStack[ValueStack.Depth-2].ti, "i", CurrentLocationSpan); } break; - case 307: // optional_component_list_seq_end -> /* empty */ + case 308: // optional_component_list_seq_end -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 308: // optional_component_list_seq_end -> member_list_section, tkEnd + case 309: // optional_component_list_seq_end -> member_list_section, tkEnd { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 310: // optional_base_classes -> tkRoundOpen, base_classes_names_list, tkRoundClose + case 311: // optional_base_classes -> tkRoundOpen, base_classes_names_list, tkRoundClose { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 311: // base_classes_names_list -> base_class_name + case 312: // base_classes_names_list -> base_class_name { CurrentSemanticValue.stn = new named_type_reference_list(ValueStack[ValueStack.Depth-1].stn as named_type_reference, CurrentLocationSpan); } break; - case 312: // base_classes_names_list -> base_classes_names_list, tkComma, base_class_name + case 313: // base_classes_names_list -> base_classes_names_list, tkComma, base_class_name { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as named_type_reference_list).Add(ValueStack[ValueStack.Depth-1].stn as named_type_reference, CurrentLocationSpan); } break; - case 313: // base_class_name -> simple_type_identifier + case 314: // base_class_name -> simple_type_identifier { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].td; } break; - case 314: // base_class_name -> template_type + case 315: // base_class_name -> template_type { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].td; } break; - case 315: // template_arguments -> tkLower, ident_list, tkGreater + case 316: // template_arguments -> tkLower, ident_list, tkGreater { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 316: // optional_where_section -> /* empty */ + case 317: // optional_where_section -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 317: // optional_where_section -> where_part_list + case 318: // optional_where_section -> where_part_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 318: // where_part_list -> where_part + case 319: // where_part_list -> where_part { CurrentSemanticValue.stn = new where_definition_list(ValueStack[ValueStack.Depth-1].stn as where_definition, CurrentLocationSpan); } break; - case 319: // where_part_list -> where_part_list, where_part + case 320: // where_part_list -> where_part_list, where_part { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-2].stn as where_definition_list).Add(ValueStack[ValueStack.Depth-1].stn as where_definition, CurrentLocationSpan); } break; - case 320: // where_part -> tkWhere, ident_list, tkColon, type_ref_and_secific_list, + case 321: // where_part -> tkWhere, ident_list, tkColon, type_ref_and_secific_list, // tkSemiColon { CurrentSemanticValue.stn = new where_definition(ValueStack[ValueStack.Depth-4].stn as ident_list, ValueStack[ValueStack.Depth-2].stn as where_type_specificator_list, CurrentLocationSpan); } break; - case 321: // type_ref_and_secific_list -> type_ref_or_secific + case 322: // type_ref_and_secific_list -> type_ref_or_secific { CurrentSemanticValue.stn = new where_type_specificator_list(ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 322: // type_ref_and_secific_list -> type_ref_and_secific_list, tkComma, + case 323: // type_ref_and_secific_list -> type_ref_and_secific_list, tkComma, // type_ref_or_secific { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as where_type_specificator_list).Add(ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 323: // type_ref_or_secific -> type_ref + case 324: // type_ref_or_secific -> type_ref { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 324: // type_ref_or_secific -> tkClass + case 325: // type_ref_or_secific -> tkClass { CurrentSemanticValue.td = new declaration_specificator(DeclarationSpecificator.WhereDefClass, ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 325: // type_ref_or_secific -> tkRecord + case 326: // type_ref_or_secific -> tkRecord { CurrentSemanticValue.td = new declaration_specificator(DeclarationSpecificator.WhereDefValueType, ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 326: // type_ref_or_secific -> tkConstructor + case 327: // type_ref_or_secific -> tkConstructor { CurrentSemanticValue.td = new declaration_specificator(DeclarationSpecificator.WhereDefConstructor, ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 327: // member_list_section -> member_list + case 328: // member_list_section -> member_list { CurrentSemanticValue.stn = new class_body_list(ValueStack[ValueStack.Depth-1].stn as class_members, CurrentLocationSpan); } break; - case 328: // member_list_section -> member_list_section, ot_visibility_specifier, + case 329: // member_list_section -> member_list_section, ot_visibility_specifier, // member_list { (ValueStack[ValueStack.Depth-1].stn as class_members).access_mod = ValueStack[ValueStack.Depth-2].stn as access_modifer_node; @@ -4265,121 +4270,121 @@ public partial class GPPGParser: ShiftReduceParser tkInternal + case 330: // ot_visibility_specifier -> tkInternal { CurrentSemanticValue.stn = new access_modifer_node(access_modifer.internal_modifer, CurrentLocationSpan); } break; - case 330: // ot_visibility_specifier -> tkPublic + case 331: // ot_visibility_specifier -> tkPublic { CurrentSemanticValue.stn = new access_modifer_node(access_modifer.public_modifer, CurrentLocationSpan); } break; - case 331: // ot_visibility_specifier -> tkProtected + case 332: // ot_visibility_specifier -> tkProtected { CurrentSemanticValue.stn = new access_modifer_node(access_modifer.protected_modifer, CurrentLocationSpan); } break; - case 332: // ot_visibility_specifier -> tkPrivate + case 333: // ot_visibility_specifier -> tkPrivate { CurrentSemanticValue.stn = new access_modifer_node(access_modifer.private_modifer, CurrentLocationSpan); } break; - case 333: // member_list -> /* empty */ + case 334: // member_list -> /* empty */ { CurrentSemanticValue.stn = new class_members(); } break; - case 334: // member_list -> field_or_const_definition_list, optional_semicolon + case 335: // member_list -> field_or_const_definition_list, optional_semicolon { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 335: // member_list -> method_decl_list + case 336: // member_list -> method_decl_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 336: // member_list -> field_or_const_definition_list, tkSemiColon, method_decl_list + case 337: // member_list -> field_or_const_definition_list, tkSemiColon, method_decl_list { (ValueStack[ValueStack.Depth-3].stn as class_members).members.AddRange((ValueStack[ValueStack.Depth-1].stn as class_members).members); (ValueStack[ValueStack.Depth-3].stn as class_members).source_context = CurrentLocationSpan; CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-3].stn; } break; - case 337: // ident_list -> identifier + case 338: // ident_list -> identifier { CurrentSemanticValue.stn = new ident_list(ValueStack[ValueStack.Depth-1].id, CurrentLocationSpan); } break; - case 338: // ident_list -> ident_list, tkComma, identifier + case 339: // ident_list -> ident_list, tkComma, identifier { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as ident_list).Add(ValueStack[ValueStack.Depth-1].id, CurrentLocationSpan); } break; - case 339: // optional_semicolon -> /* empty */ + case 340: // optional_semicolon -> /* empty */ { CurrentSemanticValue.ob = null; } break; - case 340: // optional_semicolon -> tkSemiColon + case 341: // optional_semicolon -> tkSemiColon { CurrentSemanticValue.ob = ValueStack[ValueStack.Depth-1].ti; } break; - case 341: // field_or_const_definition_list -> field_or_const_definition + case 342: // field_or_const_definition_list -> field_or_const_definition { CurrentSemanticValue.stn = new class_members(ValueStack[ValueStack.Depth-1].stn as declaration, CurrentLocationSpan); } break; - case 342: // field_or_const_definition_list -> field_or_const_definition_list, tkSemiColon, + case 343: // field_or_const_definition_list -> field_or_const_definition_list, tkSemiColon, // field_or_const_definition { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as class_members).Add(ValueStack[ValueStack.Depth-1].stn as declaration, CurrentLocationSpan); } break; - case 343: // field_or_const_definition -> attribute_declarations, + case 344: // field_or_const_definition -> attribute_declarations, // simple_field_or_const_definition { (ValueStack[ValueStack.Depth-1].stn as declaration).attributes = ValueStack[ValueStack.Depth-2].stn as attribute_list; CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 344: // method_decl_list -> method_or_property_decl + case 345: // method_decl_list -> method_or_property_decl { CurrentSemanticValue.stn = new class_members(ValueStack[ValueStack.Depth-1].stn as declaration, CurrentLocationSpan); } break; - case 345: // method_decl_list -> method_decl_list, method_or_property_decl + case 346: // method_decl_list -> method_decl_list, method_or_property_decl { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-2].stn as class_members).Add(ValueStack[ValueStack.Depth-1].stn as declaration, CurrentLocationSpan); } break; - case 346: // method_or_property_decl -> method_decl_withattr + case 347: // method_or_property_decl -> method_decl_withattr { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 347: // method_or_property_decl -> property_definition + case 348: // method_or_property_decl -> property_definition { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 348: // simple_field_or_const_definition -> tkConst, only_const_decl + case 349: // simple_field_or_const_definition -> tkConst, only_const_decl { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 349: // simple_field_or_const_definition -> field_definition + case 350: // simple_field_or_const_definition -> field_definition { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 350: // simple_field_or_const_definition -> class_or_static, field_definition + case 351: // simple_field_or_const_definition -> class_or_static, field_definition { (ValueStack[ValueStack.Depth-1].stn as var_def_statement).var_attr = definition_attribute.Static; (ValueStack[ValueStack.Depth-1].stn as var_def_statement).source_context = CurrentLocationSpan; CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 351: // class_or_static -> tkStatic + case 352: // class_or_static -> tkStatic { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 352: // class_or_static -> tkClass + case 353: // class_or_static -> tkClass { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 353: // field_definition -> var_decl_part + case 354: // field_definition -> var_decl_part { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 354: // field_definition -> tkEvent, ident_list, tkColon, type_ref + case 355: // field_definition -> tkEvent, ident_list, tkColon, type_ref { CurrentSemanticValue.stn = new var_def_statement(ValueStack[ValueStack.Depth-3].stn as ident_list, ValueStack[ValueStack.Depth-1].td, null, definition_attribute.None, true, CurrentLocationSpan); } break; - case 355: // method_decl_withattr -> attribute_declarations, method_header + case 356: // method_decl_withattr -> attribute_declarations, method_header { (ValueStack[ValueStack.Depth-1].td as declaration).attributes = ValueStack[ValueStack.Depth-2].stn as attribute_list; CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].td; } break; - case 356: // method_decl_withattr -> attribute_declarations, method_decl + case 357: // method_decl_withattr -> attribute_declarations, method_decl { (ValueStack[ValueStack.Depth-1].stn as declaration).attributes = ValueStack[ValueStack.Depth-2].stn as attribute_list; if (ValueStack[ValueStack.Depth-1].stn is procedure_definition && (ValueStack[ValueStack.Depth-1].stn as procedure_definition).proc_header != null) @@ -4387,88 +4392,88 @@ public partial class GPPGParser: ShiftReduceParser inclass_proc_func_decl + case 358: // method_decl -> inclass_proc_func_decl { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 358: // method_decl -> inclass_constr_destr_decl + case 359: // method_decl -> inclass_constr_destr_decl { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 359: // method_header -> class_or_static, method_procfunc_header + case 360: // method_header -> class_or_static, method_procfunc_header { (ValueStack[ValueStack.Depth-1].td as procedure_header).class_keyword = true; CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 360: // method_header -> method_procfunc_header + case 361: // method_header -> method_procfunc_header { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 361: // method_header -> constr_destr_header + case 362: // method_header -> constr_destr_header { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 362: // method_procfunc_header -> proc_func_header + case 363: // method_procfunc_header -> proc_func_header { CurrentSemanticValue.td = NewProcfuncHeading(ValueStack[ValueStack.Depth-1].td as procedure_header); } break; - case 363: // proc_func_header -> proc_header + case 364: // proc_func_header -> proc_header { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 364: // proc_func_header -> func_header + case 365: // proc_func_header -> func_header { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 365: // constr_destr_header -> tkConstructor, optional_proc_name, fp_list, + case 366: // constr_destr_header -> tkConstructor, optional_proc_name, fp_list, // optional_method_modificators { CurrentSemanticValue.td = new constructor(null,ValueStack[ValueStack.Depth-2].stn as formal_parameters,ValueStack[ValueStack.Depth-1].stn as procedure_attributes_list,ValueStack[ValueStack.Depth-3].stn as method_name,false,false,null,null,CurrentLocationSpan); } break; - case 366: // constr_destr_header -> class_or_static, tkConstructor, optional_proc_name, + case 367: // constr_destr_header -> class_or_static, tkConstructor, optional_proc_name, // fp_list, optional_method_modificators { CurrentSemanticValue.td = new constructor(null,ValueStack[ValueStack.Depth-2].stn as formal_parameters,ValueStack[ValueStack.Depth-1].stn as procedure_attributes_list,ValueStack[ValueStack.Depth-3].stn as method_name,false,true,null,null,CurrentLocationSpan); } break; - case 367: // constr_destr_header -> tkDestructor, optional_proc_name, fp_list, + case 368: // constr_destr_header -> tkDestructor, optional_proc_name, fp_list, // optional_method_modificators { CurrentSemanticValue.td = new destructor(null,ValueStack[ValueStack.Depth-2].stn as formal_parameters,ValueStack[ValueStack.Depth-1].stn as procedure_attributes_list,ValueStack[ValueStack.Depth-3].stn as method_name, false,false,null,null,CurrentLocationSpan); } break; - case 368: // optional_proc_name -> proc_name + case 369: // optional_proc_name -> proc_name { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 369: // optional_proc_name -> /* empty */ + case 370: // optional_proc_name -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 370: // qualified_identifier -> identifier + case 371: // qualified_identifier -> identifier { CurrentSemanticValue.stn = new method_name(null,null,ValueStack[ValueStack.Depth-1].id,null,CurrentLocationSpan); } break; - case 371: // qualified_identifier -> visibility_specifier + case 372: // qualified_identifier -> visibility_specifier { CurrentSemanticValue.stn = new method_name(null,null,ValueStack[ValueStack.Depth-1].id,null,CurrentLocationSpan); } break; - case 372: // qualified_identifier -> qualified_identifier, tkPoint, identifier + case 373: // qualified_identifier -> qualified_identifier, tkPoint, identifier { CurrentSemanticValue.stn = NewQualifiedIdentifier(ValueStack[ValueStack.Depth-3].stn as method_name, ValueStack[ValueStack.Depth-1].id, CurrentLocationSpan); } break; - case 373: // qualified_identifier -> qualified_identifier, tkPoint, visibility_specifier + case 374: // qualified_identifier -> qualified_identifier, tkPoint, visibility_specifier { CurrentSemanticValue.stn = NewQualifiedIdentifier(ValueStack[ValueStack.Depth-3].stn as method_name, ValueStack[ValueStack.Depth-1].id, CurrentLocationSpan); } break; - case 374: // property_definition -> attribute_declarations, simple_property_definition + case 375: // property_definition -> attribute_declarations, simple_property_definition { CurrentSemanticValue.stn = NewPropertyDefinition(ValueStack[ValueStack.Depth-2].stn as attribute_list, ValueStack[ValueStack.Depth-1].stn as declaration, LocationStack[LocationStack.Depth-1]); } break; - case 375: // simple_property_definition -> tkProperty, qualified_identifier, + case 376: // simple_property_definition -> tkProperty, qualified_identifier, // property_interface, property_specifiers, // tkSemiColon, array_defaultproperty { CurrentSemanticValue.stn = NewSimplePropertyDefinition(ValueStack[ValueStack.Depth-5].stn as method_name, ValueStack[ValueStack.Depth-4].stn as property_interface, ValueStack[ValueStack.Depth-3].stn as property_accessors, proc_attribute.attr_none, ValueStack[ValueStack.Depth-1].stn as property_array_default, CurrentLocationSpan); } break; - case 376: // simple_property_definition -> tkProperty, qualified_identifier, + case 377: // simple_property_definition -> tkProperty, qualified_identifier, // property_interface, property_specifiers, // tkSemiColon, property_modificator, tkSemiColon, // array_defaultproperty @@ -4483,7 +4488,7 @@ public partial class GPPGParser: ShiftReduceParser class_or_static, tkProperty, qualified_identifier, + case 378: // simple_property_definition -> class_or_static, tkProperty, qualified_identifier, // property_interface, property_specifiers, // tkSemiColon, array_defaultproperty { @@ -4491,7 +4496,7 @@ public partial class GPPGParser: ShiftReduceParser class_or_static, tkProperty, qualified_identifier, + case 379: // simple_property_definition -> class_or_static, tkProperty, qualified_identifier, // property_interface, property_specifiers, // tkSemiColon, property_modificator, tkSemiColon, // array_defaultproperty @@ -4499,7 +4504,7 @@ public partial class GPPGParser: ShiftReduceParser tkAuto, tkProperty, qualified_identifier, + case 380: // simple_property_definition -> tkAuto, tkProperty, qualified_identifier, // property_interface, // optional_property_initialization, tkSemiColon { @@ -4508,7 +4513,7 @@ public partial class GPPGParser: ShiftReduceParser class_or_static, tkAuto, tkProperty, + case 381: // simple_property_definition -> class_or_static, tkAuto, tkProperty, // qualified_identifier, property_interface, // optional_property_initialization, tkSemiColon { @@ -4518,54 +4523,54 @@ public partial class GPPGParser: ShiftReduceParser tkAssign, expr + case 382: // optional_property_initialization -> tkAssign, expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 382: // optional_property_initialization -> /* empty */ + case 383: // optional_property_initialization -> /* empty */ { CurrentSemanticValue.ex = null; } break; - case 383: // array_defaultproperty -> /* empty */ + case 384: // array_defaultproperty -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 384: // array_defaultproperty -> tkDefault, tkSemiColon + case 385: // array_defaultproperty -> tkDefault, tkSemiColon { CurrentSemanticValue.stn = new property_array_default(); CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 385: // property_interface -> property_parameter_list, tkColon, fptype + case 386: // property_interface -> property_parameter_list, tkColon, fptype { CurrentSemanticValue.stn = new property_interface(ValueStack[ValueStack.Depth-3].stn as property_parameter_list, ValueStack[ValueStack.Depth-1].td, null, CurrentLocationSpan); } break; - case 386: // property_parameter_list -> /* empty */ + case 387: // property_parameter_list -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 387: // property_parameter_list -> tkSquareOpen, parameter_decl_list, tkSquareClose + case 388: // property_parameter_list -> tkSquareOpen, parameter_decl_list, tkSquareClose { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 388: // parameter_decl_list -> parameter_decl + case 389: // parameter_decl_list -> parameter_decl { CurrentSemanticValue.stn = new property_parameter_list(ValueStack[ValueStack.Depth-1].stn as property_parameter, CurrentLocationSpan); } break; - case 389: // parameter_decl_list -> parameter_decl_list, tkSemiColon, parameter_decl + case 390: // parameter_decl_list -> parameter_decl_list, tkSemiColon, parameter_decl { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as property_parameter_list).Add(ValueStack[ValueStack.Depth-1].stn as property_parameter, CurrentLocationSpan); } break; - case 390: // parameter_decl -> ident_list, tkColon, fptype + case 391: // parameter_decl -> ident_list, tkColon, fptype { CurrentSemanticValue.stn = new property_parameter(ValueStack[ValueStack.Depth-3].stn as ident_list, ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 391: // optional_read_expr -> expr_with_func_decl_lambda + case 392: // optional_read_expr -> expr_with_func_decl_lambda { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 392: // optional_read_expr -> /* empty */ + case 393: // optional_read_expr -> /* empty */ { CurrentSemanticValue.ex = null; } break; - case 394: // property_specifiers -> tkRead, optional_read_expr, write_property_specifiers + case 395: // property_specifiers -> tkRead, optional_read_expr, write_property_specifiers { if (ValueStack[ValueStack.Depth-2].ex == null || ValueStack[ValueStack.Depth-2].ex is ident) // ����������� �������� { @@ -4581,7 +4586,7 @@ public partial class GPPGParser: ShiftReduceParser tkWrite, unlabelled_stmt, read_property_specifiers + case 396: // property_specifiers -> tkWrite, unlabelled_stmt, read_property_specifiers { if (ValueStack[ValueStack.Depth-2].stn is empty_statement) { @@ -4605,7 +4610,7 @@ public partial class GPPGParser: ShiftReduceParser tkWrite, unlabelled_stmt + case 398: // write_property_specifiers -> tkWrite, unlabelled_stmt { if (ValueStack[ValueStack.Depth-1].stn is empty_statement) { @@ -4628,7 +4633,7 @@ public partial class GPPGParser: ShiftReduceParser tkRead, optional_read_expr + case 400: // read_property_specifiers -> tkRead, optional_read_expr { if (ValueStack[ValueStack.Depth-1].ex == null || ValueStack[ValueStack.Depth-1].ex is ident) { @@ -4644,45 +4649,45 @@ public partial class GPPGParser: ShiftReduceParser var_decl_part, tkSemiColon + case 401: // var_decl -> var_decl_part, tkSemiColon { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 403: // var_decl_part -> ident_list, tkColon, type_ref + case 404: // var_decl_part -> ident_list, tkColon, type_ref { CurrentSemanticValue.stn = new var_def_statement(ValueStack[ValueStack.Depth-3].stn as ident_list, ValueStack[ValueStack.Depth-1].td, null, definition_attribute.None, false, CurrentLocationSpan); } break; - case 404: // var_decl_part -> ident_list, tkAssign, expr_with_func_decl_lambda + case 405: // var_decl_part -> ident_list, tkAssign, expr_with_func_decl_lambda { CurrentSemanticValue.stn = new var_def_statement(ValueStack[ValueStack.Depth-3].stn as ident_list, null, ValueStack[ValueStack.Depth-1].ex, definition_attribute.None, false, CurrentLocationSpan); } break; - case 405: // var_decl_part -> ident_list, tkColon, type_ref, tkAssignOrEqual, + case 406: // var_decl_part -> ident_list, tkColon, type_ref, tkAssignOrEqual, // typed_var_init_expression { CurrentSemanticValue.stn = new var_def_statement(ValueStack[ValueStack.Depth-5].stn as ident_list, ValueStack[ValueStack.Depth-3].td, ValueStack[ValueStack.Depth-1].ex, definition_attribute.None, false, CurrentLocationSpan); } break; - case 406: // typed_var_init_expression -> typed_const_plus + case 407: // typed_var_init_expression -> typed_const_plus { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 407: // typed_var_init_expression -> expl_func_decl_lambda + case 408: // typed_var_init_expression -> expl_func_decl_lambda { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 408: // typed_var_init_expression -> identifier, tkArrow, lambda_function_body + case 409: // typed_var_init_expression -> identifier, tkArrow, lambda_function_body { var idList = new ident_list(ValueStack[ValueStack.Depth-3].id, LocationStack[LocationStack.Depth-3]); var formalPars = new formal_parameters(new typed_parameters(idList, new lambda_inferred_type(new PascalABCCompiler.TreeRealization.lambda_any_type_node(), LocationStack[LocationStack.Depth-3]), parametr_kind.none, null, LocationStack[LocationStack.Depth-3]), LocationStack[LocationStack.Depth-3]); CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), formalPars, new lambda_inferred_type(new PascalABCCompiler.TreeRealization.lambda_any_type_node(), LocationStack[LocationStack.Depth-3]), ValueStack[ValueStack.Depth-1].stn as statement_list, CurrentLocationSpan); } break; - case 409: // typed_var_init_expression -> tkRoundOpen, tkRoundClose, lambda_type_ref, + case 410: // typed_var_init_expression -> tkRoundOpen, tkRoundClose, lambda_type_ref, // tkArrow, lambda_function_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), null, ValueStack[ValueStack.Depth-3].td, ValueStack[ValueStack.Depth-1].stn as statement_list, CurrentLocationSpan); } break; - case 410: // typed_var_init_expression -> tkRoundOpen, typed_const_list, tkRoundClose, + case 411: // typed_var_init_expression -> tkRoundOpen, typed_const_list, tkRoundClose, // tkArrow, lambda_function_body { var el = ValueStack[ValueStack.Depth-4].stn as expression_list; @@ -4704,18 +4709,18 @@ public partial class GPPGParser: ShiftReduceParser typed_const + case 412: // typed_const_plus -> typed_const { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 412: // typed_const_plus -> default_expr + case 413: // typed_const_plus -> default_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 413: // constr_destr_decl -> constr_destr_header, block + case 414: // constr_destr_decl -> constr_destr_header, block { CurrentSemanticValue.stn = new procedure_definition(ValueStack[ValueStack.Depth-2].td as procedure_header, ValueStack[ValueStack.Depth-1].stn as block, CurrentLocationSpan); } break; - case 414: // constr_destr_decl -> tkConstructor, optional_proc_name, fp_list, tkAssign, + case 415: // constr_destr_decl -> tkConstructor, optional_proc_name, fp_list, tkAssign, // unlabelled_stmt, tkSemiColon { if (ValueStack[ValueStack.Depth-2].stn is empty_statement) @@ -4726,7 +4731,7 @@ public partial class GPPGParser: ShiftReduceParser class_or_static, tkConstructor, optional_proc_name, + case 416: // constr_destr_decl -> class_or_static, tkConstructor, optional_proc_name, // fp_list, tkAssign, unlabelled_stmt, tkSemiColon { if (ValueStack[ValueStack.Depth-2].stn is empty_statement) @@ -4737,12 +4742,12 @@ public partial class GPPGParser: ShiftReduceParser constr_destr_header, inclass_block + case 417: // inclass_constr_destr_decl -> constr_destr_header, inclass_block { CurrentSemanticValue.stn = new procedure_definition(ValueStack[ValueStack.Depth-2].td as procedure_header, ValueStack[ValueStack.Depth-1].stn as block, CurrentLocationSpan); } break; - case 417: // inclass_constr_destr_decl -> tkConstructor, optional_proc_name, fp_list, + case 418: // inclass_constr_destr_decl -> tkConstructor, optional_proc_name, fp_list, // tkAssign, unlabelled_stmt, tkSemiColon { if (ValueStack[ValueStack.Depth-2].stn is empty_statement) @@ -4753,7 +4758,7 @@ public partial class GPPGParser: ShiftReduceParser class_or_static, tkConstructor, optional_proc_name, + case 419: // inclass_constr_destr_decl -> class_or_static, tkConstructor, optional_proc_name, // fp_list, tkAssign, unlabelled_stmt, tkSemiColon { if (ValueStack[ValueStack.Depth-2].stn is empty_statement) @@ -4764,28 +4769,28 @@ public partial class GPPGParser: ShiftReduceParser proc_func_decl_noclass + case 420: // proc_func_decl -> proc_func_decl_noclass { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 420: // proc_func_decl -> class_or_static, proc_func_decl_noclass + case 421: // proc_func_decl -> class_or_static, proc_func_decl_noclass { (ValueStack[ValueStack.Depth-1].stn as procedure_definition).proc_header.class_keyword = true; CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 421: // proc_func_decl_noclass -> proc_func_header, proc_func_external_block + case 422: // proc_func_decl_noclass -> proc_func_header, proc_func_external_block { CurrentSemanticValue.stn = new procedure_definition(ValueStack[ValueStack.Depth-2].td as procedure_header, ValueStack[ValueStack.Depth-1].stn as proc_block, CurrentLocationSpan); } break; - case 422: // proc_func_decl_noclass -> tkFunction, func_name, fp_list, tkColon, fptype, + case 423: // proc_func_decl_noclass -> tkFunction, func_name, fp_list, tkColon, fptype, // optional_method_modificators1, tkAssign, expr_l1, // tkSemiColon { 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-4])); } break; - case 423: // proc_func_decl_noclass -> tkFunction, func_name, fp_list, + case 424: // proc_func_decl_noclass -> tkFunction, func_name, fp_list, // optional_method_modificators1, tkAssign, expr_l1, // tkSemiColon { @@ -4795,21 +4800,21 @@ public partial class GPPGParser: ShiftReduceParser tkFunction, func_name, fp_list, tkColon, fptype, + case 425: // proc_func_decl_noclass -> tkFunction, func_name, fp_list, tkColon, fptype, // optional_method_modificators1, tkAssign, // func_decl_lambda, tkSemiColon { 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-4])); } break; - case 425: // proc_func_decl_noclass -> tkFunction, func_name, fp_list, + case 426: // proc_func_decl_noclass -> tkFunction, func_name, fp_list, // optional_method_modificators1, tkAssign, // func_decl_lambda, 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-4])); } break; - case 426: // proc_func_decl_noclass -> tkProcedure, proc_name, fp_list, + case 427: // proc_func_decl_noclass -> tkProcedure, proc_name, fp_list, // optional_method_modificators1, tkAssign, // unlabelled_stmt, tkSemiColon { @@ -4818,30 +4823,30 @@ public partial class GPPGParser: ShiftReduceParser proc_func_header, tkForward, tkSemiColon + case 428: // proc_func_decl_noclass -> proc_func_header, tkForward, tkSemiColon { CurrentSemanticValue.stn = new procedure_definition(ValueStack[ValueStack.Depth-3].td as procedure_header, null, CurrentLocationSpan); (CurrentSemanticValue.stn as procedure_definition).proc_header.proc_attributes.Add((procedure_attribute)ValueStack[ValueStack.Depth-2].id, ValueStack[ValueStack.Depth-2].id.source_context); } break; - case 428: // inclass_proc_func_decl -> inclass_proc_func_decl_noclass + case 429: // inclass_proc_func_decl -> inclass_proc_func_decl_noclass { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 429: // inclass_proc_func_decl -> class_or_static, inclass_proc_func_decl_noclass + case 430: // inclass_proc_func_decl -> class_or_static, inclass_proc_func_decl_noclass { if ((ValueStack[ValueStack.Depth-1].stn as procedure_definition).proc_header != null) (ValueStack[ValueStack.Depth-1].stn as procedure_definition).proc_header.class_keyword = true; CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 430: // inclass_proc_func_decl_noclass -> proc_func_header, inclass_block + case 431: // inclass_proc_func_decl_noclass -> proc_func_header, inclass_block { CurrentSemanticValue.stn = new procedure_definition(ValueStack[ValueStack.Depth-2].td as procedure_header, ValueStack[ValueStack.Depth-1].stn as proc_block, CurrentLocationSpan); } break; - case 431: // inclass_proc_func_decl_noclass -> tkFunction, func_name, fp_list, tkColon, + case 432: // inclass_proc_func_decl_noclass -> tkFunction, func_name, fp_list, tkColon, // fptype, optional_method_modificators1, // tkAssign, expr_l1_func_decl_lambda, // tkSemiColon @@ -4851,7 +4856,7 @@ public partial class GPPGParser: ShiftReduceParser tkFunction, func_name, fp_list, + case 433: // inclass_proc_func_decl_noclass -> tkFunction, func_name, fp_list, // optional_method_modificators1, tkAssign, // expr_l1_func_decl_lambda, tkSemiColon { @@ -4860,7 +4865,7 @@ public partial class GPPGParser: ShiftReduceParser tkProcedure, proc_name, fp_list, + case 434: // inclass_proc_func_decl_noclass -> tkProcedure, proc_name, fp_list, // optional_method_modificators1, tkAssign, // unlabelled_stmt, tkSemiColon { @@ -4869,21 +4874,21 @@ public partial class GPPGParser: ShiftReduceParser block + case 435: // proc_func_external_block -> block { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 435: // proc_func_external_block -> external_block + case 436: // proc_func_external_block -> external_block { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 436: // proc_name -> func_name + case 437: // proc_name -> func_name { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 437: // func_name -> func_meth_name_ident + case 438: // func_name -> func_meth_name_ident { CurrentSemanticValue.stn = new method_name(null,null, ValueStack[ValueStack.Depth-1].id, null, CurrentLocationSpan); } break; - case 438: // func_name -> func_class_name_ident_list, tkPoint, func_meth_name_ident + case 439: // func_name -> func_class_name_ident_list, tkPoint, func_meth_name_ident { var ln = ValueStack[ValueStack.Depth-3].ob as List; var cnt = ln.Count; @@ -4893,290 +4898,290 @@ public partial class GPPGParser: ShiftReduceParser func_name_with_template_args + case 440: // func_class_name_ident -> func_name_with_template_args { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 440: // func_class_name_ident_list -> func_class_name_ident + case 441: // func_class_name_ident_list -> func_class_name_ident { CurrentSemanticValue.ob = new List(); (CurrentSemanticValue.ob as List).Add(ValueStack[ValueStack.Depth-1].id); } break; - case 441: // func_class_name_ident_list -> func_class_name_ident_list, tkPoint, + case 442: // func_class_name_ident_list -> func_class_name_ident_list, tkPoint, // func_class_name_ident { (ValueStack[ValueStack.Depth-3].ob as List).Add(ValueStack[ValueStack.Depth-1].id); CurrentSemanticValue.ob = ValueStack[ValueStack.Depth-3].ob; } break; - case 442: // func_meth_name_ident -> func_name_with_template_args + case 443: // func_meth_name_ident -> func_name_with_template_args { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 443: // func_meth_name_ident -> operator_name_ident + case 444: // func_meth_name_ident -> operator_name_ident { CurrentSemanticValue.id = (ident)ValueStack[ValueStack.Depth-1].ex; } break; - case 444: // func_meth_name_ident -> operator_name_ident, template_arguments + case 445: // func_meth_name_ident -> operator_name_ident, template_arguments { CurrentSemanticValue.id = new template_operator_name(null, ValueStack[ValueStack.Depth-1].stn as ident_list, ValueStack[ValueStack.Depth-2].ex as operator_name_ident, CurrentLocationSpan); } break; - case 445: // func_name_with_template_args -> func_name_ident + case 446: // func_name_with_template_args -> func_name_ident { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 446: // func_name_with_template_args -> func_name_ident, template_arguments + case 447: // func_name_with_template_args -> func_name_ident, template_arguments { CurrentSemanticValue.id = new template_type_name(ValueStack[ValueStack.Depth-2].id.name, ValueStack[ValueStack.Depth-1].stn as ident_list, CurrentLocationSpan); } break; - case 447: // func_name_ident -> identifier + case 448: // func_name_ident -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 448: // proc_header -> tkProcedure, proc_name, fp_list, optional_method_modificators, + case 449: // proc_header -> tkProcedure, proc_name, fp_list, optional_method_modificators, // optional_where_section { CurrentSemanticValue.td = new procedure_header(ValueStack[ValueStack.Depth-3].stn as formal_parameters, ValueStack[ValueStack.Depth-2].stn as procedure_attributes_list, ValueStack[ValueStack.Depth-4].stn as method_name, ValueStack[ValueStack.Depth-1].stn as where_definition_list, CurrentLocationSpan); } break; - case 449: // func_header -> tkFunction, func_name, fp_list, optional_method_modificators, + case 450: // func_header -> tkFunction, func_name, fp_list, optional_method_modificators, // optional_where_section { CurrentSemanticValue.td = new function_header(ValueStack[ValueStack.Depth-3].stn as formal_parameters, ValueStack[ValueStack.Depth-2].stn as procedure_attributes_list, ValueStack[ValueStack.Depth-4].stn as method_name, ValueStack[ValueStack.Depth-1].stn as where_definition_list, null, CurrentLocationSpan); } break; - case 450: // func_header -> tkFunction, func_name, fp_list, tkColon, fptype, + case 451: // func_header -> tkFunction, func_name, fp_list, tkColon, fptype, // optional_method_modificators, optional_where_section { CurrentSemanticValue.td = new function_header(ValueStack[ValueStack.Depth-5].stn as formal_parameters, ValueStack[ValueStack.Depth-2].stn as procedure_attributes_list, ValueStack[ValueStack.Depth-6].stn as method_name, ValueStack[ValueStack.Depth-1].stn as where_definition_list, ValueStack[ValueStack.Depth-3].td as type_definition, CurrentLocationSpan); } break; - case 451: // external_block -> tkExternal, external_directive_ident, tkName, + case 452: // external_block -> tkExternal, external_directive_ident, tkName, // external_directive_ident, tkSemiColon { CurrentSemanticValue.stn = new external_directive(ValueStack[ValueStack.Depth-4].ex, ValueStack[ValueStack.Depth-2].ex, CurrentLocationSpan); } break; - case 452: // external_block -> tkExternal, external_directive_ident, tkSemiColon + case 453: // external_block -> tkExternal, external_directive_ident, tkSemiColon { CurrentSemanticValue.stn = new external_directive(ValueStack[ValueStack.Depth-2].ex, null, CurrentLocationSpan); } break; - case 453: // external_block -> tkExternal, tkSemiColon + case 454: // external_block -> tkExternal, tkSemiColon { CurrentSemanticValue.stn = new external_directive(null, null, CurrentLocationSpan); } break; - case 454: // external_directive_ident -> identifier + case 455: // external_directive_ident -> identifier { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].id; } break; - case 455: // external_directive_ident -> literal + case 456: // external_directive_ident -> literal { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 456: // block -> decl_sect_list, compound_stmt, tkSemiColon + case 457: // block -> decl_sect_list, compound_stmt, tkSemiColon { CurrentSemanticValue.stn = new block(ValueStack[ValueStack.Depth-3].stn as declarations, ValueStack[ValueStack.Depth-2].stn as statement_list, CurrentLocationSpan); } break; - case 457: // inclass_block -> inclass_decl_sect_list, compound_stmt, tkSemiColon + case 458: // inclass_block -> inclass_decl_sect_list, compound_stmt, tkSemiColon { CurrentSemanticValue.stn = new block(ValueStack[ValueStack.Depth-3].stn as declarations, ValueStack[ValueStack.Depth-2].stn as statement_list, CurrentLocationSpan); } break; - case 458: // inclass_block -> external_block + case 459: // inclass_block -> external_block { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 459: // fp_list -> /* empty */ + case 460: // fp_list -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 460: // fp_list -> tkRoundOpen, tkRoundClose + case 461: // fp_list -> tkRoundOpen, tkRoundClose { CurrentSemanticValue.stn = null; } break; - case 461: // fp_list -> tkRoundOpen, fp_sect_list, tkRoundClose + case 462: // fp_list -> tkRoundOpen, fp_sect_list, tkRoundClose { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; if (CurrentSemanticValue.stn != null) CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 462: // fp_sect_list -> fp_sect + case 463: // fp_sect_list -> fp_sect { CurrentSemanticValue.stn = new formal_parameters(ValueStack[ValueStack.Depth-1].stn as typed_parameters, CurrentLocationSpan); } break; - case 463: // fp_sect_list -> fp_sect_list, tkSemiColon, fp_sect + case 464: // fp_sect_list -> fp_sect_list, tkSemiColon, fp_sect { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as formal_parameters).Add(ValueStack[ValueStack.Depth-1].stn as typed_parameters, CurrentLocationSpan); } break; - case 464: // fp_sect -> attribute_declarations, simple_fp_sect + case 465: // fp_sect -> attribute_declarations, simple_fp_sect { (ValueStack[ValueStack.Depth-1].stn as declaration).attributes = ValueStack[ValueStack.Depth-2].stn as attribute_list; CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 465: // simple_fp_sect -> param_name_list, tkColon, fptype + case 466: // simple_fp_sect -> param_name_list, tkColon, fptype { CurrentSemanticValue.stn = new typed_parameters(ValueStack[ValueStack.Depth-3].stn as ident_list, ValueStack[ValueStack.Depth-1].td, parametr_kind.none, null, CurrentLocationSpan); } break; - case 466: // simple_fp_sect -> tkVar, param_name_list, tkColon, fptype + case 467: // simple_fp_sect -> tkVar, param_name_list, tkColon, fptype { CurrentSemanticValue.stn = new typed_parameters(ValueStack[ValueStack.Depth-3].stn as ident_list, ValueStack[ValueStack.Depth-1].td, parametr_kind.var_parametr, null, CurrentLocationSpan); } break; - case 467: // simple_fp_sect -> tkConst, param_name_list, tkColon, fptype + case 468: // simple_fp_sect -> tkConst, param_name_list, tkColon, fptype { CurrentSemanticValue.stn = new typed_parameters(ValueStack[ValueStack.Depth-3].stn as ident_list, ValueStack[ValueStack.Depth-1].td, parametr_kind.const_parametr, null, CurrentLocationSpan); } break; - case 468: // simple_fp_sect -> tkParams, param_name_list, tkColon, fptype + case 469: // simple_fp_sect -> tkParams, param_name_list, tkColon, fptype { CurrentSemanticValue.stn = new typed_parameters(ValueStack[ValueStack.Depth-3].stn as ident_list, ValueStack[ValueStack.Depth-1].td,parametr_kind.params_parametr,null, CurrentLocationSpan); } break; - case 469: // simple_fp_sect -> param_name_list, tkColon, fptype, tkAssign, expr + case 470: // simple_fp_sect -> param_name_list, tkColon, fptype, tkAssign, expr { CurrentSemanticValue.stn = new typed_parameters(ValueStack[ValueStack.Depth-5].stn as ident_list, ValueStack[ValueStack.Depth-3].td, parametr_kind.none, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 470: // simple_fp_sect -> tkVar, param_name_list, tkColon, fptype, tkAssign, expr + case 471: // simple_fp_sect -> tkVar, param_name_list, tkColon, fptype, tkAssign, expr { CurrentSemanticValue.stn = new typed_parameters(ValueStack[ValueStack.Depth-5].stn as ident_list, ValueStack[ValueStack.Depth-3].td, parametr_kind.var_parametr, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 471: // simple_fp_sect -> tkConst, param_name_list, tkColon, fptype, tkAssign, expr + case 472: // simple_fp_sect -> tkConst, param_name_list, tkColon, fptype, tkAssign, expr { CurrentSemanticValue.stn = new typed_parameters(ValueStack[ValueStack.Depth-5].stn as ident_list, ValueStack[ValueStack.Depth-3].td, parametr_kind.const_parametr, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 472: // param_name_list -> param_name + case 473: // param_name_list -> param_name { CurrentSemanticValue.stn = new ident_list(ValueStack[ValueStack.Depth-1].id, CurrentLocationSpan); } break; - case 473: // param_name_list -> param_name_list, tkComma, param_name + case 474: // param_name_list -> param_name_list, tkComma, param_name { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as ident_list).Add(ValueStack[ValueStack.Depth-1].id, CurrentLocationSpan); } break; - case 474: // param_name -> identifier + case 475: // param_name -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 475: // fptype -> type_ref + case 476: // fptype -> type_ref { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 476: // fptype_noproctype -> simple_type + case 477: // fptype_noproctype -> simple_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 477: // fptype_noproctype -> string_type + case 478: // fptype_noproctype -> string_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 478: // fptype_noproctype -> pointer_type + case 479: // fptype_noproctype -> pointer_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 479: // fptype_noproctype -> structured_type + case 480: // fptype_noproctype -> structured_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 480: // fptype_noproctype -> template_type + case 481: // fptype_noproctype -> template_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 481: // stmt -> unlabelled_stmt + case 482: // stmt -> unlabelled_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 482: // stmt -> label_name, tkColon, stmt + case 483: // stmt -> label_name, tkColon, stmt { CurrentSemanticValue.stn = new labeled_statement(ValueStack[ValueStack.Depth-3].id, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 483: // unlabelled_stmt -> /* empty */ + case 484: // unlabelled_stmt -> /* empty */ { CurrentSemanticValue.stn = new empty_statement(); CurrentSemanticValue.stn.source_context = null; } break; - case 484: // unlabelled_stmt -> assignment + case 485: // unlabelled_stmt -> assignment { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 485: // unlabelled_stmt -> proc_call + case 486: // unlabelled_stmt -> proc_call { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 486: // unlabelled_stmt -> goto_stmt + case 487: // unlabelled_stmt -> goto_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 487: // unlabelled_stmt -> compound_stmt + case 488: // unlabelled_stmt -> compound_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 488: // unlabelled_stmt -> if_stmt + case 489: // unlabelled_stmt -> if_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 489: // unlabelled_stmt -> case_stmt + case 490: // unlabelled_stmt -> case_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 490: // unlabelled_stmt -> repeat_stmt + case 491: // unlabelled_stmt -> repeat_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 491: // unlabelled_stmt -> while_stmt + case 492: // unlabelled_stmt -> while_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 492: // unlabelled_stmt -> for_stmt + case 493: // unlabelled_stmt -> for_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 493: // unlabelled_stmt -> with_stmt + case 494: // unlabelled_stmt -> with_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 494: // unlabelled_stmt -> inherited_message + case 495: // unlabelled_stmt -> inherited_message { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 495: // unlabelled_stmt -> try_stmt + case 496: // unlabelled_stmt -> try_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 496: // unlabelled_stmt -> raise_stmt + case 497: // unlabelled_stmt -> raise_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 497: // unlabelled_stmt -> foreach_stmt + case 498: // unlabelled_stmt -> foreach_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 498: // unlabelled_stmt -> var_stmt + case 499: // unlabelled_stmt -> var_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 499: // unlabelled_stmt -> expr_as_stmt + case 500: // unlabelled_stmt -> expr_as_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 500: // unlabelled_stmt -> lock_stmt + case 501: // unlabelled_stmt -> lock_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 501: // unlabelled_stmt -> yield_stmt + case 502: // unlabelled_stmt -> yield_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 502: // unlabelled_stmt -> yield_sequence_stmt + case 503: // unlabelled_stmt -> yield_sequence_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 503: // unlabelled_stmt -> loop_stmt + case 504: // unlabelled_stmt -> loop_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 504: // unlabelled_stmt -> match_with + case 505: // unlabelled_stmt -> match_with { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 505: // loop_stmt -> tkLoop, expr_l1, tkDo, unlabelled_stmt + case 506: // loop_stmt -> tkLoop, expr_l1, tkDo, unlabelled_stmt { CurrentSemanticValue.stn = new loop_stmt(ValueStack[ValueStack.Depth-3].ex,ValueStack[ValueStack.Depth-1].stn as statement,CurrentLocationSpan); } break; - case 506: // yield_stmt -> tkYield, expr_l1_func_decl_lambda + case 507: // yield_stmt -> tkYield, expr_l1_func_decl_lambda { CurrentSemanticValue.stn = new yield_node(ValueStack[ValueStack.Depth-1].ex,CurrentLocationSpan); } break; - case 507: // yield_sequence_stmt -> tkYield, tkSequence, expr_l1_func_decl_lambda + case 508: // yield_sequence_stmt -> tkYield, tkSequence, expr_l1_func_decl_lambda { CurrentSemanticValue.stn = new yield_sequence_node(ValueStack[ValueStack.Depth-1].ex,CurrentLocationSpan); } break; - case 508: // var_stmt -> tkVar, var_decl_part + case 509: // var_stmt -> tkVar, var_decl_part { CurrentSemanticValue.stn = new var_statement(ValueStack[ValueStack.Depth-1].stn as var_def_statement, CurrentLocationSpan); } break; - case 509: // var_stmt -> tkRoundOpen, tkVar, identifier, tkComma, var_ident_list, + case 510: // var_stmt -> tkRoundOpen, tkVar, identifier, tkComma, var_ident_list, // tkRoundClose, tkAssign, expr { (ValueStack[ValueStack.Depth-4].ob as ident_list).Insert(0,ValueStack[ValueStack.Depth-6].id); @@ -5184,7 +5189,7 @@ public partial class GPPGParser: ShiftReduceParser tkVar, tkRoundOpen, identifier, tkComma, ident_list, tkRoundClose, + case 511: // var_stmt -> tkVar, tkRoundOpen, identifier, tkComma, ident_list, tkRoundClose, // tkAssign, expr { (ValueStack[ValueStack.Depth-4].stn as ident_list).Insert(0,ValueStack[ValueStack.Depth-6].id); @@ -5192,12 +5197,12 @@ public partial class GPPGParser: ShiftReduceParser var_reference, assign_operator, expr_with_func_decl_lambda + case 512: // assignment -> var_reference, assign_operator, expr_with_func_decl_lambda { CurrentSemanticValue.stn = new assign(ValueStack[ValueStack.Depth-3].ex as addressed_value, ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 512: // assignment -> tkRoundOpen, variable, tkComma, variable_list, tkRoundClose, + case 513: // assignment -> tkRoundOpen, variable, tkComma, variable_list, tkRoundClose, // assign_operator, expr { if (ValueStack[ValueStack.Depth-2].op.type != Operators.Assignment) @@ -5207,7 +5212,7 @@ public partial class GPPGParser: ShiftReduceParser variable, tkQuestionSquareOpen, format_expr, tkSquareClose, + case 514: // assignment -> variable, tkQuestionSquareOpen, format_expr, tkSquareClose, // assign_operator, expr { var fe = ValueStack[ValueStack.Depth-4].ex as format_expr; @@ -5222,41 +5227,41 @@ public partial class GPPGParser: ShiftReduceParser variable + case 515: // variable_list -> variable { CurrentSemanticValue.ob = new addressed_value_list(ValueStack[ValueStack.Depth-1].ex as addressed_value,LocationStack[LocationStack.Depth-1]); } break; - case 515: // variable_list -> variable_list, tkComma, variable + case 516: // variable_list -> variable_list, tkComma, variable { (ValueStack[ValueStack.Depth-3].ob as addressed_value_list).Add(ValueStack[ValueStack.Depth-1].ex as addressed_value); (ValueStack[ValueStack.Depth-3].ob as syntax_tree_node).source_context = LexLocation.MergeAll(LocationStack[LocationStack.Depth-3],LocationStack[LocationStack.Depth-2],LocationStack[LocationStack.Depth-1]); CurrentSemanticValue.ob = ValueStack[ValueStack.Depth-3].ob; } break; - case 516: // var_ident_list -> tkVar, identifier + case 517: // var_ident_list -> tkVar, identifier { CurrentSemanticValue.ob = new ident_list(ValueStack[ValueStack.Depth-1].id,CurrentLocationSpan); } break; - case 517: // var_ident_list -> var_ident_list, tkComma, tkVar, identifier + case 518: // var_ident_list -> var_ident_list, tkComma, tkVar, identifier { (ValueStack[ValueStack.Depth-4].ob as ident_list).Add(ValueStack[ValueStack.Depth-1].id); (ValueStack[ValueStack.Depth-4].ob as ident_list).source_context = LexLocation.MergeAll(LocationStack[LocationStack.Depth-4],LocationStack[LocationStack.Depth-3],LocationStack[LocationStack.Depth-2],LocationStack[LocationStack.Depth-1]); CurrentSemanticValue.ob = ValueStack[ValueStack.Depth-4].ob; } break; - case 518: // proc_call -> var_reference + case 519: // proc_call -> var_reference { CurrentSemanticValue.stn = new procedure_call(ValueStack[ValueStack.Depth-1].ex as addressed_value, ValueStack[ValueStack.Depth-1].ex is ident, CurrentLocationSpan); } break; - case 519: // goto_stmt -> tkGoto, label_name + case 520: // goto_stmt -> tkGoto, label_name { CurrentSemanticValue.stn = new goto_statement(ValueStack[ValueStack.Depth-1].id, CurrentLocationSpan); } break; - case 520: // compound_stmt -> tkBegin, stmt_list, tkEnd + case 521: // compound_stmt -> tkBegin, stmt_list, tkEnd { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; (CurrentSemanticValue.stn as statement_list).left_logical_bracket = ValueStack[ValueStack.Depth-3].ti; @@ -5264,124 +5269,124 @@ public partial class GPPGParser: ShiftReduceParser stmt + case 522: // stmt_list -> stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, LocationStack[LocationStack.Depth-1]); } break; - case 522: // stmt_list -> stmt_list, tkSemiColon, stmt + case 523: // stmt_list -> stmt_list, tkSemiColon, stmt { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as statement_list).Add(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 523: // if_stmt -> tkIf, expr_l1, tkThen, unlabelled_stmt + case 524: // if_stmt -> tkIf, expr_l1, tkThen, unlabelled_stmt { CurrentSemanticValue.stn = new if_node(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].stn as statement, null, CurrentLocationSpan); } break; - case 524: // if_stmt -> tkIf, expr_l1, tkThen, unlabelled_stmt, tkElse, unlabelled_stmt + case 525: // if_stmt -> tkIf, expr_l1, tkThen, unlabelled_stmt, tkElse, unlabelled_stmt { CurrentSemanticValue.stn = new if_node(ValueStack[ValueStack.Depth-5].ex, ValueStack[ValueStack.Depth-3].stn as statement, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 525: // match_with -> tkMatch, expr_l1, tkWith, pattern_cases, else_case, tkEnd + case 526: // match_with -> tkMatch, expr_l1, tkWith, pattern_cases, else_case, tkEnd { CurrentSemanticValue.stn = new match_with(ValueStack[ValueStack.Depth-5].ex, ValueStack[ValueStack.Depth-3].stn as pattern_cases, ValueStack[ValueStack.Depth-2].stn as statement, CurrentLocationSpan); } break; - case 526: // match_with -> tkMatch, expr_l1, tkWith, pattern_cases, tkSemiColon, else_case, + case 527: // match_with -> tkMatch, expr_l1, tkWith, pattern_cases, tkSemiColon, else_case, // tkEnd { CurrentSemanticValue.stn = new match_with(ValueStack[ValueStack.Depth-6].ex, ValueStack[ValueStack.Depth-4].stn as pattern_cases, ValueStack[ValueStack.Depth-2].stn as statement, CurrentLocationSpan); } break; - case 527: // pattern_cases -> pattern_case + case 528: // pattern_cases -> pattern_case { CurrentSemanticValue.stn = new pattern_cases(ValueStack[ValueStack.Depth-1].stn as pattern_case); } break; - case 528: // pattern_cases -> pattern_cases, tkSemiColon, pattern_case + case 529: // pattern_cases -> pattern_cases, tkSemiColon, pattern_case { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as pattern_cases).Add(ValueStack[ValueStack.Depth-1].stn as pattern_case); } break; - case 529: // pattern_case -> pattern_optional_var, tkWhen, expr_l1, tkColon, unlabelled_stmt + case 530: // pattern_case -> pattern_optional_var, tkWhen, expr_l1, tkColon, unlabelled_stmt { CurrentSemanticValue.stn = new pattern_case(ValueStack[ValueStack.Depth-5].stn as pattern_node, ValueStack[ValueStack.Depth-1].stn as statement, ValueStack[ValueStack.Depth-3].ex, CurrentLocationSpan); } break; - case 530: // pattern_case -> deconstruction_or_const_pattern, tkColon, unlabelled_stmt + case 531: // pattern_case -> deconstruction_or_const_pattern, tkColon, unlabelled_stmt { CurrentSemanticValue.stn = new pattern_case(ValueStack[ValueStack.Depth-3].stn as pattern_node, ValueStack[ValueStack.Depth-1].stn as statement, null, CurrentLocationSpan); } break; - case 531: // pattern_case -> collection_pattern, tkColon, unlabelled_stmt + case 532: // pattern_case -> collection_pattern, tkColon, unlabelled_stmt { CurrentSemanticValue.stn = new pattern_case(ValueStack[ValueStack.Depth-3].stn as pattern_node, ValueStack[ValueStack.Depth-1].stn as statement, null, CurrentLocationSpan); } break; - case 532: // pattern_case -> tuple_pattern, tkWhen, expr_l1, tkColon, unlabelled_stmt + case 533: // pattern_case -> tuple_pattern, tkWhen, expr_l1, tkColon, unlabelled_stmt { CurrentSemanticValue.stn = new pattern_case(ValueStack[ValueStack.Depth-5].stn as pattern_node, ValueStack[ValueStack.Depth-1].stn as statement, ValueStack[ValueStack.Depth-3].ex, CurrentLocationSpan); } break; - case 533: // pattern_case -> tuple_pattern, tkColon, unlabelled_stmt + case 534: // pattern_case -> tuple_pattern, tkColon, unlabelled_stmt { CurrentSemanticValue.stn = new pattern_case(ValueStack[ValueStack.Depth-3].stn as pattern_node, ValueStack[ValueStack.Depth-1].stn as statement, null, CurrentLocationSpan); } break; - case 534: // case_stmt -> tkCase, expr_l1, tkOf, case_list, else_case, tkEnd + case 535: // case_stmt -> tkCase, expr_l1, tkOf, case_list, else_case, tkEnd { CurrentSemanticValue.stn = new case_node(ValueStack[ValueStack.Depth-5].ex, ValueStack[ValueStack.Depth-3].stn as case_variants, ValueStack[ValueStack.Depth-2].stn as statement, CurrentLocationSpan); } break; - case 535: // case_stmt -> tkCase, expr_l1, tkOf, case_list, tkSemiColon, else_case, tkEnd + case 536: // case_stmt -> tkCase, expr_l1, tkOf, case_list, tkSemiColon, else_case, tkEnd { CurrentSemanticValue.stn = new case_node(ValueStack[ValueStack.Depth-6].ex, ValueStack[ValueStack.Depth-4].stn as case_variants, ValueStack[ValueStack.Depth-2].stn as statement, CurrentLocationSpan); } break; - case 536: // case_stmt -> tkCase, expr_l1, tkOf, else_case, tkEnd + case 537: // case_stmt -> tkCase, expr_l1, tkOf, else_case, tkEnd { CurrentSemanticValue.stn = new case_node(ValueStack[ValueStack.Depth-4].ex, NewCaseItem(new empty_statement(), null), ValueStack[ValueStack.Depth-2].stn as statement, CurrentLocationSpan); } break; - case 537: // case_list -> case_item + case 538: // case_list -> case_item { if (ValueStack[ValueStack.Depth-1].stn is empty_statement) CurrentSemanticValue.stn = NewCaseItem(ValueStack[ValueStack.Depth-1].stn, null); else CurrentSemanticValue.stn = NewCaseItem(ValueStack[ValueStack.Depth-1].stn, CurrentLocationSpan); } break; - case 538: // case_list -> case_list, tkSemiColon, case_item + case 539: // case_list -> case_list, tkSemiColon, case_item { CurrentSemanticValue.stn = AddCaseItem(ValueStack[ValueStack.Depth-3].stn as case_variants, ValueStack[ValueStack.Depth-1].stn, CurrentLocationSpan); } break; - case 539: // case_item -> case_label_list, tkColon, unlabelled_stmt + case 540: // case_item -> case_label_list, tkColon, unlabelled_stmt { CurrentSemanticValue.stn = new case_variant(ValueStack[ValueStack.Depth-3].stn as expression_list, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 540: // case_label_list -> case_label + case 541: // case_label_list -> case_label { CurrentSemanticValue.stn = new expression_list(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 541: // case_label_list -> case_label_list, tkComma, case_label + case 542: // case_label_list -> case_label_list, tkComma, case_label { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as expression_list).Add(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 542: // case_label -> const_elem + case 543: // case_label -> const_elem { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 543: // else_case -> /* empty */ + case 544: // else_case -> /* empty */ { CurrentSemanticValue.stn = null;} break; - case 544: // else_case -> tkElse, stmt_list + case 545: // else_case -> tkElse, stmt_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 545: // repeat_stmt -> tkRepeat, stmt_list, tkUntil, expr + case 546: // repeat_stmt -> tkRepeat, stmt_list, tkUntil, expr { CurrentSemanticValue.stn = new repeat_node(ValueStack[ValueStack.Depth-3].stn as statement_list, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); (ValueStack[ValueStack.Depth-3].stn as statement_list).left_logical_bracket = ValueStack[ValueStack.Depth-4].ti; @@ -5389,23 +5394,23 @@ public partial class GPPGParser: ShiftReduceParser tkWhile, expr_l1, optional_tk_do, unlabelled_stmt + case 547: // while_stmt -> tkWhile, expr_l1, optional_tk_do, unlabelled_stmt { CurrentSemanticValue.stn = NewWhileStmt(ValueStack[ValueStack.Depth-4].ti, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-2].ti, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 547: // optional_tk_do -> tkDo + case 548: // optional_tk_do -> tkDo { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 548: // optional_tk_do -> /* empty */ + case 549: // optional_tk_do -> /* empty */ { CurrentSemanticValue.ti = null; } break; - case 549: // lock_stmt -> tkLock, expr_l1, tkDo, unlabelled_stmt + case 550: // lock_stmt -> tkLock, expr_l1, tkDo, unlabelled_stmt { CurrentSemanticValue.stn = new lock_stmt(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 550: // foreach_stmt -> tkForeach, identifier, foreach_stmt_ident_dype_opt, tkIn, + case 551: // foreach_stmt -> tkForeach, identifier, foreach_stmt_ident_dype_opt, tkIn, // expr_l1, tkDo, unlabelled_stmt { CurrentSemanticValue.stn = new foreach_stmt(ValueStack[ValueStack.Depth-6].id, ValueStack[ValueStack.Depth-5].td, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); @@ -5413,68 +5418,68 @@ public partial class GPPGParser: ShiftReduceParser tkForeach, tkVar, identifier, tkColon, type_ref, tkIn, expr_l1, + case 552: // foreach_stmt -> tkForeach, tkVar, identifier, tkColon, type_ref, tkIn, expr_l1, // tkDo, unlabelled_stmt { CurrentSemanticValue.stn = new foreach_stmt(ValueStack[ValueStack.Depth-7].id, ValueStack[ValueStack.Depth-5].td, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 552: // foreach_stmt -> tkForeach, tkVar, identifier, tkIn, expr_l1, tkDo, + case 553: // foreach_stmt -> tkForeach, tkVar, identifier, tkIn, expr_l1, tkDo, // unlabelled_stmt { CurrentSemanticValue.stn = new foreach_stmt(ValueStack[ValueStack.Depth-5].id, new no_type_foreach(), ValueStack[ValueStack.Depth-3].ex, (statement)ValueStack[ValueStack.Depth-1].stn, CurrentLocationSpan); } break; - case 553: // foreach_stmt_ident_dype_opt -> tkColon, type_ref + case 554: // foreach_stmt_ident_dype_opt -> tkColon, type_ref { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 555: // for_stmt -> tkFor, optional_var, identifier, for_stmt_decl_or_assign, expr_l1, + case 556: // for_stmt -> tkFor, optional_var, identifier, for_stmt_decl_or_assign, expr_l1, // for_cycle_type, expr_l1, optional_tk_do, unlabelled_stmt { CurrentSemanticValue.stn = NewForStmt((bool)ValueStack[ValueStack.Depth-8].ob, ValueStack[ValueStack.Depth-7].id, ValueStack[ValueStack.Depth-6].td, ValueStack[ValueStack.Depth-5].ex, (for_cycle_type)ValueStack[ValueStack.Depth-4].ob, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-2].ti, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 556: // optional_var -> tkVar + case 557: // optional_var -> tkVar { CurrentSemanticValue.ob = true; } break; - case 557: // optional_var -> /* empty */ + case 558: // optional_var -> /* empty */ { CurrentSemanticValue.ob = false; } break; - case 559: // for_stmt_decl_or_assign -> tkColon, simple_type_identifier, tkAssign + case 560: // for_stmt_decl_or_assign -> tkColon, simple_type_identifier, tkAssign { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-2].td; } break; - case 560: // for_cycle_type -> tkTo + case 561: // for_cycle_type -> tkTo { CurrentSemanticValue.ob = for_cycle_type.to; } break; - case 561: // for_cycle_type -> tkDownto + case 562: // for_cycle_type -> tkDownto { CurrentSemanticValue.ob = for_cycle_type.downto; } break; - case 562: // with_stmt -> tkWith, expr_list, tkDo, unlabelled_stmt + case 563: // with_stmt -> tkWith, expr_list, tkDo, unlabelled_stmt { CurrentSemanticValue.stn = new with_statement(ValueStack[ValueStack.Depth-1].stn as statement, ValueStack[ValueStack.Depth-3].stn as expression_list, CurrentLocationSpan); } break; - case 563: // inherited_message -> tkInherited + case 564: // inherited_message -> tkInherited { CurrentSemanticValue.stn = new inherited_message(); CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 564: // try_stmt -> tkTry, stmt_list, try_handler + case 565: // try_stmt -> tkTry, stmt_list, try_handler { CurrentSemanticValue.stn = new try_stmt(ValueStack[ValueStack.Depth-2].stn as statement_list, ValueStack[ValueStack.Depth-1].stn as try_handler, CurrentLocationSpan); (ValueStack[ValueStack.Depth-2].stn as statement_list).left_logical_bracket = ValueStack[ValueStack.Depth-3].ti; ValueStack[ValueStack.Depth-2].stn.source_context = LocationStack[LocationStack.Depth-3].Merge(LocationStack[LocationStack.Depth-2]); } break; - case 565: // try_handler -> tkFinally, stmt_list, tkEnd + case 566: // try_handler -> tkFinally, stmt_list, tkEnd { CurrentSemanticValue.stn = new try_handler_finally(ValueStack[ValueStack.Depth-2].stn as statement_list, CurrentLocationSpan); (ValueStack[ValueStack.Depth-2].stn as statement_list).left_logical_bracket = ValueStack[ValueStack.Depth-3].ti; (ValueStack[ValueStack.Depth-2].stn as statement_list).right_logical_bracket = ValueStack[ValueStack.Depth-1].ti; } break; - case 566: // try_handler -> tkExcept, exception_block, tkEnd + case 567: // try_handler -> tkExcept, exception_block, tkEnd { CurrentSemanticValue.stn = new try_handler_except((exception_block)ValueStack[ValueStack.Depth-2].stn, CurrentLocationSpan); if ((ValueStack[ValueStack.Depth-2].stn as exception_block).stmt_list != null) @@ -5484,163 +5489,163 @@ public partial class GPPGParser: ShiftReduceParser exception_handler_list, exception_block_else_branch + case 568: // exception_block -> exception_handler_list, exception_block_else_branch { CurrentSemanticValue.stn = new exception_block(null, (exception_handler_list)ValueStack[ValueStack.Depth-2].stn, (statement_list)ValueStack[ValueStack.Depth-1].stn, CurrentLocationSpan); } break; - case 568: // exception_block -> exception_handler_list, tkSemiColon, + case 569: // exception_block -> exception_handler_list, tkSemiColon, // exception_block_else_branch { CurrentSemanticValue.stn = new exception_block(null, (exception_handler_list)ValueStack[ValueStack.Depth-3].stn, (statement_list)ValueStack[ValueStack.Depth-1].stn, CurrentLocationSpan); } break; - case 569: // exception_block -> stmt_list + case 570: // exception_block -> stmt_list { CurrentSemanticValue.stn = new exception_block(ValueStack[ValueStack.Depth-1].stn as statement_list, null, null, LocationStack[LocationStack.Depth-1]); } break; - case 570: // exception_handler_list -> exception_handler + case 571: // exception_handler_list -> exception_handler { CurrentSemanticValue.stn = new exception_handler_list(ValueStack[ValueStack.Depth-1].stn as exception_handler, CurrentLocationSpan); } break; - case 571: // exception_handler_list -> exception_handler_list, tkSemiColon, + case 572: // exception_handler_list -> exception_handler_list, tkSemiColon, // exception_handler { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as exception_handler_list).Add(ValueStack[ValueStack.Depth-1].stn as exception_handler, CurrentLocationSpan); } break; - case 572: // exception_block_else_branch -> /* empty */ + case 573: // exception_block_else_branch -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 573: // exception_block_else_branch -> tkElse, stmt_list + case 574: // exception_block_else_branch -> tkElse, stmt_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 574: // exception_handler -> tkOn, exception_identifier, tkDo, unlabelled_stmt + case 575: // exception_handler -> tkOn, exception_identifier, tkDo, unlabelled_stmt { CurrentSemanticValue.stn = new exception_handler((ValueStack[ValueStack.Depth-3].stn as exception_ident).variable, (ValueStack[ValueStack.Depth-3].stn as exception_ident).type_name, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 575: // exception_identifier -> exception_class_type_identifier + case 576: // exception_identifier -> exception_class_type_identifier { CurrentSemanticValue.stn = new exception_ident(null, (named_type_reference)ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 576: // exception_identifier -> exception_variable, tkColon, + case 577: // exception_identifier -> exception_variable, tkColon, // exception_class_type_identifier { CurrentSemanticValue.stn = new exception_ident(ValueStack[ValueStack.Depth-3].id, (named_type_reference)ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 577: // exception_class_type_identifier -> simple_type_identifier + case 578: // exception_class_type_identifier -> simple_type_identifier { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 578: // exception_variable -> identifier + case 579: // exception_variable -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 579: // raise_stmt -> tkRaise + case 580: // raise_stmt -> tkRaise { CurrentSemanticValue.stn = new raise_stmt(); CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 580: // raise_stmt -> tkRaise, expr + case 581: // raise_stmt -> tkRaise, expr { CurrentSemanticValue.stn = new raise_stmt(ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); } break; - case 581: // expr_list -> expr_with_func_decl_lambda + case 582: // expr_list -> expr_with_func_decl_lambda { CurrentSemanticValue.stn = new expression_list(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 582: // expr_list -> expr_list, tkComma, expr_with_func_decl_lambda + case 583: // expr_list -> expr_list, tkComma, expr_with_func_decl_lambda { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as expression_list).Add(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 583: // expr_as_stmt -> allowable_expr_as_stmt + case 584: // expr_as_stmt -> allowable_expr_as_stmt { CurrentSemanticValue.stn = new expression_as_statement(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 584: // allowable_expr_as_stmt -> new_expr + case 585: // allowable_expr_as_stmt -> new_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 585: // expr_with_func_decl_lambda -> expr + case 586: // expr_with_func_decl_lambda -> expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 586: // expr_with_func_decl_lambda -> func_decl_lambda + case 587: // expr_with_func_decl_lambda -> func_decl_lambda { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 587: // expr -> expr_l1 + case 588: // expr -> expr_l1 { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 588: // expr -> format_expr + case 589: // expr -> format_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 589: // expr_l1 -> expr_dq + case 590: // expr_l1 -> expr_dq { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 590: // expr_l1 -> question_expr + case 591: // expr_l1 -> question_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 591: // expr_l1 -> new_question_expr + case 592: // expr_l1 -> new_question_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 592: // expr_l1_for_question_expr -> expr_dq + case 593: // expr_l1_for_question_expr -> expr_dq { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 593: // expr_l1_for_question_expr -> question_expr + case 594: // expr_l1_for_question_expr -> question_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 594: // expr_l1_for_new_question_expr -> expr_dq + case 595: // expr_l1_for_new_question_expr -> expr_dq { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 595: // expr_l1_for_new_question_expr -> new_question_expr + case 596: // expr_l1_for_new_question_expr -> new_question_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 596: // expr_l1_func_decl_lambda -> expr_l1 + case 597: // expr_l1_func_decl_lambda -> expr_l1 { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 597: // expr_l1_func_decl_lambda -> func_decl_lambda + case 598: // expr_l1_func_decl_lambda -> func_decl_lambda { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 598: // expr_l1_for_lambda -> expr_dq + case 599: // expr_l1_for_lambda -> expr_dq { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 599: // expr_l1_for_lambda -> question_expr + case 600: // expr_l1_for_lambda -> question_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 600: // expr_l1_for_lambda -> func_decl_lambda + case 601: // expr_l1_for_lambda -> func_decl_lambda { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 601: // expr_dq -> relop_expr + case 602: // expr_dq -> relop_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 602: // expr_dq -> expr_dq, tkDoubleQuestion, relop_expr + case 603: // expr_dq -> expr_dq, tkDoubleQuestion, relop_expr { CurrentSemanticValue.ex = new double_question_node(ValueStack[ValueStack.Depth-3].ex as expression, ValueStack[ValueStack.Depth-1].ex as expression, CurrentLocationSpan);} break; - case 603: // sizeof_expr -> tkSizeOf, tkRoundOpen, simple_or_template_type_reference, + case 604: // sizeof_expr -> tkSizeOf, tkRoundOpen, simple_or_template_type_reference, // tkRoundClose { CurrentSemanticValue.ex = new sizeof_operator((named_type_reference)ValueStack[ValueStack.Depth-2].td, null, CurrentLocationSpan); } break; - case 604: // typeof_expr -> tkTypeOf, tkRoundOpen, simple_or_template_type_reference, + case 605: // typeof_expr -> tkTypeOf, tkRoundOpen, simple_or_template_type_reference, // tkRoundClose { CurrentSemanticValue.ex = new typeof_operator((named_type_reference)ValueStack[ValueStack.Depth-2].td, CurrentLocationSpan); } break; - case 605: // typeof_expr -> tkTypeOf, tkRoundOpen, empty_template_type_reference, + case 606: // typeof_expr -> tkTypeOf, tkRoundOpen, empty_template_type_reference, // tkRoundClose { CurrentSemanticValue.ex = new typeof_operator((named_type_reference)ValueStack[ValueStack.Depth-2].td, CurrentLocationSpan); } break; - case 606: // question_expr -> expr_l1_for_question_expr, tkQuestion, + case 607: // question_expr -> expr_l1_for_question_expr, tkQuestion, // expr_l1_for_question_expr, tkColon, // expr_l1_for_question_expr { @@ -5649,7 +5654,7 @@ public partial class GPPGParser: ShiftReduceParser tkIf, expr_l1_for_new_question_expr, tkThen, + case 608: // new_question_expr -> tkIf, expr_l1_for_new_question_expr, tkThen, // expr_l1_for_new_question_expr, tkElse, // expr_l1_for_new_question_expr { @@ -5665,47 +5670,47 @@ public partial class GPPGParser: ShiftReduceParser simple_type_identifier, + case 609: // empty_template_type_reference -> simple_type_identifier, // template_type_empty_params { CurrentSemanticValue.td = new template_type_reference((named_type_reference)ValueStack[ValueStack.Depth-2].td, (template_param_list)ValueStack[ValueStack.Depth-1].stn, CurrentLocationSpan); } break; - case 609: // empty_template_type_reference -> simple_type_identifier, tkAmpersend, + case 610: // empty_template_type_reference -> simple_type_identifier, tkAmpersend, // template_type_empty_params { CurrentSemanticValue.td = new template_type_reference((named_type_reference)ValueStack[ValueStack.Depth-3].td, (template_param_list)ValueStack[ValueStack.Depth-1].stn, CurrentLocationSpan); } break; - case 610: // simple_or_template_type_reference -> simple_type_identifier + case 611: // simple_or_template_type_reference -> simple_type_identifier { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 611: // simple_or_template_type_reference -> simple_type_identifier, + case 612: // simple_or_template_type_reference -> simple_type_identifier, // template_type_params { CurrentSemanticValue.td = new template_type_reference((named_type_reference)ValueStack[ValueStack.Depth-2].td, (template_param_list)ValueStack[ValueStack.Depth-1].stn, CurrentLocationSpan); } break; - case 612: // simple_or_template_type_reference -> simple_type_identifier, tkAmpersend, + case 613: // simple_or_template_type_reference -> simple_type_identifier, tkAmpersend, // template_type_params { CurrentSemanticValue.td = new template_type_reference((named_type_reference)ValueStack[ValueStack.Depth-3].td, (template_param_list)ValueStack[ValueStack.Depth-1].stn, CurrentLocationSpan); } break; - case 613: // optional_array_initializer -> tkRoundOpen, typed_const_list, tkRoundClose + case 614: // optional_array_initializer -> tkRoundOpen, typed_const_list, tkRoundClose { CurrentSemanticValue.stn = new array_const((expression_list)ValueStack[ValueStack.Depth-2].stn, CurrentLocationSpan); } break; - case 615: // new_expr -> tkNew, simple_or_template_type_reference, + case 616: // new_expr -> tkNew, simple_or_template_type_reference, // optional_expr_list_with_bracket { CurrentSemanticValue.ex = new new_expr(ValueStack[ValueStack.Depth-2].td, ValueStack[ValueStack.Depth-1].stn as expression_list, false, null, CurrentLocationSpan); } break; - case 616: // new_expr -> tkNew, simple_or_template_type_reference, tkSquareOpen, + case 617: // new_expr -> tkNew, simple_or_template_type_reference, tkSquareOpen, // optional_expr_list, tkSquareClose, optional_array_initializer { var el = ValueStack[ValueStack.Depth-3].stn as expression_list; @@ -5721,7 +5726,7 @@ public partial class GPPGParser: ShiftReduceParser tkNew, tkClass, tkRoundOpen, list_fields_in_unnamed_object, + case 618: // new_expr -> tkNew, tkClass, tkRoundOpen, list_fields_in_unnamed_object, // tkRoundClose { // sugared node @@ -5736,14 +5741,14 @@ public partial class GPPGParser: ShiftReduceParser identifier, tkAssign, relop_expr + case 619: // field_in_unnamed_object -> identifier, tkAssign, relop_expr { if (ValueStack[ValueStack.Depth-1].ex is nil_const) parsertools.AddErrorFromResource("NIL_IN_UNNAMED_OBJECT",CurrentLocationSpan); CurrentSemanticValue.ob = new name_assign_expr(ValueStack[ValueStack.Depth-3].id,ValueStack[ValueStack.Depth-1].ex,CurrentLocationSpan); } break; - case 619: // field_in_unnamed_object -> relop_expr + case 620: // field_in_unnamed_object -> relop_expr { ident name = null; var id = ValueStack[ValueStack.Depth-1].ex as ident; @@ -5763,13 +5768,13 @@ public partial class GPPGParser: ShiftReduceParser field_in_unnamed_object + case 621: // list_fields_in_unnamed_object -> field_in_unnamed_object { var l = new name_assign_expr_list(); CurrentSemanticValue.ob = l.Add(ValueStack[ValueStack.Depth-1].ob as name_assign_expr); } break; - case 621: // list_fields_in_unnamed_object -> list_fields_in_unnamed_object, tkComma, + case 622: // list_fields_in_unnamed_object -> list_fields_in_unnamed_object, tkComma, // field_in_unnamed_object { var nel = ValueStack[ValueStack.Depth-3].ob as name_assign_expr_list; @@ -5780,46 +5785,46 @@ public partial class GPPGParser: ShiftReduceParser /* empty */ + case 623: // optional_expr_list_with_bracket -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 623: // optional_expr_list_with_bracket -> tkRoundOpen, optional_expr_list, + case 624: // optional_expr_list_with_bracket -> tkRoundOpen, optional_expr_list, // tkRoundClose { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 624: // relop_expr -> simple_expr + case 625: // relop_expr -> simple_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 625: // relop_expr -> relop_expr, relop, simple_expr + case 626: // relop_expr -> relop_expr, relop, simple_expr { CurrentSemanticValue.ex = new bin_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 626: // relop_expr -> relop_expr, relop, new_question_expr + case 627: // relop_expr -> relop_expr, relop, new_question_expr { CurrentSemanticValue.ex = new bin_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 627: // relop_expr -> is_type_expr, tkRoundOpen, pattern_out_param_list, tkRoundClose + case 628: // relop_expr -> is_type_expr, tkRoundOpen, pattern_out_param_list, tkRoundClose { var isTypeCheck = ValueStack[ValueStack.Depth-4].ex as typecast_node; var deconstructorPattern = new deconstructor_pattern(ValueStack[ValueStack.Depth-2].ob as List, isTypeCheck.type_def, null, CurrentLocationSpan); CurrentSemanticValue.ex = new is_pattern_expr(isTypeCheck.expr, deconstructorPattern, CurrentLocationSpan); } break; - case 628: // pattern -> simple_or_template_type_reference, tkRoundOpen, + case 629: // pattern -> simple_or_template_type_reference, tkRoundOpen, // pattern_out_param_list, tkRoundClose { CurrentSemanticValue.stn = new deconstructor_pattern(ValueStack[ValueStack.Depth-2].ob as List, ValueStack[ValueStack.Depth-4].td, null, CurrentLocationSpan); } break; - case 629: // pattern_optional_var -> simple_or_template_type_reference, tkRoundOpen, + case 630: // pattern_optional_var -> simple_or_template_type_reference, tkRoundOpen, // pattern_out_param_list_optional_var, tkRoundClose { CurrentSemanticValue.stn = new deconstructor_pattern(ValueStack[ValueStack.Depth-2].ob as List, ValueStack[ValueStack.Depth-4].td, null, CurrentLocationSpan); } break; - case 630: // deconstruction_or_const_pattern -> simple_or_template_type_reference, + case 631: // deconstruction_or_const_pattern -> simple_or_template_type_reference, // tkRoundOpen, // pattern_out_param_list_optional_var, // tkRoundClose @@ -5827,18 +5832,18 @@ public partial class GPPGParser: ShiftReduceParser, ValueStack[ValueStack.Depth-4].td, null, CurrentLocationSpan); } break; - case 631: // deconstruction_or_const_pattern -> const_pattern_expr_list + case 632: // deconstruction_or_const_pattern -> const_pattern_expr_list { CurrentSemanticValue.stn = new const_pattern(ValueStack[ValueStack.Depth-1].ob as List, CurrentLocationSpan); } break; - case 632: // const_pattern_expr_list -> const_pattern_expression + case 633: // const_pattern_expr_list -> const_pattern_expression { CurrentSemanticValue.ob = new List(); (CurrentSemanticValue.ob as List).Add(ValueStack[ValueStack.Depth-1].stn); } break; - case 633: // const_pattern_expr_list -> const_pattern_expr_list, tkComma, + case 634: // const_pattern_expr_list -> const_pattern_expr_list, tkComma, // const_pattern_expression { var list = ValueStack[ValueStack.Depth-3].ob as List; @@ -5846,36 +5851,36 @@ public partial class GPPGParser: ShiftReduceParser literal_or_number + case 635: // const_pattern_expression -> literal_or_number { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].ex; } break; - case 635: // const_pattern_expression -> simple_or_template_type_reference + case 636: // const_pattern_expression -> simple_or_template_type_reference { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].td; } break; - case 636: // const_pattern_expression -> tkNil + case 637: // const_pattern_expression -> tkNil { CurrentSemanticValue.stn = new nil_const(); CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 637: // const_pattern_expression -> sizeof_expr + case 638: // const_pattern_expression -> sizeof_expr { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].ex; } break; - case 638: // const_pattern_expression -> typeof_expr + case 639: // const_pattern_expression -> typeof_expr { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].ex; } break; - case 639: // collection_pattern -> tkSquareOpen, collection_pattern_expr_list, tkSquareClose + case 640: // collection_pattern -> tkSquareOpen, collection_pattern_expr_list, tkSquareClose { CurrentSemanticValue.stn = new collection_pattern(ValueStack[ValueStack.Depth-2].ob as List, CurrentLocationSpan); } break; - case 640: // collection_pattern_expr_list -> collection_pattern_list_item + case 641: // collection_pattern_expr_list -> collection_pattern_list_item { CurrentSemanticValue.ob = new List(); (CurrentSemanticValue.ob as List).Add(ValueStack[ValueStack.Depth-1].stn as pattern_parameter); } break; - case 641: // collection_pattern_expr_list -> collection_pattern_expr_list, tkComma, + case 642: // collection_pattern_expr_list -> collection_pattern_expr_list, tkComma, // collection_pattern_list_item { var list = ValueStack[ValueStack.Depth-3].ob as List; @@ -5883,108 +5888,108 @@ public partial class GPPGParser: ShiftReduceParser literal_or_number + case 643: // collection_pattern_list_item -> literal_or_number { CurrentSemanticValue.stn = new const_pattern_parameter(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 643: // collection_pattern_list_item -> collection_pattern_var_item + case 644: // collection_pattern_list_item -> collection_pattern_var_item { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 644: // collection_pattern_list_item -> tkUnderscore + case 645: // collection_pattern_list_item -> tkUnderscore { CurrentSemanticValue.stn = new collection_pattern_wild_card(CurrentLocationSpan); } break; - case 645: // collection_pattern_list_item -> pattern_optional_var + case 646: // collection_pattern_list_item -> pattern_optional_var { CurrentSemanticValue.stn = new recursive_deconstructor_parameter(ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); } break; - case 646: // collection_pattern_list_item -> collection_pattern + case 647: // collection_pattern_list_item -> collection_pattern { CurrentSemanticValue.stn = new recursive_collection_parameter(ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); } break; - case 647: // collection_pattern_list_item -> tuple_pattern + case 648: // collection_pattern_list_item -> tuple_pattern { CurrentSemanticValue.stn = new recursive_tuple_parameter(ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); } break; - case 648: // collection_pattern_list_item -> tkDotDot + case 649: // collection_pattern_list_item -> tkDotDot { CurrentSemanticValue.stn = new collection_pattern_gap_parameter(CurrentLocationSpan); } break; - case 649: // collection_pattern_var_item -> tkVar, identifier + case 650: // collection_pattern_var_item -> tkVar, identifier { CurrentSemanticValue.stn = new collection_pattern_var_parameter(ValueStack[ValueStack.Depth-1].id, null, CurrentLocationSpan); } break; - case 650: // tuple_pattern -> tkRoundOpen, tuple_pattern_item_list, tkRoundClose + case 651: // tuple_pattern -> tkRoundOpen, tuple_pattern_item_list, tkRoundClose { if ((ValueStack[ValueStack.Depth-2].ob as List).Count>6) parsertools.AddErrorFromResource("TUPLE_ELEMENTS_COUNT_MUST_BE_LESSEQUAL_7",CurrentLocationSpan); CurrentSemanticValue.stn = new tuple_pattern(ValueStack[ValueStack.Depth-2].ob as List, CurrentLocationSpan); } break; - case 651: // tuple_pattern_item -> tkUnderscore + case 652: // tuple_pattern_item -> tkUnderscore { CurrentSemanticValue.stn = new tuple_pattern_wild_card(CurrentLocationSpan); } break; - case 652: // tuple_pattern_item -> literal_or_number + case 653: // tuple_pattern_item -> literal_or_number { CurrentSemanticValue.stn = new const_pattern_parameter(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 653: // tuple_pattern_item -> sign, literal_or_number + case 654: // tuple_pattern_item -> sign, literal_or_number { CurrentSemanticValue.stn = new const_pattern_parameter(new un_expr(ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan), CurrentLocationSpan); } break; - case 654: // tuple_pattern_item -> tkVar, identifier + case 655: // tuple_pattern_item -> tkVar, identifier { CurrentSemanticValue.stn = new tuple_pattern_var_parameter(ValueStack[ValueStack.Depth-1].id, null, CurrentLocationSpan); } break; - case 655: // tuple_pattern_item -> pattern_optional_var + case 656: // tuple_pattern_item -> pattern_optional_var { CurrentSemanticValue.stn = new recursive_deconstructor_parameter(ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); } break; - case 656: // tuple_pattern_item -> collection_pattern + case 657: // tuple_pattern_item -> collection_pattern { CurrentSemanticValue.stn = new recursive_collection_parameter(ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); } break; - case 657: // tuple_pattern_item -> tuple_pattern + case 658: // tuple_pattern_item -> tuple_pattern { CurrentSemanticValue.stn = new recursive_tuple_parameter(ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); } break; - case 658: // tuple_pattern_item_list -> tuple_pattern_item + case 659: // tuple_pattern_item_list -> tuple_pattern_item { CurrentSemanticValue.ob = new List(); (CurrentSemanticValue.ob as List).Add(ValueStack[ValueStack.Depth-1].stn as pattern_parameter); } break; - case 659: // tuple_pattern_item_list -> tuple_pattern_item_list, tkComma, tuple_pattern_item + case 660: // tuple_pattern_item_list -> tuple_pattern_item_list, tkComma, tuple_pattern_item { var list = ValueStack[ValueStack.Depth-3].ob as List; list.Add(ValueStack[ValueStack.Depth-1].stn as pattern_parameter); CurrentSemanticValue.ob = list; } break; - case 660: // pattern_out_param_list_optional_var -> pattern_out_param_optional_var + case 661: // pattern_out_param_list_optional_var -> pattern_out_param_optional_var { CurrentSemanticValue.ob = new List(); (CurrentSemanticValue.ob as List).Add(ValueStack[ValueStack.Depth-1].stn as pattern_parameter); } break; - case 661: // pattern_out_param_list_optional_var -> pattern_out_param_list_optional_var, + case 662: // pattern_out_param_list_optional_var -> pattern_out_param_list_optional_var, // tkSemiColon, // pattern_out_param_optional_var { @@ -5993,7 +5998,7 @@ public partial class GPPGParser: ShiftReduceParser pattern_out_param_list_optional_var, + case 663: // pattern_out_param_list_optional_var -> pattern_out_param_list_optional_var, // tkComma, // pattern_out_param_optional_var { @@ -6002,13 +6007,13 @@ public partial class GPPGParser: ShiftReduceParser pattern_out_param + case 664: // pattern_out_param_list -> pattern_out_param { CurrentSemanticValue.ob = new List(); (CurrentSemanticValue.ob as List).Add(ValueStack[ValueStack.Depth-1].stn as pattern_parameter); } break; - case 664: // pattern_out_param_list -> pattern_out_param_list, tkSemiColon, + case 665: // pattern_out_param_list -> pattern_out_param_list, tkSemiColon, // pattern_out_param { var list = ValueStack[ValueStack.Depth-3].ob as List; @@ -6016,185 +6021,185 @@ public partial class GPPGParser: ShiftReduceParser pattern_out_param_list, tkComma, pattern_out_param + case 666: // pattern_out_param_list -> pattern_out_param_list, tkComma, pattern_out_param { var list = ValueStack[ValueStack.Depth-3].ob as List; list.Add(ValueStack[ValueStack.Depth-1].stn as pattern_parameter); CurrentSemanticValue.ob = list; } break; - case 666: // pattern_out_param -> tkUnderscore + case 667: // pattern_out_param -> tkUnderscore { CurrentSemanticValue.stn = new wild_card_deconstructor_parameter(CurrentLocationSpan); } break; - case 667: // pattern_out_param -> literal_or_number + case 668: // pattern_out_param -> literal_or_number { CurrentSemanticValue.stn = new const_pattern_parameter(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 668: // pattern_out_param -> tkVar, identifier, tkColon, type_ref + case 669: // pattern_out_param -> tkVar, identifier, tkColon, type_ref { CurrentSemanticValue.stn = new var_deconstructor_parameter(ValueStack[ValueStack.Depth-3].id, ValueStack[ValueStack.Depth-1].td, true, CurrentLocationSpan); } break; - case 669: // pattern_out_param -> tkVar, identifier + case 670: // pattern_out_param -> tkVar, identifier { CurrentSemanticValue.stn = new var_deconstructor_parameter(ValueStack[ValueStack.Depth-1].id, null, true, CurrentLocationSpan); } break; - case 670: // pattern_out_param -> pattern + case 671: // pattern_out_param -> pattern { CurrentSemanticValue.stn = new recursive_deconstructor_parameter(ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); } break; - case 671: // pattern_out_param -> collection_pattern + case 672: // pattern_out_param -> collection_pattern { CurrentSemanticValue.stn = new recursive_collection_parameter(ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); } break; - case 672: // pattern_out_param -> tuple_pattern + case 673: // pattern_out_param -> tuple_pattern { CurrentSemanticValue.stn = new recursive_tuple_parameter(ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); } break; - case 673: // pattern_out_param_optional_var -> tkUnderscore + case 674: // pattern_out_param_optional_var -> tkUnderscore { CurrentSemanticValue.stn = new wild_card_deconstructor_parameter(CurrentLocationSpan); } break; - case 674: // pattern_out_param_optional_var -> literal_or_number + case 675: // pattern_out_param_optional_var -> literal_or_number { CurrentSemanticValue.stn = new const_pattern_parameter(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 675: // pattern_out_param_optional_var -> sign, literal_or_number + case 676: // pattern_out_param_optional_var -> sign, literal_or_number { CurrentSemanticValue.stn = new const_pattern_parameter(new un_expr(ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan), CurrentLocationSpan); } break; - case 676: // pattern_out_param_optional_var -> identifier, tkColon, type_ref + case 677: // pattern_out_param_optional_var -> identifier, tkColon, type_ref { CurrentSemanticValue.stn = new var_deconstructor_parameter(ValueStack[ValueStack.Depth-3].id, ValueStack[ValueStack.Depth-1].td, false, CurrentLocationSpan); } break; - case 677: // pattern_out_param_optional_var -> identifier + case 678: // pattern_out_param_optional_var -> identifier { CurrentSemanticValue.stn = new var_deconstructor_parameter(ValueStack[ValueStack.Depth-1].id, null, false, CurrentLocationSpan); } break; - case 678: // pattern_out_param_optional_var -> tkVar, identifier, tkColon, type_ref + case 679: // pattern_out_param_optional_var -> tkVar, identifier, tkColon, type_ref { CurrentSemanticValue.stn = new var_deconstructor_parameter(ValueStack[ValueStack.Depth-3].id, ValueStack[ValueStack.Depth-1].td, true, CurrentLocationSpan); } break; - case 679: // pattern_out_param_optional_var -> tkVar, identifier + case 680: // pattern_out_param_optional_var -> tkVar, identifier { CurrentSemanticValue.stn = new var_deconstructor_parameter(ValueStack[ValueStack.Depth-1].id, null, true, CurrentLocationSpan); } break; - case 680: // pattern_out_param_optional_var -> pattern_optional_var + case 681: // pattern_out_param_optional_var -> pattern_optional_var { CurrentSemanticValue.stn = new recursive_deconstructor_parameter(ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); } break; - case 681: // pattern_out_param_optional_var -> collection_pattern + case 682: // pattern_out_param_optional_var -> collection_pattern { CurrentSemanticValue.stn = new recursive_collection_parameter(ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); } break; - case 682: // pattern_out_param_optional_var -> tuple_pattern + case 683: // pattern_out_param_optional_var -> tuple_pattern { CurrentSemanticValue.stn = new recursive_tuple_parameter(ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); } break; - case 683: // simple_expr_or_nothing -> simple_expr + case 684: // simple_expr_or_nothing -> simple_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 684: // simple_expr_or_nothing -> /* empty */ + case 685: // simple_expr_or_nothing -> /* empty */ { CurrentSemanticValue.ex = null; } break; - case 685: // const_expr_or_nothing -> const_expr + case 686: // const_expr_or_nothing -> const_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 686: // const_expr_or_nothing -> /* empty */ + case 687: // const_expr_or_nothing -> /* empty */ { CurrentSemanticValue.ex = null; } break; - case 687: // format_expr -> simple_expr, tkColon, simple_expr_or_nothing + case 688: // format_expr -> simple_expr, tkColon, simple_expr_or_nothing { CurrentSemanticValue.ex = new format_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); } break; - case 688: // format_expr -> tkColon, simple_expr_or_nothing + case 689: // format_expr -> tkColon, simple_expr_or_nothing { CurrentSemanticValue.ex = new format_expr(null, ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); } break; - case 689: // format_expr -> simple_expr, tkColon, simple_expr_or_nothing, tkColon, + case 690: // format_expr -> simple_expr, tkColon, simple_expr_or_nothing, tkColon, // simple_expr { CurrentSemanticValue.ex = new format_expr(ValueStack[ValueStack.Depth-5].ex, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 690: // format_expr -> tkColon, simple_expr_or_nothing, tkColon, simple_expr + case 691: // format_expr -> tkColon, simple_expr_or_nothing, tkColon, simple_expr { CurrentSemanticValue.ex = new format_expr(null, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 691: // format_const_expr -> const_expr, tkColon, const_expr_or_nothing + case 692: // format_const_expr -> const_expr, tkColon, const_expr_or_nothing { CurrentSemanticValue.ex = new format_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); } break; - case 692: // format_const_expr -> tkColon, const_expr_or_nothing + case 693: // format_const_expr -> tkColon, const_expr_or_nothing { CurrentSemanticValue.ex = new format_expr(null, ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); } break; - case 693: // format_const_expr -> const_expr, tkColon, const_expr_or_nothing, tkColon, + case 694: // format_const_expr -> const_expr, tkColon, const_expr_or_nothing, tkColon, // const_expr { CurrentSemanticValue.ex = new format_expr(ValueStack[ValueStack.Depth-5].ex, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 694: // format_const_expr -> tkColon, const_expr_or_nothing, tkColon, const_expr + case 695: // format_const_expr -> tkColon, const_expr_or_nothing, tkColon, const_expr { CurrentSemanticValue.ex = new format_expr(null, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 695: // relop -> tkEqual + case 696: // relop -> tkEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 696: // relop -> tkNotEqual + case 697: // relop -> tkNotEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 697: // relop -> tkLower + case 698: // relop -> tkLower { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 698: // relop -> tkGreater + case 699: // relop -> tkGreater { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 699: // relop -> tkLowerEqual + case 700: // relop -> tkLowerEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 700: // relop -> tkGreaterEqual + case 701: // relop -> tkGreaterEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 701: // relop -> tkIn + case 702: // relop -> tkIn { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 702: // simple_expr -> term1 + case 703: // simple_expr -> term1 { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 703: // simple_expr -> simple_expr, tkDotDot, term1 + case 704: // simple_expr -> simple_expr, tkDotDot, term1 { if (parsertools.build_tree_for_formatter) CurrentSemanticValue.ex = new diapason_expr(ValueStack[ValueStack.Depth-3].ex,ValueStack[ValueStack.Depth-1].ex,CurrentLocationSpan); @@ -6202,118 +6207,118 @@ public partial class GPPGParser: ShiftReduceParser term + case 705: // term1 -> term { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 705: // term1 -> term1, addop, term + case 706: // term1 -> term1, addop, term { CurrentSemanticValue.ex = new bin_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 706: // term1 -> term1, addop, new_question_expr + case 707: // term1 -> term1, addop, new_question_expr { CurrentSemanticValue.ex = new bin_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 707: // addop -> tkPlus + case 708: // addop -> tkPlus { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 708: // addop -> tkMinus + case 709: // addop -> tkMinus { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 709: // addop -> tkOr + case 710: // addop -> tkOr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 710: // addop -> tkXor + case 711: // addop -> tkXor { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 711: // addop -> tkCSharpStyleOr + case 712: // addop -> tkCSharpStyleOr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 712: // typecast_op -> tkAs + case 713: // typecast_op -> tkAs { CurrentSemanticValue.ob = op_typecast.as_op; } break; - case 713: // typecast_op -> tkIs + case 714: // typecast_op -> tkIs { CurrentSemanticValue.ob = op_typecast.is_op; } break; - case 714: // as_is_expr -> is_type_expr + case 715: // as_is_expr -> is_type_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 715: // as_is_expr -> as_expr + case 716: // as_is_expr -> as_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 716: // as_expr -> term, tkAs, simple_or_template_type_reference + case 717: // as_expr -> term, tkAs, simple_or_template_type_reference { CurrentSemanticValue.ex = NewAsIsExpr(ValueStack[ValueStack.Depth-3].ex, op_typecast.as_op, ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 717: // is_type_expr -> term, tkIs, simple_or_template_type_reference + case 718: // is_type_expr -> term, tkIs, simple_or_template_type_reference { CurrentSemanticValue.ex = NewAsIsExpr(ValueStack[ValueStack.Depth-3].ex, op_typecast.is_op, ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 718: // power_expr -> factor_without_unary_op, tkStarStar, factor + case 719: // power_expr -> factor_without_unary_op, tkStarStar, factor { CurrentSemanticValue.ex = new bin_expr(ValueStack[ValueStack.Depth-3].ex,ValueStack[ValueStack.Depth-1].ex,(ValueStack[ValueStack.Depth-2].op).type, CurrentLocationSpan); } break; - case 719: // power_expr -> factor_without_unary_op, tkStarStar, power_expr + case 720: // power_expr -> factor_without_unary_op, tkStarStar, power_expr { CurrentSemanticValue.ex = new bin_expr(ValueStack[ValueStack.Depth-3].ex,ValueStack[ValueStack.Depth-1].ex,(ValueStack[ValueStack.Depth-2].op).type, CurrentLocationSpan); } break; - case 720: // power_expr -> sign, power_expr + case 721: // power_expr -> sign, power_expr { CurrentSemanticValue.ex = new un_expr(ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 721: // term -> factor + case 722: // term -> factor { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 722: // term -> new_expr + case 723: // term -> new_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 723: // term -> power_expr + case 724: // term -> power_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 724: // term -> term, mulop, factor + case 725: // term -> term, mulop, factor { CurrentSemanticValue.ex = new bin_expr(ValueStack[ValueStack.Depth-3].ex,ValueStack[ValueStack.Depth-1].ex,(ValueStack[ValueStack.Depth-2].op).type, CurrentLocationSpan); } break; - case 725: // term -> term, mulop, power_expr + case 726: // term -> term, mulop, power_expr { CurrentSemanticValue.ex = new bin_expr(ValueStack[ValueStack.Depth-3].ex,ValueStack[ValueStack.Depth-1].ex,(ValueStack[ValueStack.Depth-2].op).type, CurrentLocationSpan); } break; - case 726: // term -> term, mulop, new_question_expr + case 727: // term -> term, mulop, new_question_expr { CurrentSemanticValue.ex = new bin_expr(ValueStack[ValueStack.Depth-3].ex,ValueStack[ValueStack.Depth-1].ex,(ValueStack[ValueStack.Depth-2].op).type, CurrentLocationSpan); } break; - case 727: // term -> as_is_expr + case 728: // term -> as_is_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 728: // mulop -> tkStar + case 729: // mulop -> tkStar { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 729: // mulop -> tkSlash + case 730: // mulop -> tkSlash { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 730: // mulop -> tkDiv + case 731: // mulop -> tkDiv { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 731: // mulop -> tkMod + case 732: // mulop -> tkMod { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 732: // mulop -> tkShl + case 733: // mulop -> tkShl { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 733: // mulop -> tkShr + case 734: // mulop -> tkShr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 734: // mulop -> tkAnd + case 735: // mulop -> tkAnd { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 735: // default_expr -> tkDefault, tkRoundOpen, simple_or_template_type_reference, + case 736: // default_expr -> tkDefault, tkRoundOpen, simple_or_template_type_reference, // tkRoundClose { CurrentSemanticValue.ex = new default_operator(ValueStack[ValueStack.Depth-2].td as named_type_reference, CurrentLocationSpan); } break; - case 736: // tuple -> tkRoundOpen, expr_l1, tkComma, expr_l1_list, lambda_type_ref, + case 737: // tuple -> tkRoundOpen, expr_l1, tkComma, expr_l1_list, lambda_type_ref, // optional_full_lambda_fp_list, tkRoundClose { /*if ($5 != null) @@ -6327,35 +6332,35 @@ public partial class GPPGParser: ShiftReduceParser literal_or_number + case 738: // factor_without_unary_op -> literal_or_number { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 738: // factor_without_unary_op -> var_reference + case 739: // factor_without_unary_op -> var_reference { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 739: // factor -> tkNil + case 740: // factor -> tkNil { CurrentSemanticValue.ex = new nil_const(); CurrentSemanticValue.ex.source_context = CurrentLocationSpan; } break; - case 740: // factor -> literal_or_number + case 741: // factor -> literal_or_number { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 741: // factor -> default_expr + case 742: // factor -> default_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 742: // factor -> tkSquareOpen, elem_list, tkSquareClose + case 743: // factor -> tkSquareOpen, elem_list, tkSquareClose { CurrentSemanticValue.ex = new pascal_set_constant(ValueStack[ValueStack.Depth-2].stn as expression_list, CurrentLocationSpan); } break; - case 743: // factor -> tkNot, factor + case 744: // factor -> tkNot, factor { CurrentSemanticValue.ex = new un_expr(ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 744: // factor -> sign, factor + case 745: // factor -> sign, factor { if (ValueStack[ValueStack.Depth-2].op.type == Operators.Minus) { @@ -6381,96 +6386,96 @@ public partial class GPPGParser: ShiftReduceParser tkDeref, factor + case 746: // factor -> tkDeref, factor { CurrentSemanticValue.ex = new index(ValueStack[ValueStack.Depth-1].ex, true, CurrentLocationSpan); } break; - case 746: // factor -> var_reference + case 747: // factor -> var_reference { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 747: // factor -> tuple + case 748: // factor -> tuple { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 748: // literal_or_number -> literal + case 749: // literal_or_number -> literal { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 749: // literal_or_number -> unsigned_number + case 750: // literal_or_number -> unsigned_number { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 750: // var_question_point -> variable, tkQuestionPoint, variable + case 751: // var_question_point -> variable, tkQuestionPoint, variable { CurrentSemanticValue.ex = new dot_question_node(ValueStack[ValueStack.Depth-3].ex as addressed_value,ValueStack[ValueStack.Depth-1].ex as addressed_value,CurrentLocationSpan); } break; - case 751: // var_question_point -> variable, tkQuestionPoint, var_question_point + case 752: // var_question_point -> variable, tkQuestionPoint, var_question_point { CurrentSemanticValue.ex = new dot_question_node(ValueStack[ValueStack.Depth-3].ex as addressed_value,ValueStack[ValueStack.Depth-1].ex as addressed_value,CurrentLocationSpan); } break; - case 752: // var_reference -> var_address, variable + case 753: // var_reference -> var_address, variable { CurrentSemanticValue.ex = NewVarReference(ValueStack[ValueStack.Depth-2].stn as get_address, ValueStack[ValueStack.Depth-1].ex as addressed_value, CurrentLocationSpan); } break; - case 753: // var_reference -> variable + case 754: // var_reference -> variable { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 754: // var_reference -> var_question_point + case 755: // var_reference -> var_question_point { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 755: // var_address -> tkAddressOf + case 756: // var_address -> tkAddressOf { CurrentSemanticValue.stn = NewVarAddress(CurrentLocationSpan); } break; - case 756: // var_address -> var_address, tkAddressOf + case 757: // var_address -> var_address, tkAddressOf { CurrentSemanticValue.stn = NewVarAddress(ValueStack[ValueStack.Depth-2].stn as get_address, CurrentLocationSpan); } break; - case 757: // attribute_variable -> simple_type_identifier, optional_expr_list_with_bracket + case 758: // attribute_variable -> simple_type_identifier, optional_expr_list_with_bracket { CurrentSemanticValue.stn = new attribute(null, ValueStack[ValueStack.Depth-2].td as named_type_reference, ValueStack[ValueStack.Depth-1].stn as expression_list, CurrentLocationSpan); } break; - case 758: // attribute_variable -> template_type, optional_expr_list_with_bracket + case 759: // attribute_variable -> template_type, optional_expr_list_with_bracket { CurrentSemanticValue.stn = new attribute(null, ValueStack[ValueStack.Depth-2].td as named_type_reference, ValueStack[ValueStack.Depth-1].stn as expression_list, CurrentLocationSpan); } break; - case 759: // dotted_identifier -> identifier + case 760: // dotted_identifier -> identifier { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].id; } break; - case 760: // dotted_identifier -> dotted_identifier, tkPoint, identifier_or_keyword + case 761: // dotted_identifier -> dotted_identifier, tkPoint, identifier_or_keyword { CurrentSemanticValue.ex = new dot_node(ValueStack[ValueStack.Depth-3].ex as addressed_value, ValueStack[ValueStack.Depth-1].id as addressed_value, CurrentLocationSpan); } break; - case 761: // variable_as_type -> dotted_identifier + case 762: // variable_as_type -> dotted_identifier { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex;} break; - case 762: // variable_as_type -> dotted_identifier, template_type_params + case 763: // variable_as_type -> dotted_identifier, template_type_params { CurrentSemanticValue.ex = new ident_with_templateparams(ValueStack[ValueStack.Depth-2].ex as addressed_value, ValueStack[ValueStack.Depth-1].stn as template_param_list, CurrentLocationSpan); } break; - case 763: // variable_or_literal_or_number -> variable + case 764: // variable_or_literal_or_number -> variable { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 764: // variable_or_literal_or_number -> literal_or_number + case 765: // variable_or_literal_or_number -> literal_or_number { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 765: // variable -> identifier + case 766: // variable -> identifier { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].id; } break; - case 766: // variable -> operator_name_ident + case 767: // variable -> operator_name_ident { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 767: // variable -> tkInherited, identifier + case 768: // variable -> tkInherited, identifier { CurrentSemanticValue.ex = new inherited_ident(ValueStack[ValueStack.Depth-1].id.name, CurrentLocationSpan); } break; - case 768: // variable -> tkRoundOpen, expr, tkRoundClose + case 769: // variable -> tkRoundOpen, expr, tkRoundClose { if (!parsertools.build_tree_for_formatter) { @@ -6480,18 +6485,18 @@ public partial class GPPGParser: ShiftReduceParser sizeof_expr + case 770: // variable -> sizeof_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 770: // variable -> typeof_expr + case 771: // variable -> typeof_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 771: // variable -> literal_or_number, tkPoint, identifier_or_keyword + case 772: // variable -> literal_or_number, tkPoint, identifier_or_keyword { CurrentSemanticValue.ex = new dot_node(ValueStack[ValueStack.Depth-3].ex as addressed_value, ValueStack[ValueStack.Depth-1].id as addressed_value, CurrentLocationSpan); } break; - case 772: // variable -> variable_or_literal_or_number, tkSquareOpen, expr_list, + case 773: // variable -> variable_or_literal_or_number, tkSquareOpen, expr_list, // tkSquareClose { var el = ValueStack[ValueStack.Depth-2].stn as expression_list; // SSM 10/03/16 @@ -6510,7 +6515,7 @@ public partial class GPPGParser: ShiftReduceParser variable_or_literal_or_number, tkQuestionSquareOpen, format_expr, + case 774: // variable -> variable_or_literal_or_number, tkQuestionSquareOpen, format_expr, // tkSquareClose { var fe = ValueStack[ValueStack.Depth-2].ex as format_expr; // SSM 9/01/17 @@ -6524,76 +6529,76 @@ public partial class GPPGParser: ShiftReduceParser tkVertParen, elem_list, tkVertParen + case 775: // variable -> tkVertParen, elem_list, tkVertParen { CurrentSemanticValue.ex = new array_const_new(ValueStack[ValueStack.Depth-2].stn as expression_list, CurrentLocationSpan); } break; - case 775: // variable -> variable, tkRoundOpen, optional_expr_list, tkRoundClose + case 776: // variable -> variable, tkRoundOpen, optional_expr_list, tkRoundClose { CurrentSemanticValue.ex = new method_call(ValueStack[ValueStack.Depth-4].ex as addressed_value,ValueStack[ValueStack.Depth-2].stn as expression_list, CurrentLocationSpan); } break; - case 776: // variable -> variable, tkPoint, identifier_keyword_operatorname + case 777: // variable -> variable, tkPoint, identifier_keyword_operatorname { CurrentSemanticValue.ex = new dot_node(ValueStack[ValueStack.Depth-3].ex as addressed_value, ValueStack[ValueStack.Depth-1].id as addressed_value, CurrentLocationSpan); } break; - case 777: // variable -> tuple, tkPoint, identifier_keyword_operatorname + case 778: // variable -> tuple, tkPoint, identifier_keyword_operatorname { CurrentSemanticValue.ex = new dot_node(ValueStack[ValueStack.Depth-3].ex as addressed_value, ValueStack[ValueStack.Depth-1].id as addressed_value, CurrentLocationSpan); } break; - case 778: // variable -> variable, tkDeref + case 779: // variable -> variable, tkDeref { CurrentSemanticValue.ex = new roof_dereference(ValueStack[ValueStack.Depth-2].ex as addressed_value,CurrentLocationSpan); } break; - case 779: // variable -> variable, tkAmpersend, template_type_params + case 780: // variable -> variable, tkAmpersend, template_type_params { CurrentSemanticValue.ex = new ident_with_templateparams(ValueStack[ValueStack.Depth-3].ex as addressed_value, ValueStack[ValueStack.Depth-1].stn as template_param_list, CurrentLocationSpan); } break; - case 780: // optional_expr_list -> expr_list + case 781: // optional_expr_list -> expr_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 781: // optional_expr_list -> /* empty */ + case 782: // optional_expr_list -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 782: // elem_list -> elem_list1 + case 783: // elem_list -> elem_list1 { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 783: // elem_list -> /* empty */ + case 784: // elem_list -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 784: // elem_list1 -> elem + case 785: // elem_list1 -> elem { CurrentSemanticValue.stn = new expression_list(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 785: // elem_list1 -> elem_list1, tkComma, elem + case 786: // elem_list1 -> elem_list1, tkComma, elem { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as expression_list).Add(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 786: // elem -> expr + case 787: // elem -> expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 787: // elem -> expr, tkDotDot, expr + case 788: // elem -> expr, tkDotDot, expr { CurrentSemanticValue.ex = new diapason_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 788: // one_literal -> tkStringLiteral + case 789: // one_literal -> tkStringLiteral { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].stn as literal; } break; - case 789: // one_literal -> tkAsciiChar + case 790: // one_literal -> tkAsciiChar { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].stn as literal; } break; - case 790: // literal -> literal_list + case 791: // literal -> literal_list { CurrentSemanticValue.ex = NewLiteral(ValueStack[ValueStack.Depth-1].stn as literal_const_line); } break; - case 791: // literal -> tkFormatStringLiteral + case 792: // literal -> tkFormatStringLiteral { if (parsertools.build_tree_for_formatter) { @@ -6605,12 +6610,12 @@ public partial class GPPGParser: ShiftReduceParser one_literal + case 793: // literal_list -> one_literal { CurrentSemanticValue.stn = new literal_const_line(ValueStack[ValueStack.Depth-1].ex as literal, CurrentLocationSpan); } break; - case 793: // literal_list -> literal_list, one_literal + case 794: // literal_list -> literal_list, one_literal { var line = ValueStack[ValueStack.Depth-2].stn as literal_const_line; if (line.literals.Last() is string_const && ValueStack[ValueStack.Depth-1].ex is string_const) @@ -6618,475 +6623,475 @@ public partial class GPPGParser: ShiftReduceParser tkOperator, overload_operator + case 795: // operator_name_ident -> tkOperator, overload_operator { CurrentSemanticValue.ex = new operator_name_ident((ValueStack[ValueStack.Depth-1].op as op_type_node).text, (ValueStack[ValueStack.Depth-1].op as op_type_node).type, CurrentLocationSpan); } break; - case 795: // optional_method_modificators -> tkSemiColon + case 796: // optional_method_modificators -> tkSemiColon { CurrentSemanticValue.stn = new procedure_attributes_list(new List(),CurrentLocationSpan); } break; - case 796: // optional_method_modificators -> tkSemiColon, meth_modificators, tkSemiColon + case 797: // optional_method_modificators -> tkSemiColon, meth_modificators, tkSemiColon { //parsertools.AddModifier((procedure_attributes_list)$2, proc_attribute.attr_overload); CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 797: // optional_method_modificators1 -> /* empty */ + case 798: // optional_method_modificators1 -> /* empty */ { CurrentSemanticValue.stn = new procedure_attributes_list(new List(),CurrentLocationSpan); } break; - case 798: // optional_method_modificators1 -> tkSemiColon, meth_modificators + case 799: // optional_method_modificators1 -> tkSemiColon, meth_modificators { //parsertools.AddModifier((procedure_attributes_list)$2, proc_attribute.attr_overload); CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 799: // meth_modificators -> meth_modificator + case 800: // meth_modificators -> meth_modificator { CurrentSemanticValue.stn = new procedure_attributes_list(ValueStack[ValueStack.Depth-1].id as procedure_attribute, CurrentLocationSpan); } break; - case 800: // meth_modificators -> meth_modificators, tkSemiColon, meth_modificator + case 801: // meth_modificators -> meth_modificators, tkSemiColon, meth_modificator { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as procedure_attributes_list).Add(ValueStack[ValueStack.Depth-1].id as procedure_attribute, CurrentLocationSpan); } break; - case 801: // identifier -> tkIdentifier + case 802: // identifier -> tkIdentifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 802: // identifier -> property_specifier_directives + case 803: // identifier -> property_specifier_directives { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 803: // identifier -> non_reserved + case 804: // identifier -> non_reserved { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 804: // identifier_or_keyword -> identifier + case 805: // identifier_or_keyword -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 805: // identifier_or_keyword -> keyword + case 806: // identifier_or_keyword -> keyword { CurrentSemanticValue.id = new ident(ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 806: // identifier_or_keyword -> reserved_keyword + case 807: // identifier_or_keyword -> reserved_keyword { CurrentSemanticValue.id = new ident(ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 807: // identifier_keyword_operatorname -> identifier + case 808: // identifier_keyword_operatorname -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 808: // identifier_keyword_operatorname -> keyword + case 809: // identifier_keyword_operatorname -> keyword { CurrentSemanticValue.id = new ident(ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 809: // identifier_keyword_operatorname -> operator_name_ident + case 810: // identifier_keyword_operatorname -> operator_name_ident { CurrentSemanticValue.id = (ident)ValueStack[ValueStack.Depth-1].ex; } break; - case 810: // meth_modificator -> tkAbstract + case 811: // meth_modificator -> tkAbstract { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 811: // meth_modificator -> tkOverload + case 812: // meth_modificator -> tkOverload { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; parsertools.AddWarningFromResource("OVERLOAD_IS_NOT_USED", ValueStack[ValueStack.Depth-1].id.source_context); } break; - case 812: // meth_modificator -> tkReintroduce + case 813: // meth_modificator -> tkReintroduce { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 813: // meth_modificator -> tkOverride + case 814: // meth_modificator -> tkOverride { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 814: // meth_modificator -> tkExtensionMethod + case 815: // meth_modificator -> tkExtensionMethod { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 815: // meth_modificator -> tkVirtual + case 816: // meth_modificator -> tkVirtual { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 816: // property_modificator -> tkVirtual + case 817: // property_modificator -> tkVirtual { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 817: // property_modificator -> tkOverride + case 818: // property_modificator -> tkOverride { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 818: // property_modificator -> tkAbstract + case 819: // property_modificator -> tkAbstract { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 819: // property_modificator -> tkReintroduce + case 820: // property_modificator -> tkReintroduce { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 820: // property_specifier_directives -> tkRead + case 821: // property_specifier_directives -> tkRead { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 821: // property_specifier_directives -> tkWrite + case 822: // property_specifier_directives -> tkWrite { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 822: // non_reserved -> tkName + case 823: // non_reserved -> tkName { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 823: // non_reserved -> tkNew + case 824: // non_reserved -> tkNew { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 824: // visibility_specifier -> tkInternal + case 825: // visibility_specifier -> tkInternal { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 825: // visibility_specifier -> tkPublic + case 826: // visibility_specifier -> tkPublic { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 826: // visibility_specifier -> tkProtected + case 827: // visibility_specifier -> tkProtected { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 827: // visibility_specifier -> tkPrivate + case 828: // visibility_specifier -> tkPrivate { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 828: // keyword -> visibility_specifier + case 829: // keyword -> visibility_specifier { CurrentSemanticValue.ti = new token_info(ValueStack[ValueStack.Depth-1].id.name, CurrentLocationSpan); } break; - case 829: // keyword -> tkSealed + case 830: // keyword -> tkSealed { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 830: // keyword -> tkTemplate + case 831: // keyword -> tkTemplate { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 831: // keyword -> tkOr + case 832: // keyword -> tkOr { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 832: // keyword -> tkTypeOf + case 833: // keyword -> tkTypeOf { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 833: // keyword -> tkSizeOf + case 834: // keyword -> tkSizeOf { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 834: // keyword -> tkDefault + case 835: // keyword -> tkDefault { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 835: // keyword -> tkWhere + case 836: // keyword -> tkWhere { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 836: // keyword -> tkXor + case 837: // keyword -> tkXor { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 837: // keyword -> tkAnd + case 838: // keyword -> tkAnd { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 838: // keyword -> tkDiv + case 839: // keyword -> tkDiv { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 839: // keyword -> tkMod + case 840: // keyword -> tkMod { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 840: // keyword -> tkShl + case 841: // keyword -> tkShl { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 841: // keyword -> tkShr + case 842: // keyword -> tkShr { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 842: // keyword -> tkNot + case 843: // keyword -> tkNot { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 843: // keyword -> tkAs + case 844: // keyword -> tkAs { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 844: // keyword -> tkIn + case 845: // keyword -> tkIn { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 845: // keyword -> tkIs + case 846: // keyword -> tkIs { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 846: // keyword -> tkArray + case 847: // keyword -> tkArray { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 847: // keyword -> tkSequence + case 848: // keyword -> tkSequence { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 848: // keyword -> tkBegin + case 849: // keyword -> tkBegin { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 849: // keyword -> tkCase + case 850: // keyword -> tkCase { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 850: // keyword -> tkClass + case 851: // keyword -> tkClass { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 851: // keyword -> tkConst + case 852: // keyword -> tkConst { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 852: // keyword -> tkConstructor + case 853: // keyword -> tkConstructor { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 853: // keyword -> tkDestructor + case 854: // keyword -> tkDestructor { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 854: // keyword -> tkDownto + case 855: // keyword -> tkDownto { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 855: // keyword -> tkDo + case 856: // keyword -> tkDo { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 856: // keyword -> tkElse + case 857: // keyword -> tkElse { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 857: // keyword -> tkEnd + case 858: // keyword -> tkEnd { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 858: // keyword -> tkExcept + case 859: // keyword -> tkExcept { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 859: // keyword -> tkFile + case 860: // keyword -> tkFile { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 860: // keyword -> tkAuto + case 861: // keyword -> tkAuto { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 861: // keyword -> tkFinalization + case 862: // keyword -> tkFinalization { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 862: // keyword -> tkFinally + case 863: // keyword -> tkFinally { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 863: // keyword -> tkFor + case 864: // keyword -> tkFor { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 864: // keyword -> tkForeach + case 865: // keyword -> tkForeach { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 865: // keyword -> tkFunction + case 866: // keyword -> tkFunction { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 866: // keyword -> tkIf + case 867: // keyword -> tkIf { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 867: // keyword -> tkImplementation + case 868: // keyword -> tkImplementation { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 868: // keyword -> tkInherited + case 869: // keyword -> tkInherited { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 869: // keyword -> tkInitialization + case 870: // keyword -> tkInitialization { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 870: // keyword -> tkInterface + case 871: // keyword -> tkInterface { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 871: // keyword -> tkProcedure + case 872: // keyword -> tkProcedure { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 872: // keyword -> tkProperty + case 873: // keyword -> tkProperty { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 873: // keyword -> tkRaise + case 874: // keyword -> tkRaise { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 874: // keyword -> tkRecord + case 875: // keyword -> tkRecord { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 875: // keyword -> tkRepeat + case 876: // keyword -> tkRepeat { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 876: // keyword -> tkSet + case 877: // keyword -> tkSet { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 877: // keyword -> tkTry + case 878: // keyword -> tkTry { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 878: // keyword -> tkType + case 879: // keyword -> tkType { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 879: // keyword -> tkStatic + case 880: // keyword -> tkStatic { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 880: // keyword -> tkThen + case 881: // keyword -> tkThen { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 881: // keyword -> tkTo + case 882: // keyword -> tkTo { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 882: // keyword -> tkUntil + case 883: // keyword -> tkUntil { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 883: // keyword -> tkUses + case 884: // keyword -> tkUses { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 884: // keyword -> tkVar + case 885: // keyword -> tkVar { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 885: // keyword -> tkWhile + case 886: // keyword -> tkWhile { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 886: // keyword -> tkWith + case 887: // keyword -> tkWith { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 887: // keyword -> tkNil + case 888: // keyword -> tkNil { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 888: // keyword -> tkGoto + case 889: // keyword -> tkGoto { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 889: // keyword -> tkOf + case 890: // keyword -> tkOf { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 890: // keyword -> tkLabel + case 891: // keyword -> tkLabel { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 891: // keyword -> tkProgram + case 892: // keyword -> tkProgram { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 892: // keyword -> tkUnit + case 893: // keyword -> tkUnit { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 893: // keyword -> tkLibrary + case 894: // keyword -> tkLibrary { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 894: // keyword -> tkNamespace + case 895: // keyword -> tkNamespace { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 895: // keyword -> tkExternal + case 896: // keyword -> tkExternal { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 896: // keyword -> tkParams + case 897: // keyword -> tkParams { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 897: // keyword -> tkEvent + case 898: // keyword -> tkEvent { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 898: // keyword -> tkYield + case 899: // keyword -> tkYield { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 899: // keyword -> tkMatch + case 900: // keyword -> tkMatch { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 900: // keyword -> tkWhen + case 901: // keyword -> tkWhen { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 901: // keyword -> tkPartial + case 902: // keyword -> tkPartial { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 902: // keyword -> tkAbstract + case 903: // keyword -> tkAbstract { CurrentSemanticValue.ti = new token_info(ValueStack[ValueStack.Depth-1].id.name, CurrentLocationSpan); } break; - case 903: // keyword -> tkLock + case 904: // keyword -> tkLock { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 904: // keyword -> tkImplicit + case 905: // keyword -> tkImplicit { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 905: // keyword -> tkExplicit + case 906: // keyword -> tkExplicit { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 906: // keyword -> tkOn + case 907: // keyword -> tkOn { CurrentSemanticValue.ti = new token_info(ValueStack[ValueStack.Depth-1].id.name, CurrentLocationSpan); } break; - case 907: // keyword -> tkVirtual + case 908: // keyword -> tkVirtual { CurrentSemanticValue.ti = new token_info(ValueStack[ValueStack.Depth-1].id.name, CurrentLocationSpan); } break; - case 908: // keyword -> tkOverride + case 909: // keyword -> tkOverride { CurrentSemanticValue.ti = new token_info(ValueStack[ValueStack.Depth-1].id.name, CurrentLocationSpan); } break; - case 909: // keyword -> tkLoop + case 910: // keyword -> tkLoop { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 910: // keyword -> tkExtensionMethod + case 911: // keyword -> tkExtensionMethod { CurrentSemanticValue.ti = new token_info(ValueStack[ValueStack.Depth-1].id.name, CurrentLocationSpan); } break; - case 911: // keyword -> tkOverload + case 912: // keyword -> tkOverload { CurrentSemanticValue.ti = new token_info(ValueStack[ValueStack.Depth-1].id.name, CurrentLocationSpan); } break; - case 912: // keyword -> tkReintroduce + case 913: // keyword -> tkReintroduce { CurrentSemanticValue.ti = new token_info(ValueStack[ValueStack.Depth-1].id.name, CurrentLocationSpan); } break; - case 913: // keyword -> tkForward + case 914: // keyword -> tkForward { CurrentSemanticValue.ti = new token_info(ValueStack[ValueStack.Depth-1].id.name, CurrentLocationSpan); } break; - case 914: // reserved_keyword -> tkOperator + case 915: // reserved_keyword -> tkOperator { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 915: // overload_operator -> tkMinus + case 916: // overload_operator -> tkMinus { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 916: // overload_operator -> tkPlus + case 917: // overload_operator -> tkPlus { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 917: // overload_operator -> tkSlash + case 918: // overload_operator -> tkSlash { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 918: // overload_operator -> tkStar + case 919: // overload_operator -> tkStar { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 919: // overload_operator -> tkEqual + case 920: // overload_operator -> tkEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 920: // overload_operator -> tkGreater + case 921: // overload_operator -> tkGreater { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 921: // overload_operator -> tkGreaterEqual + case 922: // overload_operator -> tkGreaterEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 922: // overload_operator -> tkLower + case 923: // overload_operator -> tkLower { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 923: // overload_operator -> tkLowerEqual + case 924: // overload_operator -> tkLowerEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 924: // overload_operator -> tkNotEqual + case 925: // overload_operator -> tkNotEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 925: // overload_operator -> tkOr + case 926: // overload_operator -> tkOr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 926: // overload_operator -> tkXor + case 927: // overload_operator -> tkXor { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 927: // overload_operator -> tkAnd + case 928: // overload_operator -> tkAnd { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 928: // overload_operator -> tkDiv + case 929: // overload_operator -> tkDiv { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 929: // overload_operator -> tkMod + case 930: // overload_operator -> tkMod { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 930: // overload_operator -> tkShl + case 931: // overload_operator -> tkShl { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 931: // overload_operator -> tkShr + case 932: // overload_operator -> tkShr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 932: // overload_operator -> tkNot + case 933: // overload_operator -> tkNot { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 933: // overload_operator -> tkIn + case 934: // overload_operator -> tkIn { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 934: // overload_operator -> tkImplicit + case 935: // overload_operator -> tkImplicit { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 935: // overload_operator -> tkExplicit + case 936: // overload_operator -> tkExplicit { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 936: // overload_operator -> assign_operator + case 937: // overload_operator -> assign_operator { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 937: // overload_operator -> tkStarStar + case 938: // overload_operator -> tkStarStar { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 938: // assign_operator -> tkAssign + case 939: // assign_operator -> tkAssign { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 939: // assign_operator -> tkPlusEqual + case 940: // assign_operator -> tkPlusEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 940: // assign_operator -> tkMinusEqual + case 941: // assign_operator -> tkMinusEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 941: // assign_operator -> tkMultEqual + case 942: // assign_operator -> tkMultEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 942: // assign_operator -> tkDivEqual + case 943: // assign_operator -> tkDivEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 943: // func_decl_lambda -> identifier, tkArrow, lambda_function_body + case 944: // func_decl_lambda -> identifier, tkArrow, lambda_function_body { var idList = new ident_list(ValueStack[ValueStack.Depth-3].id, LocationStack[LocationStack.Depth-3]); var formalPars = new formal_parameters(new typed_parameters(idList, new lambda_inferred_type(new PascalABCCompiler.TreeRealization.lambda_any_type_node(), LocationStack[LocationStack.Depth-3]), parametr_kind.none, null, LocationStack[LocationStack.Depth-3]), LocationStack[LocationStack.Depth-3]); @@ -7097,7 +7102,7 @@ public partial class GPPGParser: ShiftReduceParser tkRoundOpen, tkRoundClose, lambda_type_ref_noproctype, + case 945: // func_decl_lambda -> tkRoundOpen, tkRoundClose, lambda_type_ref_noproctype, // tkArrow, lambda_function_body { // ����� ���� ������������� �� ���� � ���� ��������� lambda_inferred_type, ���� ������ ��� null! @@ -7107,7 +7112,7 @@ public partial class GPPGParser: ShiftReduceParser tkRoundOpen, identifier, tkColon, fptype, tkRoundClose, + case 946: // func_decl_lambda -> tkRoundOpen, identifier, tkColon, fptype, tkRoundClose, // lambda_type_ref_noproctype, tkArrow, lambda_function_body { var idList = new ident_list(ValueStack[ValueStack.Depth-7].id, LocationStack[LocationStack.Depth-7]); @@ -7119,7 +7124,7 @@ public partial class GPPGParser: ShiftReduceParser tkRoundOpen, identifier, tkSemiColon, full_lambda_fp_list, + case 947: // func_decl_lambda -> tkRoundOpen, identifier, tkSemiColon, full_lambda_fp_list, // tkRoundClose, lambda_type_ref_noproctype, tkArrow, // lambda_function_body { @@ -7133,7 +7138,7 @@ public partial class GPPGParser: ShiftReduceParser tkRoundOpen, identifier, tkColon, fptype, tkSemiColon, + case 948: // func_decl_lambda -> tkRoundOpen, identifier, tkColon, fptype, tkSemiColon, // full_lambda_fp_list, tkRoundClose, // lambda_type_ref_noproctype, tkArrow, lambda_function_body { @@ -7148,7 +7153,7 @@ public partial class GPPGParser: ShiftReduceParser tkRoundOpen, expr_l1, tkComma, expr_l1_list, + case 949: // func_decl_lambda -> tkRoundOpen, expr_l1, tkComma, expr_l1_list, // lambda_type_ref, optional_full_lambda_fp_list, // tkRoundClose, rem_lambda { @@ -7217,62 +7222,62 @@ public partial class GPPGParser: ShiftReduceParser expl_func_decl_lambda + case 950: // func_decl_lambda -> expl_func_decl_lambda { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 950: // optional_full_lambda_fp_list -> /* empty */ + case 951: // optional_full_lambda_fp_list -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 951: // optional_full_lambda_fp_list -> tkSemiColon, full_lambda_fp_list + case 952: // optional_full_lambda_fp_list -> tkSemiColon, full_lambda_fp_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 952: // rem_lambda -> lambda_type_ref_noproctype, tkArrow, lambda_function_body + case 953: // rem_lambda -> lambda_type_ref_noproctype, tkArrow, lambda_function_body { CurrentSemanticValue.ob = new pair_type_stlist(ValueStack[ValueStack.Depth-3].td,ValueStack[ValueStack.Depth-1].stn as statement_list); } break; - case 953: // expl_func_decl_lambda -> tkFunction, lambda_type_ref_noproctype, tkArrow, + case 954: // expl_func_decl_lambda -> tkFunction, lambda_type_ref_noproctype, tkArrow, // lambda_function_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), null, ValueStack[ValueStack.Depth-3].td, ValueStack[ValueStack.Depth-1].stn as statement_list, 1, CurrentLocationSpan); } break; - case 954: // expl_func_decl_lambda -> tkFunction, tkRoundOpen, tkRoundClose, + case 955: // expl_func_decl_lambda -> tkFunction, tkRoundOpen, tkRoundClose, // lambda_type_ref_noproctype, tkArrow, // lambda_function_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), null, ValueStack[ValueStack.Depth-3].td, ValueStack[ValueStack.Depth-1].stn as statement_list, 1, CurrentLocationSpan); } break; - case 955: // expl_func_decl_lambda -> tkFunction, tkRoundOpen, full_lambda_fp_list, + case 956: // expl_func_decl_lambda -> tkFunction, tkRoundOpen, full_lambda_fp_list, // tkRoundClose, lambda_type_ref_noproctype, tkArrow, // lambda_function_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), ValueStack[ValueStack.Depth-5].stn as formal_parameters, ValueStack[ValueStack.Depth-3].td, ValueStack[ValueStack.Depth-1].stn as statement_list, 1, CurrentLocationSpan); } break; - case 956: // expl_func_decl_lambda -> tkProcedure, tkArrow, lambda_procedure_body + case 957: // expl_func_decl_lambda -> tkProcedure, tkArrow, lambda_procedure_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), null, null, ValueStack[ValueStack.Depth-1].stn as statement_list, 2, CurrentLocationSpan); } break; - case 957: // expl_func_decl_lambda -> tkProcedure, tkRoundOpen, tkRoundClose, tkArrow, + case 958: // expl_func_decl_lambda -> tkProcedure, tkRoundOpen, tkRoundClose, tkArrow, // lambda_procedure_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), null, null, ValueStack[ValueStack.Depth-1].stn as statement_list, 2, CurrentLocationSpan); } break; - case 958: // expl_func_decl_lambda -> tkProcedure, tkRoundOpen, full_lambda_fp_list, + case 959: // expl_func_decl_lambda -> tkProcedure, tkRoundOpen, full_lambda_fp_list, // tkRoundClose, tkArrow, lambda_procedure_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), ValueStack[ValueStack.Depth-4].stn as formal_parameters, null, ValueStack[ValueStack.Depth-1].stn as statement_list, 2, CurrentLocationSpan); } break; - case 959: // full_lambda_fp_list -> lambda_simple_fp_sect + case 960: // full_lambda_fp_list -> lambda_simple_fp_sect { var typed_pars = ValueStack[ValueStack.Depth-1].stn as typed_parameters; if (typed_pars.vars_type is lambda_inferred_type) @@ -7292,97 +7297,97 @@ public partial class GPPGParser: ShiftReduceParser full_lambda_fp_list, tkSemiColon, lambda_simple_fp_sect + case 961: // full_lambda_fp_list -> full_lambda_fp_list, tkSemiColon, lambda_simple_fp_sect { CurrentSemanticValue.stn =(ValueStack[ValueStack.Depth-3].stn as formal_parameters).Add(ValueStack[ValueStack.Depth-1].stn as typed_parameters, CurrentLocationSpan); } break; - case 961: // lambda_simple_fp_sect -> ident_list, lambda_type_ref + case 962: // lambda_simple_fp_sect -> ident_list, lambda_type_ref { CurrentSemanticValue.stn = new typed_parameters(ValueStack[ValueStack.Depth-2].stn as ident_list, ValueStack[ValueStack.Depth-1].td, parametr_kind.none, null, CurrentLocationSpan); } break; - case 962: // lambda_type_ref -> /* empty */ + case 963: // lambda_type_ref -> /* empty */ { CurrentSemanticValue.td = new lambda_inferred_type(new PascalABCCompiler.TreeRealization.lambda_any_type_node(), null); } break; - case 963: // lambda_type_ref -> tkColon, fptype + case 964: // lambda_type_ref -> tkColon, fptype { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 964: // lambda_type_ref_noproctype -> /* empty */ + case 965: // lambda_type_ref_noproctype -> /* empty */ { CurrentSemanticValue.td = new lambda_inferred_type(new PascalABCCompiler.TreeRealization.lambda_any_type_node(), null); } break; - case 965: // lambda_type_ref_noproctype -> tkColon, fptype_noproctype + case 966: // lambda_type_ref_noproctype -> tkColon, fptype_noproctype { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 966: // common_lambda_body -> compound_stmt + case 967: // common_lambda_body -> compound_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 967: // common_lambda_body -> if_stmt + case 968: // common_lambda_body -> if_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 968: // common_lambda_body -> while_stmt + case 969: // common_lambda_body -> while_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 969: // common_lambda_body -> repeat_stmt + case 970: // common_lambda_body -> repeat_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 970: // common_lambda_body -> for_stmt + case 971: // common_lambda_body -> for_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 971: // common_lambda_body -> foreach_stmt + case 972: // common_lambda_body -> foreach_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 972: // common_lambda_body -> loop_stmt + case 973: // common_lambda_body -> loop_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 973: // common_lambda_body -> case_stmt + case 974: // common_lambda_body -> case_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 974: // common_lambda_body -> try_stmt + case 975: // common_lambda_body -> try_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 975: // common_lambda_body -> lock_stmt + case 976: // common_lambda_body -> lock_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 976: // common_lambda_body -> raise_stmt + case 977: // common_lambda_body -> raise_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 977: // common_lambda_body -> yield_stmt + case 978: // common_lambda_body -> yield_stmt { parsertools.AddErrorFromResource("YIELD_STATEMENT_CANNOT_BE_USED_IN_LAMBDA_BODY", CurrentLocationSpan); } break; - case 978: // lambda_function_body -> expr_l1_for_lambda + case 979: // lambda_function_body -> expr_l1_for_lambda { var id = SyntaxVisitors.HasNameVisitor.HasName(ValueStack[ValueStack.Depth-1].ex, "Result"); if (id != null) @@ -7394,22 +7399,22 @@ public partial class GPPGParser: ShiftReduceParser common_lambda_body + case 980: // lambda_function_body -> common_lambda_body { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 980: // lambda_procedure_body -> proc_call + case 981: // lambda_procedure_body -> proc_call { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 981: // lambda_procedure_body -> assignment + case 982: // lambda_procedure_body -> assignment { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 982: // lambda_procedure_body -> common_lambda_body + case 983: // lambda_procedure_body -> common_lambda_body { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } diff --git a/Parsers/PascalABCParserNewSaushkin/PABC.ymc b/Parsers/PascalABCParserNewSaushkin/PABC.ymc index 7104a5f73..a068abbd7 100644 --- a/Parsers/PascalABCParserNewSaushkin/PABC.ymc +++ b/Parsers/PascalABCParserNewSaushkin/PABC.ymc @@ -289,5 +289,6 @@ script= + diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 982f261e7..b192847c7 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.7.1.2744 +3.7.1.2746 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index d298b8f02..eb9064728 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.7.1.2744' +!define VERSION '3.7.1.2746' diff --git a/SyntaxTree/tree/AbstractVisitor.cs b/SyntaxTree/tree/AbstractVisitor.cs index 62f3084ca..94e3fb300 100644 --- a/SyntaxTree/tree/AbstractVisitor.cs +++ b/SyntaxTree/tree/AbstractVisitor.cs @@ -1282,6 +1282,11 @@ namespace PascalABCCompiler.SyntaxTree { DefaultVisit(_semantic_ith_element_of); } + + public virtual void visit(bigint_const _bigint_const) + { + DefaultVisit(_bigint_const); + } } diff --git a/SyntaxTree/tree/HierarchyVisitor.cs b/SyntaxTree/tree/HierarchyVisitor.cs index 6c6af0658..c5faf5851 100644 --- a/SyntaxTree/tree/HierarchyVisitor.cs +++ b/SyntaxTree/tree/HierarchyVisitor.cs @@ -2045,6 +2045,14 @@ namespace PascalABCCompiler.SyntaxTree { } + public virtual void pre_do_visit(bigint_const _bigint_const) + { + } + + public virtual void post_do_visit(bigint_const _bigint_const) + { + } + public override void visit(expression _expression) { DefaultVisit(_expression); @@ -4223,6 +4231,13 @@ namespace PascalABCCompiler.SyntaxTree visit(semantic_ith_element_of.index); post_do_visit(_semantic_ith_element_of); } + + public override void visit(bigint_const _bigint_const) + { + DefaultVisit(_bigint_const); + pre_do_visit(_bigint_const); + post_do_visit(_bigint_const); + } } diff --git a/SyntaxTree/tree/SyntaxTreeStreamReader.cs b/SyntaxTree/tree/SyntaxTreeStreamReader.cs index fcef407e7..d3e84a9e0 100644 --- a/SyntaxTree/tree/SyntaxTreeStreamReader.cs +++ b/SyntaxTree/tree/SyntaxTreeStreamReader.cs @@ -530,6 +530,8 @@ namespace PascalABCCompiler.SyntaxTree return new array_const_new(); case 254: return new semantic_ith_element_of(); + case 255: + return new bigint_const(); } return null; } @@ -4445,6 +4447,18 @@ namespace PascalABCCompiler.SyntaxTree _semantic_ith_element_of.index = _read_node() as expression; } + + public void visit(bigint_const _bigint_const) + { + read_bigint_const(_bigint_const); + } + + public void read_bigint_const(bigint_const _bigint_const) + { + read_const_node(_bigint_const); + _bigint_const.val = br.ReadUInt64(); + } + } diff --git a/SyntaxTree/tree/SyntaxTreeStreamWriter.cs b/SyntaxTree/tree/SyntaxTreeStreamWriter.cs index ebe43ad50..9330bee7d 100644 --- a/SyntaxTree/tree/SyntaxTreeStreamWriter.cs +++ b/SyntaxTree/tree/SyntaxTreeStreamWriter.cs @@ -6959,6 +6959,19 @@ namespace PascalABCCompiler.SyntaxTree } } + + public void visit(bigint_const _bigint_const) + { + bw.Write((Int16)255); + write_bigint_const(_bigint_const); + } + + public void write_bigint_const(bigint_const _bigint_const) + { + write_const_node(_bigint_const); + bw.Write(_bigint_const.val); + } + } diff --git a/SyntaxTree/tree/Tree.cs b/SyntaxTree/tree/Tree.cs index 0787764dd..533c1fd95 100644 --- a/SyntaxTree/tree/Tree.cs +++ b/SyntaxTree/tree/Tree.cs @@ -54380,6 +54380,143 @@ namespace PascalABCCompiler.SyntaxTree } + /// + /// + /// + [Serializable] + public partial class bigint_const : const_node + { + + /// + ///Конструктор без параметров. + /// + public bigint_const() + { + + } + + /// + ///Конструктор с параметрами. + /// + public bigint_const(UInt64 _val) + { + this._val=_val; + FillParentsInDirectChilds(); + } + + /// + ///Конструктор с параметрами. + /// + public bigint_const(UInt64 _val,SourceContext sc) + { + this._val=_val; + source_context = sc; + FillParentsInDirectChilds(); + } + protected UInt64 _val; + + /// + /// + /// + public UInt64 val + { + get + { + return _val; + } + set + { + _val=value; + } + } + + + /// Создает копию узла + public override syntax_tree_node Clone() + { + bigint_const copy = new bigint_const(); + copy.Parent = this.Parent; + if (source_context != null) + copy.source_context = new SourceContext(source_context); + if (attributes != null) + { + copy.attributes = (attribute_list)attributes.Clone(); + copy.attributes.Parent = copy; + } + copy.val = val; + return copy; + } + + /// Получает копию данного узла корректного типа + public new bigint_const TypedClone() + { + return Clone() as bigint_const; + } + + /// Заполняет поля Parent в непосредственных дочерних узлах + public override void FillParentsInDirectChilds() + { + if (attributes != null) + attributes.Parent = this; + } + + /// Заполняет поля Parent во всем поддереве + public override void FillParentsInAllChilds() + { + FillParentsInDirectChilds(); + attributes?.FillParentsInAllChilds(); + } + + /// + ///Свойство для получения количества всех подузлов без элементов поля типа List + /// + public override Int32 subnodes_without_list_elements_count + { + get + { + return 0; + } + } + /// + ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List + /// + public override Int32 subnodes_count + { + get + { + return 0; + } + } + /// + ///Индексатор для получения всех подузлов + /// + public override syntax_tree_node this[Int32 ind] + { + get + { + if(subnodes_count == 0 || ind < 0 || ind > subnodes_count-1) + throw new IndexOutOfRangeException(); + return null; + } + set + { + if(subnodes_count == 0 || ind < 0 || ind > subnodes_count-1) + throw new IndexOutOfRangeException(); + } + } + /// + ///Метод для обхода дерева посетителем + /// + ///Объект-посетитель. + ///Return value is void + public override void visit(IVisitor visitor) + { + visitor.visit(this); + } + + } + + } diff --git a/SyntaxTree/tree/Visitor.cs b/SyntaxTree/tree/Visitor.cs index 443878117..1ca51cfc5 100644 --- a/SyntaxTree/tree/Visitor.cs +++ b/SyntaxTree/tree/Visitor.cs @@ -1534,6 +1534,12 @@ namespace PascalABCCompiler.SyntaxTree ///Node to visit /// Return value is void void visit(semantic_ith_element_of _semantic_ith_element_of); + /// + ///Method to visit bigint_const. + /// + ///Node to visit + /// Return value is void + void visit(bigint_const _bigint_const); } diff --git a/SyntaxTree/tree/tree.xml b/SyntaxTree/tree/tree.xml index 6879b60d9..f901eea83 100644 --- a/SyntaxTree/tree/tree.xml +++ b/SyntaxTree/tree/tree.xml @@ -3291,6 +3291,16 @@ + + + + + + + + + + Tree.cs @@ -3486,6 +3496,8 @@ + + diff --git a/TestSuite/CompilationSamples/School.pas b/TestSuite/CompilationSamples/School.pas index 4e55ad20b..af61b8280 100644 --- a/TestSuite/CompilationSamples/School.pas +++ b/TestSuite/CompilationSamples/School.pas @@ -26,6 +26,9 @@ function Dec(s: string; base: integer): int64; /// Перевод из системы по основанию base [2..36] в десятичную function DecBig(s: string; base: integer): BigInteger; +/// Перевод BigInteger в систему счисления по основанию base (2..36) +function ToBase(BI: BigInteger; base: integer): string; + /// Перевод десятичного числа в систему счисления по основанию base (2..36) function ToBase(sDec: string; base: integer): string; @@ -183,6 +186,8 @@ end; {$endregion} +const sb = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'; + {$region Dec} function Dec(s: string; base: integer): int64; @@ -190,7 +195,6 @@ begin if not (base in 2..36) then raise new School_InvalidBase ($'ToDecimal: Недопустимое основание {base}'); - var sb := '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'; s := s.ToUpper; var r := s.Except(sb[:base + 1]).JoinToString; if r.Length > 0 then @@ -211,7 +215,6 @@ begin if not (base in 2..36) then raise new School_InvalidBase ($'ToDecimal: Недопустимое основание {base}'); - var sb := '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'; s := s.ToUpper; var r := s.Except(sb[:base + 1]).JoinToString; if r.Length > 0 then @@ -226,36 +229,37 @@ begin pa *= base end end; +{$endregion} +{$region ToBase} + +/// Перевод BigInteger в систему счисления по основанию base (2..36) +function ToBase(BI: BigInteger; base: integer): string; +begin + var s := new System.Text.StringBuilder(''); + while BI > 0 do + begin + s.Insert(0,sb[integer(BI mod base) + 1]); + BI := BI div base + end; + Result := if s.Length = 0 then '0' else s.ToString +end; + +/// Перевод BigInteger в систему счисления по основанию base (2..36) +function ToBase(Self: BigInteger; base: integer): string; extensionmethod := + ToBase(Self, base); + /// Перевод десятичного числа в систему счисления по основанию base (2..36) function ToBase(sDec: string; base: integer): string; begin var n: BigInteger; - if not BigInteger.TryParse(sDec, n) then exit; - var s := '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'; - Result := ''; - while n > 0 do - begin - Result := s[integer(n mod base) + 1] + Result; - n := n div base - end; - if Result = '' then Result := '0' + if BigInteger.TryParse(sDec, n) then + Result := ToBase(n, base) end; /// Перевод десятичного числа в систему счисления по основанию base (2..36) -function ToBase(Self: string; base: integer): string; extensionmethod; -begin - var n: BigInteger; - if not BigInteger.TryParse(Self, n) then exit; - var s := '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'; - Result := ''; - while n > 0 do - begin - Result := s[integer(n mod base) + 1] + Result; - n := n div base - end; - if Result = '' then Result := '0' -end; +function ToBase(Self: string; base: integer): string; extensionmethod := + ToBase(Self, base); {$endregion} diff --git a/TestSuite/bi1.pas b/TestSuite/bi1.pas new file mode 100644 index 000000000..d7a9b46ac --- /dev/null +++ b/TestSuite/bi1.pas @@ -0,0 +1,4 @@ +begin + var a := 2222222222222222222bi; + Assert(a=2222222222222222222bi); +end. \ No newline at end of file diff --git a/TreeConverter/TreeConversion/syntax_tree_visitor.cs b/TreeConverter/TreeConversion/syntax_tree_visitor.cs index cdd9c77d0..5403f3ef0 100644 --- a/TreeConverter/TreeConversion/syntax_tree_visitor.cs +++ b/TreeConverter/TreeConversion/syntax_tree_visitor.cs @@ -17272,6 +17272,15 @@ namespace PascalABCCompiler.TreeConverter return; } + public override void visit(SyntaxTree.bigint_const bi) + { + var names = new List { new ident("System"), new ident("Numerics"), new ident("BigInteger") }; + var ntr = new named_type_reference(names, bi.source_context); + var ne = new new_expr(ntr, new expression_list(new uint64_const(bi.val)),bi.source_context); + visit(ne); + } + + public override void visit(SyntaxTree.int32_const int32) { diff --git a/bin/Lib/School.pas b/bin/Lib/School.pas index 4e55ad20b..af61b8280 100644 --- a/bin/Lib/School.pas +++ b/bin/Lib/School.pas @@ -26,6 +26,9 @@ function Dec(s: string; base: integer): int64; /// Перевод из системы по основанию base [2..36] в десятичную function DecBig(s: string; base: integer): BigInteger; +/// Перевод BigInteger в систему счисления по основанию base (2..36) +function ToBase(BI: BigInteger; base: integer): string; + /// Перевод десятичного числа в систему счисления по основанию base (2..36) function ToBase(sDec: string; base: integer): string; @@ -183,6 +186,8 @@ end; {$endregion} +const sb = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'; + {$region Dec} function Dec(s: string; base: integer): int64; @@ -190,7 +195,6 @@ begin if not (base in 2..36) then raise new School_InvalidBase ($'ToDecimal: Недопустимое основание {base}'); - var sb := '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'; s := s.ToUpper; var r := s.Except(sb[:base + 1]).JoinToString; if r.Length > 0 then @@ -211,7 +215,6 @@ begin if not (base in 2..36) then raise new School_InvalidBase ($'ToDecimal: Недопустимое основание {base}'); - var sb := '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'; s := s.ToUpper; var r := s.Except(sb[:base + 1]).JoinToString; if r.Length > 0 then @@ -226,36 +229,37 @@ begin pa *= base end end; +{$endregion} +{$region ToBase} + +/// Перевод BigInteger в систему счисления по основанию base (2..36) +function ToBase(BI: BigInteger; base: integer): string; +begin + var s := new System.Text.StringBuilder(''); + while BI > 0 do + begin + s.Insert(0,sb[integer(BI mod base) + 1]); + BI := BI div base + end; + Result := if s.Length = 0 then '0' else s.ToString +end; + +/// Перевод BigInteger в систему счисления по основанию base (2..36) +function ToBase(Self: BigInteger; base: integer): string; extensionmethod := + ToBase(Self, base); + /// Перевод десятичного числа в систему счисления по основанию base (2..36) function ToBase(sDec: string; base: integer): string; begin var n: BigInteger; - if not BigInteger.TryParse(sDec, n) then exit; - var s := '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'; - Result := ''; - while n > 0 do - begin - Result := s[integer(n mod base) + 1] + Result; - n := n div base - end; - if Result = '' then Result := '0' + if BigInteger.TryParse(sDec, n) then + Result := ToBase(n, base) end; /// Перевод десятичного числа в систему счисления по основанию base (2..36) -function ToBase(Self: string; base: integer): string; extensionmethod; -begin - var n: BigInteger; - if not BigInteger.TryParse(Self, n) then exit; - var s := '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'; - Result := ''; - while n > 0 do - begin - Result := s[integer(n mod base) + 1] + Result; - n := n div base - end; - if Result = '' then Result := '0' -end; +function ToBase(Self: string; base: integer): string; extensionmethod := + ToBase(Self, base); {$endregion}