diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index b89a8f235..6607a7c49 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 = "4"; public const string Build = "2"; - public const string Revision = "1898"; + public const string Revision = "1899"; 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 ae6c1e25f..3cc3295c6 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=4 -%REVISION%=1898 %COREVERSION%=2 +%REVISION%=1899 +%MINOR%=4 %MAJOR%=3 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 3c78fd8ab..2d309307d 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.4.2.1898' +!define VERSION '3.4.2.1899' diff --git a/SyntaxVisitors/YieldVisitors/ReplaceBreakContinueWithGotoLabelVisitor.cs b/SyntaxVisitors/YieldVisitors/ReplaceBreakContinueWithGotoLabelVisitor.cs index 7deab9c97..f7fdd84b1 100644 --- a/SyntaxVisitors/YieldVisitors/ReplaceBreakContinueWithGotoLabelVisitor.cs +++ b/SyntaxVisitors/YieldVisitors/ReplaceBreakContinueWithGotoLabelVisitor.cs @@ -41,11 +41,11 @@ namespace SyntaxVisitors var pcName = pcIdent.name.ToLower(); if (pcName == "break") { - Replace(pc, this.GotoBreak); + ReplaceUsingParent(pc, this.GotoBreak); } else if (pcName == "continue") { - Replace(pc, this.GotoContinue); + ReplaceUsingParent(pc, this.GotoContinue); } } } diff --git a/TestSuite/yield_break2.pas b/TestSuite/yield_break2.pas new file mode 100644 index 000000000..afe6b0424 --- /dev/null +++ b/TestSuite/yield_break2.pas @@ -0,0 +1,12 @@ +function f1: sequence of byte; +begin + while true do + begin + yield 1; + break; + end; +end; + +begin + Assert(f1.First=1); +end. \ No newline at end of file