diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 0da71beda..5ddcd4ab4 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -13,9 +13,9 @@ using System.Runtime.CompilerServices; internal static class RevisionClass { public const string Major = "3"; - public const string Minor = "9"; + public const string Minor = "10"; public const string Build = "0"; - public const string Revision = "3531"; + public const string Revision = "3533"; 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 eb735a70e..6e87b4a5e 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=9 -%REVISION%=3531 +%MINOR%=10 +%REVISION%=3533 %COREVERSION%=0 %MAJOR%=3 diff --git a/InstallerSamples/WhatsNew/3_10_0/DrawPoints.pas b/InstallerSamples/WhatsNew/3_10_0/DrawPoints.pas new file mode 100644 index 000000000..f1d334c2b --- /dev/null +++ b/InstallerSamples/WhatsNew/3_10_0/DrawPoints.pas @@ -0,0 +1,11 @@ +uses Turtle; + +begin + Window.Title := 'DrawPoints'; + var n := 1000; + var d := 10; + var a := ArrRandomReal(n,-d,d); + DrawPoints(a[::2],a[1::2]); + a := ArrRandomReal(n,-d,d); + DrawPoints(a[::2],a[1::2]); +end. \ No newline at end of file diff --git a/InstallerSamples/WhatsNew/3_10_0/TurtleNew.pas b/InstallerSamples/WhatsNew/3_10_0/TurtleNew.pas new file mode 100644 index 000000000..037112ff6 --- /dev/null +++ b/InstallerSamples/WhatsNew/3_10_0/TurtleNew.pas @@ -0,0 +1,28 @@ +uses Turtle; + +procedure Hilbert(level: integer; angle,step: real); +begin + if level = 0 then + exit; + TurnRight(angle); + Hilbert(level-1, -angle, step); + + Forw(step); + TurnLeft(angle); + Hilbert(level-1, angle, step); + + Forw(step); + Hilbert(level-1, angle, step); + + TurnLeft(angle); + Forw(step); + Hilbert(level-1, -angle, step); + TurnRight(angle); +end; + +begin + SetWidth(2); + ToPoint(-9,-9); + Down; + Hilbert(6,90,0.3); +end. \ No newline at end of file diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 97f2850bb..57fccf7fb 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.9.0.3531 +3.10.0.3533 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index f1a6fac90..1c8964f90 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.9.0.3531' +!define VERSION '3.10.0.3533' diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas index f199647cb..402cf81f5 100644 --- a/TestSuite/CompilationSamples/PABCSystem.pas +++ b/TestSuite/CompilationSamples/PABCSystem.pas @@ -11352,9 +11352,9 @@ begin end; /// Разбивает последовательность на серии длины size -function Batch(Self: sequence of T; size: integer): sequence of sequence of T; extensionmethod; +function Batch(Self: sequence of T; size: integer): sequence of array of T; extensionmethod; begin - var buf := new List; + var buf := new List(size); foreach var elm in Self do begin buf.Add(elm); if buf.Count=size then begin @@ -11368,10 +11368,10 @@ begin end; /// Разбивает последовательность на серии длины size и применяет проекцию к каждой серии -function Batch(Self: sequence of T; size: integer; proj: Func, Res>): sequence of Res; extensionmethod; +function Batch(Self: sequence of T; size: integer; proj: Func): sequence of Res; extensionmethod; begin //Result := SeqWhile(Self, v -> v.Skip(size), v -> v.Count > 0).Select(v -> v.Take(size)).Select(ss -> proj(ss)); - Result := Self.Batch(size).Select(ss -> proj(ss)); + Result := Self.Batch(size).Select(proj); end; ///--