diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index dcbed8e97..628d330f4 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 = "11"; public const string Build = "0"; - public const string Revision = "3677"; + public const string Revision = "3679"; 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 b6f201d5a..3f919782f 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %MINOR%=11 -%REVISION%=3677 +%REVISION%=3679 %COREVERSION%=0 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 34a3ac014..b6bf67639 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.11.0.3677 +3.11.0.3679 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index e756d98d6..88bdb47ce 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.11.0.3677' +!define VERSION '3.11.0.3679' diff --git a/TestSuite/CompilationSamples/SF.pas b/TestSuite/CompilationSamples/SF.pas index 37108015a..abd8a7cfe 100644 --- a/TestSuite/CompilationSamples/SF.pas +++ b/TestSuite/CompilationSamples/SF.pas @@ -80,6 +80,7 @@ function RAI(n: integer) := ReadArrInteger(n); function RAR(n: integer) := ReadArrReal(n); function Pr(Self: integer): integer; extensionmethod := Self.Print; +function Pr(Self: int64): int64; extensionmethod := Self.Print; function Pr(Self: real): real; extensionmethod := Self.Print; function Pr(Self: Biginteger): Biginteger; extensionmethod := Self.Print; function Pr(Self: char): char; extensionmethod := Self.Print; @@ -89,6 +90,7 @@ function Pr(Self: string): string; extensionmethod := Self.Print; function Pr(Self: array [,] of T; w: integer := 4): array [,] of T; extensionmethod := Self.Print(w); function Prln(Self: integer): integer; extensionmethod := Self.Println; +function Prln(Self: int64): int64; extensionmethod := Self.Println; function Prln(Self: real): real; extensionmethod := Self.Println; function Prln(Self: Biginteger): Biginteger; extensionmethod := Self.Println; function Prln(Self: char): char; extensionmethod := Self.Println; @@ -455,4 +457,4 @@ begin end; -end. \ No newline at end of file +end. diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas index 4bcbeb4c7..4f4a6aa0f 100644 --- a/bin/Lib/PABCSystem.pas +++ b/bin/Lib/PABCSystem.pas @@ -12996,6 +12996,10 @@ begin yield Self[i, j] end; +/// Возвращает по заданному двумерному массиву последовательность его элементов по строкам +function Elements(Self: array [,] of T): sequence of T; extensionmethod := Self.ElementsByRow; + + /// Возвращает по заданному двумерному массиву последовательность его элементов по столбцам function ElementsByCol(Self: array [,] of T): sequence of T; extensionmethod; begin diff --git a/bin/PascalABCNET.chm b/bin/PascalABCNET.chm index 446dfad5e..1dcdadb2a 100644 Binary files a/bin/PascalABCNET.chm and b/bin/PascalABCNET.chm differ