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

fix #2185

Browse source
This commit is contained in:
Александр Погорелов 2020-03-09 14:14:53 +03:00
parent 1bec360fe3
commit 664a504301
3 changed files with 27 additions and 7 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: 09.03.2020 13:01:02
// UserName: ?????????
// Machine: DESKTOP-P4NLNB1
// DateTime: 3/9/2020 1:37:31 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: 09.03.2020 13:01:02
// UserName: ?????????
// Machine: DESKTOP-P4NLNB1
// DateTime: 3/9/2020 1:37:31 PM
// UserName: fatco
// Input file <ABCPascal.y>
// options: no-lines gplex

22
SyntaxVisitors/SugarVisitors/PatternsDesugaringVisitor.cs
View file

@ -94,6 +94,7 @@ namespace SyntaxVisitors.SugarVisitors
private const string GeneratedPatternNamePrefix = "<>pattern";
private const string GeneratedDeconstructParamPrefix = "<>deconstructParam";
private const string GeneratedVisitElseBranchVariableName = "<>visitElseBranch";
private const string GeneratedMatchExprVariableName = "<>matchExprVariable";
private int generalVariableCounter = 0;
private int successVariableCounter = 0;
@ -103,6 +104,7 @@ namespace SyntaxVisitors.SugarVisitors
private if_node _previousIf;
private statement desugaredMatchWith;
private List<if_node> processedIfNodes = new List<if_node>();
private var_statement matchedExprVarDeclaration;
//const matching
private List<statement> typeChecks = new List<statement>();
@ -114,6 +116,23 @@ namespace SyntaxVisitors.SugarVisitors
desugaredMatchWith = null;
_previousIf = null;
matchedExprVarDeclaration = new var_statement(
new ident(GeneratedMatchExprVariableName, matchWith.expr.source_context),
matchWith.expr.Clone() as expression,
matchWith.expr.source_context);
ReplaceUsingParent(matchWith.expr, new ident(GeneratedMatchExprVariableName, matchWith.expr.source_context));
/*if (matchWith.Parent is statement_list stl)
{
stl.InsertBefore(matchWith, matchedExprVarDeclaration);
}
else
{
var enclosingStl = new statement_list(matchedExprVarDeclaration, matchWith);
enclosingStl.source_context = matchWith.source_context;
ReplaceUsingParent(matchWith, enclosingStl);
}*/
// Кэшируем выражение для однократного вычисления
//var cachedExpression = NewGeneralName();
//AddDefinitionsInUpperStatementList(matchWith, new[] { new var_statement(cachedExpression, matchWith.expr) });
@ -181,6 +200,8 @@ namespace SyntaxVisitors.SugarVisitors
desugaredMatchWith = new statement_list(typeChecks);
}
desugaredMatchWith = new statement_list(matchedExprVarDeclaration, desugaredMatchWith);
// Замена выражения match with на новое несахарное поддерево и его обход
ReplaceUsingParent(matchWith, desugaredMatchWith);
visit(desugaredMatchWith);
@ -528,7 +549,6 @@ namespace SyntaxVisitors.SugarVisitors
bin_expr.LogicalAnd(successMatchingCheck, afterGapEqual);
}
}
// если добавлять в and, то все равно ран тайм эррор, будто вычисляет все, даже если первое = false
desugaringResult.CollectionLengthCheck = new bin_expr(
new dot_node(matchingExpression as addressed_value, new ident(CountPropertyName), pattern.source_context),
new int32_const(exprBeforeGap.Count + exprAfterGap.Count),