administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix #2164

Browse source
This commit is contained in:
Александр Погорелов 2020-02-10 15:51:16 +03:00
parent 938c0d27e3
commit 750654fd9f
4 changed files with 58 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
View file

@ -1,9 +1,9 @@
//
// This CSharp output file generated by Gardens Point LEX
// Version: 1.1.3.301
// Machine: DESKTOP-G8V08V4
// DateTime: 13.01.2020 1:44:39
// UserName: ?????????
// Machine: DESKTOP-P4NLNB1
// DateTime: 2/10/2020 2:41:45 PM
// UserName: fatco
// GPLEX input file <ABCPascal.lex>
// GPLEX frame file <embedded resource>
//

6
Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
View file

@ -1,9 +1,9 @@
// (see accompanying GPPGcopyright.rtf)
// GPPG version 1.3.6
// Machine: DESKTOP-G8V08V4
// DateTime: 13.01.2020 1:44:39
// UserName: ?????????
// Machine: DESKTOP-P4NLNB1
// DateTime: 2/10/2020 2:41:46 PM
// UserName: fatco
// Input file <ABCPascal.y>
// options: no-lines gplex

42
SyntaxVisitors/SugarVisitors/PatternsDesugaringVisitor.cs
View file

@ -124,14 +124,15 @@ namespace SyntaxVisitors.SugarVisitors
{
if (patternCase == null)
continue;
DefaultDesugarPattern(matchWith.expr, patternCase);
switch (patternCase.pattern)
/*switch (patternCase.pattern)
{
case deconstructor_pattern pattern:
{
// Проверяем встречался ли уже такой тип при деконструкции
// SSM 02.01.19 пока закомментировал этот кусок т.к. при этом коде падает стандартный пример ArithmSimplify.cs. #1408 снова открыл
/*var deconstructionType = (patternCase.pattern as deconstructor_pattern).
var deconstructionType = (patternCase.pattern as deconstructor_pattern).
type as named_type_reference;
if (deconstructionType != null &&
deconstructionType.names != null &&
@ -144,14 +145,15 @@ namespace SyntaxVisitors.SugarVisitors
patternCase.pattern.source_context);
}
usedDeconstructionTypes.Add(deconstructionTypeName);
} */
}
DefaultDesugarPattern(matchWith.expr, patternCase);
break;
}
case const_pattern p:
{
DesugarConstPatternCase(matchWith.expr, patternCase);
//DesugarConstPatternCase(matchWith.expr, patternCase);
DefaultDesugarPattern(matchWith.expr, patternCase);
break;
}
case collection_pattern p:
@ -164,7 +166,7 @@ namespace SyntaxVisitors.SugarVisitors
DefaultDesugarPattern(matchWith.expr, patternCase);
break;
}
}
}*/
}
if (matchWith.defaultAction != null)
@ -692,6 +694,9 @@ namespace SyntaxVisitors.SugarVisitors
case tuple_pattern cp:
statementsToAdd = ProcessDesugaringForTuplePattern(isExpression);
break;
case const_pattern cp:
statementsToAdd = ProcessDesugaringForConstPattern(isExpression);
break;
}
var enclosingIf = GetAscendant<if_node>(isExpression);
@ -712,6 +717,33 @@ namespace SyntaxVisitors.SugarVisitors
}
}
private List<statement> ProcessDesugaringForConstPattern(is_pattern_expr isExpression)
{
var patternExpressionNode = isExpression.right as const_pattern;
var statementsToAdd = new List<statement>();
var equalCalls = new List<bin_expr>();
foreach (var patternExpression in patternExpressionNode.pattern_expressions.expressions)
{
statementsToAdd.Add(GetTypeCompatibilityCheck(isExpression.left, patternExpression));
equalCalls.Add(
new bin_expr(isExpression.left, patternExpression, Operators.Equal, isExpression.source_context
)
);
}
typeChecks.AddRange(statementsToAdd);
expression orPatternCases = equalCalls[0];
for (int i = 1; i < equalCalls.Count; ++i)
{
orPatternCases = bin_expr.LogicalOr(orPatternCases, equalCalls[i]);
}
ReplaceUsingParent(isExpression, orPatternCases);
return statementsToAdd;
}
private List<statement> ProcessDesugaringForDeconstructorPattern(is_pattern_expr isExpression)
{
var pattern = isExpression.right as deconstructor_pattern;

14
TestSuite/patterns/patterns-nested-const-pattern.pas Normal file
View file

@ -0,0 +1,14 @@
begin
var a := 3;
var b := 2;
match a with
1: assert(false);
2: assert(false);
3:
match b with
1: assert(false);
2: exit;
end;
end;
assert(false);
end.