diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index b9dca55f7..afda94381 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "2"; public const string Minor = "2"; public const string Build = "0"; - public const string Revision = "944"; + public const string Revision = "945"; 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 1a4aeca8c..f731f33e2 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %MINOR%=2 -%REVISION%=944 +%REVISION%=945 %MAJOR%=2 %COREVERSION%=0 diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs index 2a833179a..877a03fab 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs @@ -1,9 +1,9 @@ // // This CSharp output file generated by Gardens Point LEX // Version: 1.1.3.301 -// Machine: IVAN-PC -// DateTime: 14.05.2015 11:52:36 -// UserName: Ivan +// Machine: SSM +// DateTime: 17.05.2015 21:07:31 +// UserName: ????????? // GPLEX input file // GPLEX frame file // diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y index e836f918c..d34bbda22 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y @@ -1138,6 +1138,81 @@ simple_type { $$ = new enum_type_definition($2 as enumerator_list, @$); } + | identifier tkArrow identifier + { + var l = new List(); + l.Add(new ident("System")); + l.Add(new ident("Func")); + var t = new template_param_list(); + t.Add(new named_type_reference($1,@1)); + t.Add(new named_type_reference($3,@3)); + t.source_context = @$; + $$ = new template_type_reference(new named_type_reference(l), t, @$); + } + | tkRoundOpen tkRoundClose tkArrow identifier + { + var l = new List(); + l.Add(new ident("System")); + l.Add(new ident("Func")); + var t = new template_param_list(); + t.Add(new named_type_reference($4,@4)); + t.source_context = @4; + $$ = new template_type_reference(new named_type_reference(l), t, @$); + } + | tkRoundOpen enumeration_id_list tkRoundClose tkArrow identifier + { + var l = new List(); + l.Add(new ident("System")); + l.Add(new ident("Func")); + var t = new template_param_list(); + var en = $2 as enumerator_list; + if (en.enumerators.Count == 1) + parsertools.AddErrorFromResource("ONE_TYPE_PARAMETER_MUSTBE_WITHOUT_PARENTHESES",en.enumerators[0].name.source_context); + for (int i=0; i(); + l.Add(new ident("System")); + l.Add(new ident("Action")); + var t = new template_param_list(); + t.Add(new named_type_reference($1,@1)); + t.source_context = @1; + $$ = new template_type_reference(new named_type_reference(l), t, @$); + } + | tkRoundOpen tkRoundClose tkArrow tkRoundOpen tkRoundClose + { + var l = new List(); + l.Add(new ident("System")); + l.Add(new ident("Action")); + $$ = new named_type_reference(l,@$); + } + | tkRoundOpen enumeration_id_list tkRoundClose tkArrow tkRoundOpen tkRoundClose + { + var l = new List(); + l.Add(new ident("System")); + l.Add(new ident("Action")); + var t = new template_param_list(); + var en = $2 as enumerator_list; + if (en.enumerators.Count == 1) + parsertools.AddErrorFromResource("ONE_TYPE_PARAMETER_MUSTBE_WITHOUT_PARENTHESES",en.enumerators[0].name.source_context); + for (int i=0; i(); + l.Add(new ident("System")); + l.Add(new ident("Func")); + var t = new template_param_list(); + t.Add(new named_type_reference($1,@1)); + t.Add(new named_type_reference($3,@3)); + t.source_context = @$; + $$ = new template_type_reference(new named_type_reference(l), t, @$); + } + | tkRoundOpen tkRoundClose tkArrow identifier + { + var l = new List(); + l.Add(new ident("System")); + l.Add(new ident("Func")); + var t = new template_param_list(); + t.Add(new named_type_reference($4,@4)); + t.source_context = @4; + $$ = new template_type_reference(new named_type_reference(l), t, @$); + } + | tkRoundOpen identifier tkComma template_param_list tkRoundClose tkArrow identifier + { + var l = new List(); + l.Add(new ident("System")); + l.Add(new ident("Func")); + var t = $4 as template_param_list; + t.Add(new named_type_reference($7,@7)); + t.params_list.Insert(0,new named_type_reference($2,@2)); + t.source_context = @$; + $$ = new template_type_reference(new named_type_reference(l), t, @$); + } + | identifier tkArrow tkRoundOpen tkRoundClose + { + var l = new List(); + l.Add(new ident("System")); + l.Add(new ident("Action")); + var t = new template_param_list(); + t.Add(new named_type_reference($1,@1)); + t.source_context = @1; + $$ = new template_type_reference(new named_type_reference(l), t, @$); + } + | tkRoundOpen tkRoundClose tkArrow tkRoundOpen tkRoundClose + { + var l = new List(); + l.Add(new ident("System")); + l.Add(new ident("Action")); + var t = new template_param_list(); + t.source_context = @$; + $$ = new template_type_reference(new named_type_reference(l), t, @$); + } + | tkRoundOpen identifier tkComma template_param_list tkRoundClose tkArrow tkRoundOpen tkRoundClose + { + var l = new List(); + l.Add(new ident("System")); + l.Add(new ident("Action")); + var t = $4 as template_param_list; + t.params_list.Insert(0,new named_type_reference($2,@2)); + t.source_context = @$; + $$ = new template_type_reference(new named_type_reference(l), t, @$); + }*/ ; object_type diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs index f798f6f08..ba872ef17 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs @@ -1,9 +1,9 @@ // (see accompanying GPPGcopyright.rtf) // GPPG version 1.3.6 -// Machine: IVAN-PC -// DateTime: 14.05.2015 11:52:38 -// UserName: Ivan +// Machine: SSM +// DateTime: 17.05.2015 21:07:31 +// UserName: ????????? // Input file // options: no-lines gplex @@ -73,8 +73,8 @@ public partial class GPPGParser: ShiftReduceParser aliasses; #pragma warning restore 649 - private static Rule[] rules = new Rule[758]; - private static State[] states = new State[1213]; + private static Rule[] rules = new Rule[764]; + private static State[] states = new State[1227]; private static string[] nonTerms = new string[] { "parse_goal", "unit_key_word", "assignment", "optional_array_initializer", "attribute_declarations", "ot_visibility_specifier", "one_attribute", "attribute_variable", @@ -149,13 +149,13 @@ public partial class GPPGParser: ShiftReduceParser range_term + case 222: // simple_type -> identifier, tkArrow, identifier +{ + var l = new List(); + l.Add(new ident("System")); + l.Add(new ident("Func")); + var t = new template_param_list(); + t.Add(new named_type_reference(ValueStack[ValueStack.Depth-3].id,LocationStack[LocationStack.Depth-3])); + t.Add(new named_type_reference(ValueStack[ValueStack.Depth-1].id,LocationStack[LocationStack.Depth-1])); + t.source_context = CurrentLocationSpan; + CurrentSemanticValue.td = new template_type_reference(new named_type_reference(l), t, CurrentLocationSpan); + } + break; + case 223: // simple_type -> tkRoundOpen, tkRoundClose, tkArrow, identifier +{ + var l = new List(); + l.Add(new ident("System")); + l.Add(new ident("Func")); + var t = new template_param_list(); + t.Add(new named_type_reference(ValueStack[ValueStack.Depth-1].id,LocationStack[LocationStack.Depth-1])); + t.source_context = LocationStack[LocationStack.Depth-1]; + CurrentSemanticValue.td = new template_type_reference(new named_type_reference(l), t, CurrentLocationSpan); + } + break; + case 224: // simple_type -> tkRoundOpen, enumeration_id_list, tkRoundClose, tkArrow, + // identifier +{ + var l = new List(); + l.Add(new ident("System")); + l.Add(new ident("Func")); + var t = new template_param_list(); + var en = ValueStack[ValueStack.Depth-4].stn as enumerator_list; + if (en.enumerators.Count == 1) + parsertools.AddErrorFromResource("ONE_TYPE_PARAMETER_MUSTBE_WITHOUT_PARENTHESES",en.enumerators[0].name.source_context); + for (int i=0; i identifier, tkArrow, tkRoundOpen, tkRoundClose +{ + var l = new List(); + l.Add(new ident("System")); + l.Add(new ident("Action")); + var t = new template_param_list(); + t.Add(new named_type_reference(ValueStack[ValueStack.Depth-4].id,LocationStack[LocationStack.Depth-4])); + t.source_context = LocationStack[LocationStack.Depth-4]; + CurrentSemanticValue.td = new template_type_reference(new named_type_reference(l), t, CurrentLocationSpan); + } + break; + case 226: // simple_type -> tkRoundOpen, tkRoundClose, tkArrow, tkRoundOpen, tkRoundClose +{ + var l = new List(); + l.Add(new ident("System")); + l.Add(new ident("Action")); + CurrentSemanticValue.td = new named_type_reference(l,CurrentLocationSpan); + } + break; + case 227: // simple_type -> tkRoundOpen, enumeration_id_list, tkRoundClose, tkArrow, + // tkRoundOpen, tkRoundClose +{ + var l = new List(); + l.Add(new ident("System")); + l.Add(new ident("Action")); + var t = new template_param_list(); + var en = ValueStack[ValueStack.Depth-5].stn as enumerator_list; + if (en.enumerators.Count == 1) + parsertools.AddErrorFromResource("ONE_TYPE_PARAMETER_MUSTBE_WITHOUT_PARENTHESES",en.enumerators[0].name.source_context); + for (int i=0; i range_term { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 223: // range_expr -> range_expr, const_addop, range_term + case 229: // 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 224: // range_term -> range_factor + case 230: // range_term -> range_factor { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 225: // range_term -> range_term, const_mulop, range_factor + case 231: // 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 226: // range_factor -> simple_type_identifier + case 232: // range_factor -> simple_type_identifier { if((ValueStack[ValueStack.Depth-1].td as named_type_reference).names.Count>0) CurrentSemanticValue.ex = (ValueStack[ValueStack.Depth-1].td as named_type_reference).names[0]; @@ -3071,23 +3174,23 @@ public partial class GPPGParser: ShiftReduceParser unsigned_number + case 233: // range_factor -> unsigned_number { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 228: // range_factor -> sign, range_factor + case 234: // range_factor -> sign, range_factor { CurrentSemanticValue.ex = new un_expr(ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 229: // range_factor -> literal + case 235: // range_factor -> literal { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 230: // range_factor -> range_factor, tkRoundOpen, const_elem_list, tkRoundClose + case 236: // 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 231: // range_factor -> tkRoundOpen, const_expr, tkRoundClose + case 237: // range_factor -> tkRoundOpen, const_expr, tkRoundClose { if (!parsertools.build_tree_for_brackets) CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-2].ex; @@ -3095,304 +3198,304 @@ public partial class GPPGParser: ShiftReduceParser identifier + case 238: // simple_type_identifier -> identifier { CurrentSemanticValue.td = new named_type_reference(ValueStack[ValueStack.Depth-1].id, CurrentLocationSpan); } break; - case 233: // simple_type_identifier -> simple_type_identifier, tkPoint, + case 239: // 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 234: // enumeration_id_list -> enumeration_id, tkComma, enumeration_id + case 240: // 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 235: // enumeration_id_list -> enumeration_id_list, tkComma, enumeration_id + case 241: // 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 236: // enumeration_id -> identifier + case 242: // enumeration_id -> identifier { CurrentSemanticValue.stn = new enumerator(ValueStack[ValueStack.Depth-1].id, null, CurrentLocationSpan); } break; - case 237: // enumeration_id -> identifier, tkEqual, expr + case 243: // enumeration_id -> identifier, tkEqual, expr { CurrentSemanticValue.stn = new enumerator(ValueStack[ValueStack.Depth-3].id, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 238: // pointer_type -> tkDeref, fptype + case 244: // pointer_type -> tkDeref, fptype { CurrentSemanticValue.td = new ref_type(ValueStack[ValueStack.Depth-1].td,CurrentLocationSpan); } break; - case 239: // structured_type -> unpacked_structured_type + case 245: // structured_type -> unpacked_structured_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 240: // structured_type -> tkPacked, unpacked_structured_type + case 246: // structured_type -> tkPacked, unpacked_structured_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 241: // unpacked_structured_type -> array_type + case 247: // unpacked_structured_type -> array_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 242: // unpacked_structured_type -> record_type + case 248: // unpacked_structured_type -> record_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 243: // unpacked_structured_type -> set_type + case 249: // unpacked_structured_type -> set_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 244: // unpacked_structured_type -> file_type + case 250: // unpacked_structured_type -> file_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 245: // unpacked_structured_type -> sequence_type + case 251: // unpacked_structured_type -> sequence_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 246: // sequence_type -> tkSequence, tkOf, type_ref + case 252: // sequence_type -> tkSequence, tkOf, type_ref { CurrentSemanticValue.td = new sequence_type(ValueStack[ValueStack.Depth-1].td,CurrentLocationSpan); } break; - case 247: // array_type -> tkArray, tkSquareOpen, simple_type_list, tkSquareClose, tkOf, + case 253: // 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 248: // array_type -> unsized_array_type + case 254: // array_type -> unsized_array_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 249: // unsized_array_type -> tkArray, tkOf, type_ref + case 255: // unsized_array_type -> tkArray, tkOf, type_ref { CurrentSemanticValue.td = new array_type(null, ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 250: // simple_type_list -> simple_type_or_ + case 256: // simple_type_list -> simple_type_or_ { CurrentSemanticValue.stn = new indexers_types(ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 251: // simple_type_list -> simple_type_list, tkComma, simple_type_or_ + case 257: // 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 252: // simple_type_or_ -> simple_type + case 258: // simple_type_or_ -> simple_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 253: // simple_type_or_ -> /* empty */ + case 259: // simple_type_or_ -> /* empty */ { CurrentSemanticValue.td = null; } break; - case 254: // set_type -> tkSet, tkOf, simple_type + case 260: // set_type -> tkSet, tkOf, simple_type { CurrentSemanticValue.td = new set_type_definition(ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 255: // file_type -> tkFile, tkOf, type_ref + case 261: // file_type -> tkFile, tkOf, type_ref { CurrentSemanticValue.td = new file_type(ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 256: // file_type -> tkFile + case 262: // file_type -> tkFile { CurrentSemanticValue.td = new file_type(); CurrentSemanticValue.td.source_context = CurrentLocationSpan; } break; - case 257: // string_type -> tkIdentifier, tkSquareOpen, const_expr, tkSquareClose + case 263: // 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 258: // procedural_type -> procedural_type_kind + case 264: // procedural_type -> procedural_type_kind { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 259: // procedural_type_kind -> proc_type_decl + case 265: // procedural_type_kind -> proc_type_decl { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 260: // proc_type_decl -> tkProcedure, fp_list + case 266: // 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 261: // proc_type_decl -> tkFunction, fp_list + case 267: // proc_type_decl -> tkFunction, fp_list { CurrentSemanticValue.td = new function_header(ValueStack[ValueStack.Depth-1].stn as formal_parameters, null, null, null, null, CurrentLocationSpan); } break; - case 262: // proc_type_decl -> tkFunction, fp_list, tkColon, fptype + case 268: // 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 263: // object_type -> class_attributes, class_or_interface_keyword, + case 269: // object_type -> class_attributes, class_or_interface_keyword, // optional_base_classes, optional_where_section, // optional_component_list_seq_end { CurrentSemanticValue.td = NewObjectType((class_attribute)ValueStack[ValueStack.Depth-5].ob, ValueStack[ValueStack.Depth-4].ti, ValueStack[ValueStack.Depth-3].stn as named_type_reference_list, ValueStack[ValueStack.Depth-2].stn as where_definition_list, ValueStack[ValueStack.Depth-1].stn as class_body, CurrentLocationSpan); } break; - case 264: // record_type -> tkRecord, optional_base_classes, optional_where_section, + case 270: // record_type -> tkRecord, optional_base_classes, optional_where_section, // member_list_section, tkEnd { CurrentSemanticValue.td = NewRecordType(ValueStack[ValueStack.Depth-4].stn as named_type_reference_list, ValueStack[ValueStack.Depth-3].stn as where_definition_list, ValueStack[ValueStack.Depth-2].stn as class_body, CurrentLocationSpan); } break; - case 265: // class_attribute -> tkSealed + case 271: // class_attribute -> tkSealed { CurrentSemanticValue.ob = class_attribute.Sealed; } break; - case 266: // class_attribute -> tkPartial + case 272: // class_attribute -> tkPartial { CurrentSemanticValue.ob = class_attribute.Partial; } break; - case 267: // class_attribute -> tkAbstract + case 273: // class_attribute -> tkAbstract { CurrentSemanticValue.ob = class_attribute.Abstract; } break; - case 268: // class_attribute -> tkAuto + case 274: // class_attribute -> tkAuto { CurrentSemanticValue.ob = class_attribute.Auto; } break; - case 269: // class_attributes -> /* empty */ + case 275: // class_attributes -> /* empty */ { CurrentSemanticValue.ob = class_attribute.None; } break; - case 270: // class_attributes -> class_attributes1 + case 276: // class_attributes -> class_attributes1 { CurrentSemanticValue.ob = ValueStack[ValueStack.Depth-1].ob; } break; - case 271: // class_attributes1 -> class_attribute + case 277: // class_attributes1 -> class_attribute { CurrentSemanticValue.ob = ValueStack[ValueStack.Depth-1].ob; } break; - case 272: // class_attributes1 -> class_attributes1, class_attribute + case 278: // class_attributes1 -> class_attributes1, class_attribute { ValueStack[ValueStack.Depth-2].ob = ((class_attribute)ValueStack[ValueStack.Depth-2].ob) | ((class_attribute)ValueStack[ValueStack.Depth-1].ob); CurrentSemanticValue.ob = ValueStack[ValueStack.Depth-2].ob; } break; - case 273: // class_or_interface_keyword -> tkClass + case 279: // class_or_interface_keyword -> tkClass { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 274: // class_or_interface_keyword -> tkInterface + case 280: // class_or_interface_keyword -> tkInterface { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 275: // class_or_interface_keyword -> tkTemplate + case 281: // class_or_interface_keyword -> tkTemplate { CurrentSemanticValue.ti = NewClassOrInterfaceKeyword(ValueStack[ValueStack.Depth-1].ti); } break; - case 276: // class_or_interface_keyword -> tkTemplate, tkClass + case 282: // class_or_interface_keyword -> tkTemplate, tkClass { CurrentSemanticValue.ti = NewClassOrInterfaceKeyword(ValueStack[ValueStack.Depth-2].ti, "c", CurrentLocationSpan); } break; - case 277: // class_or_interface_keyword -> tkTemplate, tkRecord + case 283: // class_or_interface_keyword -> tkTemplate, tkRecord { CurrentSemanticValue.ti = NewClassOrInterfaceKeyword(ValueStack[ValueStack.Depth-2].ti, "r", CurrentLocationSpan); } break; - case 278: // class_or_interface_keyword -> tkTemplate, tkInterface + case 284: // class_or_interface_keyword -> tkTemplate, tkInterface { CurrentSemanticValue.ti = NewClassOrInterfaceKeyword(ValueStack[ValueStack.Depth-2].ti, "i", CurrentLocationSpan); } break; - case 279: // optional_component_list_seq_end -> /* empty */ + case 285: // optional_component_list_seq_end -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 280: // optional_component_list_seq_end -> member_list_section, tkEnd + case 286: // optional_component_list_seq_end -> member_list_section, tkEnd { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 282: // optional_base_classes -> tkRoundOpen, base_classes_names_list, tkRoundClose + case 288: // optional_base_classes -> tkRoundOpen, base_classes_names_list, tkRoundClose { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 283: // base_classes_names_list -> base_class_name + case 289: // 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 284: // base_classes_names_list -> base_classes_names_list, tkComma, base_class_name + case 290: // 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 285: // base_class_name -> simple_type_identifier + case 291: // base_class_name -> simple_type_identifier { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].td; } break; - case 286: // base_class_name -> template_type + case 292: // base_class_name -> template_type { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].td; } break; - case 287: // template_arguments -> tkLower, ident_list, tkGreater + case 293: // template_arguments -> tkLower, ident_list, tkGreater { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 288: // optional_where_section -> /* empty */ + case 294: // optional_where_section -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 289: // optional_where_section -> where_part_list + case 295: // optional_where_section -> where_part_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 290: // where_part_list -> where_part + case 296: // where_part_list -> where_part { CurrentSemanticValue.stn = new where_definition_list(ValueStack[ValueStack.Depth-1].stn as where_definition, CurrentLocationSpan); } break; - case 291: // where_part_list -> where_part_list, where_part + case 297: // 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 292: // where_part -> tkWhere, ident_list, tkColon, type_ref_and_secific_list, + case 298: // 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 type_definition_list, CurrentLocationSpan); } break; - case 293: // type_ref_and_secific_list -> type_ref_or_secific + case 299: // type_ref_and_secific_list -> type_ref_or_secific { CurrentSemanticValue.stn = new type_definition_list(ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 294: // type_ref_and_secific_list -> type_ref_and_secific_list, tkComma, + case 300: // type_ref_and_secific_list -> type_ref_and_secific_list, tkComma, // type_ref_or_secific { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as type_definition_list).Add(ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 295: // type_ref_or_secific -> type_ref + case 301: // type_ref_or_secific -> type_ref { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 296: // type_ref_or_secific -> tkClass + case 302: // type_ref_or_secific -> tkClass { CurrentSemanticValue.td = new declaration_specificator(DeclarationSpecificator.WhereDefClass, ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 297: // type_ref_or_secific -> tkRecord + case 303: // type_ref_or_secific -> tkRecord { CurrentSemanticValue.td = new declaration_specificator(DeclarationSpecificator.WhereDefValueType, ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 298: // type_ref_or_secific -> tkConstructor + case 304: // type_ref_or_secific -> tkConstructor { CurrentSemanticValue.td = new declaration_specificator(DeclarationSpecificator.WhereDefConstructor, ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 299: // member_list_section -> member_list + case 305: // member_list_section -> member_list { CurrentSemanticValue.stn = new class_body(ValueStack[ValueStack.Depth-1].stn as class_members, CurrentLocationSpan); } break; - case 300: // member_list_section -> member_list_section, ot_visibility_specifier, + case 306: // 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; @@ -3404,361 +3507,361 @@ public partial class GPPGParser: ShiftReduceParser tkInternal + case 307: // ot_visibility_specifier -> tkInternal { CurrentSemanticValue.stn = new access_modifer_node(access_modifer.internal_modifer, CurrentLocationSpan); } break; - case 302: // ot_visibility_specifier -> tkPublic + case 308: // ot_visibility_specifier -> tkPublic { CurrentSemanticValue.stn = new access_modifer_node(access_modifer.public_modifer, CurrentLocationSpan); } break; - case 303: // ot_visibility_specifier -> tkProtected + case 309: // ot_visibility_specifier -> tkProtected { CurrentSemanticValue.stn = new access_modifer_node(access_modifer.protected_modifer, CurrentLocationSpan); } break; - case 304: // ot_visibility_specifier -> tkPrivate + case 310: // ot_visibility_specifier -> tkPrivate { CurrentSemanticValue.stn = new access_modifer_node(access_modifer.private_modifer, CurrentLocationSpan); } break; - case 305: // member_list -> /* empty */ + case 311: // member_list -> /* empty */ { CurrentSemanticValue.stn = new class_members(); } break; - case 306: // member_list -> field_or_const_definition_list, optional_semicolon + case 312: // member_list -> field_or_const_definition_list, optional_semicolon { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 307: // member_list -> method_decl_list + case 313: // member_list -> method_decl_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 308: // member_list -> field_or_const_definition_list, tkSemiColon, method_decl_list + case 314: // 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 309: // ident_list -> identifier + case 315: // ident_list -> identifier { CurrentSemanticValue.stn = new ident_list(ValueStack[ValueStack.Depth-1].id, CurrentLocationSpan); } break; - case 310: // ident_list -> ident_list, tkComma, identifier + case 316: // 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 311: // optional_semicolon -> /* empty */ + case 317: // optional_semicolon -> /* empty */ { CurrentSemanticValue.ob = null; } break; - case 312: // optional_semicolon -> tkSemiColon + case 318: // optional_semicolon -> tkSemiColon { CurrentSemanticValue.ob = ValueStack[ValueStack.Depth-1].ti; } break; - case 313: // field_or_const_definition_list -> field_or_const_definition + case 319: // field_or_const_definition_list -> field_or_const_definition { CurrentSemanticValue.stn = new class_members(ValueStack[ValueStack.Depth-1].stn as declaration, CurrentLocationSpan); } break; - case 314: // field_or_const_definition_list -> field_or_const_definition_list, tkSemiColon, + case 320: // 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 315: // field_or_const_definition -> attribute_declarations, + case 321: // 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 316: // method_decl_list -> method_or_property_decl + case 322: // method_decl_list -> method_or_property_decl { CurrentSemanticValue.stn = new class_members(ValueStack[ValueStack.Depth-1].stn as declaration, CurrentLocationSpan); } break; - case 317: // method_decl_list -> method_decl_list, method_or_property_decl + case 323: // 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 318: // method_or_property_decl -> method_decl_withattr + case 324: // method_or_property_decl -> method_decl_withattr { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 319: // method_or_property_decl -> property_definition + case 325: // method_or_property_decl -> property_definition { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 320: // simple_field_or_const_definition -> tkConst, only_const_decl + case 326: // simple_field_or_const_definition -> tkConst, only_const_decl { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 321: // simple_field_or_const_definition -> field_definition + case 327: // simple_field_or_const_definition -> field_definition { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 322: // simple_field_or_const_definition -> tkClass, field_definition + case 328: // simple_field_or_const_definition -> tkClass, 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 323: // field_definition -> var_decl_part + case 329: // field_definition -> var_decl_part { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 324: // field_definition -> tkEvent, ident_list, tkColon, type_ref + case 330: // 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 325: // method_decl_withattr -> attribute_declarations, method_header + case 331: // 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 326: // method_decl_withattr -> attribute_declarations, method_decl + case 332: // method_decl_withattr -> attribute_declarations, method_decl { - (ValueStack[ValueStack.Depth-1].stn as procedure_definition).proc_header.attributes = ValueStack[ValueStack.Depth-2].stn as attribute_list; + (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 327: // method_decl -> inclass_proc_func_decl + case 333: // method_decl -> inclass_proc_func_decl { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 328: // method_decl -> inclass_constr_destr_decl + case 334: // method_decl -> inclass_constr_destr_decl { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 329: // method_header -> tkClass, method_procfunc_header + case 335: // method_header -> tkClass, method_procfunc_header { (ValueStack[ValueStack.Depth-1].td as procedure_header).class_keyword = true; CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 330: // method_header -> method_procfunc_header + case 336: // method_header -> method_procfunc_header { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 331: // method_header -> constr_destr_header + case 337: // method_header -> constr_destr_header { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 332: // method_procfunc_header -> proc_func_header + case 338: // method_procfunc_header -> proc_func_header { CurrentSemanticValue.td = NewProcfuncHeading(ValueStack[ValueStack.Depth-1].td as procedure_header); } break; - case 333: // proc_func_header -> proc_header + case 339: // proc_func_header -> proc_header { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 334: // proc_func_header -> func_header + case 340: // proc_func_header -> func_header { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 335: // constr_destr_header -> tkConstructor, optional_proc_name, fp_list, + case 341: // 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 336: // constr_destr_header -> tkClass, tkConstructor, optional_proc_name, fp_list, + case 342: // constr_destr_header -> tkClass, 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 337: // constr_destr_header -> tkDestructor, optional_proc_name, fp_list, + case 343: // 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 338: // optional_proc_name -> proc_name + case 344: // optional_proc_name -> proc_name { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 339: // optional_proc_name -> /* empty */ + case 345: // optional_proc_name -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 340: // qualified_identifier -> identifier + case 346: // qualified_identifier -> identifier { CurrentSemanticValue.stn = new method_name(null,null,ValueStack[ValueStack.Depth-1].id,null,CurrentLocationSpan); } break; - case 341: // qualified_identifier -> visibility_specifier + case 347: // qualified_identifier -> visibility_specifier { CurrentSemanticValue.stn = new method_name(null,null,ValueStack[ValueStack.Depth-1].id,null,CurrentLocationSpan); } break; - case 342: // qualified_identifier -> qualified_identifier, tkPoint, identifier + case 348: // 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 343: // qualified_identifier -> qualified_identifier, tkPoint, visibility_specifier + case 349: // 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 344: // property_definition -> attribute_declarations, simple_prim_property_definition + case 350: // property_definition -> attribute_declarations, simple_prim_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 345: // simple_prim_property_definition -> simple_property_definition + case 351: // simple_prim_property_definition -> simple_property_definition { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 346: // simple_prim_property_definition -> tkClass, simple_property_definition + case 352: // simple_prim_property_definition -> tkClass, simple_property_definition { CurrentSemanticValue.stn = NewSimplePrimPropertyDefinition(ValueStack[ValueStack.Depth-1].stn as simple_property, CurrentLocationSpan); } break; - case 347: // simple_property_definition -> tkProperty, qualified_identifier, + case 353: // 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, ValueStack[ValueStack.Depth-1].stn as property_array_default, CurrentLocationSpan); } break; - case 348: // array_defaultproperty -> /* empty */ + case 354: // array_defaultproperty -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 349: // array_defaultproperty -> tkDefault, tkSemiColon + case 355: // array_defaultproperty -> tkDefault, tkSemiColon { CurrentSemanticValue.stn = new property_array_default(); CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 350: // property_interface -> /* empty */ + case 356: // property_interface -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 351: // property_interface -> property_parameter_list, tkColon, fptype + case 357: // 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 352: // property_parameter_list -> /* empty */ + case 358: // property_parameter_list -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 353: // property_parameter_list -> tkSquareOpen, parameter_decl_list, tkSquareClose + case 359: // property_parameter_list -> tkSquareOpen, parameter_decl_list, tkSquareClose { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 354: // parameter_decl_list -> parameter_decl + case 360: // parameter_decl_list -> parameter_decl { CurrentSemanticValue.stn = new property_parameter_list(ValueStack[ValueStack.Depth-1].stn as property_parameter, CurrentLocationSpan); } break; - case 355: // parameter_decl_list -> parameter_decl_list, tkSemiColon, parameter_decl + case 361: // 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 356: // parameter_decl -> ident_list, tkColon, fptype + case 362: // 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 357: // optional_identifier -> identifier + case 363: // optional_identifier -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 358: // optional_identifier -> /* empty */ + case 364: // optional_identifier -> /* empty */ { CurrentSemanticValue.id = null; } break; - case 360: // property_specifiers -> tkRead, optional_identifier, property_specifiers + case 366: // property_specifiers -> tkRead, optional_identifier, property_specifiers { CurrentSemanticValue.stn = NewPropertySpecifiersRead(ValueStack[ValueStack.Depth-3].id, ValueStack[ValueStack.Depth-2].id, ValueStack[ValueStack.Depth-1].stn as property_accessors, CurrentLocationSpan); } break; - case 361: // property_specifiers -> tkWrite, optional_identifier, property_specifiers + case 367: // property_specifiers -> tkWrite, optional_identifier, property_specifiers { CurrentSemanticValue.stn = NewPropertySpecifiersWrite(ValueStack[ValueStack.Depth-3].id, ValueStack[ValueStack.Depth-2].id, ValueStack[ValueStack.Depth-1].stn as property_accessors, CurrentLocationSpan); } break; - case 362: // var_decl -> var_decl_part, tkSemiColon + case 368: // var_decl -> var_decl_part, tkSemiColon { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 365: // var_decl_part -> ident_list, tkColon, type_ref + case 371: // 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 366: // var_decl_part -> ident_list, tkAssign, expr + case 372: // var_decl_part -> ident_list, tkAssign, expr { 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 367: // var_decl_part -> ident_list, tkColon, type_ref, tkAssignOrEqual, + case 373: // var_decl_part -> ident_list, tkColon, type_ref, tkAssignOrEqual, // typed_const_or_new { 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 368: // var_decl_part -> ident_list, tkColon, type_ref, tkAssignOrEqual, + case 374: // var_decl_part -> ident_list, tkColon, type_ref, tkAssignOrEqual, // expl_func_decl_lambda { 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 369: // typed_const_or_new -> typed_const + case 375: // typed_const_or_new -> typed_const { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 370: // typed_const_or_new -> new_expr + case 376: // typed_const_or_new -> new_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 371: // typed_const_or_new -> default_expr + case 377: // typed_const_or_new -> default_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 372: // constr_destr_decl -> constr_destr_header, block + case 378: // 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 373: // inclass_constr_destr_decl -> constr_destr_header, inclass_block + case 379: // 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 374: // proc_func_decl -> proc_func_decl_noclass + case 380: // proc_func_decl -> proc_func_decl_noclass { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 375: // proc_func_decl -> tkClass, proc_func_decl_noclass + case 381: // proc_func_decl -> tkClass, 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 376: // proc_func_decl_noclass -> proc_func_header, proc_func_external_block + case 382: // 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 377: // proc_func_decl_noclass -> tkFunction, func_name, fp_list, tkColon, fptype, + case 383: // proc_func_decl_noclass -> tkFunction, func_name, fp_list, tkColon, fptype, // tkAssign, relop_expr, tkSemiColon { CurrentSemanticValue.stn = SyntaxTreeBuilder.BuildShortFuncDefinition(ValueStack[ValueStack.Depth-6].stn as formal_parameters, new procedure_attributes_list(), ValueStack[ValueStack.Depth-7].stn as method_name, ValueStack[ValueStack.Depth-4].td as type_definition, ValueStack[ValueStack.Depth-2].ex, LocationStack[LocationStack.Depth-8].Merge(LocationStack[LocationStack.Depth-4])); } break; - case 378: // proc_func_decl_noclass -> tkFunction, func_name, fp_list, tkAssign, relop_expr, + case 384: // proc_func_decl_noclass -> tkFunction, func_name, fp_list, tkAssign, relop_expr, // tkSemiColon { CurrentSemanticValue.stn = SyntaxTreeBuilder.BuildShortFuncDefinition(ValueStack[ValueStack.Depth-4].stn as formal_parameters, new procedure_attributes_list(), ValueStack[ValueStack.Depth-5].stn as method_name, null, ValueStack[ValueStack.Depth-2].ex, LocationStack[LocationStack.Depth-6].Merge(LocationStack[LocationStack.Depth-4])); } break; - case 379: // proc_func_decl_noclass -> tkProcedure, proc_name, fp_list, tkAssign, stmt, + case 385: // proc_func_decl_noclass -> tkProcedure, proc_name, fp_list, tkAssign, stmt, // tkSemiColon { CurrentSemanticValue.stn = SyntaxTreeBuilder.BuildShortProcDefinition(ValueStack[ValueStack.Depth-4].stn as formal_parameters, new procedure_attributes_list(), ValueStack[ValueStack.Depth-5].stn as method_name, ValueStack[ValueStack.Depth-2].stn as statement, LocationStack[LocationStack.Depth-6].Merge(LocationStack[LocationStack.Depth-4])); } break; - case 380: // proc_func_decl_noclass -> proc_func_header, tkForward, tkSemiColon + case 386: // 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 381: // inclass_proc_func_decl -> inclass_proc_func_decl_noclass + case 387: // inclass_proc_func_decl -> inclass_proc_func_decl_noclass { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 382: // inclass_proc_func_decl -> tkClass, inclass_proc_func_decl_noclass + case 388: // inclass_proc_func_decl -> tkClass, 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 383: // inclass_proc_func_decl_noclass -> proc_func_header, inclass_block + case 389: // 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 384: // inclass_proc_func_decl_noclass -> tkFunction, func_name, fp_list, tkColon, + case 390: // inclass_proc_func_decl_noclass -> tkFunction, func_name, fp_list, tkColon, // fptype, optional_method_modificators1, // tkAssign, relop_expr, tkSemiColon { @@ -3767,7 +3870,7 @@ public partial class GPPGParser: ShiftReduceParser tkFunction, func_name, fp_list, + case 391: // inclass_proc_func_decl_noclass -> tkFunction, func_name, fp_list, // optional_method_modificators1, tkAssign, // relop_expr, tkSemiColon { @@ -3776,7 +3879,7 @@ public partial class GPPGParser: ShiftReduceParser tkProcedure, proc_name, fp_list, + case 392: // inclass_proc_func_decl_noclass -> tkProcedure, proc_name, fp_list, // optional_method_modificators1, tkAssign, // stmt, tkSemiColon { @@ -3785,21 +3888,21 @@ public partial class GPPGParser: ShiftReduceParser block + case 393: // proc_func_external_block -> block { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 388: // proc_func_external_block -> external_block + case 394: // proc_func_external_block -> external_block { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 389: // proc_name -> func_name + case 395: // proc_name -> func_name { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 390: // func_name -> func_meth_name_ident + case 396: // func_name -> func_meth_name_ident { CurrentSemanticValue.stn = new method_name(null,null, ValueStack[ValueStack.Depth-1].id, null, CurrentLocationSpan); } break; - case 391: // func_name -> func_class_name_ident_list, tkPoint, func_meth_name_ident + case 397: // func_name -> func_class_name_ident_list, tkPoint, func_meth_name_ident { var ln = ValueStack[ValueStack.Depth-3].ob as List; var cnt = (ValueStack[ValueStack.Depth-3].ob as List).Count; @@ -3809,266 +3912,266 @@ public partial class GPPGParser: ShiftReduceParser func_name_with_template_args + case 398: // func_class_name_ident -> func_name_with_template_args { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 393: // func_class_name_ident_list -> func_class_name_ident + case 399: // 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 394: // func_class_name_ident_list -> func_class_name_ident_list, tkPoint, + case 400: // 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 395: // func_meth_name_ident -> func_name_with_template_args + case 401: // func_meth_name_ident -> func_name_with_template_args { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 396: // func_meth_name_ident -> operator_name_ident + case 402: // func_meth_name_ident -> operator_name_ident { CurrentSemanticValue.id = (ident)ValueStack[ValueStack.Depth-1].ex; } break; - case 397: // func_name_with_template_args -> func_name_ident + case 403: // func_name_with_template_args -> func_name_ident { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 398: // func_name_with_template_args -> func_name_ident, template_arguments + case 404: // 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 399: // func_name_ident -> identifier + case 405: // func_name_ident -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 400: // proc_header -> tkProcedure, proc_name, fp_list, optional_method_modificators, + case 406: // 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 401: // func_header -> tkFunction, func_name, fp_list, optional_method_modificators, + case 407: // 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 402: // func_header -> tkFunction, func_name, fp_list, tkColon, fptype, + case 408: // 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 403: // external_block -> tkExternal, external_directive_ident, tkName, + case 409: // 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 404: // external_block -> tkExternal, external_directive_ident, tkSemiColon + case 410: // external_block -> tkExternal, external_directive_ident, tkSemiColon { CurrentSemanticValue.stn = new external_directive(ValueStack[ValueStack.Depth-2].ex, null, CurrentLocationSpan); } break; - case 405: // external_block -> tkExternal, tkSemiColon + case 411: // external_block -> tkExternal, tkSemiColon { CurrentSemanticValue.stn = new external_directive(null, null, CurrentLocationSpan); } break; - case 406: // external_directive_ident -> identifier + case 412: // external_directive_ident -> identifier { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].id; } break; - case 407: // external_directive_ident -> literal + case 413: // external_directive_ident -> literal { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 408: // block -> decl_sect_list, compound_stmt, tkSemiColon + case 414: // 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 409: // inclass_block -> inclass_decl_sect_list, compound_stmt, tkSemiColon + case 415: // 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 410: // fp_list -> /* empty */ + case 416: // fp_list -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 411: // fp_list -> tkRoundOpen, tkRoundClose + case 417: // fp_list -> tkRoundOpen, tkRoundClose { CurrentSemanticValue.stn = null; } break; - case 412: // fp_list -> tkRoundOpen, fp_sect_list, tkRoundClose + case 418: // 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 413: // fp_sect_list -> fp_sect + case 419: // fp_sect_list -> fp_sect { CurrentSemanticValue.stn = new formal_parameters(ValueStack[ValueStack.Depth-1].stn as typed_parameters, CurrentLocationSpan); } break; - case 414: // fp_sect_list -> fp_sect_list, tkSemiColon, fp_sect + case 420: // 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 415: // fp_sect -> attribute_declarations, simple_fp_sect + case 421: // 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 416: // simple_fp_sect -> param_name_list, tkColon, fptype + case 422: // 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 417: // simple_fp_sect -> tkVar, param_name_list, tkColon, fptype + case 423: // 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 418: // simple_fp_sect -> tkConst, param_name_list, tkColon, fptype + case 424: // 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 419: // simple_fp_sect -> tkParams, param_name_list, tkColon, fptype + case 425: // 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 420: // simple_fp_sect -> param_name_list, tkColon, fptype, tkAssign, const_expr + case 426: // simple_fp_sect -> param_name_list, tkColon, fptype, tkAssign, const_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 421: // simple_fp_sect -> tkVar, param_name_list, tkColon, fptype, tkAssign, const_expr + case 427: // simple_fp_sect -> tkVar, param_name_list, tkColon, fptype, tkAssign, const_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 422: // simple_fp_sect -> tkConst, param_name_list, tkColon, fptype, tkAssign, + case 428: // simple_fp_sect -> tkConst, param_name_list, tkColon, fptype, tkAssign, // const_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 423: // param_name_list -> param_name + case 429: // param_name_list -> param_name { CurrentSemanticValue.stn = new ident_list(ValueStack[ValueStack.Depth-1].id, CurrentLocationSpan); } break; - case 424: // param_name_list -> param_name_list, tkComma, param_name + case 430: // 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 425: // param_name -> identifier + case 431: // param_name -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 426: // fptype -> type_ref + case 432: // fptype -> type_ref { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 427: // stmt -> unlabelled_stmt + case 433: // stmt -> unlabelled_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 428: // stmt -> label_name, tkColon, stmt + case 434: // 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 429: // unlabelled_stmt -> /* empty */ + case 435: // unlabelled_stmt -> /* empty */ { CurrentSemanticValue.stn = new empty_statement(); CurrentSemanticValue.stn.source_context = null; } break; - case 430: // unlabelled_stmt -> assignment + case 436: // unlabelled_stmt -> assignment { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 431: // unlabelled_stmt -> proc_call + case 437: // unlabelled_stmt -> proc_call { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 432: // unlabelled_stmt -> goto_stmt + case 438: // unlabelled_stmt -> goto_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 433: // unlabelled_stmt -> compound_stmt + case 439: // unlabelled_stmt -> compound_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 434: // unlabelled_stmt -> if_stmt + case 440: // unlabelled_stmt -> if_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 435: // unlabelled_stmt -> case_stmt + case 441: // unlabelled_stmt -> case_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 436: // unlabelled_stmt -> repeat_stmt + case 442: // unlabelled_stmt -> repeat_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 437: // unlabelled_stmt -> while_stmt + case 443: // unlabelled_stmt -> while_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 438: // unlabelled_stmt -> for_stmt + case 444: // unlabelled_stmt -> for_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 439: // unlabelled_stmt -> with_stmt + case 445: // unlabelled_stmt -> with_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 440: // unlabelled_stmt -> inherited_message + case 446: // unlabelled_stmt -> inherited_message { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 441: // unlabelled_stmt -> try_stmt + case 447: // unlabelled_stmt -> try_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 442: // unlabelled_stmt -> raise_stmt + case 448: // unlabelled_stmt -> raise_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 443: // unlabelled_stmt -> foreach_stmt + case 449: // unlabelled_stmt -> foreach_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 444: // unlabelled_stmt -> var_stmt + case 450: // unlabelled_stmt -> var_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 445: // unlabelled_stmt -> expr_as_stmt + case 451: // unlabelled_stmt -> expr_as_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 446: // unlabelled_stmt -> lock_stmt + case 452: // unlabelled_stmt -> lock_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 447: // unlabelled_stmt -> my_stmt + case 453: // unlabelled_stmt -> my_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 448: // my_stmt -> tkCycle, expr, unlabelled_stmt + case 454: // my_stmt -> tkCycle, expr, unlabelled_stmt { CurrentSemanticValue.stn = parsertools.MyStmt(ValueStack[ValueStack.Depth-2].ex,ValueStack[ValueStack.Depth-1].stn as statement); } break; - case 449: // var_stmt -> tkVar, var_decl_part + case 455: // var_stmt -> tkVar, var_decl_part { CurrentSemanticValue.stn = new var_statement(ValueStack[ValueStack.Depth-1].stn as var_def_statement, CurrentLocationSpan); } break; - case 450: // assignment -> var_reference, assign_operator, expr + case 456: // assignment -> var_reference, assign_operator, expr { 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 451: // proc_call -> var_reference + case 457: // proc_call -> var_reference { CurrentSemanticValue.stn = new procedure_call(ValueStack[ValueStack.Depth-1].ex as addressed_value, CurrentLocationSpan); } break; - case 452: // goto_stmt -> tkGoto, label_name + case 458: // goto_stmt -> tkGoto, label_name { CurrentSemanticValue.stn = new goto_statement(ValueStack[ValueStack.Depth-1].id, CurrentLocationSpan); } break; - case 453: // compound_stmt -> tkBegin, stmt_list, tkEnd + case 459: // 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; @@ -4076,73 +4179,73 @@ public partial class GPPGParser: ShiftReduceParser stmt + case 460: // stmt_list -> stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, LocationStack[LocationStack.Depth-1]); } break; - case 455: // stmt_list -> stmt_list, tkSemiColon, stmt + case 461: // 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 456: // if_stmt -> tkIf, expr, tkThen, stmt + case 462: // if_stmt -> tkIf, expr, tkThen, stmt { CurrentSemanticValue.stn = new if_node(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].stn as statement, null, CurrentLocationSpan); } break; - case 457: // if_stmt -> tkIf, expr, tkThen, stmt, tkElse, stmt + case 463: // if_stmt -> tkIf, expr, tkThen, stmt, tkElse, 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 458: // case_stmt -> tkCase, expr, tkOf, case_list, else_case, tkEnd + case 464: // case_stmt -> tkCase, expr, 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 459: // case_list -> case_item + case 465: // 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 460: // case_list -> case_list, tkSemiColon, case_item + case 466: // 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 461: // case_item -> /* empty */ + case 467: // case_item -> /* empty */ { CurrentSemanticValue.stn = new empty_statement(); } break; - case 462: // case_item -> case_label_list, tkColon, stmt + case 468: // case_item -> case_label_list, tkColon, stmt { CurrentSemanticValue.stn = new case_variant(ValueStack[ValueStack.Depth-3].stn as expression_list, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 463: // case_label_list -> case_label + case 469: // case_label_list -> case_label { CurrentSemanticValue.stn = new expression_list(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 464: // case_label_list -> case_label_list, tkComma, case_label + case 470: // 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 465: // case_label -> const_elem + case 471: // case_label -> const_elem { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 466: // else_case -> /* empty */ + case 472: // else_case -> /* empty */ { CurrentSemanticValue.stn = null;} break; - case 467: // else_case -> tkElse, stmt_list + case 473: // else_case -> tkElse, stmt_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 468: // repeat_stmt -> tkRepeat, stmt_list, tkUntil, expr + case 474: // 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; @@ -4150,89 +4253,89 @@ public partial class GPPGParser: ShiftReduceParser tkWhile, expr, optional_tk_do, stmt + case 475: // while_stmt -> tkWhile, expr, optional_tk_do, 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 470: // optional_tk_do -> tkDo + case 476: // optional_tk_do -> tkDo { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 471: // optional_tk_do -> /* empty */ + case 477: // optional_tk_do -> /* empty */ { CurrentSemanticValue.ti = null; } break; - case 472: // lock_stmt -> tkLock, expr, tkDo, stmt + case 478: // lock_stmt -> tkLock, expr, tkDo, stmt { CurrentSemanticValue.stn = new lock_stmt(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 473: // foreach_stmt -> tkForeach, identifier, foreach_stmt_ident_dype_opt, tkIn, expr, + case 479: // foreach_stmt -> tkForeach, identifier, foreach_stmt_ident_dype_opt, tkIn, expr, // tkDo, 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); } break; - case 474: // foreach_stmt -> tkForeach, tkVar, identifier, tkColon, type_ref, tkIn, expr, + case 480: // foreach_stmt -> tkForeach, tkVar, identifier, tkColon, type_ref, tkIn, expr, // tkDo, 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 475: // foreach_stmt -> tkForeach, tkVar, identifier, tkIn, expr, tkDo, stmt + case 481: // foreach_stmt -> tkForeach, tkVar, identifier, tkIn, expr, tkDo, 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 476: // foreach_stmt_ident_dype_opt -> tkColon, type_ref + case 482: // foreach_stmt_ident_dype_opt -> tkColon, type_ref { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 478: // for_stmt -> tkFor, optional_var, identifier, for_stmt_decl_or_assign, expr, + case 484: // for_stmt -> tkFor, optional_var, identifier, for_stmt_decl_or_assign, expr, // for_cycle_type, expr, optional_tk_do, stmt { CurrentSemanticValue.stn = NewForStmt(ValueStack[ValueStack.Depth-9].ti, (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 479: // optional_var -> tkVar + case 485: // optional_var -> tkVar { CurrentSemanticValue.ob = true; } break; - case 480: // optional_var -> /* empty */ + case 486: // optional_var -> /* empty */ { CurrentSemanticValue.ob = false; } break; - case 482: // for_stmt_decl_or_assign -> tkColon, simple_type_identifier, tkAssign + case 488: // for_stmt_decl_or_assign -> tkColon, simple_type_identifier, tkAssign { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-2].td; } break; - case 483: // for_cycle_type -> tkTo + case 489: // for_cycle_type -> tkTo { CurrentSemanticValue.ob = for_cycle_type.to; } break; - case 484: // for_cycle_type -> tkDownto + case 490: // for_cycle_type -> tkDownto { CurrentSemanticValue.ob = for_cycle_type.downto; } break; - case 485: // with_stmt -> tkWith, expr_list, tkDo, stmt + case 491: // with_stmt -> tkWith, expr_list, tkDo, stmt { CurrentSemanticValue.stn = new with_statement(ValueStack[ValueStack.Depth-1].stn as statement, ValueStack[ValueStack.Depth-3].stn as expression_list, CurrentLocationSpan); } break; - case 486: // inherited_message -> tkInherited + case 492: // inherited_message -> tkInherited { CurrentSemanticValue.stn = new inherited_message(); CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 487: // try_stmt -> tkTry, stmt_list, try_handler + case 493: // 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 488: // try_handler -> tkFinally, stmt_list, tkEnd + case 494: // 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 489: // try_handler -> tkExcept, exception_block, tkEnd + case 495: // 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) @@ -4242,151 +4345,151 @@ public partial class GPPGParser: ShiftReduceParser exception_handler_list, exception_block_else_branch + case 496: // 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 491: // exception_block -> exception_handler_list, tkSemiColon, + case 497: // 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 492: // exception_block -> stmt_list + case 498: // 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 493: // exception_handler_list -> exception_handler + case 499: // exception_handler_list -> exception_handler { CurrentSemanticValue.stn = new exception_handler_list(ValueStack[ValueStack.Depth-1].stn as exception_handler, CurrentLocationSpan); } break; - case 494: // exception_handler_list -> exception_handler_list, tkSemiColon, + case 500: // 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 495: // exception_block_else_branch -> /* empty */ + case 501: // exception_block_else_branch -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 496: // exception_block_else_branch -> tkElse, stmt_list + case 502: // exception_block_else_branch -> tkElse, stmt_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 497: // exception_handler -> tkOn, exception_identifier, tkDo, stmt + case 503: // exception_handler -> tkOn, exception_identifier, tkDo, 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 498: // exception_identifier -> exception_class_type_identifier + case 504: // exception_identifier -> exception_class_type_identifier { CurrentSemanticValue.stn = new exception_ident(null, (named_type_reference)ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 499: // exception_identifier -> exception_variable, tkColon, + case 505: // 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 500: // exception_class_type_identifier -> simple_type_identifier + case 506: // exception_class_type_identifier -> simple_type_identifier { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 501: // exception_variable -> identifier + case 507: // exception_variable -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 502: // raise_stmt -> tkRaise + case 508: // raise_stmt -> tkRaise { CurrentSemanticValue.stn = new raise_stmt(); CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 503: // raise_stmt -> tkRaise, expr + case 509: // raise_stmt -> tkRaise, expr { CurrentSemanticValue.stn = new raise_stmt(ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); } break; - case 504: // expr_list -> expr + case 510: // expr_list -> expr { CurrentSemanticValue.stn = new expression_list(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 505: // expr_list -> expr_list, tkComma, expr + case 511: // expr_list -> expr_list, tkComma, expr { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as expression_list).Add(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 506: // expr_as_stmt -> allowable_expr_as_stmt + case 512: // expr_as_stmt -> allowable_expr_as_stmt { CurrentSemanticValue.stn = new expression_as_statement(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 507: // allowable_expr_as_stmt -> new_expr + case 513: // allowable_expr_as_stmt -> new_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 508: // expr -> expr_l1 + case 514: // expr -> expr_l1 { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 509: // expr -> format_expr + case 515: // expr -> format_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 510: // expr -> func_decl_lambda + case 516: // expr -> func_decl_lambda { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 511: // expr_l1 -> relop_expr + case 517: // expr_l1 -> relop_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 512: // expr_l1 -> question_expr + case 518: // expr_l1 -> question_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 513: // sizeof_expr -> tkSizeOf, tkRoundOpen, simple_or_template_type_reference, + case 519: // 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 514: // typeof_expr -> tkTypeOf, tkRoundOpen, simple_or_template_type_reference, + case 520: // 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 515: // question_expr -> expr_l1, tkQuestion, expr_l1, tkColon, expr_l1 + case 521: // question_expr -> expr_l1, tkQuestion, expr_l1, tkColon, expr_l1 { CurrentSemanticValue.ex = new question_colon_expression(ValueStack[ValueStack.Depth-5].ex, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 516: // simple_or_template_type_reference -> simple_type_identifier + case 522: // simple_or_template_type_reference -> simple_type_identifier { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 517: // simple_or_template_type_reference -> simple_type_identifier, + case 523: // 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 518: // simple_or_template_type_reference -> simple_type_identifier, tkAmpersend, + case 524: // 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 519: // optional_array_initializer -> tkRoundOpen, typed_const_list, tkRoundClose + case 525: // optional_array_initializer -> tkRoundOpen, typed_const_list, tkRoundClose { CurrentSemanticValue.stn = new array_const((expression_list)ValueStack[ValueStack.Depth-2].stn, CurrentLocationSpan); } break; - case 521: // new_expr -> tkNew, simple_or_template_type_reference, + case 527: // 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 522: // new_expr -> tkNew, array_name_for_new_expr, tkSquareOpen, optional_expr_list, + case 528: // new_expr -> tkNew, array_name_for_new_expr, tkSquareOpen, optional_expr_list, // tkSquareClose, optional_array_initializer { var el = ValueStack[ValueStack.Depth-3].stn as expression_list; @@ -4402,7 +4505,7 @@ public partial class GPPGParser: ShiftReduceParser tkNew, tkClass, tkRoundOpen, list_fields_in_unnamed_object, + case 529: // new_expr -> tkNew, tkClass, tkRoundOpen, list_fields_in_unnamed_object, // tkRoundClose { // sugared node @@ -4417,12 +4520,12 @@ public partial class GPPGParser: ShiftReduceParser identifier, tkAssign, relop_expr + case 530: // field_in_unnamed_object -> identifier, tkAssign, relop_expr { CurrentSemanticValue.ob = new name_assign_expr(ValueStack[ValueStack.Depth-3].id,ValueStack[ValueStack.Depth-1].ex,CurrentLocationSpan); } break; - case 525: // field_in_unnamed_object -> relop_expr + case 531: // field_in_unnamed_object -> relop_expr { ident name = null; var id = ValueStack[ValueStack.Depth-1].ex as ident; @@ -4442,13 +4545,13 @@ public partial class GPPGParser: ShiftReduceParser field_in_unnamed_object + case 532: // 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 527: // list_fields_in_unnamed_object -> list_fields_in_unnamed_object, tkComma, + case 533: // 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; @@ -4459,230 +4562,230 @@ public partial class GPPGParser: ShiftReduceParser simple_type_identifier + case 534: // array_name_for_new_expr -> simple_type_identifier { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 529: // array_name_for_new_expr -> unsized_array_type + case 535: // array_name_for_new_expr -> unsized_array_type { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 530: // optional_expr_list_with_bracket -> /* empty */ + case 536: // optional_expr_list_with_bracket -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 531: // optional_expr_list_with_bracket -> tkRoundOpen, optional_expr_list, + case 537: // optional_expr_list_with_bracket -> tkRoundOpen, optional_expr_list, // tkRoundClose { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 532: // relop_expr -> simple_expr + case 538: // relop_expr -> simple_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 533: // relop_expr -> relop_expr, relop, simple_expr + case 539: // 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 534: // relop_expr -> relop_expr, tkMatching, simple_expr + case 540: // relop_expr -> relop_expr, tkMatching, simple_expr { CurrentSemanticValue.ex = new matching_expression(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 535: // format_expr -> simple_expr, tkColon, simple_expr + case 541: // format_expr -> simple_expr, tkColon, simple_expr { CurrentSemanticValue.ex = new format_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); } break; - case 536: // format_expr -> simple_expr, tkColon, simple_expr, tkColon, simple_expr + case 542: // format_expr -> simple_expr, tkColon, simple_expr, 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 537: // relop -> tkEqual + case 543: // relop -> tkEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 538: // relop -> tkNotEqual + case 544: // relop -> tkNotEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 539: // relop -> tkLower + case 545: // relop -> tkLower { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 540: // relop -> tkGreater + case 546: // relop -> tkGreater { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 541: // relop -> tkLowerEqual + case 547: // relop -> tkLowerEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 542: // relop -> tkGreaterEqual + case 548: // relop -> tkGreaterEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 543: // relop -> tkIn + case 549: // relop -> tkIn { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 544: // simple_expr -> term + case 550: // simple_expr -> term { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 545: // simple_expr -> simple_expr, addop, term + case 551: // simple_expr -> simple_expr, 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 546: // addop -> tkPlus + case 552: // addop -> tkPlus { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 547: // addop -> tkMinus + case 553: // addop -> tkMinus { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 548: // addop -> tkOr + case 554: // addop -> tkOr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 549: // addop -> tkXor + case 555: // addop -> tkXor { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 550: // addop -> tkCSharpStyleOr + case 556: // addop -> tkCSharpStyleOr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 551: // typecast_op -> tkAs + case 557: // typecast_op -> tkAs { CurrentSemanticValue.ob = op_typecast.as_op; } break; - case 552: // typecast_op -> tkIs + case 558: // typecast_op -> tkIs { CurrentSemanticValue.ob = op_typecast.is_op; } break; - case 553: // as_is_expr -> term, typecast_op, simple_or_template_type_reference + case 559: // as_is_expr -> term, typecast_op, simple_or_template_type_reference { CurrentSemanticValue.ex = NewAsIsExpr(ValueStack[ValueStack.Depth-3].ex, (op_typecast)ValueStack[ValueStack.Depth-2].ob, ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 554: // term -> factor + case 560: // term -> factor { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 555: // term -> new_expr + case 561: // term -> new_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 556: // term -> term, mulop, factor + case 562: // 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 557: // term -> as_is_expr + case 563: // term -> as_is_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 558: // mulop -> tkStar + case 564: // mulop -> tkStar { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 559: // mulop -> tkSlash + case 565: // mulop -> tkSlash { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 560: // mulop -> tkDiv + case 566: // mulop -> tkDiv { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 561: // mulop -> tkMod + case 567: // mulop -> tkMod { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 562: // mulop -> tkShl + case 568: // mulop -> tkShl { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 563: // mulop -> tkShr + case 569: // mulop -> tkShr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 564: // mulop -> tkAnd + case 570: // mulop -> tkAnd { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 565: // default_expr -> tkDefault, tkRoundOpen, simple_or_template_type_reference, + case 571: // 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 566: // factor -> tkNil + case 572: // factor -> tkNil { CurrentSemanticValue.ex = new nil_const(); CurrentSemanticValue.ex.source_context = CurrentLocationSpan; } break; - case 567: // factor -> literal_or_number + case 573: // factor -> literal_or_number { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 568: // factor -> default_expr + case 574: // factor -> default_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 569: // factor -> tkSquareOpen, elem_list, tkSquareClose + case 575: // factor -> tkSquareOpen, elem_list, tkSquareClose { CurrentSemanticValue.ex = new pascal_set_constant(ValueStack[ValueStack.Depth-2].stn as expression_list, CurrentLocationSpan); } break; - case 570: // factor -> tkNot, factor + case 576: // factor -> tkNot, factor { CurrentSemanticValue.ex = new un_expr(ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 571: // factor -> sign, factor + case 577: // factor -> sign, factor { CurrentSemanticValue.ex = new un_expr(ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 572: // factor -> tkDeref, factor + case 578: // factor -> tkDeref, factor { CurrentSemanticValue.ex = new roof_dereference(ValueStack[ValueStack.Depth-1].ex as addressed_value, CurrentLocationSpan); } break; - case 573: // factor -> var_reference + case 579: // factor -> var_reference { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 574: // literal_or_number -> literal + case 580: // literal_or_number -> literal { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 575: // literal_or_number -> unsigned_number + case 581: // literal_or_number -> unsigned_number { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 576: // var_reference -> var_address, variable + case 582: // 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 577: // var_reference -> variable + case 583: // var_reference -> variable { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 578: // var_address -> tkAddressOf + case 584: // var_address -> tkAddressOf { CurrentSemanticValue.stn = NewVarAddress(CurrentLocationSpan); } break; - case 579: // var_address -> var_address, tkAddressOf + case 585: // var_address -> var_address, tkAddressOf { CurrentSemanticValue.stn = NewVarAddress(ValueStack[ValueStack.Depth-2].stn as get_address, CurrentLocationSpan); } break; - case 580: // attribute_variable -> simple_type_identifier, optional_expr_list_with_bracket + case 586: // 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 581: // dotted_identifier -> identifier + case 587: // dotted_identifier -> identifier { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].id; } break; - case 582: // dotted_identifier -> dotted_identifier, tkPoint, identifier_or_keyword + case 588: // 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 583: // variable_as_type -> dotted_identifier + case 589: // variable_as_type -> dotted_identifier { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex;} break; - case 584: // variable_as_type -> dotted_identifier, template_type_params + case 590: // 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 585: // variable -> identifier + case 591: // variable -> identifier { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].id; } break; - case 586: // variable -> operator_name_ident + case 592: // variable -> operator_name_ident { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 587: // variable -> tkInherited, identifier + case 593: // variable -> tkInherited, identifier { CurrentSemanticValue.ex = new inherited_ident(ValueStack[ValueStack.Depth-1].id.name, CurrentLocationSpan); } break; - case 588: // variable -> tkRoundOpen, expr, tkRoundClose + case 594: // variable -> tkRoundOpen, expr, tkRoundClose { if (!parsertools.build_tree_for_brackets) { @@ -4692,501 +4795,501 @@ public partial class GPPGParser: ShiftReduceParser sizeof_expr + case 595: // variable -> sizeof_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 590: // variable -> typeof_expr + case 596: // variable -> typeof_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 591: // variable -> literal_or_number, tkPoint, identifier_or_keyword + case 597: // 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 592: // variable -> variable, var_specifiers + case 598: // variable -> variable, var_specifiers { CurrentSemanticValue.ex = NewVariable(ValueStack[ValueStack.Depth-2].ex as addressed_value, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 593: // var_specifiers -> tkSquareOpen, expr_list, tkSquareClose + case 599: // var_specifiers -> tkSquareOpen, expr_list, tkSquareClose { CurrentSemanticValue.ex = new indexer(ValueStack[ValueStack.Depth-2].stn as expression_list, CurrentLocationSpan); } break; - case 594: // var_specifiers -> tkRoundOpen, optional_expr_list, tkRoundClose + case 600: // var_specifiers -> tkRoundOpen, optional_expr_list, tkRoundClose { CurrentSemanticValue.ex = new method_call(ValueStack[ValueStack.Depth-2].stn as expression_list, CurrentLocationSpan); } break; - case 595: // var_specifiers -> tkPoint, identifier_keyword_operatorname + case 601: // var_specifiers -> tkPoint, identifier_keyword_operatorname { CurrentSemanticValue.ex = new dot_node(null, ValueStack[ValueStack.Depth-1].id as addressed_value, CurrentLocationSpan); } break; - case 596: // var_specifiers -> tkDeref + case 602: // var_specifiers -> tkDeref { CurrentSemanticValue.ex = new roof_dereference(); CurrentSemanticValue.ex.source_context = CurrentLocationSpan; } break; - case 597: // var_specifiers -> tkAmpersend, template_type_params + case 603: // var_specifiers -> tkAmpersend, template_type_params { CurrentSemanticValue.ex = new ident_with_templateparams(null, ValueStack[ValueStack.Depth-1].stn as template_param_list, CurrentLocationSpan); } break; - case 598: // optional_expr_list -> expr_list + case 604: // optional_expr_list -> expr_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 599: // optional_expr_list -> /* empty */ + case 605: // optional_expr_list -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 600: // elem_list -> elem_list1 + case 606: // elem_list -> elem_list1 { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 601: // elem_list -> /* empty */ + case 607: // elem_list -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 602: // elem_list1 -> elem + case 608: // elem_list1 -> elem { CurrentSemanticValue.stn = new expression_list(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 603: // elem_list1 -> elem_list1, tkComma, elem + case 609: // 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 604: // elem -> expr + case 610: // elem -> expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 605: // elem -> expr, tkDotDot, expr + case 611: // elem -> expr, tkDotDot, expr { CurrentSemanticValue.ex = new diapason_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 606: // one_literal -> tkStringLiteral + case 612: // one_literal -> tkStringLiteral { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].stn as literal; } break; - case 607: // one_literal -> tkAsciiChar + case 613: // one_literal -> tkAsciiChar { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].stn as literal; } break; - case 608: // literal -> literal_list + case 614: // literal -> literal_list { CurrentSemanticValue.ex = NewLiteral(ValueStack[ValueStack.Depth-1].stn as literal_const_line); } break; - case 609: // literal_list -> one_literal + case 615: // literal_list -> one_literal { CurrentSemanticValue.stn = new literal_const_line(ValueStack[ValueStack.Depth-1].ex as literal, CurrentLocationSpan); } break; - case 610: // literal_list -> literal_list, one_literal + case 616: // literal_list -> literal_list, one_literal { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-2].stn as literal_const_line).Add(ValueStack[ValueStack.Depth-1].ex as literal, CurrentLocationSpan); } break; - case 611: // operator_name_ident -> tkOperator, overload_operator + case 617: // 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 612: // optional_method_modificators -> tkSemiColon + case 618: // optional_method_modificators -> tkSemiColon { CurrentSemanticValue.stn = new procedure_attributes_list(new procedure_attribute(proc_attribute.attr_overload),CurrentLocationSpan); } break; - case 613: // optional_method_modificators -> tkSemiColon, meth_modificators, tkSemiColon + case 619: // optional_method_modificators -> tkSemiColon, meth_modificators, tkSemiColon { parsertools.AddModifier((procedure_attributes_list)ValueStack[ValueStack.Depth-2].stn, proc_attribute.attr_overload); CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 614: // optional_method_modificators1 -> /* empty */ + case 620: // optional_method_modificators1 -> /* empty */ { CurrentSemanticValue.stn = new procedure_attributes_list(new procedure_attribute(proc_attribute.attr_overload),CurrentLocationSpan); } break; - case 615: // optional_method_modificators1 -> tkSemiColon, meth_modificators + case 621: // optional_method_modificators1 -> tkSemiColon, meth_modificators { parsertools.AddModifier((procedure_attributes_list)ValueStack[ValueStack.Depth-1].stn, proc_attribute.attr_overload); CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 616: // meth_modificators -> meth_modificator + case 622: // meth_modificators -> meth_modificator { CurrentSemanticValue.stn = new procedure_attributes_list(ValueStack[ValueStack.Depth-1].id as procedure_attribute, CurrentLocationSpan); } break; - case 617: // meth_modificators -> meth_modificators, tkSemiColon, meth_modificator + case 623: // 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 618: // identifier -> tkIdentifier + case 624: // identifier -> tkIdentifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 619: // identifier -> property_specifier_directives + case 625: // identifier -> property_specifier_directives { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 620: // identifier -> non_reserved + case 626: // identifier -> non_reserved { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 621: // identifier_or_keyword -> identifier + case 627: // identifier_or_keyword -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 622: // identifier_or_keyword -> keyword + case 628: // identifier_or_keyword -> keyword { CurrentSemanticValue.id = new ident(ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 623: // identifier_or_keyword -> reserved_keyword + case 629: // identifier_or_keyword -> reserved_keyword { CurrentSemanticValue.id = new ident(ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 624: // identifier_keyword_operatorname -> identifier + case 630: // identifier_keyword_operatorname -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 625: // identifier_keyword_operatorname -> keyword + case 631: // identifier_keyword_operatorname -> keyword { CurrentSemanticValue.id = new ident(ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 626: // identifier_keyword_operatorname -> operator_name_ident + case 632: // identifier_keyword_operatorname -> operator_name_ident { CurrentSemanticValue.id = (ident)ValueStack[ValueStack.Depth-1].ex; } break; - case 627: // meth_modificator -> tkAbstract + case 633: // meth_modificator -> tkAbstract { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 628: // meth_modificator -> tkOverload + case 634: // meth_modificator -> tkOverload { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 629: // meth_modificator -> tkReintroduce + case 635: // meth_modificator -> tkReintroduce { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 630: // meth_modificator -> tkOverride + case 636: // meth_modificator -> tkOverride { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 631: // meth_modificator -> tkVirtual + case 637: // meth_modificator -> tkVirtual { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 632: // property_specifier_directives -> tkRead + case 638: // property_specifier_directives -> tkRead { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 633: // property_specifier_directives -> tkWrite + case 639: // property_specifier_directives -> tkWrite { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 634: // non_reserved -> tkName + case 640: // non_reserved -> tkName { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 635: // non_reserved -> tkNew + case 641: // non_reserved -> tkNew { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 636: // visibility_specifier -> tkInternal + case 642: // visibility_specifier -> tkInternal { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 637: // visibility_specifier -> tkPublic + case 643: // visibility_specifier -> tkPublic { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 638: // visibility_specifier -> tkProtected + case 644: // visibility_specifier -> tkProtected { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 639: // visibility_specifier -> tkPrivate + case 645: // visibility_specifier -> tkPrivate { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 640: // keyword -> visibility_specifier + case 646: // keyword -> visibility_specifier { CurrentSemanticValue.ti = new token_info(ValueStack[ValueStack.Depth-1].id.name, CurrentLocationSpan); } break; - case 641: // keyword -> tkSealed + case 647: // keyword -> tkSealed { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 642: // keyword -> tkTemplate + case 648: // keyword -> tkTemplate { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 643: // keyword -> tkOr + case 649: // keyword -> tkOr { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 644: // keyword -> tkTypeOf + case 650: // keyword -> tkTypeOf { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 645: // keyword -> tkSizeOf + case 651: // keyword -> tkSizeOf { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 646: // keyword -> tkDefault + case 652: // keyword -> tkDefault { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 647: // keyword -> tkWhere + case 653: // keyword -> tkWhere { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 648: // keyword -> tkXor + case 654: // keyword -> tkXor { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 649: // keyword -> tkAnd + case 655: // keyword -> tkAnd { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 650: // keyword -> tkDiv + case 656: // keyword -> tkDiv { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 651: // keyword -> tkMod + case 657: // keyword -> tkMod { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 652: // keyword -> tkShl + case 658: // keyword -> tkShl { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 653: // keyword -> tkShr + case 659: // keyword -> tkShr { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 654: // keyword -> tkNot + case 660: // keyword -> tkNot { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 655: // keyword -> tkAs + case 661: // keyword -> tkAs { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 656: // keyword -> tkIn + case 662: // keyword -> tkIn { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 657: // keyword -> tkIs + case 663: // keyword -> tkIs { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 658: // keyword -> tkArray + case 664: // keyword -> tkArray { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 659: // keyword -> tkSequence + case 665: // keyword -> tkSequence { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 660: // keyword -> tkBegin + case 666: // keyword -> tkBegin { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 661: // keyword -> tkCase + case 667: // keyword -> tkCase { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 662: // keyword -> tkClass + case 668: // keyword -> tkClass { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 663: // keyword -> tkConst + case 669: // keyword -> tkConst { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 664: // keyword -> tkConstructor + case 670: // keyword -> tkConstructor { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 665: // keyword -> tkDestructor + case 671: // keyword -> tkDestructor { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 666: // keyword -> tkDownto + case 672: // keyword -> tkDownto { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 667: // keyword -> tkDo + case 673: // keyword -> tkDo { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 668: // keyword -> tkElse + case 674: // keyword -> tkElse { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 669: // keyword -> tkExcept + case 675: // keyword -> tkExcept { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 670: // keyword -> tkFile + case 676: // keyword -> tkFile { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 671: // keyword -> tkAuto + case 677: // keyword -> tkAuto { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 672: // keyword -> tkFinalization + case 678: // keyword -> tkFinalization { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 673: // keyword -> tkFinally + case 679: // keyword -> tkFinally { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 674: // keyword -> tkFor + case 680: // keyword -> tkFor { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 675: // keyword -> tkForeach + case 681: // keyword -> tkForeach { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 676: // keyword -> tkFunction + case 682: // keyword -> tkFunction { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 677: // keyword -> tkIf + case 683: // keyword -> tkIf { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 678: // keyword -> tkImplementation + case 684: // keyword -> tkImplementation { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 679: // keyword -> tkInherited + case 685: // keyword -> tkInherited { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 680: // keyword -> tkInitialization + case 686: // keyword -> tkInitialization { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 681: // keyword -> tkInterface + case 687: // keyword -> tkInterface { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 682: // keyword -> tkProcedure + case 688: // keyword -> tkProcedure { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 683: // keyword -> tkProperty + case 689: // keyword -> tkProperty { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 684: // keyword -> tkRaise + case 690: // keyword -> tkRaise { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 685: // keyword -> tkRecord + case 691: // keyword -> tkRecord { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 686: // keyword -> tkRepeat + case 692: // keyword -> tkRepeat { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 687: // keyword -> tkSet + case 693: // keyword -> tkSet { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 688: // keyword -> tkTry + case 694: // keyword -> tkTry { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 689: // keyword -> tkType + case 695: // keyword -> tkType { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 690: // keyword -> tkThen + case 696: // keyword -> tkThen { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 691: // keyword -> tkTo + case 697: // keyword -> tkTo { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 692: // keyword -> tkUntil + case 698: // keyword -> tkUntil { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 693: // keyword -> tkUses + case 699: // keyword -> tkUses { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 694: // keyword -> tkVar + case 700: // keyword -> tkVar { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 695: // keyword -> tkWhile + case 701: // keyword -> tkWhile { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 696: // keyword -> tkWith + case 702: // keyword -> tkWith { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 697: // keyword -> tkNil + case 703: // keyword -> tkNil { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 698: // keyword -> tkGoto + case 704: // keyword -> tkGoto { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 699: // keyword -> tkOf + case 705: // keyword -> tkOf { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 700: // keyword -> tkLabel + case 706: // keyword -> tkLabel { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 701: // keyword -> tkProgram + case 707: // keyword -> tkProgram { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 702: // keyword -> tkUnit + case 708: // keyword -> tkUnit { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 703: // keyword -> tkLibrary + case 709: // keyword -> tkLibrary { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 704: // keyword -> tkExternal + case 710: // keyword -> tkExternal { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 705: // keyword -> tkParams + case 711: // keyword -> tkParams { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 706: // reserved_keyword -> tkOperator + case 712: // reserved_keyword -> tkOperator { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 707: // reserved_keyword -> tkEnd + case 713: // reserved_keyword -> tkEnd { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 708: // overload_operator -> tkMinus + case 714: // overload_operator -> tkMinus { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 709: // overload_operator -> tkPlus + case 715: // overload_operator -> tkPlus { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 710: // overload_operator -> tkSlash + case 716: // overload_operator -> tkSlash { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 711: // overload_operator -> tkStar + case 717: // overload_operator -> tkStar { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 712: // overload_operator -> tkEqual + case 718: // overload_operator -> tkEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 713: // overload_operator -> tkGreater + case 719: // overload_operator -> tkGreater { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 714: // overload_operator -> tkGreaterEqual + case 720: // overload_operator -> tkGreaterEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 715: // overload_operator -> tkLower + case 721: // overload_operator -> tkLower { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 716: // overload_operator -> tkLowerEqual + case 722: // overload_operator -> tkLowerEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 717: // overload_operator -> tkNotEqual + case 723: // overload_operator -> tkNotEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 718: // overload_operator -> tkOr + case 724: // overload_operator -> tkOr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 719: // overload_operator -> tkXor + case 725: // overload_operator -> tkXor { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 720: // overload_operator -> tkAnd + case 726: // overload_operator -> tkAnd { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 721: // overload_operator -> tkDiv + case 727: // overload_operator -> tkDiv { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 722: // overload_operator -> tkMod + case 728: // overload_operator -> tkMod { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 723: // overload_operator -> tkShl + case 729: // overload_operator -> tkShl { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 724: // overload_operator -> tkShr + case 730: // overload_operator -> tkShr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 725: // overload_operator -> tkNot + case 731: // overload_operator -> tkNot { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 726: // overload_operator -> tkIn + case 732: // overload_operator -> tkIn { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 727: // overload_operator -> tkImplicit + case 733: // overload_operator -> tkImplicit { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 728: // overload_operator -> tkExplicit + case 734: // overload_operator -> tkExplicit { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 729: // overload_operator -> assign_operator + case 735: // overload_operator -> assign_operator { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 730: // assign_operator -> tkAssign + case 736: // assign_operator -> tkAssign { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 731: // assign_operator -> tkPlusEqual + case 737: // assign_operator -> tkPlusEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 732: // assign_operator -> tkMinusEqual + case 738: // assign_operator -> tkMinusEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 733: // assign_operator -> tkMultEqual + case 739: // assign_operator -> tkMultEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 734: // assign_operator -> tkDivEqual + case 740: // assign_operator -> tkDivEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 735: // func_decl_lambda -> identifier, tkArrow, lambda_function_body + case 741: // 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(), null), 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(), null), ValueStack[ValueStack.Depth-1].stn as statement_list, CurrentLocationSpan); } break; - case 736: // func_decl_lambda -> tkRoundOpen, tkRoundClose, lambda_type_ref, tkArrow, + case 742: // func_decl_lambda -> 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 737: // func_decl_lambda -> tkRoundOpen, identifier, tkColon, fptype, tkRoundClose, + case 743: // func_decl_lambda -> tkRoundOpen, identifier, tkColon, fptype, tkRoundClose, // lambda_type_ref, tkArrow, lambda_function_body { var idList = new ident_list(ValueStack[ValueStack.Depth-7].id, LocationStack[LocationStack.Depth-7]); @@ -5195,7 +5298,7 @@ public partial class GPPGParser: ShiftReduceParser tkRoundOpen, identifier, tkSemiColon, full_lambda_fp_list, + case 744: // func_decl_lambda -> tkRoundOpen, identifier, tkSemiColon, full_lambda_fp_list, // tkRoundClose, lambda_type_ref, tkArrow, // lambda_function_body { @@ -5206,7 +5309,7 @@ public partial class GPPGParser: ShiftReduceParser tkRoundOpen, identifier, tkColon, fptype, tkSemiColon, + case 745: // func_decl_lambda -> tkRoundOpen, identifier, tkColon, fptype, tkSemiColon, // full_lambda_fp_list, tkRoundClose, lambda_type_ref, // tkArrow, lambda_function_body { @@ -5218,7 +5321,7 @@ public partial class GPPGParser: ShiftReduceParser tkRoundOpen, identifier, tkComma, lambda_simple_fp_sect, + case 746: // func_decl_lambda -> tkRoundOpen, identifier, tkComma, lambda_simple_fp_sect, // tkRoundClose, lambda_type_ref, tkArrow, // lambda_function_body { @@ -5232,7 +5335,7 @@ public partial class GPPGParser: ShiftReduceParser tkRoundOpen, identifier, tkComma, lambda_simple_fp_sect, + case 747: // func_decl_lambda -> tkRoundOpen, identifier, tkComma, lambda_simple_fp_sect, // tkSemiColon, full_lambda_fp_list, tkRoundClose, // lambda_type_ref, tkArrow, lambda_function_body { @@ -5248,88 +5351,88 @@ public partial class GPPGParser: ShiftReduceParser expl_func_decl_lambda + case 748: // func_decl_lambda -> expl_func_decl_lambda { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 743: // expl_func_decl_lambda -> tkFunction, lambda_type_ref, tkArrow, + case 749: // expl_func_decl_lambda -> tkFunction, 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 744: // expl_func_decl_lambda -> tkFunction, tkRoundOpen, tkRoundClose, lambda_type_ref, + case 750: // expl_func_decl_lambda -> tkFunction, 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 745: // expl_func_decl_lambda -> tkFunction, tkRoundOpen, full_lambda_fp_list, + case 751: // expl_func_decl_lambda -> tkFunction, tkRoundOpen, full_lambda_fp_list, // tkRoundClose, lambda_type_ref, 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, CurrentLocationSpan); } break; - case 746: // expl_func_decl_lambda -> tkProcedure, tkArrow, lambda_procedure_body + case 752: // 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, CurrentLocationSpan); } break; - case 747: // expl_func_decl_lambda -> tkProcedure, tkRoundOpen, tkRoundClose, tkArrow, + case 753: // 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, CurrentLocationSpan); } break; - case 748: // expl_func_decl_lambda -> tkProcedure, tkRoundOpen, full_lambda_fp_list, + case 754: // 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, CurrentLocationSpan); } break; - case 749: // full_lambda_fp_list -> lambda_simple_fp_sect + case 755: // full_lambda_fp_list -> lambda_simple_fp_sect { CurrentSemanticValue.stn = new formal_parameters(ValueStack[ValueStack.Depth-1].stn as typed_parameters, CurrentLocationSpan); } break; - case 750: // full_lambda_fp_list -> full_lambda_fp_list, tkSemiColon, lambda_simple_fp_sect + case 756: // 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 751: // lambda_simple_fp_sect -> ident_list, lambda_type_ref + case 757: // 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 752: // lambda_type_ref -> /* empty */ + case 758: // lambda_type_ref -> /* empty */ { CurrentSemanticValue.td = new lambda_inferred_type(new PascalABCCompiler.TreeRealization.lambda_any_type_node(), null); } break; - case 753: // lambda_type_ref -> tkColon, fptype + case 759: // lambda_type_ref -> tkColon, fptype { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 754: // lambda_function_body -> expr_l1 + case 760: // lambda_function_body -> expr_l1 { CurrentSemanticValue.stn = NewLambdaBody(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 755: // lambda_function_body -> compound_stmt + case 761: // lambda_function_body -> compound_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 756: // lambda_procedure_body -> proc_call + case 762: // lambda_procedure_body -> proc_call { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 757: // lambda_procedure_body -> compound_stmt + case 763: // lambda_procedure_body -> compound_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } diff --git a/Parsers/PascalABCParserNewSaushkin/PABC.tags b/Parsers/PascalABCParserNewSaushkin/PABC.tags index d332c9cb8..37cc68b69 100644 --- a/Parsers/PascalABCParserNewSaushkin/PABC.tags +++ b/Parsers/PascalABCParserNewSaushkin/PABC.tags @@ -292,7 +292,6 @@ - @@ -303,6 +302,7 @@ + diff --git a/Parsers/PascalABCParserNewSaushkin/PABC.ymc b/Parsers/PascalABCParserNewSaushkin/PABC.ymc index 92d8a40aa..6bcddffa8 100644 --- a/Parsers/PascalABCParserNewSaushkin/PABC.ymc +++ b/Parsers/PascalABCParserNewSaushkin/PABC.ymc @@ -6,10 +6,12 @@ yaccGen=D:\PascalABC.NET\!PABC_SVN1\Parsers\PascalABCParserNewSaushkin\GPLex_GPP lexGenOpt=/unicode yaccGenOpt=/gplex useGenOpt=False -scriptWorkingDir=D:\PascalABC.NET\!PABC_SVN1\Parsers\PascalABCParserNewSaushkin +scriptWorkingDir=D:\PascalABC.NET\!PABC_Git\Parsers\PascalABCParserNewSaushkin script= -"D:\PascalABC.NET\!PABC_SVN1\Parsers\PascalABCParserNewSaushkin\GPLex_GPPG\gplex.exe" /unicode "D:\PascalABC.NET\!PABC_SVN1\Parsers\PascalABCParserNewSaushkin\ABCPascal.lex" -"D:\PascalABC.NET\!PABC_SVN1\Parsers\PascalABCParserNewSaushkin\GPLex_GPPG\gppg.exe" /no-lines /gplex "D:\PascalABC.NET\!PABC_SVN1\Parsers\PascalABCParserNewSaushkin\ABCPascal.y" +"D:\PascalABC.NET\!PABC_Git\Parsers\PascalABCParserNewSaushkin\GPLex_GPPG\gplex.exe" /unicode "D:\PascalABC.NET\!PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.lex" +"D:\PascalABC.NET\!PABC_Git\Parsers\PascalABCParserNewSaushkin\GPLex_GPPG\gppg.exe" /no-lines /gplex "D:\PascalABC.NET\!PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.y" + + diff --git a/PascalABCNET.sln b/PascalABCNET.sln index 312099a03..be1d580eb 100644 --- a/PascalABCNET.sln +++ b/PascalABCNET.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualPascalABCNET", "VisualPascalABCNET", "{26843C5D-9D7E-4C2C-AC14-2D227FA5592E}" EndProject @@ -411,6 +411,7 @@ Global {CFC683F8-0165-4A9F-9C3F-BB8C5BAB507F} = {26843C5D-9D7E-4C2C-AC14-2D227FA5592E} {BC35F816-54EE-47E0-89FC-1C66EAC155A9} = {26843C5D-9D7E-4C2C-AC14-2D227FA5592E} {EC68A3D8-6D63-4A79-ABA6-BF8E9D7756D7} = {26843C5D-9D7E-4C2C-AC14-2D227FA5592E} + {A5A3667E-8A3B-4569-BA0E-AD49E12D07E7} = {26843C5D-9D7E-4C2C-AC14-2D227FA5592E} {DBE875B5-6187-45D8-8B75-2E43CC513A60} = {EC68A3D8-6D63-4A79-ABA6-BF8E9D7756D7} {43879684-ADBE-470A-AAC6-2ACA36603971} = {EC68A3D8-6D63-4A79-ABA6-BF8E9D7756D7} {3F74B986-7711-42B1-93D7-51952A71FF2E} = {EC68A3D8-6D63-4A79-ABA6-BF8E9D7756D7} @@ -430,19 +431,15 @@ Global {10679470-FE1B-4193-A203-D940CF0AEA54} = {F8CE2712-826B-450B-A72F-D32D80C99858} {1AB15F6E-C22E-499A-A7ED-54BA7DE5CFA6} = {F8CE2712-826B-450B-A72F-D32D80C99858} {BB6973BA-B3A2-4B31-A986-7CB008F22C4F} = {F8CE2712-826B-450B-A72F-D32D80C99858} - {1D51D03C-FB74-4AB2-84B4-09EB077BEAFE} = {BB6973BA-B3A2-4B31-A986-7CB008F22C4F} {94EED2FF-0641-4562-8167-CBC280A733AF} = {F8CE2712-826B-450B-A72F-D32D80C99858} + {146083AD-6684-4EBC-A539-AAD749A16364} = {F8CE2712-826B-450B-A72F-D32D80C99858} + {1D51D03C-FB74-4AB2-84B4-09EB077BEAFE} = {BB6973BA-B3A2-4B31-A986-7CB008F22C4F} + {1443F539-DCC7-4491-B4FD-B716C739DB3C} = {BB6973BA-B3A2-4B31-A986-7CB008F22C4F} {C2CAC65A-B2AE-4CCC-B067-E6B8E75DF73A} = {94EED2FF-0641-4562-8167-CBC280A733AF} {613E0DDA-AA8A-437C-AC45-507B47429FF9} = {94EED2FF-0641-4562-8167-CBC280A733AF} - {A5A3667E-8A3B-4569-BA0E-AD49E12D07E7} = {26843C5D-9D7E-4C2C-AC14-2D227FA5592E} {2748AD25-9C63-4E12-877B-4DCE96FBED54} = {A5A3667E-8A3B-4569-BA0E-AD49E12D07E7} {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {A5A3667E-8A3B-4569-BA0E-AD49E12D07E7} {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {A5A3667E-8A3B-4569-BA0E-AD49E12D07E7} {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {A5A3667E-8A3B-4569-BA0E-AD49E12D07E7} - {146083AD-6684-4EBC-A539-AAD749A16364} = {F8CE2712-826B-450B-A72F-D32D80C99858} - {1443F539-DCC7-4491-B4FD-B716C739DB3C} = {BB6973BA-B3A2-4B31-A986-7CB008F22C4F} - EndGlobalSection - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true EndGlobalSection EndGlobal diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 19473b03a..5e1c7bc06 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '2.2.0.944' \ No newline at end of file +!define VERSION '2.2.0.945' \ No newline at end of file diff --git a/bin/Lng/Eng/PascalABCParser.dat b/bin/Lng/Eng/PascalABCParser.dat index 3dae1f178..e6ae72b59 100644 --- a/bin/Lng/Eng/PascalABCParser.dat +++ b/bin/Lng/Eng/PascalABCParser.dat @@ -49,4 +49,5 @@ ONE_OPERATOR=Expected operator ONE_STMT=Expected statement DUPLICATE_NAMES_IN_ANON_TYPE=Duplicate field names in anonymous type -BAD_ANON_TYPE=Bad field name in anonymous type \ No newline at end of file +BAD_ANON_TYPE=Bad field name in anonymous type +ONE_TYPE_PARAMETER_MUSTBE_WITHOUT_PARENTHESES=The alone typed parameter must be without parentheses \ No newline at end of file diff --git a/bin/Lng/Rus/PascalABCParser.dat b/bin/Lng/Rus/PascalABCParser.dat index e84bf32c8..41e9dbe0f 100644 --- a/bin/Lng/Rus/PascalABCParser.dat +++ b/bin/Lng/Rus/PascalABCParser.dat @@ -50,3 +50,4 @@ ONE_STMT=Ожидался оператор DUPLICATE_NAMES_IN_ANON_TYPE=Анонимный тип не может содержать поля с одинаковыми именами BAD_ANON_TYPE=Неверное определение имени поля анонимного типа +ONE_TYPE_PARAMETER_MUSTBE_WITHOUT_PARENTHESES=Одинокий типовой параметр не должен заключаться в скобки \ No newline at end of file