diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index ba00cfeda..61efd2add 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "5"; public const string Build = "0"; - public const string Revision = "2094"; + public const string Revision = "2095"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index d472b5f0b..af3f25eb6 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=0 -%REVISION%=2094 %MINOR%=5 +%REVISION%=2095 +%COREVERSION%=0 %MAJOR%=3 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 3609bb751..c6eb6f802 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.5.0.2094' +!define VERSION '3.5.0.2095' diff --git a/SyntaxTreeConverters/StandOutExprWithLambdaInForeachSequenceVisitor.cs b/SyntaxTreeConverters/StandOutExprWithLambdaInForeachSequenceVisitor.cs index ab75aae4a..558cc17a3 100644 --- a/SyntaxTreeConverters/StandOutExprWithLambdaInForeachSequenceVisitor.cs +++ b/SyntaxTreeConverters/StandOutExprWithLambdaInForeachSequenceVisitor.cs @@ -26,7 +26,7 @@ namespace PascalABCCompiler.SyntaxTreeConverters public override void visit(foreach_stmt fe) { - if (fe.DescendantNodes().OfType().Count() > 0) + //if (fe.DescendantNodes().OfType().Count() > 0) // из-за #1984 убрал вообще условие. Пусть будет всегда { var id = GenIdentName(); id.Parent = fe; diff --git a/TestSuite/lambda_capture_foreach_seq2.pas b/TestSuite/lambda_capture_foreach_seq2.pas new file mode 100644 index 000000000..9a8a27f84 --- /dev/null +++ b/TestSuite/lambda_capture_foreach_seq2.pas @@ -0,0 +1,17 @@ +type + t1 = class + s := Seq&(2,2,2); + procedure p1; + begin + var p: procedure := ()-> + begin + foreach var tsk in s do + Assert(tsk=2) + end; + p; + end; + end; + +begin + t1.Create.p1 +end. \ No newline at end of file