diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 133cf655d..a13a95e62 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 = "10"; public const string Build = "3"; - public const string Revision = "3621"; + public const string Revision = "3626"; 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 72891241e..ea92fb5d6 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=10 -%REVISION%=3621 %COREVERSION%=3 +%REVISION%=3626 +%MINOR%=10 %MAJOR%=3 diff --git a/InstallerSamples/WhatsNew/3_10_4/IsOrdered1.pas b/InstallerSamples/WhatsNew/3_10_4/IsOrdered1.pas new file mode 100644 index 000000000..876578098 --- /dev/null +++ b/InstallerSamples/WhatsNew/3_10_4/IsOrdered1.pas @@ -0,0 +1,23 @@ +type + Player = auto class + Name: string; Points: integer; + end; + +function GetPlayers := [ + new Player('Alice', 120), + new Player('Bob', 95), + new Player('Charlie', 130), + new Player('Diana', 110) +]; + +begin + var leaderboard := GetPlayers; + Println(leaderboard); + if not leaderboard.IsOrderedByDescending(p -> p.Points) then + Println('Рейтинг составлен неверно!'); + + leaderboard := leaderboard.OrderByDescending(p -> p.Points).ToArray; + Println(leaderboard); + if leaderboard.IsOrderedByDescending(p -> p.Points) then + Println('Теперь рейтинг составлен неверно!'); +end. \ No newline at end of file diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index f5ad9188a..fe50ca55c 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.10.3.3621 +3.10.3.3626 diff --git a/ReleaseGenerators/PT4/Lib/PT4AExam.dll b/ReleaseGenerators/PT4/Lib/PT4AExam.dll index 3dc15e100..f860107ab 100644 Binary files a/ReleaseGenerators/PT4/Lib/PT4AExam.dll and b/ReleaseGenerators/PT4/Lib/PT4AExam.dll differ diff --git a/ReleaseGenerators/PT4/Lib/xPT4AExam.dll b/ReleaseGenerators/PT4/Lib/xPT4AExam.dll index 636e26963..55c82ca00 100644 Binary files a/ReleaseGenerators/PT4/Lib/xPT4AExam.dll and b/ReleaseGenerators/PT4/Lib/xPT4AExam.dll differ diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 5c72239f7..535beba0d 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.10.3.3621' +!define VERSION '3.10.3.3626' diff --git a/TestSuite/CompilationSamples/GraphWPF.pas b/TestSuite/CompilationSamples/GraphWPF.pas index e423dca79..3c51296c1 100644 --- a/TestSuite/CompilationSamples/GraphWPF.pas +++ b/TestSuite/CompilationSamples/GraphWPF.pas @@ -1786,6 +1786,8 @@ type if real.IsNaN(YTicks) then YTicks := Ticks(max-min); var th := TextHeightP('0'); + if title<>'' then + th := TextHeightP(title); var tw := GetRY0.Step(YTicks).TakeWhile(ry -> ry <= max).Select(y -> TextWidthP(y.Round(YTicksPrecision).ToString)).Max; var dd := TextWidthP(b.Round(xTicksPrecision).ToString)/2; @@ -2556,4 +2558,4 @@ initialization __InitModule; finalization -end. \ No newline at end of file +end. diff --git a/bin/PT4/Lib/PT4AExam.dll b/bin/PT4/Lib/PT4AExam.dll index 3dc15e100..f860107ab 100644 Binary files a/bin/PT4/Lib/PT4AExam.dll and b/bin/PT4/Lib/PT4AExam.dll differ diff --git a/bin/PT4/Lib/xPT4AExam.dll b/bin/PT4/Lib/xPT4AExam.dll index 636e26963..55c82ca00 100644 Binary files a/bin/PT4/Lib/xPT4AExam.dll and b/bin/PT4/Lib/xPT4AExam.dll differ