From 38f124a682d9bfdddbf1332119e75c8cb8fb2730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=9F=D0=BE=D0=B3=D0=BE=D1=80=D0=B5=D0=BB=D0=BE=D0=B2?= Date: Sat, 30 Mar 2019 06:18:58 +0300 Subject: [PATCH] Collection patterns --- CodeCompletion/DomSyntaxTreeVisitor.cs | 2 +- CodeCompletion/FindReferences.cs | 2 +- .../SyntaxTreeVisitors/SyntaxTreeComparer.cs | 2 +- .../PascalABCParserNewSaushkin/ABCPascal.cs | 2 +- .../PascalABCParserNewSaushkin/ABCPascal.y | 101 +- .../ABCPascalYacc.cs | 4523 +++++++++-------- .../SemanticRules.cs | 23 - SyntaxTree/tree/AbstractVisitor.cs | 18 +- SyntaxTree/tree/HierarchyVisitor.cs | 62 +- SyntaxTree/tree/SyntaxTreeStreamReader.cs | 82 +- SyntaxTree/tree/SyntaxTreeStreamWriter.cs | 110 +- SyntaxTree/tree/Tree.cs | 918 +++- SyntaxTree/tree/TreeHelper.cs | 7 +- SyntaxTree/tree/Visitor.cs | 24 +- SyntaxTree/tree/tree.xml | 65 +- .../PatternsDesugaringVisitor.cs | 316 +- bin/Lng/Rus/SyntaxTreeVisitorsErrors.dat | 1 + 17 files changed, 3555 insertions(+), 2703 deletions(-) diff --git a/CodeCompletion/DomSyntaxTreeVisitor.cs b/CodeCompletion/DomSyntaxTreeVisitor.cs index c1a5b8700..0a8a4d4ab 100644 --- a/CodeCompletion/DomSyntaxTreeVisitor.cs +++ b/CodeCompletion/DomSyntaxTreeVisitor.cs @@ -759,7 +759,7 @@ namespace CodeCompletion } else { - foreach (pattern_deconstructor_parameter pdp in _deconstructor_pattern.parameters) + foreach (pattern_parameter pdp in _deconstructor_pattern.parameters) { if (pdp is var_deconstructor_parameter) { diff --git a/CodeCompletion/FindReferences.cs b/CodeCompletion/FindReferences.cs index 20a55f745..18410e366 100644 --- a/CodeCompletion/FindReferences.cs +++ b/CodeCompletion/FindReferences.cs @@ -1682,7 +1682,7 @@ namespace CodeCompletion public override void visit(deconstructor_pattern _deconstructor_pattern) { _deconstructor_pattern.type.visit(this); - foreach (pattern_deconstructor_parameter pdp in _deconstructor_pattern.parameters) + foreach (pattern_parameter pdp in _deconstructor_pattern.parameters) pdp.visit(this); } public override void visit(recursive_deconstructor_parameter _recursive_deconstructor_parameter) diff --git a/ParserTools/SyntaxTreeVisitors/SyntaxTreeComparer.cs b/ParserTools/SyntaxTreeVisitors/SyntaxTreeComparer.cs index 4ab3f6d09..020740221 100644 --- a/ParserTools/SyntaxTreeVisitors/SyntaxTreeComparer.cs +++ b/ParserTools/SyntaxTreeVisitors/SyntaxTreeComparer.cs @@ -2313,7 +2313,7 @@ namespace PascalABCCompiler.SyntaxTree } } - public void CompareInternal(pattern_deconstructor_parameter left, pattern_deconstructor_parameter right) + public void CompareInternal(pattern_parameter left, pattern_parameter right) { if (left == null && right != null || left != null && right == null) throw_not_equal(left, right); diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs index 45866a0ae..c32cedbcb 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs @@ -2,7 +2,7 @@ // This CSharp output file generated by Gardens Point LEX // Version: 1.1.3.301 // Machine: DESKTOP-IF20NRO -// DateTime: 3/13/2019 12:33:32 PM +// DateTime: 3/17/2019 11:23:05 AM // UserName: FatCow // GPLEX input file // GPLEX frame file diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y index 413b689b9..34dfd4770 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y @@ -145,7 +145,7 @@ %type simple_property_definition %type stmt_or_expression unlabelled_stmt stmt case_item %type set_type -%type as_is_expr as_is_constexpr is_expr as_expr power_expr power_constexpr +%type as_is_expr as_is_constexpr is_type_expr as_expr power_expr power_constexpr %type unsized_array_type simple_type_or_ simple_type simple_type_question/*array_name_for_new_expr*/ foreach_stmt_ident_dype_opt fptype type_ref fptype_noproctype array_type %type template_param template_empty_param structured_type unpacked_structured_type empty_template_type_reference simple_or_template_type_reference type_ref_or_secific for_stmt_decl_or_assign type_decl_type %type type_ref_and_secific_list @@ -174,8 +174,8 @@ %type full_lambda_fp_list lambda_simple_fp_sect lambda_function_body lambda_procedure_body common_lambda_body optional_full_lambda_fp_list %type field_in_unnamed_object list_fields_in_unnamed_object func_class_name_ident_list rem_lambda variable_list var_ident_list %type tkAssignOrEqual -%type pattern pattern_optional_var const_pattern match_with pattern_case pattern_cases pattern_out_param pattern_out_param_optional_var tuple_pattern_expr_list const_pattern_expr_list -%type pattern_out_param_list pattern_out_param_list_optional_var +%type pattern pattern_optional_var const_pattern collection_pattern collection_pattern_list_item match_with pattern_case pattern_cases pattern_out_param pattern_out_param_optional_var tuple_pattern_expr_list const_pattern_expr_list +%type pattern_out_param_list pattern_out_param_list_optional_var collection_pattern_expr_list %type const_pattern_expression tuple_pattern tuple_pattern_expr %% @@ -2798,6 +2798,10 @@ pattern_case { $$ = new pattern_case($1 as pattern_node, $3 as statement, null, @$); } + | collection_pattern tkColon unlabelled_stmt + { + $$ = new pattern_case($1 as pattern_node, $3 as statement, null, @$); + } ; case_stmt @@ -3272,28 +3276,73 @@ relop_expr { $$ = new bin_expr($1, $3, $2.type, @$); } - | is_expr tkRoundOpen pattern_out_param_list tkRoundClose + | is_type_expr tkRoundOpen pattern_out_param_list tkRoundClose { var isTypeCheck = $1 as typecast_node; - var deconstructorPattern = new deconstructor_pattern($3 as List, isTypeCheck.type_def, @$); - $$ = new is_pattern_expr(isTypeCheck.expr, deconstructorPattern, null, @$); + var deconstructorPattern = new deconstructor_pattern($3 as List, isTypeCheck.type_def, @$); + $$ = new is_pattern_expr(isTypeCheck.expr, deconstructorPattern, @$); + } + + | term tkIs collection_pattern + { + $$ = new is_pattern_expr($1, $3 as pattern_node, @$); } ; pattern : simple_or_template_type_reference tkRoundOpen pattern_out_param_list tkRoundClose { - $$ = new deconstructor_pattern($3 as List, $1, @$); + $$ = new deconstructor_pattern($3 as List, $1, @$); } ; pattern_optional_var : simple_or_template_type_reference tkRoundOpen pattern_out_param_list_optional_var tkRoundClose { - $$ = new deconstructor_pattern($3 as List, $1, @$); + $$ = new deconstructor_pattern($3 as List, $1, @$); } ; +collection_pattern + : tkSquareOpen collection_pattern_expr_list tkSquareClose + { + $$ = new collection_pattern($2 as List, @$); + } + ; + +collection_pattern_expr_list + : collection_pattern_list_item + { + $$ = new List(); + ($$ as List).Add($1 as pattern_parameter); + } + | collection_pattern_expr_list tkComma collection_pattern_list_item + { + var list = $1 as List; + list.Add($3 as pattern_parameter); + $$ = list; + } + ; + +collection_pattern_list_item + : literal_or_number + { + $$ = new const_pattern_parameter($1, @$); + } + | pattern + { + $$ = new recursive_deconstructor_parameter($1 as pattern_node, @$); + } + | pattern_optional_var + { + $$ = new recursive_deconstructor_parameter($1 as pattern_node, @$); + } + | tkDotDot + { + $$ = new collection_pattern_gap_parameter(); + } + ; + const_pattern : const_pattern_expr_list { @@ -3351,19 +3400,19 @@ tuple_pattern_expr_list pattern_out_param_list_optional_var : pattern_out_param_optional_var { - $$ = new List(); - ($$ as List).Add($1 as pattern_deconstructor_parameter); + $$ = new List(); + ($$ as List).Add($1 as pattern_parameter); } | pattern_out_param_list_optional_var tkSemiColon pattern_out_param_optional_var { - var list = $1 as List; - list.Add($3 as pattern_deconstructor_parameter); + var list = $1 as List; + list.Add($3 as pattern_parameter); $$ = list; } | pattern_out_param_list_optional_var tkComma pattern_out_param_optional_var { - var list = $1 as List; - list.Add($3 as pattern_deconstructor_parameter); + var list = $1 as List; + list.Add($3 as pattern_parameter); $$ = list; } ; @@ -3371,19 +3420,19 @@ pattern_out_param_list_optional_var pattern_out_param_list : pattern_out_param { - $$ = new List(); - ($$ as List).Add($1 as pattern_deconstructor_parameter); + $$ = new List(); + ($$ as List).Add($1 as pattern_parameter); } | pattern_out_param_list tkSemiColon pattern_out_param { - var list = $1 as List; - list.Add($3 as pattern_deconstructor_parameter); + var list = $1 as List; + list.Add($3 as pattern_parameter); $$ = list; } | pattern_out_param_list tkComma pattern_out_param { - var list = $1 as List; - list.Add($3 as pattern_deconstructor_parameter); + var list = $1 as List; + list.Add($3 as pattern_parameter); $$ = list; } ; @@ -3395,7 +3444,7 @@ pattern_out_param } | literal_or_number { - $$ = new const_deconstructor_parameter($1, @$); + $$ = new const_pattern_parameter($1, @$); } | tkVar identifier tkColon type_ref { @@ -3418,7 +3467,7 @@ pattern_out_param_optional_var } | literal_or_number { - $$ = new const_deconstructor_parameter($1, @$); + $$ = new const_pattern_parameter($1, @$); } | identifier tkColon type_ref { @@ -3554,7 +3603,7 @@ typecast_op ; as_is_expr - : is_expr + : is_type_expr { $$ = $1; } | as_expr { $$ = $1; } @@ -3567,15 +3616,11 @@ as_expr } ; -is_expr +is_type_expr : term tkIs simple_or_template_type_reference { $$ = NewAsIsExpr($1, op_typecast.is_op, $3, @$); } - | term tkIs literal_or_number - { - $$ = NewIsObjectExpr($1, $3, @$); - } ; simple_term diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs index 255910dff..9c17bf14e 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs @@ -2,7 +2,7 @@ // GPPG version 1.3.6 // Machine: DESKTOP-IF20NRO -// DateTime: 3/13/2019 12:33:33 PM +// DateTime: 3/17/2019 11:23:05 AM // UserName: FatCow // Input file @@ -75,8 +75,8 @@ public partial class GPPGParser: ShiftReduceParser aliasses; #pragma warning restore 649 - private static Rule[] rules = new Rule[917]; - private static State[] states = new State[1523]; + private static Rule[] rules = new Rule[925]; + private static State[] states = new State[1546]; private static string[] nonTerms = new string[] { "parse_goal", "unit_key_word", "class_or_static", "assignment", "optional_array_initializer", "attribute_declarations", "ot_visibility_specifier", "one_attribute", "attribute_variable", @@ -138,7 +138,7 @@ public partial class GPPGParser: ShiftReduceParser tkCase, expr_l1, tkOf, case_list, else_case, tkEnd + case 525: // pattern_case -> collection_pattern, tkColon, unlabelled_stmt +{ + CurrentSemanticValue.stn = new pattern_case(ValueStack[ValueStack.Depth-3].stn as pattern_node, ValueStack[ValueStack.Depth-1].stn as statement, null, CurrentLocationSpan); + } + break; + case 526: // case_stmt -> tkCase, expr_l1, tkOf, case_list, else_case, tkEnd { CurrentSemanticValue.stn = new case_node(ValueStack[ValueStack.Depth-5].ex, ValueStack[ValueStack.Depth-3].stn as case_variants, ValueStack[ValueStack.Depth-2].stn as statement, CurrentLocationSpan); } break; - case 526: // case_stmt -> tkCase, expr_l1, tkOf, case_list, tkSemiColon, else_case, tkEnd + case 527: // case_stmt -> tkCase, expr_l1, tkOf, case_list, tkSemiColon, else_case, tkEnd { CurrentSemanticValue.stn = new case_node(ValueStack[ValueStack.Depth-6].ex, ValueStack[ValueStack.Depth-4].stn as case_variants, ValueStack[ValueStack.Depth-2].stn as statement, CurrentLocationSpan); } break; - case 527: // case_stmt -> tkCase, expr_l1, tkOf, else_case, tkEnd + case 528: // case_stmt -> tkCase, expr_l1, tkOf, else_case, tkEnd { CurrentSemanticValue.stn = new case_node(ValueStack[ValueStack.Depth-4].ex, NewCaseItem(new empty_statement(), null), ValueStack[ValueStack.Depth-2].stn as statement, CurrentLocationSpan); } break; - case 528: // case_list -> case_item + case 529: // 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 529: // case_list -> case_list, tkSemiColon, case_item + case 530: // 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 530: // case_item -> case_label_list, tkColon, unlabelled_stmt + case 531: // case_item -> case_label_list, tkColon, unlabelled_stmt { CurrentSemanticValue.stn = new case_variant(ValueStack[ValueStack.Depth-3].stn as expression_list, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 531: // case_label_list -> case_label + case 532: // case_label_list -> case_label { CurrentSemanticValue.stn = new expression_list(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 532: // case_label_list -> case_label_list, tkComma, case_label + case 533: // 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 533: // case_label -> const_elem + case 534: // case_label -> const_elem { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 534: // else_case -> /* empty */ + case 535: // else_case -> /* empty */ { CurrentSemanticValue.stn = null;} break; - case 535: // else_case -> tkElse, stmt_list + case 536: // else_case -> tkElse, stmt_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 536: // repeat_stmt -> tkRepeat, stmt_list, tkUntil, expr + case 537: // 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; @@ -5159,23 +5197,23 @@ public partial class GPPGParser: ShiftReduceParser tkWhile, expr_l1, optional_tk_do, unlabelled_stmt + case 538: // while_stmt -> tkWhile, expr_l1, optional_tk_do, unlabelled_stmt { CurrentSemanticValue.stn = NewWhileStmt(ValueStack[ValueStack.Depth-4].ti, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-2].ti, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 538: // optional_tk_do -> tkDo + case 539: // optional_tk_do -> tkDo { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 539: // optional_tk_do -> /* empty */ + case 540: // optional_tk_do -> /* empty */ { CurrentSemanticValue.ti = null; } break; - case 540: // lock_stmt -> tkLock, expr_l1, tkDo, unlabelled_stmt + case 541: // lock_stmt -> tkLock, expr_l1, tkDo, unlabelled_stmt { CurrentSemanticValue.stn = new lock_stmt(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 541: // foreach_stmt -> tkForeach, identifier, foreach_stmt_ident_dype_opt, tkIn, + case 542: // foreach_stmt -> tkForeach, identifier, foreach_stmt_ident_dype_opt, tkIn, // expr_l1, tkDo, unlabelled_stmt { CurrentSemanticValue.stn = new foreach_stmt(ValueStack[ValueStack.Depth-6].id, ValueStack[ValueStack.Depth-5].td, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); @@ -5183,68 +5221,68 @@ public partial class GPPGParser: ShiftReduceParser tkForeach, tkVar, identifier, tkColon, type_ref, tkIn, expr_l1, + case 543: // foreach_stmt -> tkForeach, tkVar, identifier, tkColon, type_ref, tkIn, expr_l1, // tkDo, unlabelled_stmt { CurrentSemanticValue.stn = new foreach_stmt(ValueStack[ValueStack.Depth-7].id, ValueStack[ValueStack.Depth-5].td, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 543: // foreach_stmt -> tkForeach, tkVar, identifier, tkIn, expr_l1, tkDo, + case 544: // foreach_stmt -> tkForeach, tkVar, identifier, tkIn, expr_l1, tkDo, // unlabelled_stmt { CurrentSemanticValue.stn = new foreach_stmt(ValueStack[ValueStack.Depth-5].id, new no_type_foreach(), ValueStack[ValueStack.Depth-3].ex, (statement)ValueStack[ValueStack.Depth-1].stn, CurrentLocationSpan); } break; - case 544: // foreach_stmt_ident_dype_opt -> tkColon, type_ref + case 545: // foreach_stmt_ident_dype_opt -> tkColon, type_ref { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 546: // for_stmt -> tkFor, optional_var, identifier, for_stmt_decl_or_assign, expr_l1, + case 547: // for_stmt -> tkFor, optional_var, identifier, for_stmt_decl_or_assign, expr_l1, // for_cycle_type, expr_l1, optional_tk_do, unlabelled_stmt { CurrentSemanticValue.stn = NewForStmt((bool)ValueStack[ValueStack.Depth-8].ob, ValueStack[ValueStack.Depth-7].id, ValueStack[ValueStack.Depth-6].td, ValueStack[ValueStack.Depth-5].ex, (for_cycle_type)ValueStack[ValueStack.Depth-4].ob, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-2].ti, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 547: // optional_var -> tkVar + case 548: // optional_var -> tkVar { CurrentSemanticValue.ob = true; } break; - case 548: // optional_var -> /* empty */ + case 549: // optional_var -> /* empty */ { CurrentSemanticValue.ob = false; } break; - case 550: // for_stmt_decl_or_assign -> tkColon, simple_type_identifier, tkAssign + case 551: // for_stmt_decl_or_assign -> tkColon, simple_type_identifier, tkAssign { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-2].td; } break; - case 551: // for_cycle_type -> tkTo + case 552: // for_cycle_type -> tkTo { CurrentSemanticValue.ob = for_cycle_type.to; } break; - case 552: // for_cycle_type -> tkDownto + case 553: // for_cycle_type -> tkDownto { CurrentSemanticValue.ob = for_cycle_type.downto; } break; - case 553: // with_stmt -> tkWith, expr_list, tkDo, unlabelled_stmt + case 554: // with_stmt -> tkWith, expr_list, tkDo, unlabelled_stmt { CurrentSemanticValue.stn = new with_statement(ValueStack[ValueStack.Depth-1].stn as statement, ValueStack[ValueStack.Depth-3].stn as expression_list, CurrentLocationSpan); } break; - case 554: // inherited_message -> tkInherited + case 555: // inherited_message -> tkInherited { CurrentSemanticValue.stn = new inherited_message(); CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 555: // try_stmt -> tkTry, stmt_list, try_handler + case 556: // 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 556: // try_handler -> tkFinally, stmt_list, tkEnd + case 557: // 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 557: // try_handler -> tkExcept, exception_block, tkEnd + case 558: // 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) @@ -5254,186 +5292,186 @@ public partial class GPPGParser: ShiftReduceParser exception_handler_list, exception_block_else_branch + case 559: // 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 559: // exception_block -> exception_handler_list, tkSemiColon, + case 560: // 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 560: // exception_block -> stmt_list + case 561: // 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 561: // exception_handler_list -> exception_handler + case 562: // exception_handler_list -> exception_handler { CurrentSemanticValue.stn = new exception_handler_list(ValueStack[ValueStack.Depth-1].stn as exception_handler, CurrentLocationSpan); } break; - case 562: // exception_handler_list -> exception_handler_list, tkSemiColon, + case 563: // 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 563: // exception_block_else_branch -> /* empty */ + case 564: // exception_block_else_branch -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 564: // exception_block_else_branch -> tkElse, stmt_list + case 565: // exception_block_else_branch -> tkElse, stmt_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 565: // exception_handler -> tkOn, exception_identifier, tkDo, unlabelled_stmt + case 566: // exception_handler -> tkOn, exception_identifier, tkDo, unlabelled_stmt { CurrentSemanticValue.stn = new exception_handler((ValueStack[ValueStack.Depth-3].stn as exception_ident).variable, (ValueStack[ValueStack.Depth-3].stn as exception_ident).type_name, ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 566: // exception_identifier -> exception_class_type_identifier + case 567: // exception_identifier -> exception_class_type_identifier { CurrentSemanticValue.stn = new exception_ident(null, (named_type_reference)ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 567: // exception_identifier -> exception_variable, tkColon, + case 568: // 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 568: // exception_class_type_identifier -> simple_type_identifier + case 569: // exception_class_type_identifier -> simple_type_identifier { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 569: // exception_variable -> identifier + case 570: // exception_variable -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 570: // raise_stmt -> tkRaise + case 571: // raise_stmt -> tkRaise { CurrentSemanticValue.stn = new raise_stmt(); CurrentSemanticValue.stn.source_context = CurrentLocationSpan; } break; - case 571: // raise_stmt -> tkRaise, expr + case 572: // raise_stmt -> tkRaise, expr { CurrentSemanticValue.stn = new raise_stmt(ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); } break; - case 572: // expr_list -> expr_with_func_decl_lambda + case 573: // expr_list -> expr_with_func_decl_lambda { CurrentSemanticValue.stn = new expression_list(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 573: // expr_list -> expr_list, tkComma, expr_with_func_decl_lambda + case 574: // expr_list -> expr_list, tkComma, expr_with_func_decl_lambda { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as expression_list).Add(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 574: // expr_as_stmt -> allowable_expr_as_stmt + case 575: // expr_as_stmt -> allowable_expr_as_stmt { CurrentSemanticValue.stn = new expression_as_statement(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 575: // allowable_expr_as_stmt -> new_expr + case 576: // allowable_expr_as_stmt -> new_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 576: // expr_with_func_decl_lambda -> expr + case 577: // expr_with_func_decl_lambda -> expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 577: // expr_with_func_decl_lambda -> func_decl_lambda + case 578: // expr_with_func_decl_lambda -> func_decl_lambda { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 578: // expr -> expr_l1 + case 579: // expr -> expr_l1 { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 579: // expr -> format_expr + case 580: // expr -> format_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 580: // expr_l1 -> expr_dq + case 581: // expr_l1 -> expr_dq { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 581: // expr_l1 -> question_expr + case 582: // expr_l1 -> question_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 582: // expr_l1_func_decl_lambda -> expr_l1 + case 583: // expr_l1_func_decl_lambda -> expr_l1 { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 583: // expr_l1_func_decl_lambda -> func_decl_lambda + case 584: // expr_l1_func_decl_lambda -> func_decl_lambda { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 584: // expr_dq -> relop_expr + case 585: // expr_dq -> relop_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 585: // expr_dq -> expr_dq, tkDoubleQuestion, relop_expr + case 586: // expr_dq -> expr_dq, tkDoubleQuestion, relop_expr { CurrentSemanticValue.ex = new double_question_node(ValueStack[ValueStack.Depth-3].ex as expression, ValueStack[ValueStack.Depth-1].ex as expression, CurrentLocationSpan);} break; - case 586: // sizeof_expr -> tkSizeOf, tkRoundOpen, simple_or_template_type_reference, + case 587: // 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 587: // typeof_expr -> tkTypeOf, tkRoundOpen, simple_or_template_type_reference, + case 588: // 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 588: // typeof_expr -> tkTypeOf, tkRoundOpen, empty_template_type_reference, + case 589: // typeof_expr -> tkTypeOf, tkRoundOpen, empty_template_type_reference, // tkRoundClose { CurrentSemanticValue.ex = new typeof_operator((named_type_reference)ValueStack[ValueStack.Depth-2].td, CurrentLocationSpan); } break; - case 589: // question_expr -> expr_l1, tkQuestion, expr_l1, tkColon, expr_l1 + case 590: // question_expr -> expr_l1, tkQuestion, expr_l1, tkColon, expr_l1 { if (ValueStack[ValueStack.Depth-3].ex is nil_const && ValueStack[ValueStack.Depth-1].ex is nil_const) parsertools.AddErrorFromResource("TWO_NILS_IN_QUESTION_EXPR",LocationStack[LocationStack.Depth-3]); CurrentSemanticValue.ex = new question_colon_expression(ValueStack[ValueStack.Depth-5].ex, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 590: // empty_template_type_reference -> simple_type_identifier, + case 591: // empty_template_type_reference -> simple_type_identifier, // template_type_empty_params { CurrentSemanticValue.td = new template_type_reference((named_type_reference)ValueStack[ValueStack.Depth-2].td, (template_param_list)ValueStack[ValueStack.Depth-1].stn, CurrentLocationSpan); } break; - case 591: // empty_template_type_reference -> simple_type_identifier, tkAmpersend, + case 592: // empty_template_type_reference -> simple_type_identifier, tkAmpersend, // template_type_empty_params { CurrentSemanticValue.td = new template_type_reference((named_type_reference)ValueStack[ValueStack.Depth-3].td, (template_param_list)ValueStack[ValueStack.Depth-1].stn, CurrentLocationSpan); } break; - case 592: // simple_or_template_type_reference -> simple_type_identifier + case 593: // simple_or_template_type_reference -> simple_type_identifier { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 593: // simple_or_template_type_reference -> simple_type_identifier, + case 594: // 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 594: // simple_or_template_type_reference -> simple_type_identifier, tkAmpersend, + case 595: // 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 595: // optional_array_initializer -> tkRoundOpen, typed_const_list, tkRoundClose + case 596: // optional_array_initializer -> tkRoundOpen, typed_const_list, tkRoundClose { CurrentSemanticValue.stn = new array_const((expression_list)ValueStack[ValueStack.Depth-2].stn, CurrentLocationSpan); } break; - case 597: // new_expr -> tkNew, simple_or_template_type_reference, + case 598: // 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 598: // new_expr -> tkNew, simple_or_template_type_reference, tkSquareOpen, + case 599: // new_expr -> tkNew, simple_or_template_type_reference, tkSquareOpen, // optional_expr_list, tkSquareClose, optional_array_initializer { var el = ValueStack[ValueStack.Depth-3].stn as expression_list; @@ -5449,7 +5487,7 @@ public partial class GPPGParser: ShiftReduceParser tkNew, tkClass, tkRoundOpen, list_fields_in_unnamed_object, + case 600: // new_expr -> tkNew, tkClass, tkRoundOpen, list_fields_in_unnamed_object, // tkRoundClose { // sugared node @@ -5464,12 +5502,12 @@ public partial class GPPGParser: ShiftReduceParser identifier, tkAssign, relop_expr + case 601: // 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 601: // field_in_unnamed_object -> relop_expr + case 602: // field_in_unnamed_object -> relop_expr { ident name = null; var id = ValueStack[ValueStack.Depth-1].ex as ident; @@ -5489,13 +5527,13 @@ public partial class GPPGParser: ShiftReduceParser field_in_unnamed_object + case 603: // 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 603: // list_fields_in_unnamed_object -> list_fields_in_unnamed_object, tkComma, + case 604: // 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; @@ -5506,63 +5544,107 @@ public partial class GPPGParser: ShiftReduceParser /* empty */ + case 605: // optional_expr_list_with_bracket -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 605: // optional_expr_list_with_bracket -> tkRoundOpen, optional_expr_list, + case 606: // optional_expr_list_with_bracket -> tkRoundOpen, optional_expr_list, // tkRoundClose { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 606: // relop_expr -> simple_expr + case 607: // relop_expr -> simple_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 607: // relop_expr -> relop_expr, relop, simple_expr + case 608: // 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 608: // relop_expr -> is_expr, tkRoundOpen, pattern_out_param_list, tkRoundClose + case 609: // relop_expr -> is_type_expr, tkRoundOpen, pattern_out_param_list, tkRoundClose { var isTypeCheck = ValueStack[ValueStack.Depth-4].ex as typecast_node; - var deconstructorPattern = new deconstructor_pattern(ValueStack[ValueStack.Depth-2].ob as List, isTypeCheck.type_def, CurrentLocationSpan); - CurrentSemanticValue.ex = new is_pattern_expr(isTypeCheck.expr, deconstructorPattern, null, CurrentLocationSpan); + var deconstructorPattern = new deconstructor_pattern(ValueStack[ValueStack.Depth-2].ob as List, isTypeCheck.type_def, CurrentLocationSpan); + CurrentSemanticValue.ex = new is_pattern_expr(isTypeCheck.expr, deconstructorPattern, CurrentLocationSpan); } break; - case 609: // pattern -> simple_or_template_type_reference, tkRoundOpen, + case 610: // relop_expr -> term, tkIs, collection_pattern +{ + CurrentSemanticValue.ex = new is_pattern_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); + } + break; + case 611: // pattern -> simple_or_template_type_reference, tkRoundOpen, // pattern_out_param_list, tkRoundClose { - CurrentSemanticValue.stn = new deconstructor_pattern(ValueStack[ValueStack.Depth-2].ob as List, ValueStack[ValueStack.Depth-4].td, CurrentLocationSpan); + CurrentSemanticValue.stn = new deconstructor_pattern(ValueStack[ValueStack.Depth-2].ob as List, ValueStack[ValueStack.Depth-4].td, CurrentLocationSpan); } break; - case 610: // pattern_optional_var -> simple_or_template_type_reference, tkRoundOpen, + case 612: // pattern_optional_var -> simple_or_template_type_reference, tkRoundOpen, // pattern_out_param_list_optional_var, tkRoundClose { - CurrentSemanticValue.stn = new deconstructor_pattern(ValueStack[ValueStack.Depth-2].ob as List, ValueStack[ValueStack.Depth-4].td, CurrentLocationSpan); + CurrentSemanticValue.stn = new deconstructor_pattern(ValueStack[ValueStack.Depth-2].ob as List, ValueStack[ValueStack.Depth-4].td, CurrentLocationSpan); } break; - case 611: // const_pattern -> const_pattern_expr_list + case 613: // collection_pattern -> tkSquareOpen, collection_pattern_expr_list, tkSquareClose +{ + CurrentSemanticValue.stn = new collection_pattern(ValueStack[ValueStack.Depth-2].ob as List, CurrentLocationSpan); + } + break; + case 614: // collection_pattern_expr_list -> collection_pattern_list_item +{ + CurrentSemanticValue.ob = new List(); + (CurrentSemanticValue.ob as List).Add(ValueStack[ValueStack.Depth-1].stn as pattern_parameter); + } + break; + case 615: // collection_pattern_expr_list -> collection_pattern_expr_list, tkComma, + // collection_pattern_list_item +{ + var list = ValueStack[ValueStack.Depth-3].ob as List; + list.Add(ValueStack[ValueStack.Depth-1].stn as pattern_parameter); + CurrentSemanticValue.ob = list; + } + break; + case 616: // collection_pattern_list_item -> literal_or_number +{ + CurrentSemanticValue.stn = new const_pattern_parameter(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); + } + break; + case 617: // collection_pattern_list_item -> pattern +{ + CurrentSemanticValue.stn = new recursive_deconstructor_parameter(ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); + } + break; + case 618: // collection_pattern_list_item -> pattern_optional_var +{ + CurrentSemanticValue.stn = new recursive_deconstructor_parameter(ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); + } + break; + case 619: // collection_pattern_list_item -> tkDotDot +{ + CurrentSemanticValue.stn = new collection_pattern_gap_parameter(); + } + break; + case 620: // const_pattern -> const_pattern_expr_list { CurrentSemanticValue.stn = new const_pattern(ValueStack[ValueStack.Depth-1].stn as expression_list, CurrentLocationSpan); } break; - case 612: // const_pattern_expr_list -> const_pattern_expression + case 621: // const_pattern_expr_list -> const_pattern_expression { CurrentSemanticValue.stn = new expression_list(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 613: // const_pattern_expr_list -> const_pattern_expr_list, tkComma, + case 622: // const_pattern_expr_list -> const_pattern_expr_list, tkComma, // const_pattern_expression { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as expression_list).Add(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 614: // const_pattern_expression -> literal_or_number + case 623: // const_pattern_expression -> literal_or_number { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 615: // const_pattern_expression -> tuple_pattern + case 624: // const_pattern_expression -> tuple_pattern { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 616: // tuple_pattern -> tkRoundOpen, tuple_pattern_expr, tkComma, + case 625: // tuple_pattern -> tkRoundOpen, tuple_pattern_expr, tkComma, // tuple_pattern_expr_list, lambda_type_ref, // optional_full_lambda_fp_list, tkRoundClose { @@ -5577,316 +5659,311 @@ public partial class GPPGParser: ShiftReduceParser tkUnderscore + case 626: // tuple_pattern_expr -> tkUnderscore { CurrentSemanticValue.ex = new tuple_wild_card(); } break; - case 618: // tuple_pattern_expr -> literal_or_number + case 627: // tuple_pattern_expr -> literal_or_number { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 619: // tuple_pattern_expr_list -> tuple_pattern_expr + case 628: // tuple_pattern_expr_list -> tuple_pattern_expr { CurrentSemanticValue.stn = new expression_list(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 620: // tuple_pattern_expr_list -> tuple_pattern_expr_list, tkComma, tuple_pattern_expr + case 629: // tuple_pattern_expr_list -> tuple_pattern_expr_list, tkComma, tuple_pattern_expr { CurrentSemanticValue.stn = (ValueStack[ValueStack.Depth-3].stn as expression_list).Add(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 621: // pattern_out_param_list_optional_var -> pattern_out_param_optional_var + case 630: // pattern_out_param_list_optional_var -> pattern_out_param_optional_var { - CurrentSemanticValue.ob = new List(); - (CurrentSemanticValue.ob as List).Add(ValueStack[ValueStack.Depth-1].stn as pattern_deconstructor_parameter); + CurrentSemanticValue.ob = new List(); + (CurrentSemanticValue.ob as List).Add(ValueStack[ValueStack.Depth-1].stn as pattern_parameter); } break; - case 622: // pattern_out_param_list_optional_var -> pattern_out_param_list_optional_var, + case 631: // pattern_out_param_list_optional_var -> pattern_out_param_list_optional_var, // tkSemiColon, // pattern_out_param_optional_var { - var list = ValueStack[ValueStack.Depth-3].ob as List; - list.Add(ValueStack[ValueStack.Depth-1].stn as pattern_deconstructor_parameter); + var list = ValueStack[ValueStack.Depth-3].ob as List; + list.Add(ValueStack[ValueStack.Depth-1].stn as pattern_parameter); CurrentSemanticValue.ob = list; } break; - case 623: // pattern_out_param_list_optional_var -> pattern_out_param_list_optional_var, + case 632: // pattern_out_param_list_optional_var -> pattern_out_param_list_optional_var, // tkComma, // pattern_out_param_optional_var { - var list = ValueStack[ValueStack.Depth-3].ob as List; - list.Add(ValueStack[ValueStack.Depth-1].stn as pattern_deconstructor_parameter); + var list = ValueStack[ValueStack.Depth-3].ob as List; + list.Add(ValueStack[ValueStack.Depth-1].stn as pattern_parameter); CurrentSemanticValue.ob = list; } break; - case 624: // pattern_out_param_list -> pattern_out_param + case 633: // pattern_out_param_list -> pattern_out_param { - CurrentSemanticValue.ob = new List(); - (CurrentSemanticValue.ob as List).Add(ValueStack[ValueStack.Depth-1].stn as pattern_deconstructor_parameter); + CurrentSemanticValue.ob = new List(); + (CurrentSemanticValue.ob as List).Add(ValueStack[ValueStack.Depth-1].stn as pattern_parameter); } break; - case 625: // pattern_out_param_list -> pattern_out_param_list, tkSemiColon, + case 634: // pattern_out_param_list -> pattern_out_param_list, tkSemiColon, // pattern_out_param { - var list = ValueStack[ValueStack.Depth-3].ob as List; - list.Add(ValueStack[ValueStack.Depth-1].stn as pattern_deconstructor_parameter); + var list = ValueStack[ValueStack.Depth-3].ob as List; + list.Add(ValueStack[ValueStack.Depth-1].stn as pattern_parameter); CurrentSemanticValue.ob = list; } break; - case 626: // pattern_out_param_list -> pattern_out_param_list, tkComma, pattern_out_param + case 635: // pattern_out_param_list -> pattern_out_param_list, tkComma, pattern_out_param { - var list = ValueStack[ValueStack.Depth-3].ob as List; - list.Add(ValueStack[ValueStack.Depth-1].stn as pattern_deconstructor_parameter); + var list = ValueStack[ValueStack.Depth-3].ob as List; + list.Add(ValueStack[ValueStack.Depth-1].stn as pattern_parameter); CurrentSemanticValue.ob = list; } break; - case 627: // pattern_out_param -> tkUnderscore + case 636: // pattern_out_param -> tkUnderscore { CurrentSemanticValue.stn = new wild_card_deconstructor_parameter(); } break; - case 628: // pattern_out_param -> literal_or_number + case 637: // pattern_out_param -> literal_or_number { - CurrentSemanticValue.stn = new const_deconstructor_parameter(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); + CurrentSemanticValue.stn = new const_pattern_parameter(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 629: // pattern_out_param -> tkVar, identifier, tkColon, type_ref + case 638: // pattern_out_param -> tkVar, identifier, tkColon, type_ref { CurrentSemanticValue.stn = new var_deconstructor_parameter(ValueStack[ValueStack.Depth-3].id, ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 630: // pattern_out_param -> tkVar, identifier + case 639: // pattern_out_param -> tkVar, identifier { CurrentSemanticValue.stn = new var_deconstructor_parameter(ValueStack[ValueStack.Depth-1].id, null, CurrentLocationSpan); } break; - case 631: // pattern_out_param -> pattern + case 640: // pattern_out_param -> pattern { CurrentSemanticValue.stn = new recursive_deconstructor_parameter(ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); } break; - case 632: // pattern_out_param_optional_var -> tkUnderscore + case 641: // pattern_out_param_optional_var -> tkUnderscore { CurrentSemanticValue.stn = new wild_card_deconstructor_parameter(); } break; - case 633: // pattern_out_param_optional_var -> literal_or_number + case 642: // pattern_out_param_optional_var -> literal_or_number { - CurrentSemanticValue.stn = new const_deconstructor_parameter(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); + CurrentSemanticValue.stn = new const_pattern_parameter(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 634: // pattern_out_param_optional_var -> identifier, tkColon, type_ref + case 643: // pattern_out_param_optional_var -> identifier, tkColon, type_ref { CurrentSemanticValue.stn = new var_deconstructor_parameter(ValueStack[ValueStack.Depth-3].id, ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 635: // pattern_out_param_optional_var -> identifier + case 644: // pattern_out_param_optional_var -> identifier { CurrentSemanticValue.stn = new var_deconstructor_parameter(ValueStack[ValueStack.Depth-1].id, null, CurrentLocationSpan); } break; - case 636: // pattern_out_param_optional_var -> tkVar, identifier, tkColon, type_ref + case 645: // pattern_out_param_optional_var -> tkVar, identifier, tkColon, type_ref { CurrentSemanticValue.stn = new var_deconstructor_parameter(ValueStack[ValueStack.Depth-3].id, ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 637: // pattern_out_param_optional_var -> tkVar, identifier + case 646: // pattern_out_param_optional_var -> tkVar, identifier { CurrentSemanticValue.stn = new var_deconstructor_parameter(ValueStack[ValueStack.Depth-1].id, null, CurrentLocationSpan); } break; - case 638: // pattern_out_param_optional_var -> pattern_optional_var + case 647: // pattern_out_param_optional_var -> pattern_optional_var { CurrentSemanticValue.stn = new recursive_deconstructor_parameter(ValueStack[ValueStack.Depth-1].stn as pattern_node, CurrentLocationSpan); } break; - case 639: // simple_expr_or_nothing -> simple_expr + case 648: // simple_expr_or_nothing -> simple_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 640: // simple_expr_or_nothing -> /* empty */ + case 649: // simple_expr_or_nothing -> /* empty */ { CurrentSemanticValue.ex = null; } break; - case 641: // const_expr_or_nothing -> const_expr + case 650: // const_expr_or_nothing -> const_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 642: // const_expr_or_nothing -> /* empty */ + case 651: // const_expr_or_nothing -> /* empty */ { CurrentSemanticValue.ex = null; } break; - case 643: // format_expr -> simple_expr, tkColon, simple_expr_or_nothing + case 652: // format_expr -> simple_expr, tkColon, simple_expr_or_nothing { CurrentSemanticValue.ex = new format_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); } break; - case 644: // format_expr -> tkColon, simple_expr_or_nothing + case 653: // format_expr -> tkColon, simple_expr_or_nothing { CurrentSemanticValue.ex = new format_expr(null, ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); } break; - case 645: // format_expr -> simple_expr, tkColon, simple_expr_or_nothing, tkColon, + case 654: // format_expr -> simple_expr, tkColon, simple_expr_or_nothing, tkColon, // simple_expr { CurrentSemanticValue.ex = new format_expr(ValueStack[ValueStack.Depth-5].ex, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 646: // format_expr -> tkColon, simple_expr_or_nothing, tkColon, simple_expr + case 655: // format_expr -> tkColon, simple_expr_or_nothing, tkColon, simple_expr { CurrentSemanticValue.ex = new format_expr(null, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 647: // format_const_expr -> const_expr, tkColon, const_expr_or_nothing + case 656: // format_const_expr -> const_expr, tkColon, const_expr_or_nothing { CurrentSemanticValue.ex = new format_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); } break; - case 648: // format_const_expr -> tkColon, const_expr_or_nothing + case 657: // format_const_expr -> tkColon, const_expr_or_nothing { CurrentSemanticValue.ex = new format_expr(null, ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); } break; - case 649: // format_const_expr -> const_expr, tkColon, const_expr_or_nothing, tkColon, + case 658: // format_const_expr -> const_expr, tkColon, const_expr_or_nothing, tkColon, // const_expr { CurrentSemanticValue.ex = new format_expr(ValueStack[ValueStack.Depth-5].ex, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 650: // format_const_expr -> tkColon, const_expr_or_nothing, tkColon, const_expr + case 659: // format_const_expr -> tkColon, const_expr_or_nothing, tkColon, const_expr { CurrentSemanticValue.ex = new format_expr(null, ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 651: // relop -> tkEqual + case 660: // relop -> tkEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 652: // relop -> tkNotEqual + case 661: // relop -> tkNotEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 653: // relop -> tkLower + case 662: // relop -> tkLower { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 654: // relop -> tkGreater + case 663: // relop -> tkGreater { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 655: // relop -> tkLowerEqual + case 664: // relop -> tkLowerEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 656: // relop -> tkGreaterEqual + case 665: // relop -> tkGreaterEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 657: // relop -> tkIn + case 666: // relop -> tkIn { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 658: // simple_expr -> term + case 667: // simple_expr -> term { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 659: // simple_expr -> simple_expr, addop, term + case 668: // 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 660: // addop -> tkPlus + case 669: // addop -> tkPlus { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 661: // addop -> tkMinus + case 670: // addop -> tkMinus { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 662: // addop -> tkOr + case 671: // addop -> tkOr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 663: // addop -> tkXor + case 672: // addop -> tkXor { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 664: // addop -> tkCSharpStyleOr + case 673: // addop -> tkCSharpStyleOr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 665: // typecast_op -> tkAs + case 674: // typecast_op -> tkAs { CurrentSemanticValue.ob = op_typecast.as_op; } break; - case 666: // typecast_op -> tkIs + case 675: // typecast_op -> tkIs { CurrentSemanticValue.ob = op_typecast.is_op; } break; - case 667: // as_is_expr -> is_expr + case 676: // as_is_expr -> is_type_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 668: // as_is_expr -> as_expr + case 677: // as_is_expr -> as_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 669: // as_expr -> term, tkAs, simple_or_template_type_reference + case 678: // as_expr -> term, tkAs, simple_or_template_type_reference { CurrentSemanticValue.ex = NewAsIsExpr(ValueStack[ValueStack.Depth-3].ex, op_typecast.as_op, ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 670: // is_expr -> term, tkIs, simple_or_template_type_reference + case 679: // is_type_expr -> term, tkIs, simple_or_template_type_reference { CurrentSemanticValue.ex = NewAsIsExpr(ValueStack[ValueStack.Depth-3].ex, op_typecast.is_op, ValueStack[ValueStack.Depth-1].td, CurrentLocationSpan); } break; - case 671: // is_expr -> term, tkIs, literal_or_number -{ - CurrentSemanticValue.ex = NewIsObjectExpr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); - } - break; - case 672: // simple_term -> factor + case 680: // simple_term -> factor { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 673: // power_expr -> simple_term, tkStarStar, factor + case 681: // power_expr -> simple_term, tkStarStar, factor { CurrentSemanticValue.ex = new bin_expr(ValueStack[ValueStack.Depth-3].ex,ValueStack[ValueStack.Depth-1].ex,(ValueStack[ValueStack.Depth-2].op).type, CurrentLocationSpan); } break; - case 674: // term -> factor + case 682: // term -> factor { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 675: // term -> new_expr + case 683: // term -> new_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 676: // term -> power_expr + case 684: // term -> power_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 677: // term -> term, mulop, factor + case 685: // 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 678: // term -> term, mulop, power_expr + case 686: // term -> term, mulop, power_expr { CurrentSemanticValue.ex = new bin_expr(ValueStack[ValueStack.Depth-3].ex,ValueStack[ValueStack.Depth-1].ex,(ValueStack[ValueStack.Depth-2].op).type, CurrentLocationSpan); } break; - case 679: // term -> as_is_expr + case 687: // term -> as_is_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 680: // mulop -> tkStar + case 688: // mulop -> tkStar { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 681: // mulop -> tkSlash + case 689: // mulop -> tkSlash { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 682: // mulop -> tkDiv + case 690: // mulop -> tkDiv { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 683: // mulop -> tkMod + case 691: // mulop -> tkMod { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 684: // mulop -> tkShl + case 692: // mulop -> tkShl { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 685: // mulop -> tkShr + case 693: // mulop -> tkShr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 686: // mulop -> tkAnd + case 694: // mulop -> tkAnd { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 687: // default_expr -> tkDefault, tkRoundOpen, simple_or_template_type_reference, + case 695: // 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 688: // tuple -> tkRoundOpen, expr_l1, tkComma, expr_l1_list, lambda_type_ref, + case 696: // tuple -> tkRoundOpen, expr_l1, tkComma, expr_l1_list, lambda_type_ref, // optional_full_lambda_fp_list, tkRoundClose { /*if ($5 != null) @@ -5900,29 +5977,29 @@ public partial class GPPGParser: ShiftReduceParser tkNil + case 697: // factor -> tkNil { CurrentSemanticValue.ex = new nil_const(); CurrentSemanticValue.ex.source_context = CurrentLocationSpan; } break; - case 690: // factor -> literal_or_number + case 698: // factor -> literal_or_number { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 691: // factor -> default_expr + case 699: // factor -> default_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 692: // factor -> tkSquareOpen, elem_list, tkSquareClose + case 700: // factor -> tkSquareOpen, elem_list, tkSquareClose { CurrentSemanticValue.ex = new pascal_set_constant(ValueStack[ValueStack.Depth-2].stn as expression_list, CurrentLocationSpan); } break; - case 693: // factor -> tkNot, factor + case 701: // factor -> tkNot, factor { CurrentSemanticValue.ex = new un_expr(ValueStack[ValueStack.Depth-1].ex, ValueStack[ValueStack.Depth-2].op.type, CurrentLocationSpan); } break; - case 694: // factor -> sign, factor + case 702: // factor -> sign, factor { if (ValueStack[ValueStack.Depth-2].op.type == Operators.Minus) { @@ -5949,91 +6026,91 @@ public partial class GPPGParser: ShiftReduceParser var_reference + case 703: // factor -> var_reference { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 696: // factor -> tuple + case 704: // factor -> tuple { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 697: // literal_or_number -> literal + case 705: // literal_or_number -> literal { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 698: // literal_or_number -> unsigned_number + case 706: // literal_or_number -> unsigned_number { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 699: // var_question_point -> variable, tkQuestionPoint, variable + case 707: // var_question_point -> variable, tkQuestionPoint, variable { CurrentSemanticValue.ex = new dot_question_node(ValueStack[ValueStack.Depth-3].ex as addressed_value,ValueStack[ValueStack.Depth-1].ex as addressed_value,CurrentLocationSpan); } break; - case 700: // var_question_point -> variable, tkQuestionPoint, var_question_point + case 708: // var_question_point -> variable, tkQuestionPoint, var_question_point { CurrentSemanticValue.ex = new dot_question_node(ValueStack[ValueStack.Depth-3].ex as addressed_value,ValueStack[ValueStack.Depth-1].ex as addressed_value,CurrentLocationSpan); } break; - case 701: // var_reference -> var_address, variable + case 709: // 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 702: // var_reference -> variable + case 710: // var_reference -> variable { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 703: // var_reference -> var_question_point + case 711: // var_reference -> var_question_point { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 704: // var_address -> tkAddressOf + case 712: // var_address -> tkAddressOf { CurrentSemanticValue.stn = NewVarAddress(CurrentLocationSpan); } break; - case 705: // var_address -> var_address, tkAddressOf + case 713: // var_address -> var_address, tkAddressOf { CurrentSemanticValue.stn = NewVarAddress(ValueStack[ValueStack.Depth-2].stn as get_address, CurrentLocationSpan); } break; - case 706: // attribute_variable -> simple_type_identifier, optional_expr_list_with_bracket + case 714: // 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 707: // attribute_variable -> template_type, optional_expr_list_with_bracket + case 715: // attribute_variable -> template_type, optional_expr_list_with_bracket { CurrentSemanticValue.stn = new attribute(null, ValueStack[ValueStack.Depth-2].td as named_type_reference, ValueStack[ValueStack.Depth-1].stn as expression_list, CurrentLocationSpan); } break; - case 708: // dotted_identifier -> identifier + case 716: // dotted_identifier -> identifier { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].id; } break; - case 709: // dotted_identifier -> dotted_identifier, tkPoint, identifier_or_keyword + case 717: // 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 710: // variable_as_type -> dotted_identifier + case 718: // variable_as_type -> dotted_identifier { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex;} break; - case 711: // variable_as_type -> dotted_identifier, template_type_params + case 719: // 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 712: // variable_or_literal_or_number -> variable + case 720: // variable_or_literal_or_number -> variable { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 713: // variable_or_literal_or_number -> literal_or_number + case 721: // variable_or_literal_or_number -> literal_or_number { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 714: // variable -> identifier + case 722: // variable -> identifier { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].id; } break; - case 715: // variable -> operator_name_ident + case 723: // variable -> operator_name_ident { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 716: // variable -> tkInherited, identifier + case 724: // variable -> tkInherited, identifier { CurrentSemanticValue.ex = new inherited_ident(ValueStack[ValueStack.Depth-1].id.name, CurrentLocationSpan); } break; - case 717: // variable -> tkRoundOpen, expr, tkRoundClose + case 725: // variable -> tkRoundOpen, expr, tkRoundClose { if (!parsertools.build_tree_for_formatter) { @@ -6043,18 +6120,18 @@ public partial class GPPGParser: ShiftReduceParser sizeof_expr + case 726: // variable -> sizeof_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 719: // variable -> typeof_expr + case 727: // variable -> typeof_expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 720: // variable -> literal_or_number, tkPoint, identifier_or_keyword + case 728: // 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 721: // variable -> variable_or_literal_or_number, tkSquareOpen, expr_list, + case 729: // variable -> variable_or_literal_or_number, tkSquareOpen, expr_list, // tkSquareClose { var el = ValueStack[ValueStack.Depth-2].stn as expression_list; // SSM 10/03/16 @@ -6073,7 +6150,7 @@ public partial class GPPGParser: ShiftReduceParser variable, tkQuestionSquareOpen, format_expr, tkSquareClose + case 730: // variable -> variable, tkQuestionSquareOpen, format_expr, tkSquareClose { var fe = ValueStack[ValueStack.Depth-2].ex as format_expr; // SSM 9/01/17 if (!parsertools.build_tree_for_formatter) @@ -6086,71 +6163,71 @@ public partial class GPPGParser: ShiftReduceParser variable, tkRoundOpen, optional_expr_list, tkRoundClose + case 731: // variable -> variable, tkRoundOpen, optional_expr_list, tkRoundClose { CurrentSemanticValue.ex = new method_call(ValueStack[ValueStack.Depth-4].ex as addressed_value,ValueStack[ValueStack.Depth-2].stn as expression_list, CurrentLocationSpan); } break; - case 724: // variable -> variable, tkPoint, identifier_keyword_operatorname + case 732: // variable -> variable, tkPoint, identifier_keyword_operatorname { CurrentSemanticValue.ex = new dot_node(ValueStack[ValueStack.Depth-3].ex as addressed_value, ValueStack[ValueStack.Depth-1].id as addressed_value, CurrentLocationSpan); } break; - case 725: // variable -> tuple, tkPoint, identifier_keyword_operatorname + case 733: // variable -> tuple, tkPoint, identifier_keyword_operatorname { CurrentSemanticValue.ex = new dot_node(ValueStack[ValueStack.Depth-3].ex as addressed_value, ValueStack[ValueStack.Depth-1].id as addressed_value, CurrentLocationSpan); } break; - case 726: // variable -> variable, tkDeref + case 734: // variable -> variable, tkDeref { CurrentSemanticValue.ex = new roof_dereference(ValueStack[ValueStack.Depth-2].ex as addressed_value,CurrentLocationSpan); } break; - case 727: // variable -> variable, tkAmpersend, template_type_params + case 735: // variable -> variable, tkAmpersend, template_type_params { CurrentSemanticValue.ex = new ident_with_templateparams(ValueStack[ValueStack.Depth-3].ex as addressed_value, ValueStack[ValueStack.Depth-1].stn as template_param_list, CurrentLocationSpan); } break; - case 728: // optional_expr_list -> expr_list + case 736: // optional_expr_list -> expr_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 729: // optional_expr_list -> /* empty */ + case 737: // optional_expr_list -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 730: // elem_list -> elem_list1 + case 738: // elem_list -> elem_list1 { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 731: // elem_list -> /* empty */ + case 739: // elem_list -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 732: // elem_list1 -> elem + case 740: // elem_list1 -> elem { CurrentSemanticValue.stn = new expression_list(ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 733: // elem_list1 -> elem_list1, tkComma, elem + case 741: // 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 734: // elem -> expr + case 742: // elem -> expr { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 735: // elem -> expr, tkDotDot, expr + case 743: // elem -> expr, tkDotDot, expr { CurrentSemanticValue.ex = new diapason_expr(ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); } break; - case 736: // one_literal -> tkStringLiteral + case 744: // one_literal -> tkStringLiteral { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].stn as literal; } break; - case 737: // one_literal -> tkAsciiChar + case 745: // one_literal -> tkAsciiChar { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].stn as literal; } break; - case 738: // literal -> literal_list + case 746: // literal -> literal_list { CurrentSemanticValue.ex = NewLiteral(ValueStack[ValueStack.Depth-1].stn as literal_const_line); } break; - case 739: // literal -> tkFormatStringLiteral + case 747: // literal -> tkFormatStringLiteral { if (parsertools.build_tree_for_formatter) { @@ -6162,12 +6239,12 @@ public partial class GPPGParser: ShiftReduceParser one_literal + case 748: // literal_list -> one_literal { CurrentSemanticValue.stn = new literal_const_line(ValueStack[ValueStack.Depth-1].ex as literal, CurrentLocationSpan); } break; - case 741: // literal_list -> literal_list, one_literal + case 749: // literal_list -> literal_list, one_literal { var line = ValueStack[ValueStack.Depth-2].stn as literal_const_line; if (line.literals.Last() is string_const && ValueStack[ValueStack.Depth-1].ex is string_const) @@ -6175,446 +6252,446 @@ public partial class GPPGParser: ShiftReduceParser tkOperator, overload_operator + case 750: // 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 743: // optional_method_modificators -> tkSemiColon + case 751: // optional_method_modificators -> tkSemiColon { CurrentSemanticValue.stn = new procedure_attributes_list(new List(),CurrentLocationSpan); } break; - case 744: // optional_method_modificators -> tkSemiColon, meth_modificators, tkSemiColon + case 752: // optional_method_modificators -> tkSemiColon, meth_modificators, tkSemiColon { //parsertools.AddModifier((procedure_attributes_list)$2, proc_attribute.attr_overload); CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-2].stn; } break; - case 745: // optional_method_modificators1 -> /* empty */ + case 753: // optional_method_modificators1 -> /* empty */ { CurrentSemanticValue.stn = new procedure_attributes_list(new List(),CurrentLocationSpan); } break; - case 746: // optional_method_modificators1 -> tkSemiColon, meth_modificators + case 754: // optional_method_modificators1 -> tkSemiColon, meth_modificators { //parsertools.AddModifier((procedure_attributes_list)$2, proc_attribute.attr_overload); CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 747: // meth_modificators -> meth_modificator + case 755: // meth_modificators -> meth_modificator { CurrentSemanticValue.stn = new procedure_attributes_list(ValueStack[ValueStack.Depth-1].id as procedure_attribute, CurrentLocationSpan); } break; - case 748: // meth_modificators -> meth_modificators, tkSemiColon, meth_modificator + case 756: // 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 749: // identifier -> tkIdentifier + case 757: // identifier -> tkIdentifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 750: // identifier -> property_specifier_directives + case 758: // identifier -> property_specifier_directives { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 751: // identifier -> non_reserved + case 759: // identifier -> non_reserved { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 752: // identifier_or_keyword -> identifier + case 760: // identifier_or_keyword -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 753: // identifier_or_keyword -> keyword + case 761: // identifier_or_keyword -> keyword { CurrentSemanticValue.id = new ident(ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 754: // identifier_or_keyword -> reserved_keyword + case 762: // identifier_or_keyword -> reserved_keyword { CurrentSemanticValue.id = new ident(ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 755: // identifier_keyword_operatorname -> identifier + case 763: // identifier_keyword_operatorname -> identifier { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 756: // identifier_keyword_operatorname -> keyword + case 764: // identifier_keyword_operatorname -> keyword { CurrentSemanticValue.id = new ident(ValueStack[ValueStack.Depth-1].ti.text, CurrentLocationSpan); } break; - case 757: // identifier_keyword_operatorname -> operator_name_ident + case 765: // identifier_keyword_operatorname -> operator_name_ident { CurrentSemanticValue.id = (ident)ValueStack[ValueStack.Depth-1].ex; } break; - case 758: // meth_modificator -> tkAbstract + case 766: // meth_modificator -> tkAbstract { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 759: // meth_modificator -> tkOverload + case 767: // meth_modificator -> tkOverload { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; parsertools.AddWarningFromResource("OVERLOAD_IS_NOT_USED", ValueStack[ValueStack.Depth-1].id.source_context); } break; - case 760: // meth_modificator -> tkReintroduce + case 768: // meth_modificator -> tkReintroduce { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 761: // meth_modificator -> tkOverride + case 769: // meth_modificator -> tkOverride { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 762: // meth_modificator -> tkExtensionMethod + case 770: // meth_modificator -> tkExtensionMethod { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 763: // meth_modificator -> tkVirtual + case 771: // meth_modificator -> tkVirtual { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 764: // property_modificator -> tkVirtual + case 772: // property_modificator -> tkVirtual { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 765: // property_modificator -> tkOverride + case 773: // property_modificator -> tkOverride { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 766: // property_modificator -> tkAbstract + case 774: // property_modificator -> tkAbstract { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 767: // property_specifier_directives -> tkRead + case 775: // property_specifier_directives -> tkRead { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 768: // property_specifier_directives -> tkWrite + case 776: // property_specifier_directives -> tkWrite { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 769: // non_reserved -> tkName + case 777: // non_reserved -> tkName { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 770: // non_reserved -> tkNew + case 778: // non_reserved -> tkNew { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 771: // visibility_specifier -> tkInternal + case 779: // visibility_specifier -> tkInternal { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 772: // visibility_specifier -> tkPublic + case 780: // visibility_specifier -> tkPublic { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 773: // visibility_specifier -> tkProtected + case 781: // visibility_specifier -> tkProtected { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 774: // visibility_specifier -> tkPrivate + case 782: // visibility_specifier -> tkPrivate { CurrentSemanticValue.id = ValueStack[ValueStack.Depth-1].id; } break; - case 775: // keyword -> visibility_specifier + case 783: // keyword -> visibility_specifier { CurrentSemanticValue.ti = new token_info(ValueStack[ValueStack.Depth-1].id.name, CurrentLocationSpan); } break; - case 776: // keyword -> tkSealed + case 784: // keyword -> tkSealed { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 777: // keyword -> tkTemplate + case 785: // keyword -> tkTemplate { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 778: // keyword -> tkOr + case 786: // keyword -> tkOr { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 779: // keyword -> tkTypeOf + case 787: // keyword -> tkTypeOf { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 780: // keyword -> tkSizeOf + case 788: // keyword -> tkSizeOf { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 781: // keyword -> tkDefault + case 789: // keyword -> tkDefault { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 782: // keyword -> tkWhere + case 790: // keyword -> tkWhere { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 783: // keyword -> tkXor + case 791: // keyword -> tkXor { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 784: // keyword -> tkAnd + case 792: // keyword -> tkAnd { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 785: // keyword -> tkDiv + case 793: // keyword -> tkDiv { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 786: // keyword -> tkMod + case 794: // keyword -> tkMod { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 787: // keyword -> tkShl + case 795: // keyword -> tkShl { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 788: // keyword -> tkShr + case 796: // keyword -> tkShr { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 789: // keyword -> tkNot + case 797: // keyword -> tkNot { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 790: // keyword -> tkAs + case 798: // keyword -> tkAs { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 791: // keyword -> tkIn + case 799: // keyword -> tkIn { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 792: // keyword -> tkIs + case 800: // keyword -> tkIs { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].op; } break; - case 793: // keyword -> tkArray + case 801: // keyword -> tkArray { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 794: // keyword -> tkSequence + case 802: // keyword -> tkSequence { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 795: // keyword -> tkBegin + case 803: // keyword -> tkBegin { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 796: // keyword -> tkCase + case 804: // keyword -> tkCase { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 797: // keyword -> tkClass + case 805: // keyword -> tkClass { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 798: // keyword -> tkConst + case 806: // keyword -> tkConst { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 799: // keyword -> tkConstructor + case 807: // keyword -> tkConstructor { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 800: // keyword -> tkDestructor + case 808: // keyword -> tkDestructor { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 801: // keyword -> tkDownto + case 809: // keyword -> tkDownto { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 802: // keyword -> tkDo + case 810: // keyword -> tkDo { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 803: // keyword -> tkElse + case 811: // keyword -> tkElse { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 804: // keyword -> tkExcept + case 812: // keyword -> tkExcept { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 805: // keyword -> tkFile + case 813: // keyword -> tkFile { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 806: // keyword -> tkAuto + case 814: // keyword -> tkAuto { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 807: // keyword -> tkFinalization + case 815: // keyword -> tkFinalization { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 808: // keyword -> tkFinally + case 816: // keyword -> tkFinally { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 809: // keyword -> tkFor + case 817: // keyword -> tkFor { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 810: // keyword -> tkForeach + case 818: // keyword -> tkForeach { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 811: // keyword -> tkFunction + case 819: // keyword -> tkFunction { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 812: // keyword -> tkIf + case 820: // keyword -> tkIf { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 813: // keyword -> tkImplementation + case 821: // keyword -> tkImplementation { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 814: // keyword -> tkInherited + case 822: // keyword -> tkInherited { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 815: // keyword -> tkInitialization + case 823: // keyword -> tkInitialization { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 816: // keyword -> tkInterface + case 824: // keyword -> tkInterface { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 817: // keyword -> tkProcedure + case 825: // keyword -> tkProcedure { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 818: // keyword -> tkProperty + case 826: // keyword -> tkProperty { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 819: // keyword -> tkRaise + case 827: // keyword -> tkRaise { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 820: // keyword -> tkRecord + case 828: // keyword -> tkRecord { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 821: // keyword -> tkRepeat + case 829: // keyword -> tkRepeat { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 822: // keyword -> tkSet + case 830: // keyword -> tkSet { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 823: // keyword -> tkTry + case 831: // keyword -> tkTry { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 824: // keyword -> tkType + case 832: // keyword -> tkType { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 825: // keyword -> tkStatic + case 833: // keyword -> tkStatic { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 826: // keyword -> tkThen + case 834: // keyword -> tkThen { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 827: // keyword -> tkTo + case 835: // keyword -> tkTo { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 828: // keyword -> tkUntil + case 836: // keyword -> tkUntil { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 829: // keyword -> tkUses + case 837: // keyword -> tkUses { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 830: // keyword -> tkVar + case 838: // keyword -> tkVar { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 831: // keyword -> tkWhile + case 839: // keyword -> tkWhile { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 832: // keyword -> tkWith + case 840: // keyword -> tkWith { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 833: // keyword -> tkNil + case 841: // keyword -> tkNil { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 834: // keyword -> tkGoto + case 842: // keyword -> tkGoto { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 835: // keyword -> tkOf + case 843: // keyword -> tkOf { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 836: // keyword -> tkLabel + case 844: // keyword -> tkLabel { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 837: // keyword -> tkProgram + case 845: // keyword -> tkProgram { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 838: // keyword -> tkUnit + case 846: // keyword -> tkUnit { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 839: // keyword -> tkLibrary + case 847: // keyword -> tkLibrary { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 840: // keyword -> tkNamespace + case 848: // keyword -> tkNamespace { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 841: // keyword -> tkExternal + case 849: // keyword -> tkExternal { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 842: // keyword -> tkParams + case 850: // keyword -> tkParams { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 843: // keyword -> tkEvent + case 851: // keyword -> tkEvent { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 844: // keyword -> tkYield + case 852: // keyword -> tkYield { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 845: // keyword -> tkMatch + case 853: // keyword -> tkMatch { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 846: // keyword -> tkWhen + case 854: // keyword -> tkWhen { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 847: // reserved_keyword -> tkOperator + case 855: // reserved_keyword -> tkOperator { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 848: // reserved_keyword -> tkEnd + case 856: // reserved_keyword -> tkEnd { CurrentSemanticValue.ti = ValueStack[ValueStack.Depth-1].ti; } break; - case 849: // overload_operator -> tkMinus + case 857: // overload_operator -> tkMinus { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 850: // overload_operator -> tkPlus + case 858: // overload_operator -> tkPlus { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 851: // overload_operator -> tkSlash + case 859: // overload_operator -> tkSlash { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 852: // overload_operator -> tkStar + case 860: // overload_operator -> tkStar { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 853: // overload_operator -> tkEqual + case 861: // overload_operator -> tkEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 854: // overload_operator -> tkGreater + case 862: // overload_operator -> tkGreater { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 855: // overload_operator -> tkGreaterEqual + case 863: // overload_operator -> tkGreaterEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 856: // overload_operator -> tkLower + case 864: // overload_operator -> tkLower { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 857: // overload_operator -> tkLowerEqual + case 865: // overload_operator -> tkLowerEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 858: // overload_operator -> tkNotEqual + case 866: // overload_operator -> tkNotEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 859: // overload_operator -> tkOr + case 867: // overload_operator -> tkOr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 860: // overload_operator -> tkXor + case 868: // overload_operator -> tkXor { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 861: // overload_operator -> tkAnd + case 869: // overload_operator -> tkAnd { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 862: // overload_operator -> tkDiv + case 870: // overload_operator -> tkDiv { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 863: // overload_operator -> tkMod + case 871: // overload_operator -> tkMod { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 864: // overload_operator -> tkShl + case 872: // overload_operator -> tkShl { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 865: // overload_operator -> tkShr + case 873: // overload_operator -> tkShr { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 866: // overload_operator -> tkNot + case 874: // overload_operator -> tkNot { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 867: // overload_operator -> tkIn + case 875: // overload_operator -> tkIn { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 868: // overload_operator -> tkImplicit + case 876: // overload_operator -> tkImplicit { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 869: // overload_operator -> tkExplicit + case 877: // overload_operator -> tkExplicit { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 870: // overload_operator -> assign_operator + case 878: // overload_operator -> assign_operator { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 871: // overload_operator -> tkStarStar + case 879: // overload_operator -> tkStarStar { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 872: // assign_operator -> tkAssign + case 880: // assign_operator -> tkAssign { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 873: // assign_operator -> tkPlusEqual + case 881: // assign_operator -> tkPlusEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 874: // assign_operator -> tkMinusEqual + case 882: // assign_operator -> tkMinusEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 875: // assign_operator -> tkMultEqual + case 883: // assign_operator -> tkMultEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 876: // assign_operator -> tkDivEqual + case 884: // assign_operator -> tkDivEqual { CurrentSemanticValue.op = ValueStack[ValueStack.Depth-1].op; } break; - case 877: // func_decl_lambda -> identifier, tkArrow, lambda_function_body + case 885: // func_decl_lambda -> identifier, tkArrow, lambda_function_body { var idList = new ident_list(ValueStack[ValueStack.Depth-3].id, LocationStack[LocationStack.Depth-3]); var formalPars = new formal_parameters(new typed_parameters(idList, new lambda_inferred_type(new PascalABCCompiler.TreeRealization.lambda_any_type_node(), LocationStack[LocationStack.Depth-3]), parametr_kind.none, null, LocationStack[LocationStack.Depth-3]), LocationStack[LocationStack.Depth-3]); CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), formalPars, new lambda_inferred_type(new PascalABCCompiler.TreeRealization.lambda_any_type_node(), LocationStack[LocationStack.Depth-3]), ValueStack[ValueStack.Depth-1].stn as statement_list, CurrentLocationSpan); } break; - case 878: // func_decl_lambda -> tkRoundOpen, tkRoundClose, lambda_type_ref_noproctype, + case 886: // func_decl_lambda -> tkRoundOpen, tkRoundClose, lambda_type_ref_noproctype, // tkArrow, lambda_function_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), null, ValueStack[ValueStack.Depth-3].td, ValueStack[ValueStack.Depth-1].stn as statement_list, CurrentLocationSpan); } break; - case 879: // func_decl_lambda -> tkRoundOpen, identifier, tkColon, fptype, tkRoundClose, + case 887: // func_decl_lambda -> tkRoundOpen, identifier, tkColon, fptype, tkRoundClose, // lambda_type_ref_noproctype, tkArrow, lambda_function_body { var idList = new ident_list(ValueStack[ValueStack.Depth-7].id, LocationStack[LocationStack.Depth-7]); @@ -6623,7 +6700,7 @@ public partial class GPPGParser: ShiftReduceParser tkRoundOpen, identifier, tkSemiColon, full_lambda_fp_list, + case 888: // func_decl_lambda -> tkRoundOpen, identifier, tkSemiColon, full_lambda_fp_list, // tkRoundClose, lambda_type_ref_noproctype, tkArrow, // lambda_function_body { @@ -6634,7 +6711,7 @@ public partial class GPPGParser: ShiftReduceParser tkRoundOpen, identifier, tkColon, fptype, tkSemiColon, + case 889: // func_decl_lambda -> tkRoundOpen, identifier, tkColon, fptype, tkSemiColon, // full_lambda_fp_list, tkRoundClose, // lambda_type_ref_noproctype, tkArrow, lambda_function_body { @@ -6646,7 +6723,7 @@ public partial class GPPGParser: ShiftReduceParser tkRoundOpen, expr_l1, tkComma, expr_l1_list, + case 890: // func_decl_lambda -> tkRoundOpen, expr_l1, tkComma, expr_l1_list, // lambda_type_ref, optional_full_lambda_fp_list, // tkRoundClose, rem_lambda { @@ -6708,61 +6785,61 @@ public partial class GPPGParser: ShiftReduceParser expl_func_decl_lambda + case 891: // func_decl_lambda -> expl_func_decl_lambda { CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; } break; - case 884: // optional_full_lambda_fp_list -> /* empty */ + case 892: // optional_full_lambda_fp_list -> /* empty */ { CurrentSemanticValue.stn = null; } break; - case 885: // optional_full_lambda_fp_list -> tkSemiColon, full_lambda_fp_list + case 893: // optional_full_lambda_fp_list -> tkSemiColon, full_lambda_fp_list { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 886: // rem_lambda -> lambda_type_ref_noproctype, tkArrow, lambda_function_body + case 894: // rem_lambda -> lambda_type_ref_noproctype, tkArrow, lambda_function_body { CurrentSemanticValue.ob = new pair_type_stlist(ValueStack[ValueStack.Depth-3].td,ValueStack[ValueStack.Depth-1].stn as statement_list); } break; - case 887: // expl_func_decl_lambda -> tkFunction, lambda_type_ref, tkArrow, + case 895: // 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, 1, CurrentLocationSpan); } break; - case 888: // expl_func_decl_lambda -> tkFunction, tkRoundOpen, tkRoundClose, lambda_type_ref, + case 896: // 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, 1, CurrentLocationSpan); } break; - case 889: // expl_func_decl_lambda -> tkFunction, tkRoundOpen, full_lambda_fp_list, + case 897: // 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, 1, CurrentLocationSpan); } break; - case 890: // expl_func_decl_lambda -> tkProcedure, tkArrow, lambda_procedure_body + case 898: // expl_func_decl_lambda -> tkProcedure, tkArrow, lambda_procedure_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), null, null, ValueStack[ValueStack.Depth-1].stn as statement_list, 2, CurrentLocationSpan); } break; - case 891: // expl_func_decl_lambda -> tkProcedure, tkRoundOpen, tkRoundClose, tkArrow, + case 899: // expl_func_decl_lambda -> tkProcedure, tkRoundOpen, tkRoundClose, tkArrow, // lambda_procedure_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), null, null, ValueStack[ValueStack.Depth-1].stn as statement_list, 2, CurrentLocationSpan); } break; - case 892: // expl_func_decl_lambda -> tkProcedure, tkRoundOpen, full_lambda_fp_list, + case 900: // expl_func_decl_lambda -> tkProcedure, tkRoundOpen, full_lambda_fp_list, // tkRoundClose, tkArrow, lambda_procedure_body { CurrentSemanticValue.ex = new function_lambda_definition(lambdaHelper.CreateLambdaName(), ValueStack[ValueStack.Depth-4].stn as formal_parameters, null, ValueStack[ValueStack.Depth-1].stn as statement_list, 2, CurrentLocationSpan); } break; - case 893: // full_lambda_fp_list -> lambda_simple_fp_sect + case 901: // full_lambda_fp_list -> lambda_simple_fp_sect { var typed_pars = ValueStack[ValueStack.Depth-1].stn as typed_parameters; if (typed_pars.vars_type is lambda_inferred_type) @@ -6782,97 +6859,97 @@ public partial class GPPGParser: ShiftReduceParser full_lambda_fp_list, tkSemiColon, lambda_simple_fp_sect + case 902: // 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 895: // lambda_simple_fp_sect -> ident_list, lambda_type_ref + case 903: // 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 896: // lambda_type_ref -> /* empty */ + case 904: // lambda_type_ref -> /* empty */ { CurrentSemanticValue.td = new lambda_inferred_type(new PascalABCCompiler.TreeRealization.lambda_any_type_node(), null); } break; - case 897: // lambda_type_ref -> tkColon, fptype + case 905: // lambda_type_ref -> tkColon, fptype { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 898: // lambda_type_ref_noproctype -> /* empty */ + case 906: // lambda_type_ref_noproctype -> /* empty */ { CurrentSemanticValue.td = new lambda_inferred_type(new PascalABCCompiler.TreeRealization.lambda_any_type_node(), null); } break; - case 899: // lambda_type_ref_noproctype -> tkColon, fptype_noproctype + case 907: // lambda_type_ref_noproctype -> tkColon, fptype_noproctype { CurrentSemanticValue.td = ValueStack[ValueStack.Depth-1].td; } break; - case 900: // common_lambda_body -> compound_stmt + case 908: // common_lambda_body -> compound_stmt { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 901: // common_lambda_body -> if_stmt + case 909: // common_lambda_body -> if_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 902: // common_lambda_body -> while_stmt + case 910: // common_lambda_body -> while_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 903: // common_lambda_body -> repeat_stmt + case 911: // common_lambda_body -> repeat_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 904: // common_lambda_body -> for_stmt + case 912: // common_lambda_body -> for_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 905: // common_lambda_body -> foreach_stmt + case 913: // common_lambda_body -> foreach_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 906: // common_lambda_body -> loop_stmt + case 914: // common_lambda_body -> loop_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 907: // common_lambda_body -> case_stmt + case 915: // common_lambda_body -> case_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 908: // common_lambda_body -> try_stmt + case 916: // common_lambda_body -> try_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 909: // common_lambda_body -> lock_stmt + case 917: // common_lambda_body -> lock_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 910: // common_lambda_body -> yield_stmt + case 918: // common_lambda_body -> yield_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 911: // common_lambda_body -> raise_stmt + case 919: // common_lambda_body -> raise_stmt { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 912: // lambda_function_body -> expr_l1 + case 920: // lambda_function_body -> expr_l1 { var id = SyntaxVisitors.ExprHasNameVisitor.HasName(ValueStack[ValueStack.Depth-1].ex, "Result"); if (id != null) @@ -6884,22 +6961,22 @@ public partial class GPPGParser: ShiftReduceParser common_lambda_body + case 921: // lambda_function_body -> common_lambda_body { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } break; - case 914: // lambda_procedure_body -> proc_call + case 922: // lambda_procedure_body -> proc_call { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 915: // lambda_procedure_body -> assignment + case 923: // lambda_procedure_body -> assignment { CurrentSemanticValue.stn = new statement_list(ValueStack[ValueStack.Depth-1].stn as statement, CurrentLocationSpan); } break; - case 916: // lambda_procedure_body -> common_lambda_body + case 924: // lambda_procedure_body -> common_lambda_body { CurrentSemanticValue.stn = ValueStack[ValueStack.Depth-1].stn; } diff --git a/Parsers/PascalABCParserNewSaushkin/SemanticRules.cs b/Parsers/PascalABCParserNewSaushkin/SemanticRules.cs index b6d86778e..75c958ed7 100644 --- a/Parsers/PascalABCParserNewSaushkin/SemanticRules.cs +++ b/Parsers/PascalABCParserNewSaushkin/SemanticRules.cs @@ -321,29 +321,6 @@ namespace GPPGParserScanner return naie; } - public method_call NewIsObjectExpr(syntax_tree_node left_term, syntax_tree_node right_term, LexLocation loc) - { - var eq_params = new expression_list( - new List() - { - (addressed_value)left_term, - (addressed_value)right_term - } - ); - var equals_call_node = new method_call( - new dot_node(new ident("object"), new ident("Equals")), - eq_params, - loc); - - if (!(left_term is addressed_value)) - parsertools.errors.Add(new bad_operand_type(parsertools.CurrentFileName, left_term.source_context, equals_call_node)); - - if (!(right_term is addressed_value)) - parsertools.errors.Add(new bad_operand_type(parsertools.CurrentFileName, right_term.source_context, equals_call_node)); - - return equals_call_node; - } - public function_lambda_call NewFactor(ident func_decl_lambda, expression_list expr_list, LexLocation loc) { var fld = parsertools.find_pascalABC_lambda_name(func_decl_lambda.name); diff --git a/SyntaxTree/tree/AbstractVisitor.cs b/SyntaxTree/tree/AbstractVisitor.cs index d06d65f05..72f078c4a 100644 --- a/SyntaxTree/tree/AbstractVisitor.cs +++ b/SyntaxTree/tree/AbstractVisitor.cs @@ -1153,9 +1153,9 @@ namespace PascalABCCompiler.SyntaxTree DefaultVisit(_deconstructor_pattern); } - public virtual void visit(pattern_deconstructor_parameter _pattern_deconstructor_parameter) + public virtual void visit(pattern_parameter _pattern_parameter) { - DefaultVisit(_pattern_deconstructor_parameter); + DefaultVisit(_pattern_parameter); } public virtual void visit(desugared_deconstruction _desugared_deconstruction) @@ -1198,15 +1198,25 @@ namespace PascalABCCompiler.SyntaxTree DefaultVisit(_tuple_wild_card); } - public virtual void visit(const_deconstructor_parameter _const_deconstructor_parameter) + public virtual void visit(const_pattern_parameter _const_pattern_parameter) { - DefaultVisit(_const_deconstructor_parameter); + DefaultVisit(_const_pattern_parameter); } public virtual void visit(wild_card_deconstructor_parameter _wild_card_deconstructor_parameter) { DefaultVisit(_wild_card_deconstructor_parameter); } + + public virtual void visit(collection_pattern _collection_pattern) + { + DefaultVisit(_collection_pattern); + } + + public virtual void visit(collection_pattern_gap_parameter _collection_pattern_gap_parameter) + { + DefaultVisit(_collection_pattern_gap_parameter); + } } diff --git a/SyntaxTree/tree/HierarchyVisitor.cs b/SyntaxTree/tree/HierarchyVisitor.cs index e9befb6d8..f299e51ac 100644 --- a/SyntaxTree/tree/HierarchyVisitor.cs +++ b/SyntaxTree/tree/HierarchyVisitor.cs @@ -1837,11 +1837,11 @@ namespace PascalABCCompiler.SyntaxTree { } - public virtual void pre_do_visit(pattern_deconstructor_parameter _pattern_deconstructor_parameter) + public virtual void pre_do_visit(pattern_parameter _pattern_parameter) { } - public virtual void post_do_visit(pattern_deconstructor_parameter _pattern_deconstructor_parameter) + public virtual void post_do_visit(pattern_parameter _pattern_parameter) { } @@ -1909,11 +1909,11 @@ namespace PascalABCCompiler.SyntaxTree { } - public virtual void pre_do_visit(const_deconstructor_parameter _const_deconstructor_parameter) + public virtual void pre_do_visit(const_pattern_parameter _const_pattern_parameter) { } - public virtual void post_do_visit(const_deconstructor_parameter _const_deconstructor_parameter) + public virtual void post_do_visit(const_pattern_parameter _const_pattern_parameter) { } @@ -1925,6 +1925,22 @@ namespace PascalABCCompiler.SyntaxTree { } + public virtual void pre_do_visit(collection_pattern _collection_pattern) + { + } + + public virtual void post_do_visit(collection_pattern _collection_pattern) + { + } + + public virtual void pre_do_visit(collection_pattern_gap_parameter _collection_pattern_gap_parameter) + { + } + + public virtual void post_do_visit(collection_pattern_gap_parameter _collection_pattern_gap_parameter) + { + } + public override void visit(expression _expression) { DefaultVisit(_expression); @@ -3836,6 +3852,8 @@ namespace PascalABCCompiler.SyntaxTree { DefaultVisit(_pattern_node); pre_do_visit(_pattern_node); + for (int i = 0; i < parameters.Count; i++) + visit(pattern_node.parameters[i]); post_do_visit(_pattern_node); } @@ -3854,7 +3872,6 @@ namespace PascalABCCompiler.SyntaxTree pre_do_visit(_is_pattern_expr); visit(is_pattern_expr.left); visit(is_pattern_expr.right); - visit(is_pattern_expr.constDeconstructorParamCheck); post_do_visit(_is_pattern_expr); } @@ -3891,17 +3908,16 @@ namespace PascalABCCompiler.SyntaxTree { DefaultVisit(_deconstructor_pattern); pre_do_visit(_deconstructor_pattern); - for (int i = 0; i < parameters.Count; i++) - visit(deconstructor_pattern.parameters[i]); visit(deconstructor_pattern.type); + visit(deconstructor_pattern.const_params_check); post_do_visit(_deconstructor_pattern); } - public override void visit(pattern_deconstructor_parameter _pattern_deconstructor_parameter) + public override void visit(pattern_parameter _pattern_parameter) { - DefaultVisit(_pattern_deconstructor_parameter); - pre_do_visit(_pattern_deconstructor_parameter); - post_do_visit(_pattern_deconstructor_parameter); + DefaultVisit(_pattern_parameter); + pre_do_visit(_pattern_parameter); + post_do_visit(_pattern_parameter); } public override void visit(desugared_deconstruction _desugared_deconstruction) @@ -3970,12 +3986,12 @@ namespace PascalABCCompiler.SyntaxTree post_do_visit(_tuple_wild_card); } - public override void visit(const_deconstructor_parameter _const_deconstructor_parameter) + public override void visit(const_pattern_parameter _const_pattern_parameter) { - DefaultVisit(_const_deconstructor_parameter); - pre_do_visit(_const_deconstructor_parameter); - visit(const_deconstructor_parameter.const_param); - post_do_visit(_const_deconstructor_parameter); + DefaultVisit(_const_pattern_parameter); + pre_do_visit(_const_pattern_parameter); + visit(const_pattern_parameter.const_param); + post_do_visit(_const_pattern_parameter); } public override void visit(wild_card_deconstructor_parameter _wild_card_deconstructor_parameter) @@ -3984,6 +4000,20 @@ namespace PascalABCCompiler.SyntaxTree pre_do_visit(_wild_card_deconstructor_parameter); post_do_visit(_wild_card_deconstructor_parameter); } + + public override void visit(collection_pattern _collection_pattern) + { + DefaultVisit(_collection_pattern); + pre_do_visit(_collection_pattern); + post_do_visit(_collection_pattern); + } + + public override void visit(collection_pattern_gap_parameter _collection_pattern_gap_parameter) + { + DefaultVisit(_collection_pattern_gap_parameter); + pre_do_visit(_collection_pattern_gap_parameter); + post_do_visit(_collection_pattern_gap_parameter); + } } diff --git a/SyntaxTree/tree/SyntaxTreeStreamReader.cs b/SyntaxTree/tree/SyntaxTreeStreamReader.cs index 13480c12c..f6c17ea1d 100644 --- a/SyntaxTree/tree/SyntaxTreeStreamReader.cs +++ b/SyntaxTree/tree/SyntaxTreeStreamReader.cs @@ -479,7 +479,7 @@ namespace PascalABCCompiler.SyntaxTree case 228: return new deconstructor_pattern(); case 229: - return new pattern_deconstructor_parameter(); + return new pattern_parameter(); case 230: return new desugared_deconstruction(); case 231: @@ -497,9 +497,13 @@ namespace PascalABCCompiler.SyntaxTree case 237: return new tuple_wild_card(); case 238: - return new const_deconstructor_parameter(); + return new const_pattern_parameter(); case 239: return new wild_card_deconstructor_parameter(); + case 240: + return new collection_pattern(); + case 241: + return new collection_pattern_gap_parameter(); } return null; } @@ -3971,6 +3975,19 @@ namespace PascalABCCompiler.SyntaxTree public void read_pattern_node(pattern_node _pattern_node) { read_syntax_tree_node(_pattern_node); + if (br.ReadByte() == 0) + { + _pattern_node.parameters = null; + } + else + { + _pattern_node.parameters = new List(); + Int32 ssyy_count = br.ReadInt32(); + for(Int32 ssyy_i = 0; ssyy_i < ssyy_count; ssyy_i++) + { + _pattern_node.parameters.Add(_read_node() as pattern_parameter); + } + } } @@ -3997,7 +4014,6 @@ namespace PascalABCCompiler.SyntaxTree read_expression(_is_pattern_expr); _is_pattern_expr.left = _read_node() as expression; _is_pattern_expr.right = _read_node() as pattern_node; - _is_pattern_expr.constDeconstructorParamCheck = _read_node() as expression; } @@ -4061,31 +4077,19 @@ namespace PascalABCCompiler.SyntaxTree public void read_deconstructor_pattern(deconstructor_pattern _deconstructor_pattern) { read_pattern_node(_deconstructor_pattern); - if (br.ReadByte() == 0) - { - _deconstructor_pattern.parameters = null; - } - else - { - _deconstructor_pattern.parameters = new List(); - Int32 ssyy_count = br.ReadInt32(); - for(Int32 ssyy_i = 0; ssyy_i < ssyy_count; ssyy_i++) - { - _deconstructor_pattern.parameters.Add(_read_node() as pattern_deconstructor_parameter); - } - } _deconstructor_pattern.type = _read_node() as type_definition; + _deconstructor_pattern.const_params_check = _read_node() as expression; } - public void visit(pattern_deconstructor_parameter _pattern_deconstructor_parameter) + public void visit(pattern_parameter _pattern_parameter) { - read_pattern_deconstructor_parameter(_pattern_deconstructor_parameter); + read_pattern_parameter(_pattern_parameter); } - public void read_pattern_deconstructor_parameter(pattern_deconstructor_parameter _pattern_deconstructor_parameter) + public void read_pattern_parameter(pattern_parameter _pattern_parameter) { - read_syntax_tree_node(_pattern_deconstructor_parameter); + read_syntax_tree_node(_pattern_parameter); } @@ -4109,7 +4113,7 @@ namespace PascalABCCompiler.SyntaxTree public void read_var_deconstructor_parameter(var_deconstructor_parameter _var_deconstructor_parameter) { - read_pattern_deconstructor_parameter(_var_deconstructor_parameter); + read_pattern_parameter(_var_deconstructor_parameter); _var_deconstructor_parameter.identifier = _read_node() as ident; _var_deconstructor_parameter.type = _read_node() as type_definition; } @@ -4122,7 +4126,7 @@ namespace PascalABCCompiler.SyntaxTree public void read_recursive_deconstructor_parameter(recursive_deconstructor_parameter _recursive_deconstructor_parameter) { - read_pattern_deconstructor_parameter(_recursive_deconstructor_parameter); + read_pattern_parameter(_recursive_deconstructor_parameter); _recursive_deconstructor_parameter.pattern = _read_node() as pattern_node; } @@ -4210,15 +4214,15 @@ namespace PascalABCCompiler.SyntaxTree } - public void visit(const_deconstructor_parameter _const_deconstructor_parameter) + public void visit(const_pattern_parameter _const_pattern_parameter) { - read_const_deconstructor_parameter(_const_deconstructor_parameter); + read_const_pattern_parameter(_const_pattern_parameter); } - public void read_const_deconstructor_parameter(const_deconstructor_parameter _const_deconstructor_parameter) + public void read_const_pattern_parameter(const_pattern_parameter _const_pattern_parameter) { - read_pattern_deconstructor_parameter(_const_deconstructor_parameter); - _const_deconstructor_parameter.const_param = _read_node() as expression; + read_pattern_parameter(_const_pattern_parameter); + _const_pattern_parameter.const_param = _read_node() as expression; } @@ -4229,7 +4233,29 @@ namespace PascalABCCompiler.SyntaxTree public void read_wild_card_deconstructor_parameter(wild_card_deconstructor_parameter _wild_card_deconstructor_parameter) { - read_pattern_deconstructor_parameter(_wild_card_deconstructor_parameter); + read_pattern_parameter(_wild_card_deconstructor_parameter); + } + + + public void visit(collection_pattern _collection_pattern) + { + read_collection_pattern(_collection_pattern); + } + + public void read_collection_pattern(collection_pattern _collection_pattern) + { + read_pattern_node(_collection_pattern); + } + + + public void visit(collection_pattern_gap_parameter _collection_pattern_gap_parameter) + { + read_collection_pattern_gap_parameter(_collection_pattern_gap_parameter); + } + + public void read_collection_pattern_gap_parameter(collection_pattern_gap_parameter _collection_pattern_gap_parameter) + { + read_pattern_parameter(_collection_pattern_gap_parameter); } } diff --git a/SyntaxTree/tree/SyntaxTreeStreamWriter.cs b/SyntaxTree/tree/SyntaxTreeStreamWriter.cs index 9e366e1f7..af91d80f9 100644 --- a/SyntaxTree/tree/SyntaxTreeStreamWriter.cs +++ b/SyntaxTree/tree/SyntaxTreeStreamWriter.cs @@ -6187,6 +6187,27 @@ namespace PascalABCCompiler.SyntaxTree public void write_pattern_node(pattern_node _pattern_node) { write_syntax_tree_node(_pattern_node); + if (_pattern_node.parameters == null) + { + bw.Write((byte)0); + } + else + { + bw.Write((byte)1); + bw.Write(_pattern_node.parameters.Count); + for(Int32 ssyy_i = 0; ssyy_i < _pattern_node.parameters.Count; ssyy_i++) + { + if (_pattern_node.parameters[ssyy_i] == null) + { + bw.Write((byte)0); + } + else + { + bw.Write((byte)1); + _pattern_node.parameters[ssyy_i].visit(this); + } + } + } } @@ -6247,15 +6268,6 @@ namespace PascalABCCompiler.SyntaxTree bw.Write((byte)1); _is_pattern_expr.right.visit(this); } - if (_is_pattern_expr.constDeconstructorParamCheck == null) - { - bw.Write((byte)0); - } - else - { - bw.Write((byte)1); - _is_pattern_expr.constDeconstructorParamCheck.visit(this); - } } @@ -6379,27 +6391,6 @@ namespace PascalABCCompiler.SyntaxTree public void write_deconstructor_pattern(deconstructor_pattern _deconstructor_pattern) { write_pattern_node(_deconstructor_pattern); - if (_deconstructor_pattern.parameters == null) - { - bw.Write((byte)0); - } - else - { - bw.Write((byte)1); - bw.Write(_deconstructor_pattern.parameters.Count); - for(Int32 ssyy_i = 0; ssyy_i < _deconstructor_pattern.parameters.Count; ssyy_i++) - { - if (_deconstructor_pattern.parameters[ssyy_i] == null) - { - bw.Write((byte)0); - } - else - { - bw.Write((byte)1); - _deconstructor_pattern.parameters[ssyy_i].visit(this); - } - } - } if (_deconstructor_pattern.type == null) { bw.Write((byte)0); @@ -6409,18 +6400,27 @@ namespace PascalABCCompiler.SyntaxTree bw.Write((byte)1); _deconstructor_pattern.type.visit(this); } + if (_deconstructor_pattern.const_params_check == null) + { + bw.Write((byte)0); + } + else + { + bw.Write((byte)1); + _deconstructor_pattern.const_params_check.visit(this); + } } - public void visit(pattern_deconstructor_parameter _pattern_deconstructor_parameter) + public void visit(pattern_parameter _pattern_parameter) { bw.Write((Int16)229); - write_pattern_deconstructor_parameter(_pattern_deconstructor_parameter); + write_pattern_parameter(_pattern_parameter); } - public void write_pattern_deconstructor_parameter(pattern_deconstructor_parameter _pattern_deconstructor_parameter) + public void write_pattern_parameter(pattern_parameter _pattern_parameter) { - write_syntax_tree_node(_pattern_deconstructor_parameter); + write_syntax_tree_node(_pattern_parameter); } @@ -6462,7 +6462,7 @@ namespace PascalABCCompiler.SyntaxTree public void write_var_deconstructor_parameter(var_deconstructor_parameter _var_deconstructor_parameter) { - write_pattern_deconstructor_parameter(_var_deconstructor_parameter); + write_pattern_parameter(_var_deconstructor_parameter); if (_var_deconstructor_parameter.identifier == null) { bw.Write((byte)0); @@ -6492,7 +6492,7 @@ namespace PascalABCCompiler.SyntaxTree public void write_recursive_deconstructor_parameter(recursive_deconstructor_parameter _recursive_deconstructor_parameter) { - write_pattern_deconstructor_parameter(_recursive_deconstructor_parameter); + write_pattern_parameter(_recursive_deconstructor_parameter); if (_recursive_deconstructor_parameter.pattern == null) { bw.Write((byte)0); @@ -6617,23 +6617,23 @@ namespace PascalABCCompiler.SyntaxTree } - public void visit(const_deconstructor_parameter _const_deconstructor_parameter) + public void visit(const_pattern_parameter _const_pattern_parameter) { bw.Write((Int16)238); - write_const_deconstructor_parameter(_const_deconstructor_parameter); + write_const_pattern_parameter(_const_pattern_parameter); } - public void write_const_deconstructor_parameter(const_deconstructor_parameter _const_deconstructor_parameter) + public void write_const_pattern_parameter(const_pattern_parameter _const_pattern_parameter) { - write_pattern_deconstructor_parameter(_const_deconstructor_parameter); - if (_const_deconstructor_parameter.const_param == null) + write_pattern_parameter(_const_pattern_parameter); + if (_const_pattern_parameter.const_param == null) { bw.Write((byte)0); } else { bw.Write((byte)1); - _const_deconstructor_parameter.const_param.visit(this); + _const_pattern_parameter.const_param.visit(this); } } @@ -6646,7 +6646,31 @@ namespace PascalABCCompiler.SyntaxTree public void write_wild_card_deconstructor_parameter(wild_card_deconstructor_parameter _wild_card_deconstructor_parameter) { - write_pattern_deconstructor_parameter(_wild_card_deconstructor_parameter); + write_pattern_parameter(_wild_card_deconstructor_parameter); + } + + + public void visit(collection_pattern _collection_pattern) + { + bw.Write((Int16)240); + write_collection_pattern(_collection_pattern); + } + + public void write_collection_pattern(collection_pattern _collection_pattern) + { + write_pattern_node(_collection_pattern); + } + + + public void visit(collection_pattern_gap_parameter _collection_pattern_gap_parameter) + { + bw.Write((Int16)241); + write_collection_pattern_gap_parameter(_collection_pattern_gap_parameter); + } + + public void write_collection_pattern_gap_parameter(collection_pattern_gap_parameter _collection_pattern_gap_parameter) + { + write_pattern_parameter(_collection_pattern_gap_parameter); } } diff --git a/SyntaxTree/tree/Tree.cs b/SyntaxTree/tree/Tree.cs index df4cf6c7e..4e209597c 100644 --- a/SyntaxTree/tree/Tree.cs +++ b/SyntaxTree/tree/Tree.cs @@ -48114,6 +48114,196 @@ namespace PascalABCCompiler.SyntaxTree } + /// + ///Конструктор с параметрами. + /// + public pattern_node(List _parameters) + { + this._parameters=_parameters; + FillParentsInDirectChilds(); + } + + /// + ///Конструктор с параметрами. + /// + public pattern_node(List _parameters,SourceContext sc) + { + this._parameters=_parameters; + source_context = sc; + FillParentsInDirectChilds(); + } + public pattern_node(pattern_parameter elem, SourceContext sc = null) + { + Add(elem, sc); + FillParentsInDirectChilds(); + } + + protected List _parameters=new List(); + + /// + /// + /// + public List parameters + { + get + { + return _parameters; + } + set + { + _parameters=value; + } + } + + + public pattern_node Add(pattern_parameter elem, SourceContext sc = null) + { + parameters.Add(elem); + if (elem != null) + elem.Parent = this; + if (sc != null) + source_context = sc; + return this; + } + + public void AddFirst(pattern_parameter el) + { + if (el == null) + throw new ArgumentNullException(nameof(el)); + parameters.Insert(0, el); + FillParentsInDirectChilds(); + } + + public void AddFirst(IEnumerable els) + { + if (els == null) + throw new ArgumentNullException(nameof(els)); + parameters.InsertRange(0, els); + foreach (var el in els) + if (el != null) + el.Parent = this; + } + + public void AddMany(params pattern_parameter[] els) + { + if (els == null) + throw new ArgumentNullException(nameof(els)); + parameters.AddRange(els); + foreach (var el in els) + if (el != null) + el.Parent = this; + } + + private int FindIndexInList(pattern_parameter el) + { + if (el == null) + throw new ArgumentNullException(nameof(el)); + var ind = parameters.FindIndex(x => x == el); + if (ind == -1) + throw new Exception(string.Format("У списка {0} не найден элемент {1} среди дочерних\n", this, el)); + return ind; + } + + public void InsertAfter(pattern_parameter el, pattern_parameter newel) + { + if (el == null) + throw new ArgumentNullException(nameof(el)); + if (newel == null) + throw new ArgumentNullException(nameof(newel)); + parameters.Insert(FindIndexInList(el) + 1, newel); + newel.Parent = this; + } + + public void InsertAfter(pattern_parameter el, IEnumerable newels) + { + if (el == null) + throw new ArgumentNullException(nameof(el)); + if (newels == null) + throw new ArgumentNullException(nameof(newels)); + parameters.InsertRange(FindIndexInList(el) + 1, newels); + foreach (var newel in newels) + if (newel != null) + newel.Parent = this; + } + + public void InsertBefore(pattern_parameter el, pattern_parameter newel) + { + if (el == null) + throw new ArgumentNullException(nameof(el)); + if (newel == null) + throw new ArgumentNullException(nameof(newel)); + parameters.Insert(FindIndexInList(el), newel); + newel.Parent = this; + } + + public void InsertBefore(pattern_parameter el, IEnumerable newels) + { + if (el == null) + throw new ArgumentNullException(nameof(el)); + if (newels == null) + throw new ArgumentNullException(nameof(newels)); + parameters.InsertRange(FindIndexInList(el), newels); + foreach (var newel in newels) + if (newel != null) + newel.Parent = this; + } + + public bool Remove(pattern_parameter el) + { + return parameters.Remove(el); + } + + public void ReplaceInList(pattern_parameter el, pattern_parameter newel) + { + if (el == null) + throw new ArgumentNullException(nameof(el)); + if (newel == null) + throw new ArgumentNullException(nameof(newel)); + parameters[FindIndexInList(el)] = newel; + newel.Parent = this; + } + + public void ReplaceInList(pattern_parameter el, IEnumerable newels) + { + if (el == null) + throw new ArgumentNullException(nameof(el)); + if (newels == null) + throw new ArgumentNullException(nameof(newels)); + var ind = FindIndexInList(el); + parameters.RemoveAt(ind); + parameters.InsertRange(ind, newels); + foreach (var newel in newels) + if (newel != null) + newel.Parent = this; + } + + public int RemoveAll(Predicate match) + { + return parameters.RemoveAll(match); + } + + public pattern_parameter Last() + { + if (parameters.Count > 0) + return parameters[parameters.Count - 1]; + throw new InvalidOperationException("Список пуст"); + } + + public int Count + { + get { return parameters.Count; } + } + + public void Insert(int pos, pattern_parameter el) + { + if (el == null) + throw new ArgumentNullException(nameof(el)); + parameters.Insert(pos,el); + if (el != null) + el.Parent = this; + } + + /// Создает копию узла public override syntax_tree_node Clone() { @@ -48121,6 +48311,19 @@ namespace PascalABCCompiler.SyntaxTree copy.Parent = this.Parent; if (source_context != null) copy.source_context = new SourceContext(source_context); + if (parameters != null) + { + foreach (pattern_parameter elem in parameters) + { + if (elem != null) + { + copy.Add((pattern_parameter)elem.Clone()); + copy.Last().Parent = copy; + } + else + copy.Add(null); + } + } return copy; } @@ -48133,12 +48336,23 @@ namespace PascalABCCompiler.SyntaxTree /// Заполняет поля Parent в непосредственных дочерних узлах public override void FillParentsInDirectChilds() { + if (parameters != null) + { + foreach (var child in parameters) + if (child != null) + child.Parent = this; + } } /// Заполняет поля Parent во всем поддереве public override void FillParentsInAllChilds() { FillParentsInDirectChilds(); + if (parameters != null) + { + foreach (var child in parameters) + child?.FillParentsInAllChilds(); + } } /// @@ -48158,7 +48372,7 @@ namespace PascalABCCompiler.SyntaxTree { get { - return 0; + return 0 + (parameters == null ? 0 : parameters.Count); } } /// @@ -48170,12 +48384,29 @@ namespace PascalABCCompiler.SyntaxTree { if(subnodes_count == 0 || ind < 0 || ind > subnodes_count-1) throw new IndexOutOfRangeException(); + Int32 index_counter=ind - 0; + if(parameters != null) + { + if(index_counter < parameters.Count) + { + return parameters[index_counter]; + } + } return null; } set { if(subnodes_count == 0 || ind < 0 || ind > subnodes_count-1) throw new IndexOutOfRangeException(); + Int32 index_counter=ind - 0; + if(parameters != null) + { + if(index_counter < parameters.Count) + { + parameters[index_counter]= (pattern_parameter)value; + return; + } + } } } /// @@ -48226,6 +48457,29 @@ namespace PascalABCCompiler.SyntaxTree source_context = sc; FillParentsInDirectChilds(); } + + /// + ///Конструктор с параметрами. + /// + public type_pattern(List _parameters,ident _identifier,type_definition _type) + { + this._parameters=_parameters; + this._identifier=_identifier; + this._type=_type; + FillParentsInDirectChilds(); + } + + /// + ///Конструктор с параметрами. + /// + public type_pattern(List _parameters,ident _identifier,type_definition _type,SourceContext sc) + { + this._parameters=_parameters; + this._identifier=_identifier; + this._type=_type; + source_context = sc; + FillParentsInDirectChilds(); + } protected ident _identifier; protected type_definition _type; @@ -48271,6 +48525,19 @@ namespace PascalABCCompiler.SyntaxTree copy.Parent = this.Parent; if (source_context != null) copy.source_context = new SourceContext(source_context); + if (parameters != null) + { + foreach (pattern_parameter elem in parameters) + { + if (elem != null) + { + copy.Add((pattern_parameter)elem.Clone()); + copy.Last().Parent = copy; + } + else + copy.Add(null); + } + } if (identifier != null) { copy.identifier = (ident)identifier.Clone(); @@ -48293,6 +48560,12 @@ namespace PascalABCCompiler.SyntaxTree /// Заполняет поля Parent в непосредственных дочерних узлах public override void FillParentsInDirectChilds() { + if (parameters != null) + { + foreach (var child in parameters) + if (child != null) + child.Parent = this; + } if (identifier != null) identifier.Parent = this; if (type != null) @@ -48303,6 +48576,11 @@ namespace PascalABCCompiler.SyntaxTree public override void FillParentsInAllChilds() { FillParentsInDirectChilds(); + if (parameters != null) + { + foreach (var child in parameters) + child?.FillParentsInAllChilds(); + } identifier?.FillParentsInAllChilds(); type?.FillParentsInAllChilds(); } @@ -48324,7 +48602,7 @@ namespace PascalABCCompiler.SyntaxTree { get { - return 2; + return 2 + (parameters == null ? 0 : parameters.Count); } } /// @@ -48343,6 +48621,14 @@ namespace PascalABCCompiler.SyntaxTree case 1: return type; } + Int32 index_counter=ind - 2; + if(parameters != null) + { + if(index_counter < parameters.Count) + { + return parameters[index_counter]; + } + } return null; } set @@ -48358,6 +48644,15 @@ namespace PascalABCCompiler.SyntaxTree type = (type_definition)value; break; } + Int32 index_counter=ind - 2; + if(parameters != null) + { + if(index_counter < parameters.Count) + { + parameters[index_counter]= (pattern_parameter)value; + return; + } + } } } /// @@ -48391,28 +48686,25 @@ namespace PascalABCCompiler.SyntaxTree /// ///Конструктор с параметрами. /// - public is_pattern_expr(expression _left,pattern_node _right,expression _constDeconstructorParamCheck) + public is_pattern_expr(expression _left,pattern_node _right) { this._left=_left; this._right=_right; - this._constDeconstructorParamCheck=_constDeconstructorParamCheck; FillParentsInDirectChilds(); } /// ///Конструктор с параметрами. /// - public is_pattern_expr(expression _left,pattern_node _right,expression _constDeconstructorParamCheck,SourceContext sc) + public is_pattern_expr(expression _left,pattern_node _right,SourceContext sc) { this._left=_left; this._right=_right; - this._constDeconstructorParamCheck=_constDeconstructorParamCheck; source_context = sc; FillParentsInDirectChilds(); } protected expression _left; protected pattern_node _right; - protected expression _constDeconstructorParamCheck; /// /// @@ -48448,23 +48740,6 @@ namespace PascalABCCompiler.SyntaxTree } } - /// - /// - /// - public expression constDeconstructorParamCheck - { - get - { - return _constDeconstructorParamCheck; - } - set - { - _constDeconstructorParamCheck=value; - if (_constDeconstructorParamCheck != null) - _constDeconstructorParamCheck.Parent = this; - } - } - /// Создает копию узла public override syntax_tree_node Clone() @@ -48488,11 +48763,6 @@ namespace PascalABCCompiler.SyntaxTree copy.right = (pattern_node)right.Clone(); copy.right.Parent = copy; } - if (constDeconstructorParamCheck != null) - { - copy.constDeconstructorParamCheck = (expression)constDeconstructorParamCheck.Clone(); - copy.constDeconstructorParamCheck.Parent = copy; - } return copy; } @@ -48511,8 +48781,6 @@ namespace PascalABCCompiler.SyntaxTree left.Parent = this; if (right != null) right.Parent = this; - if (constDeconstructorParamCheck != null) - constDeconstructorParamCheck.Parent = this; } /// Заполняет поля Parent во всем поддереве @@ -48522,7 +48790,6 @@ namespace PascalABCCompiler.SyntaxTree attributes?.FillParentsInAllChilds(); left?.FillParentsInAllChilds(); right?.FillParentsInAllChilds(); - constDeconstructorParamCheck?.FillParentsInAllChilds(); } /// @@ -48532,7 +48799,7 @@ namespace PascalABCCompiler.SyntaxTree { get { - return 3; + return 2; } } /// @@ -48542,7 +48809,7 @@ namespace PascalABCCompiler.SyntaxTree { get { - return 3; + return 2; } } /// @@ -48560,8 +48827,6 @@ namespace PascalABCCompiler.SyntaxTree return left; case 1: return right; - case 2: - return constDeconstructorParamCheck; } return null; } @@ -48577,9 +48842,6 @@ namespace PascalABCCompiler.SyntaxTree case 1: right = (pattern_node)value; break; - case 2: - constDeconstructorParamCheck = (expression)value; - break; } } } @@ -49391,7 +49653,26 @@ namespace PascalABCCompiler.SyntaxTree /// ///Конструктор с параметрами. /// - public deconstructor_pattern(List _parameters,type_definition _type) + public deconstructor_pattern(type_definition _type) + { + this._type=_type; + FillParentsInDirectChilds(); + } + + /// + ///Конструктор с параметрами. + /// + public deconstructor_pattern(type_definition _type,SourceContext sc) + { + this._type=_type; + source_context = sc; + FillParentsInDirectChilds(); + } + + /// + ///Конструктор с параметрами. + /// + public deconstructor_pattern(List _parameters,type_definition _type) { this._parameters=_parameters; this._type=_type; @@ -49401,36 +49682,15 @@ namespace PascalABCCompiler.SyntaxTree /// ///Конструктор с параметрами. /// - public deconstructor_pattern(List _parameters,type_definition _type,SourceContext sc) + public deconstructor_pattern(List _parameters,type_definition _type,SourceContext sc) { this._parameters=_parameters; this._type=_type; source_context = sc; FillParentsInDirectChilds(); } - public deconstructor_pattern(pattern_deconstructor_parameter elem, SourceContext sc = null) - { - Add(elem, sc); - FillParentsInDirectChilds(); - } - - protected List _parameters=new List(); protected type_definition _type; - - /// - ///Результат деконструирования - /// - public List parameters - { - get - { - return _parameters; - } - set - { - _parameters=value; - } - } + protected expression _const_params_check; /// ///Деконструируемый тип @@ -49449,155 +49709,24 @@ namespace PascalABCCompiler.SyntaxTree } } + /// + ///Проверка соответствия для константных параметрах деконструирования + /// + public expression const_params_check + { + get + { + return _const_params_check; + } + set + { + _const_params_check=value; + if (_const_params_check != null) + _const_params_check.Parent = this; + } + } + - public deconstructor_pattern Add(pattern_deconstructor_parameter elem, SourceContext sc = null) - { - parameters.Add(elem); - if (elem != null) - elem.Parent = this; - if (sc != null) - source_context = sc; - return this; - } - - public void AddFirst(pattern_deconstructor_parameter el) - { - if (el == null) - throw new ArgumentNullException(nameof(el)); - parameters.Insert(0, el); - FillParentsInDirectChilds(); - } - - public void AddFirst(IEnumerable els) - { - if (els == null) - throw new ArgumentNullException(nameof(els)); - parameters.InsertRange(0, els); - foreach (var el in els) - if (el != null) - el.Parent = this; - } - - public void AddMany(params pattern_deconstructor_parameter[] els) - { - if (els == null) - throw new ArgumentNullException(nameof(els)); - parameters.AddRange(els); - foreach (var el in els) - if (el != null) - el.Parent = this; - } - - private int FindIndexInList(pattern_deconstructor_parameter el) - { - if (el == null) - throw new ArgumentNullException(nameof(el)); - var ind = parameters.FindIndex(x => x == el); - if (ind == -1) - throw new Exception(string.Format("У списка {0} не найден элемент {1} среди дочерних\n", this, el)); - return ind; - } - - public void InsertAfter(pattern_deconstructor_parameter el, pattern_deconstructor_parameter newel) - { - if (el == null) - throw new ArgumentNullException(nameof(el)); - if (newel == null) - throw new ArgumentNullException(nameof(newel)); - parameters.Insert(FindIndexInList(el) + 1, newel); - newel.Parent = this; - } - - public void InsertAfter(pattern_deconstructor_parameter el, IEnumerable newels) - { - if (el == null) - throw new ArgumentNullException(nameof(el)); - if (newels == null) - throw new ArgumentNullException(nameof(newels)); - parameters.InsertRange(FindIndexInList(el) + 1, newels); - foreach (var newel in newels) - if (newel != null) - newel.Parent = this; - } - - public void InsertBefore(pattern_deconstructor_parameter el, pattern_deconstructor_parameter newel) - { - if (el == null) - throw new ArgumentNullException(nameof(el)); - if (newel == null) - throw new ArgumentNullException(nameof(newel)); - parameters.Insert(FindIndexInList(el), newel); - newel.Parent = this; - } - - public void InsertBefore(pattern_deconstructor_parameter el, IEnumerable newels) - { - if (el == null) - throw new ArgumentNullException(nameof(el)); - if (newels == null) - throw new ArgumentNullException(nameof(newels)); - parameters.InsertRange(FindIndexInList(el), newels); - foreach (var newel in newels) - if (newel != null) - newel.Parent = this; - } - - public bool Remove(pattern_deconstructor_parameter el) - { - return parameters.Remove(el); - } - - public void ReplaceInList(pattern_deconstructor_parameter el, pattern_deconstructor_parameter newel) - { - if (el == null) - throw new ArgumentNullException(nameof(el)); - if (newel == null) - throw new ArgumentNullException(nameof(newel)); - parameters[FindIndexInList(el)] = newel; - newel.Parent = this; - } - - public void ReplaceInList(pattern_deconstructor_parameter el, IEnumerable newels) - { - if (el == null) - throw new ArgumentNullException(nameof(el)); - if (newels == null) - throw new ArgumentNullException(nameof(newels)); - var ind = FindIndexInList(el); - parameters.RemoveAt(ind); - parameters.InsertRange(ind, newels); - foreach (var newel in newels) - if (newel != null) - newel.Parent = this; - } - - public int RemoveAll(Predicate match) - { - return parameters.RemoveAll(match); - } - - public pattern_deconstructor_parameter Last() - { - if (parameters.Count > 0) - return parameters[parameters.Count - 1]; - throw new InvalidOperationException("Список пуст"); - } - - public int Count - { - get { return parameters.Count; } - } - - public void Insert(int pos, pattern_deconstructor_parameter el) - { - if (el == null) - throw new ArgumentNullException(nameof(el)); - parameters.Insert(pos,el); - if (el != null) - el.Parent = this; - } - - /// Создает копию узла public override syntax_tree_node Clone() { @@ -49607,11 +49736,11 @@ namespace PascalABCCompiler.SyntaxTree copy.source_context = new SourceContext(source_context); if (parameters != null) { - foreach (pattern_deconstructor_parameter elem in parameters) + foreach (pattern_parameter elem in parameters) { if (elem != null) { - copy.Add((pattern_deconstructor_parameter)elem.Clone()); + copy.Add((pattern_parameter)elem.Clone()); copy.Last().Parent = copy; } else @@ -49623,6 +49752,11 @@ namespace PascalABCCompiler.SyntaxTree copy.type = (type_definition)type.Clone(); copy.type.Parent = copy; } + if (const_params_check != null) + { + copy.const_params_check = (expression)const_params_check.Clone(); + copy.const_params_check.Parent = copy; + } return copy; } @@ -49643,6 +49777,8 @@ namespace PascalABCCompiler.SyntaxTree } if (type != null) type.Parent = this; + if (const_params_check != null) + const_params_check.Parent = this; } /// Заполняет поля Parent во всем поддереве @@ -49655,6 +49791,7 @@ namespace PascalABCCompiler.SyntaxTree child?.FillParentsInAllChilds(); } type?.FillParentsInAllChilds(); + const_params_check?.FillParentsInAllChilds(); } /// @@ -49664,7 +49801,7 @@ namespace PascalABCCompiler.SyntaxTree { get { - return 1; + return 2; } } /// @@ -49674,7 +49811,7 @@ namespace PascalABCCompiler.SyntaxTree { get { - return 1 + (parameters == null ? 0 : parameters.Count); + return 2 + (parameters == null ? 0 : parameters.Count); } } /// @@ -49690,8 +49827,10 @@ namespace PascalABCCompiler.SyntaxTree { case 0: return type; + case 1: + return const_params_check; } - Int32 index_counter=ind - 1; + Int32 index_counter=ind - 2; if(parameters != null) { if(index_counter < parameters.Count) @@ -49710,13 +49849,16 @@ namespace PascalABCCompiler.SyntaxTree case 0: type = (type_definition)value; break; + case 1: + const_params_check = (expression)value; + break; } - Int32 index_counter=ind - 1; + Int32 index_counter=ind - 2; if(parameters != null) { if(index_counter < parameters.Count) { - parameters[index_counter]= (pattern_deconstructor_parameter)value; + parameters[index_counter]= (pattern_parameter)value; return; } } @@ -49736,16 +49878,16 @@ namespace PascalABCCompiler.SyntaxTree /// - ///Базовый класс параметра deconstruct + ///Базовый класс параметра для pattern_node /// [Serializable] - public partial class pattern_deconstructor_parameter : syntax_tree_node + public partial class pattern_parameter : syntax_tree_node { /// ///Конструктор без параметров. /// - public pattern_deconstructor_parameter() + public pattern_parameter() { } @@ -49753,7 +49895,7 @@ namespace PascalABCCompiler.SyntaxTree /// Создает копию узла public override syntax_tree_node Clone() { - pattern_deconstructor_parameter copy = new pattern_deconstructor_parameter(); + pattern_parameter copy = new pattern_parameter(); copy.Parent = this.Parent; if (source_context != null) copy.source_context = new SourceContext(source_context); @@ -49761,9 +49903,9 @@ namespace PascalABCCompiler.SyntaxTree } /// Получает копию данного узла корректного типа - public new pattern_deconstructor_parameter TypedClone() + public new pattern_parameter TypedClone() { - return Clone() as pattern_deconstructor_parameter; + return Clone() as pattern_parameter; } /// Заполняет поля Parent в непосредственных дочерних узлах @@ -50021,7 +50163,7 @@ namespace PascalABCCompiler.SyntaxTree ///Параметр-объявление переменной (возможно без типа) /// [Serializable] - public partial class var_deconstructor_parameter : pattern_deconstructor_parameter + public partial class var_deconstructor_parameter : pattern_parameter { /// @@ -50203,7 +50345,7 @@ namespace PascalABCCompiler.SyntaxTree ///Параметр-паттерн. Часть рекурсивного паттерна. /// [Serializable] - public partial class recursive_deconstructor_parameter : pattern_deconstructor_parameter + public partial class recursive_deconstructor_parameter : pattern_parameter { /// @@ -51314,6 +51456,27 @@ namespace PascalABCCompiler.SyntaxTree source_context = sc; FillParentsInDirectChilds(); } + + /// + ///Конструктор с параметрами. + /// + public const_pattern(List _parameters,expression_list _pattern_expressions) + { + this._parameters=_parameters; + this._pattern_expressions=_pattern_expressions; + FillParentsInDirectChilds(); + } + + /// + ///Конструктор с параметрами. + /// + public const_pattern(List _parameters,expression_list _pattern_expressions,SourceContext sc) + { + this._parameters=_parameters; + this._pattern_expressions=_pattern_expressions; + source_context = sc; + FillParentsInDirectChilds(); + } protected expression_list _pattern_expressions; /// @@ -51341,6 +51504,19 @@ namespace PascalABCCompiler.SyntaxTree copy.Parent = this.Parent; if (source_context != null) copy.source_context = new SourceContext(source_context); + if (parameters != null) + { + foreach (pattern_parameter elem in parameters) + { + if (elem != null) + { + copy.Add((pattern_parameter)elem.Clone()); + copy.Last().Parent = copy; + } + else + copy.Add(null); + } + } if (pattern_expressions != null) { copy.pattern_expressions = (expression_list)pattern_expressions.Clone(); @@ -51358,6 +51534,12 @@ namespace PascalABCCompiler.SyntaxTree /// Заполняет поля Parent в непосредственных дочерних узлах public override void FillParentsInDirectChilds() { + if (parameters != null) + { + foreach (var child in parameters) + if (child != null) + child.Parent = this; + } if (pattern_expressions != null) pattern_expressions.Parent = this; } @@ -51366,6 +51548,11 @@ namespace PascalABCCompiler.SyntaxTree public override void FillParentsInAllChilds() { FillParentsInDirectChilds(); + if (parameters != null) + { + foreach (var child in parameters) + child?.FillParentsInAllChilds(); + } pattern_expressions?.FillParentsInAllChilds(); } @@ -51386,7 +51573,7 @@ namespace PascalABCCompiler.SyntaxTree { get { - return 1; + return 1 + (parameters == null ? 0 : parameters.Count); } } /// @@ -51403,6 +51590,14 @@ namespace PascalABCCompiler.SyntaxTree case 0: return pattern_expressions; } + Int32 index_counter=ind - 1; + if(parameters != null) + { + if(index_counter < parameters.Count) + { + return parameters[index_counter]; + } + } return null; } set @@ -51415,6 +51610,15 @@ namespace PascalABCCompiler.SyntaxTree pattern_expressions = (expression_list)value; break; } + Int32 index_counter=ind - 1; + if(parameters != null) + { + if(index_counter < parameters.Count) + { + parameters[index_counter]= (pattern_parameter)value; + return; + } + } } } /// @@ -51534,13 +51738,13 @@ namespace PascalABCCompiler.SyntaxTree /// /// [Serializable] - public partial class const_deconstructor_parameter : pattern_deconstructor_parameter + public partial class const_pattern_parameter : pattern_parameter { /// ///Конструктор без параметров. /// - public const_deconstructor_parameter() + public const_pattern_parameter() { } @@ -51548,7 +51752,7 @@ namespace PascalABCCompiler.SyntaxTree /// ///Конструктор с параметрами. /// - public const_deconstructor_parameter(expression _const_param) + public const_pattern_parameter(expression _const_param) { this._const_param=_const_param; FillParentsInDirectChilds(); @@ -51557,7 +51761,7 @@ namespace PascalABCCompiler.SyntaxTree /// ///Конструктор с параметрами. /// - public const_deconstructor_parameter(expression _const_param,SourceContext sc) + public const_pattern_parameter(expression _const_param,SourceContext sc) { this._const_param=_const_param; source_context = sc; @@ -51586,7 +51790,7 @@ namespace PascalABCCompiler.SyntaxTree /// Создает копию узла public override syntax_tree_node Clone() { - const_deconstructor_parameter copy = new const_deconstructor_parameter(); + const_pattern_parameter copy = new const_pattern_parameter(); copy.Parent = this.Parent; if (source_context != null) copy.source_context = new SourceContext(source_context); @@ -51599,9 +51803,9 @@ namespace PascalABCCompiler.SyntaxTree } /// Получает копию данного узла корректного типа - public new const_deconstructor_parameter TypedClone() + public new const_pattern_parameter TypedClone() { - return Clone() as const_deconstructor_parameter; + return Clone() as const_pattern_parameter; } /// Заполняет поля Parent в непосредственных дочерних узлах @@ -51683,7 +51887,7 @@ namespace PascalABCCompiler.SyntaxTree /// /// [Serializable] - public partial class wild_card_deconstructor_parameter : pattern_deconstructor_parameter + public partial class wild_card_deconstructor_parameter : pattern_parameter { /// @@ -51771,6 +51975,250 @@ namespace PascalABCCompiler.SyntaxTree } + /// + /// + /// + [Serializable] + public partial class collection_pattern : pattern_node + { + + /// + ///Конструктор без параметров. + /// + public collection_pattern() + { + + } + + + /// + ///Конструктор с параметрами. + /// + public collection_pattern(List _parameters) + { + this._parameters=_parameters; + FillParentsInDirectChilds(); + } + + /// + ///Конструктор с параметрами. + /// + public collection_pattern(List _parameters,SourceContext sc) + { + this._parameters=_parameters; + source_context = sc; + FillParentsInDirectChilds(); + } + /// Создает копию узла + public override syntax_tree_node Clone() + { + collection_pattern copy = new collection_pattern(); + copy.Parent = this.Parent; + if (source_context != null) + copy.source_context = new SourceContext(source_context); + if (parameters != null) + { + foreach (pattern_parameter elem in parameters) + { + if (elem != null) + { + copy.Add((pattern_parameter)elem.Clone()); + copy.Last().Parent = copy; + } + else + copy.Add(null); + } + } + return copy; + } + + /// Получает копию данного узла корректного типа + public new collection_pattern TypedClone() + { + return Clone() as collection_pattern; + } + + /// Заполняет поля Parent в непосредственных дочерних узлах + public override void FillParentsInDirectChilds() + { + if (parameters != null) + { + foreach (var child in parameters) + if (child != null) + child.Parent = this; + } + } + + /// Заполняет поля Parent во всем поддереве + public override void FillParentsInAllChilds() + { + FillParentsInDirectChilds(); + if (parameters != null) + { + foreach (var child in parameters) + child?.FillParentsInAllChilds(); + } + } + + /// + ///Свойство для получения количества всех подузлов без элементов поля типа List + /// + public override Int32 subnodes_without_list_elements_count + { + get + { + return 0; + } + } + /// + ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List + /// + public override Int32 subnodes_count + { + get + { + return 0 + (parameters == null ? 0 : parameters.Count); + } + } + /// + ///Индексатор для получения всех подузлов + /// + public override syntax_tree_node this[Int32 ind] + { + get + { + if(subnodes_count == 0 || ind < 0 || ind > subnodes_count-1) + throw new IndexOutOfRangeException(); + Int32 index_counter=ind - 0; + if(parameters != null) + { + if(index_counter < parameters.Count) + { + return parameters[index_counter]; + } + } + return null; + } + set + { + if(subnodes_count == 0 || ind < 0 || ind > subnodes_count-1) + throw new IndexOutOfRangeException(); + Int32 index_counter=ind - 0; + if(parameters != null) + { + if(index_counter < parameters.Count) + { + parameters[index_counter]= (pattern_parameter)value; + return; + } + } + } + } + /// + ///Метод для обхода дерева посетителем + /// + ///Объект-посетитель. + ///Return value is void + public override void visit(IVisitor visitor) + { + visitor.visit(this); + } + + } + + + /// + /// + /// + [Serializable] + public partial class collection_pattern_gap_parameter : pattern_parameter + { + + /// + ///Конструктор без параметров. + /// + public collection_pattern_gap_parameter() + { + + } + + /// Создает копию узла + public override syntax_tree_node Clone() + { + collection_pattern_gap_parameter copy = new collection_pattern_gap_parameter(); + copy.Parent = this.Parent; + if (source_context != null) + copy.source_context = new SourceContext(source_context); + return copy; + } + + /// Получает копию данного узла корректного типа + public new collection_pattern_gap_parameter TypedClone() + { + return Clone() as collection_pattern_gap_parameter; + } + + /// Заполняет поля Parent в непосредственных дочерних узлах + public override void FillParentsInDirectChilds() + { + } + + /// Заполняет поля Parent во всем поддереве + public override void FillParentsInAllChilds() + { + FillParentsInDirectChilds(); + } + + /// + ///Свойство для получения количества всех подузлов без элементов поля типа List + /// + public override Int32 subnodes_without_list_elements_count + { + get + { + return 0; + } + } + /// + ///Свойство для получения количества всех подузлов. Подузлом также считается каждый элемент поля типа List + /// + public override Int32 subnodes_count + { + get + { + return 0; + } + } + /// + ///Индексатор для получения всех подузлов + /// + public override syntax_tree_node this[Int32 ind] + { + get + { + if(subnodes_count == 0 || ind < 0 || ind > subnodes_count-1) + throw new IndexOutOfRangeException(); + return null; + } + set + { + if(subnodes_count == 0 || ind < 0 || ind > subnodes_count-1) + throw new IndexOutOfRangeException(); + } + } + /// + ///Метод для обхода дерева посетителем + /// + ///Объект-посетитель. + ///Return value is void + public override void visit(IVisitor visitor) + { + visitor.visit(this); + } + + } + + } diff --git a/SyntaxTree/tree/TreeHelper.cs b/SyntaxTree/tree/TreeHelper.cs index 3c1c4ea97..b78b6e419 100644 --- a/SyntaxTree/tree/TreeHelper.cs +++ b/SyntaxTree/tree/TreeHelper.cs @@ -1818,11 +1818,14 @@ namespace PascalABCCompiler.SyntaxTree public partial class deconstructor_pattern { - public bool IsRecursive => parameters.Any(x => x is recursive_deconstructor_parameter); - public override string ToString() => $"{type}({string.Join(", ", parameters.Select(x => x.ToString()))})"; } + public partial class pattern_node + { + public bool IsRecursive => parameters.Any(x => x is recursive_deconstructor_parameter); + } + public partial class var_deconstructor_parameter { public override string ToString() => identifier.ToString() + (type == null ? "" : $": {type}"); diff --git a/SyntaxTree/tree/Visitor.cs b/SyntaxTree/tree/Visitor.cs index 95e5f0c53..dab164012 100644 --- a/SyntaxTree/tree/Visitor.cs +++ b/SyntaxTree/tree/Visitor.cs @@ -1379,11 +1379,11 @@ namespace PascalABCCompiler.SyntaxTree /// Return value is void void visit(deconstructor_pattern _deconstructor_pattern); /// - ///Method to visit pattern_deconstructor_parameter. + ///Method to visit pattern_parameter. /// - ///Node to visit + ///Node to visit /// Return value is void - void visit(pattern_deconstructor_parameter _pattern_deconstructor_parameter); + void visit(pattern_parameter _pattern_parameter); /// ///Method to visit desugared_deconstruction. /// @@ -1433,17 +1433,29 @@ namespace PascalABCCompiler.SyntaxTree /// Return value is void void visit(tuple_wild_card _tuple_wild_card); /// - ///Method to visit const_deconstructor_parameter. + ///Method to visit const_pattern_parameter. /// - ///Node to visit + ///Node to visit /// Return value is void - void visit(const_deconstructor_parameter _const_deconstructor_parameter); + void visit(const_pattern_parameter _const_pattern_parameter); /// ///Method to visit wild_card_deconstructor_parameter. /// ///Node to visit /// Return value is void void visit(wild_card_deconstructor_parameter _wild_card_deconstructor_parameter); + /// + ///Method to visit collection_pattern. + /// + ///Node to visit + /// Return value is void + void visit(collection_pattern _collection_pattern); + /// + ///Method to visit collection_pattern_gap_parameter. + /// + ///Node to visit + /// Return value is void + void visit(collection_pattern_gap_parameter _collection_pattern_gap_parameter); } diff --git a/SyntaxTree/tree/tree.xml b/SyntaxTree/tree/tree.xml index 5cc15f855..c72d050f4 100644 --- a/SyntaxTree/tree/tree.xml +++ b/SyntaxTree/tree/tree.xml @@ -2864,7 +2864,9 @@ - + + + @@ -2894,7 +2896,6 @@ - @@ -2954,8 +2955,8 @@ - + @@ -2967,7 +2968,7 @@ - + @@ -2994,7 +2995,7 @@ - + @@ -3009,7 +3010,7 @@ - + @@ -3066,7 +3067,7 @@ 0 - 11 + 9 @@ -3078,7 +3079,7 @@ - + @@ -3088,11 +3089,11 @@ 0 - 11 + 9 - + @@ -3100,7 +3101,31 @@ 0 - 11 + 9 + + + + + + + + + 0 + + + 9 + + + + + + + + + 0 + + + 9 @@ -3129,9 +3154,8 @@ - + - @@ -3168,6 +3192,7 @@ + @@ -3379,6 +3404,13 @@ + + + + + + + @@ -3414,6 +3446,8 @@ + + @@ -3451,6 +3485,7 @@ + @@ -3570,6 +3605,8 @@ + + @@ -3995,6 +4032,8 @@ + + diff --git a/SyntaxVisitors/SugarVisitors/PatternsDesugaringVisitor.cs b/SyntaxVisitors/SugarVisitors/PatternsDesugaringVisitor.cs index 4c2e06b27..19c4f7d98 100644 --- a/SyntaxVisitors/SugarVisitors/PatternsDesugaringVisitor.cs +++ b/SyntaxVisitors/SugarVisitors/PatternsDesugaringVisitor.cs @@ -46,7 +46,7 @@ namespace SyntaxVisitors.SugarVisitors { var result = new List(); result.Add(CastVariableDefinition); - result.Add(new desugared_deconstruction(DeconstructionVariables, CastVariable, patternContext)); + result.Add(new desugared_deconstruction(DeconstructionVariables, CastVariable, patternContext)); result.Add(SuccessVariableDefinition); return result; @@ -74,6 +74,7 @@ namespace SyntaxVisitors.SugarVisitors private int generalVariableCounter = 0; private int successVariableCounter = 0; private int labelVariableCounter = 0; + private int deconstructParamVariableCounter = 0; private if_node _previousIf; private statement desugaredMatchWith; @@ -100,31 +101,40 @@ namespace SyntaxVisitors.SugarVisitors if (patternCase == null) continue; - if (patternCase.pattern is deconstructor_pattern) + switch (patternCase.pattern) { - // Проверяем встречался ли уже такой тип при деконструкции - // SSM 02.01.19 пока закомментировал этот кусок т.к. при этом коде падает стандартный пример ArithmSimplify.cs. #1408 снова открыл - /*var deconstructionType = (patternCase.pattern as deconstructor_pattern). - type as named_type_reference; - if (deconstructionType != null && - deconstructionType.names != null && - deconstructionType.names.Count != 0) - { - var deconstructionTypeName = deconstructionType.names[0].name; - if (usedDeconstructionTypes.Contains(deconstructionTypeName)) + case deconstructor_pattern pattern: { - throw new SyntaxVisitorError("REPEATED_DECONSTRUCTION_TYPE", - patternCase.pattern.source_context); + // Проверяем встречался ли уже такой тип при деконструкции + // SSM 02.01.19 пока закомментировал этот кусок т.к. при этом коде падает стандартный пример ArithmSimplify.cs. #1408 снова открыл + /*var deconstructionType = (patternCase.pattern as deconstructor_pattern). + type as named_type_reference; + if (deconstructionType != null && + deconstructionType.names != null && + deconstructionType.names.Count != 0) + { + var deconstructionTypeName = deconstructionType.names[0].name; + if (usedDeconstructionTypes.Contains(deconstructionTypeName)) + { + throw new SyntaxVisitorError("REPEATED_DECONSTRUCTION_TYPE", + patternCase.pattern.source_context); + } + usedDeconstructionTypes.Add(deconstructionTypeName); + } */ + + DesugarDeconstructorPatternCase(matchWith.expr, patternCase); + break; + } + case const_pattern p: + { + DesugarConstPatternCase(matchWith.expr, patternCase); + break; + } + case collection_pattern p: + { + DesugarDeconstructorPatternCase(matchWith.expr, patternCase); + break; } - usedDeconstructionTypes.Add(deconstructionTypeName); - } */ - - DesugarDeconstructorPatternCase(matchWith.expr, patternCase); - } - - if (patternCase.pattern is const_pattern) - { - DesugarConstPatternCase(matchWith.expr, patternCase); } } @@ -150,16 +160,15 @@ namespace SyntaxVisitors.SugarVisitors throw new SyntaxVisitorError("PATTERN_MATHING_IS_NOT_SUPPORTED_IN_THIS_CONTEXT", isPatternExpr.source_context); Debug.Assert(GetAscendant(isPatternExpr) != null, "Couldn't find statement list in upper nodes"); - + DesugarIsExpression(isPatternExpr); } private void DesugarDeconstructorPatternCase(expression matchingExpression, pattern_case patternCase) { - Debug.Assert(patternCase.pattern is deconstructor_pattern); - var paramCheckExpr = DesugarDeconstructorPatternParameters(patternCase.pattern as deconstructor_pattern); + //var paramCheckExpr = DesugarDeconstructorPatternParameters(patternCase.pattern as deconstructor_pattern); - var isExpression = new is_pattern_expr(matchingExpression, patternCase.pattern, paramCheckExpr); + var isExpression = new is_pattern_expr(matchingExpression, patternCase.pattern, patternCase.source_context); var ifCondition = patternCase.condition == null ? (expression)isExpression : bin_expr.LogicalAnd(isExpression, patternCase.condition); var ifCheck = SubtreeCreator.CreateIf(ifCondition, patternCase.case_action); @@ -173,7 +182,7 @@ namespace SyntaxVisitors.SugarVisitors for (int i = 0; i < pattern.parameters.Count; ++i) { - if (pattern.parameters[i] is const_deconstructor_parameter constPattern) + if (pattern.parameters[i] is const_pattern_parameter constPattern) { var constParamIdent = new ident(NewDeconstructParamId(), pattern.parameters[i].source_context); @@ -202,7 +211,6 @@ namespace SyntaxVisitors.SugarVisitors if (pattern.parameters[i] is wild_card_deconstructor_parameter) { var wildCardGeneratedParamIdent = new ident(NewDeconstructParamId(), pattern.parameters[i].source_context); - pattern.parameters[i] = new var_deconstructor_parameter( wildCardGeneratedParamIdent, null, @@ -214,8 +222,8 @@ namespace SyntaxVisitors.SugarVisitors if (deconstructor_param.pattern is deconstructor_pattern deconstructor_pattern) { var recursiveChecks = DesugarDeconstructorPatternParameters(deconstructor_pattern); - paramCheckExpr = paramCheckExpr == null ? - recursiveChecks : + paramCheckExpr = paramCheckExpr == null ? + recursiveChecks : bin_expr.LogicalAnd(paramCheckExpr, recursiveChecks); } } @@ -254,7 +262,6 @@ namespace SyntaxVisitors.SugarVisitors elemsToCompare.Add(currentInd); } else { - //possibleTupleCase.parameters.ReplaceInList(possibleTupleCase.parameters.expressions[currentInd], new nil_const()); possibleTupleCase.parameters[currentInd] = new int32_const(0, patternCase.source_context); } } @@ -269,7 +276,7 @@ namespace SyntaxVisitors.SugarVisitors var tupleEqualsCall = SubtreeCreator. CreateSystemFunctionCall( WildCardsTupleEqualFunctionName, - possibleTupleCase, + possibleTupleCase, matchingExpression, seqCall ); @@ -313,11 +320,92 @@ namespace SyntaxVisitors.SugarVisitors } var ifCondition = patternCase.condition == null ? orPatternCases : bin_expr.LogicalAnd(orPatternCases, patternCase.condition); var ifCheck = SubtreeCreator.CreateIf(ifCondition, patternCase.case_action); - + // Добавляем полученные statements в результат AddDesugaredCaseToResult(ifCheck, ifCheck); } + private expression GetCollectionItemsEqualCheckBeforeGap(addressed_value matchingExpression, List toCompare) + { + var fromIndex = 0; + expression equalChecks = null; + foreach (var param in toCompare) + { + if (param is const_pattern_parameter const_params) + { + var indexerCall = new indexer( + matchingExpression, + new expression_list( + new int32_const(fromIndex++, matchingExpression.source_context), + matchingExpression.source_context), + matchingExpression.source_context); + + var eqParams = new expression_list( + new List() + { + indexerCall, + const_params.const_param + } + ); + + var equalCall = new method_call( + new dot_node( + new ident("object"), + new ident("Equals")), + eqParams, + matchingExpression.source_context + ); + + equalChecks = equalChecks == null ? (expression)equalCall : bin_expr.LogicalAnd(equalChecks, equalCall); + } + } + return equalChecks; + } + + private expression GetCollectionItemsEqualCheckAfterGap(addressed_value matchingExpression, List toCompare) + { + var elemFromTail = 1; + expression equalChecks = null; + foreach (var param in toCompare) + { + if (param is const_pattern_parameter const_param) + { + var indexerCall = new indexer( + matchingExpression, + new expression_list( + new bin_expr( + new method_call( + new dot_node( + matchingExpression, + new ident("Count", matchingExpression.source_context)), + new expression_list()), + new int32_const(elemFromTail++, matchingExpression.source_context), + Operators.Minus), + matchingExpression.source_context), + matchingExpression.source_context); + + var eqParams = new expression_list( + new List() + { + indexerCall, + const_param.const_param + } + ); + + var equalCall = new method_call( + new dot_node( + new ident("object"), + new ident("Equals")), + eqParams, + matchingExpression.source_context + ); + + equalChecks = equalChecks == null ? (expression)equalCall : bin_expr.LogicalAnd(equalChecks, equalCall); + } + } + return equalChecks; + } + private ident NewGeneralName() => new ident(GeneratedPatternNamePrefix + "GenVar" + generalVariableCounter++); private ident NewSuccessName() => new ident(GeneratedPatternNamePrefix + "Success" + successVariableCounter++); @@ -346,7 +434,7 @@ namespace SyntaxVisitors.SugarVisitors _previousIf = newIf; } - private DeconstructionDesugaringResult DesugarPattern(deconstructor_pattern pattern, expression matchingExpression, expression constParamCheck) + private DeconstructionDesugaringResult DesugarDeconstructorPattern(deconstructor_pattern pattern, expression matchingExpression) { Debug.Assert(!pattern.IsRecursive, "All recursive patterns should be desugared into simple patterns at this point"); @@ -359,10 +447,6 @@ namespace SyntaxVisitors.SugarVisitors // делегирование проверки паттерна функции IsTest desugarResult.TypeCastCheck = SubtreeCreator.CreateSystemFunctionCall(IsTestMethodName, matchingExpression, castVariableName); - if (constParamCheck != null) - { - desugarResult.TypeCastCheck = bin_expr.LogicalAnd(desugarResult.TypeCastCheck, constParamCheck); - } var parameters = pattern.parameters.Cast(); foreach (var deconstructedVariable in parameters) @@ -378,35 +462,90 @@ namespace SyntaxVisitors.SugarVisitors return desugarResult; } + private expression DesugarCollectionPattern(collection_pattern pattern, expression matchingExpression) + { + Debug.Assert(!pattern.IsRecursive, "All recursive patterns should be desugared into simple patterns at this point"); + + var collectionItems = pattern.parameters; + var gapItemMet = false; + var gapIndex = 0; + var exprBeforeGap = new List(); + var exprAfterGap = new List(); + for (int i = 0; i < collectionItems.Count; ++i) + { + if (collectionItems[i] is collection_pattern_gap_parameter) + { + if (gapItemMet) + { + throw new SyntaxVisitorError("REPEATED_DOTDOT_COLLECTION_PATTERN_EXPR", + pattern.source_context); + } + gapItemMet = true; + gapIndex = i; + continue; + } + + if (gapItemMet) + { + exprAfterGap.Insert(0, collectionItems[i]); + } + else + { + exprBeforeGap.Add(collectionItems[i]); + } + } + + var itemsEqualCalls = GetCollectionItemsEqualCheckBeforeGap(matchingExpression as addressed_value, exprBeforeGap); + if (gapItemMet && exprAfterGap.Count != 0) + { + var afterGapEqual = GetCollectionItemsEqualCheckAfterGap(matchingExpression as addressed_value, exprAfterGap); + itemsEqualCalls = itemsEqualCalls == null ? afterGapEqual : bin_expr.LogicalAnd(itemsEqualCalls, afterGapEqual); + } + + return itemsEqualCalls; + } + private void DesugarIsExpression(is_pattern_expr isPatternExpr) { - Debug.Assert(isPatternExpr.right is deconstructor_pattern); - var constParamCheck = DesugarDeconstructorPatternParameters(isPatternExpr.right as deconstructor_pattern); - isPatternExpr.constDeconstructorParamCheck = constParamCheck; - var patternLocation = GetLocation(isPatternExpr); - - var pattern = isPatternExpr.right as deconstructor_pattern; - - //AddDefinitionsInUpperStatementList(isPatternExpr, new[] { GetTypeCompatibilityCheck(isPatternExpr) }); - if (pattern.IsRecursive) + if (isPatternExpr.right.IsRecursive) { - var desugaredRecursiveIs = DesugarRecursiveDeconstructor(isPatternExpr.left, pattern); + var desugaredRecursiveIs = DesugarRecursiveDeconstructor(isPatternExpr.left, isPatternExpr.right); ReplaceUsingParent(isPatternExpr, desugaredRecursiveIs); desugaredRecursiveIs.visit(this); return; } + var patternLocation = GetLocation(isPatternExpr); - switch (patternLocation) + switch (isPatternExpr.right) { - case PatternLocation.IfCondition: DesugarIsExpressionInIfCondition(isPatternExpr); break; - case PatternLocation.Assign: DesugarIsExpressionInAssignment(isPatternExpr); break; + case deconstructor_pattern pattern: + { + var constParamCheck = DesugarDeconstructorPatternParameters(isPatternExpr.right as deconstructor_pattern); + pattern.const_params_check = constParamCheck; + + //AddDefinitionsInUpperStatementList(isPatternExpr, new[] { GetTypeCompatibilityCheck(isPatternExpr) }); + switch (patternLocation) + { + case PatternLocation.IfCondition: DesugarIsExpressionInIfCondition(isPatternExpr); break; + case PatternLocation.Assign: DesugarIsExpressionInAssignment(isPatternExpr); break; + } + break; + } + case collection_pattern pattern: + { + switch (patternLocation) + { + case PatternLocation.IfCondition: DesugarIsExpressionInIfCondition(isPatternExpr); break; + } + break; + } } } - private expression DesugarRecursiveDeconstructor(expression expression, deconstructor_pattern pattern) + private expression DesugarRecursiveDeconstructor(expression expression, pattern_node pattern) { - List parameters = pattern.parameters; - expression conjunction = new is_pattern_expr(expression, pattern, null); + List parameters = pattern.parameters; + expression conjunction = new is_pattern_expr(expression, pattern, pattern.source_context); for (int i = 0; i < parameters.Count; i++) { if (parameters[i] is recursive_deconstructor_parameter parameter) @@ -416,41 +555,40 @@ namespace SyntaxVisitors.SugarVisitors var varParameter = new var_deconstructor_parameter(newName, null); parameters[i] = varParameter; varParameter.Parent = parameters[i]; - conjunction = bin_expr.LogicalAnd(conjunction, DesugarRecursiveDeconstructor(newName, parameter.pattern as deconstructor_pattern)); + conjunction = bin_expr.LogicalAnd(conjunction, DesugarRecursiveDeconstructor(newName, parameter.pattern)); } } - return conjunction; } private void DesugarIsExpressionInAssignment(is_pattern_expr isExpression) { - var pattern = isExpression.right as deconstructor_pattern; - var desugaringResult = DesugarPattern(pattern, isExpression.left, isExpression.constDeconstructorParamCheck); - ReplaceUsingParent(isExpression, desugaringResult.SuccessVariable); - - var statementsToAdd = desugaringResult.GetDeconstructionDefinitions(pattern.source_context); - statementsToAdd.Add(GetMatchedExpressionCheck(isExpression.left)); - statementsToAdd.Add(GetTypeCompatibilityCheck(isExpression)); - statementsToAdd.Add(desugaringResult.GetPatternCheckWithDeconstrunctorCall()); - + var statementsToAdd = ProcessDesugaringForDeconstructorPattern(isExpression); AddDefinitionsInUpperStatementList(isExpression, statementsToAdd); } private void DesugarIsExpressionInIfCondition(is_pattern_expr isExpression) { - var pattern = isExpression.right as deconstructor_pattern; - var desugaringResult = DesugarPattern(pattern, isExpression.left, isExpression.constDeconstructorParamCheck); - ReplaceUsingParent(isExpression, desugaringResult.SuccessVariable); + List statementsToAdd = null; - var statementsToAdd = desugaringResult.GetDeconstructionDefinitions(pattern.source_context); - statementsToAdd.Add(GetMatchedExpressionCheck(isExpression.left)); - statementsToAdd.Add(GetTypeCompatibilityCheck(isExpression)); - statementsToAdd.Add(desugaringResult.GetPatternCheckWithDeconstrunctorCall()); + switch (isExpression.right) + { + case deconstructor_pattern dp: + if (dp.const_params_check != null) + { + var ifToAddConstParamsCheck = GetAscendant(isExpression); + ifToAddConstParamsCheck.condition = bin_expr.LogicalAnd(ifToAddConstParamsCheck.condition, dp.const_params_check); + } + statementsToAdd = ProcessDesugaringForDeconstructorPattern(isExpression); + break; + case collection_pattern cp: + statementsToAdd = ProcessDesugaringForCollectionPattern(isExpression); + break; + } var enclosingIf = GetAscendant(isExpression); // Если уже обрабатывался ранее (второй встретившийся в том же условии is), то не изменяем if - if (processedIfNodes.Contains(enclosingIf)) + if (processedIfNodes.Contains(enclosingIf)) AddDefinitionsInUpperStatementList(isExpression, statementsToAdd); // Иначе помещаем определения и if-then в отдельный блок, а else после этого блока else @@ -466,6 +604,30 @@ namespace SyntaxVisitors.SugarVisitors } } + private List ProcessDesugaringForDeconstructorPattern(is_pattern_expr isExpression) + { + var pattern = isExpression.right as deconstructor_pattern; + var desugaringResult = DesugarDeconstructorPattern(pattern, isExpression.left); + ReplaceUsingParent(isExpression, desugaringResult.SuccessVariable); + var statementsToAdd = desugaringResult.GetDeconstructionDefinitions(pattern.source_context); + statementsToAdd.Add(GetMatchedExpressionCheck(isExpression.left)); + statementsToAdd.Add(GetTypeCompatibilityCheck(isExpression)); + statementsToAdd.Add(desugaringResult.GetPatternCheckWithDeconstrunctorCall()); + + return statementsToAdd; + } + + private List ProcessDesugaringForCollectionPattern(is_pattern_expr isExpression) + { + var pattern = isExpression.right as collection_pattern; + var successCheck = DesugarCollectionPattern(pattern, isExpression.left); + ReplaceUsingParent(isExpression, successCheck); + + var statementsToAdd = new List(); + + return statementsToAdd; + } + private semantic_check_sugared_statement_node GetMatchedExpressionCheck(expression matchedExpression) => new semantic_check_sugared_statement_node(SemanticCheckType.MatchedExpression, new List() { matchedExpression }); @@ -596,12 +758,10 @@ namespace SyntaxVisitors.SugarVisitors return null; } - - //random id generator - private int postfix = 0; + private string NewDeconstructParamId() { - return GeneratedDeconstructParamPrefix + postfix++.ToString(); + return GeneratedPatternNamePrefix + "DeconstructParam" + deconstructParamVariableCounter++.ToString(); } } } diff --git a/bin/Lng/Rus/SyntaxTreeVisitorsErrors.dat b/bin/Lng/Rus/SyntaxTreeVisitorsErrors.dat index 02ad14d81..63011e8bd 100644 --- a/bin/Lng/Rus/SyntaxTreeVisitorsErrors.dat +++ b/bin/Lng/Rus/SyntaxTreeVisitorsErrors.dat @@ -18,6 +18,7 @@ LAMBDA_EXPRESSIONS_CANNOT_CONTAIN_YIELD=Лямбда-выражения не м PATTERN_MATHING_IS_NOT_SUPPORTED_IN_THIS_CONTEXT=Сопоставление с образцом не поддерживается в данном контексте ONLY_ONE_DECONSTRUCT_ALLOWED=Можно определить только один пользовательский деконструктор REPEATED_DECONSTRUCTION_TYPE=Повторение типов при сопоставлении с образцом +REPEATED_DOTDOT_COLLECTION_PATTERN_EXPR=Конструкция '..' встречена более одного раза в выражении для сопоставления Var_{0}_is_already_defined=Переменная {0} уже определена