diff --git a/Parsers/PascalABCParserNewSaushkin/PABC.ymc b/Parsers/PascalABCParserNewSaushkin/PABC.ymc
index ef840bcb5..97257f394 100644
--- a/Parsers/PascalABCParserNewSaushkin/PABC.ymc
+++ b/Parsers/PascalABCParserNewSaushkin/PABC.ymc
@@ -271,5 +271,6 @@ script=
+
diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt
index f9a1f9676..99f74c384 100644
--- a/Release/pabcversion.txt
+++ b/Release/pabcversion.txt
@@ -1 +1 @@
-3.6.3.2570
+3.6.3.2573
diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh
index 47547ce07..c9ff917aa 100644
--- a/ReleaseGenerators/PascalABCNET_version.nsh
+++ b/ReleaseGenerators/PascalABCNET_version.nsh
@@ -1 +1 @@
-!define VERSION '3.6.3.2570'
+!define VERSION '3.6.3.2573'
diff --git a/SyntaxTreeConverters/StandardSyntaxConverter.cs b/SyntaxTreeConverters/StandardSyntaxConverter.cs
index 5a17e2746..ce270598f 100644
--- a/SyntaxTreeConverters/StandardSyntaxConverter.cs
+++ b/SyntaxTreeConverters/StandardSyntaxConverter.cs
@@ -20,8 +20,8 @@ namespace PascalABCCompiler.SyntaxTreeConverters
// FillParentNodeVisitor расположен в SyntaxTree/tree как базовый визитор, отвечающий за построение дерева
//FillParentNodeVisitor.New.ProcessNode(root); // почему-то перепрошивает не всё. А следующий вызов - всё
root.FillParentsInAllChilds();
- // new range - до всего! До выноса выражения с лямбдой из foreach
- NewRangeDesugarVisitor.New.ProcessNode(root);
+ // new range - до всего! До выноса выражения с лямбдой из foreach. 11.07 добавил поиск yields и присваивание pd.HasYield
+ NewRangeDesugarAndFindHasYieldVisitor.New.ProcessNode(root);
// Unnamed Records перенёс сюда
UnnamedRecordsCheckVisitor.New.ProcessNode(root);
diff --git a/SyntaxVisitors/SugarVisitors/NewRangeDesugarVisitor.cs b/SyntaxVisitors/SugarVisitors/NewRangeDesugarVisitor.cs
index 08d709caa..7915d2d75 100644
--- a/SyntaxVisitors/SugarVisitors/NewRangeDesugarVisitor.cs
+++ b/SyntaxVisitors/SugarVisitors/NewRangeDesugarVisitor.cs
@@ -10,11 +10,11 @@ using PascalABCCompiler.SyntaxTree;
namespace SyntaxVisitors.SugarVisitors
{
- public class NewRangeDesugarVisitor : BaseChangeVisitor
+ public class NewRangeDesugarAndFindHasYieldVisitor : BaseChangeVisitor
{
- public static NewRangeDesugarVisitor New
+ public static NewRangeDesugarAndFindHasYieldVisitor New
{
- get { return new NewRangeDesugarVisitor(); }
+ get { return new NewRangeDesugarAndFindHasYieldVisitor(); }
}
public override void visit(diapason_expr_new diap)
@@ -97,5 +97,28 @@ namespace SyntaxVisitors.SugarVisitors
}*/
else base.visit(fe);
}
+
+ List lpd = new List();
+
+ public override void visit (procedure_definition pd)
+ {
+ lpd.Add(pd);
+ base.visit(pd);
+ lpd.RemoveAt(lpd.Count - 1);
+ }
+ public override void visit(yield_node yn)
+ {
+ if (lpd.Count > 0)
+ lpd[lpd.Count - 1].has_yield = true;
+ base.visit(yn);
+ }
+
+ public override void visit(yield_sequence_node yn)
+ {
+ if (lpd.Count > 0)
+ lpd[lpd.Count - 1].has_yield = true;
+ base.visit(yn);
+ }
+
}
}
\ No newline at end of file
diff --git a/SyntaxVisitors/SugarVisitors/PatternsDesugaringVisitor.cs b/SyntaxVisitors/SugarVisitors/PatternsDesugaringVisitor.cs
index cbc1cb65a..3750ed268 100644
--- a/SyntaxVisitors/SugarVisitors/PatternsDesugaringVisitor.cs
+++ b/SyntaxVisitors/SugarVisitors/PatternsDesugaringVisitor.cs
@@ -224,43 +224,49 @@ namespace SyntaxVisitors.SugarVisitors
Debug.Assert(GetAscendant(isPatternExpr) != null, "Couldn't find statement list in upper nodes");
- var l = new List();
- //l.Add(stat);
- var pp = isPatternExpr.right?.parameters;
- if (pp != null)
+ syntax_tree_node stn = isPatternExpr;
+ while (stn != null && !(stn is procedure_definition) && !(stn is function_lambda_definition))
+ stn = stn.Parent;
+ if (stn is procedure_definition pd && pd.has_yield)
{
- foreach (var p in pp)
+ var l = new List();
+ var pp = isPatternExpr.right?.parameters;
+ if (pp != null)
{
- if (p is var_deconstructor_parameter vdp)
+ foreach (var p in pp)
{
- var idClone = vdp.identifier.TypedClone();
- var idNew = vdp.identifier.TypedClone();
- idNew.name = GenerateNewName(idNew.name);
- var vs = new var_statement(idClone, idNew, idClone.source_context);
- vdp.identifier.name = idNew.name;
- l.Add(vs);
+ if (p is var_deconstructor_parameter vdp)
+ {
+ var idClone = vdp.identifier.TypedClone();
+ var idNew = vdp.identifier.TypedClone();
+ idNew.name = GenerateNewName(idNew.name);
+ var vs = new var_statement(idClone, idNew, idClone.source_context);
+ vdp.identifier.name = idNew.name;
+ l.Add(vs);
+ }
}
}
+
+ var stat = GetAscendant(isPatternExpr);
+ if (stat is if_node ifn)
+ {
+ //l.Add(ifn.then_body);
+ if (!(ifn.then_body is statement_list))
+ {
+ ifn.then_body = new statement_list(ifn.then_body);
+ }
+ (ifn.then_body as statement_list).list.InsertRange(0, l);
+ }
+ else
+ {
+ l.Insert(0, stat);
+ foreach (var x in l)
+ x.Parent = stat.Parent;
+ var stl = stat.Parent as statement_list;
+ stl.ReplaceInList(stat, l);
+ }
}
- var stat = GetAscendant(isPatternExpr);
- if (stat is if_node ifn)
- {
- //l.Add(ifn.then_body);
- if (!(ifn.then_body is statement_list))
- {
- ifn.then_body = new statement_list(ifn.then_body);
- }
- (ifn.then_body as statement_list).list.InsertRange(0, l);
- }
- else
- {
- l.Insert(0, stat);
- foreach (var x in l)
- x.Parent = stat.Parent;
- var stl = stat.Parent as statement_list;
- stl.ReplaceInList(stat, l);
- }
//ReplaceStatement(stat, l); // тут нельзя.
diff --git a/TestSuite/isVar.pas b/TestSuite/isVar.pas
new file mode 100644
index 000000000..a79533683
--- /dev/null
+++ b/TestSuite/isVar.pas
@@ -0,0 +1,4 @@
+begin
+ var b := ('abc' is string(var s)) and (s = 'abc');
+ Assert(b);
+end.
\ No newline at end of file
diff --git a/TestSuite/isvar2.pas b/TestSuite/isvar2.pas
deleted file mode 100644
index 4808ebbc9..000000000
--- a/TestSuite/isvar2.pas
+++ /dev/null
@@ -1,18 +0,0 @@
-function f1(o: object): sequence of object;
-begin
-
- //var c := o is object(var a);
- if o is object(var a) then
- begin
- // var b := a;
- // Writeln(a); // object
- yield a;
- Assert(a <> nil); // nil
- // Writeln(b); // object
- // b := b;
- end;
-end;
-
-begin
- foreach var o in f1(new object) do
-end.
\ No newline at end of file
diff --git a/TestSuite/isvar3.pas b/TestSuite/isvar3.pas
deleted file mode 100644
index 4f10e0e48..000000000
--- a/TestSuite/isvar3.pas
+++ /dev/null
@@ -1,19 +0,0 @@
-function f1(o: object): sequence of object;
-begin
-
- //var c := o is object(var a);
- if o is object(var a) then
- //begin
- // var b := a;
- // Writeln(a); // object
- yield a;
- //Assert(a <> nil); // nil
- // Writeln(b); // object
- // b := b;
- //end;
-end;
-
-begin
- foreach var o in f1(new object) do
- Assert(o<>nil)
-end.
\ No newline at end of file
diff --git a/TestSuite/isvar4.pas b/TestSuite/isvar4.pas
deleted file mode 100644
index 3d54646af..000000000
--- a/TestSuite/isvar4.pas
+++ /dev/null
@@ -1,19 +0,0 @@
-function f1(o: object): sequence of object;
-begin
-
- var c := o is object(var a);
- //if o is object(var a) then
- //begin
- // var b := a;
- // Writeln(a); // object
- yield a;
- Assert(a <> nil); // nil
- // Writeln(b); // object
- // b := b;
- //end;
-end;
-
-begin
- foreach var o in f1(new object) do
-
-end.
\ No newline at end of file
diff --git a/bin/PascalABCNET.chm b/bin/PascalABCNET.chm
index 6a00647bf..86bfda65d 100644
Binary files a/bin/PascalABCNET.chm and b/bin/PascalABCNET.chm differ