diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 5f724a916..6fb5a403c 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 = "1865"; + public const string Revision = "1869"; 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 2e49c1efb..dd2af2ce3 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %COREVERSION%=2 -%REVISION%=1865 +%REVISION%=1869 %MINOR%=4 %MAJOR%=3 diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for sequence of T.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for sequence of T.html index c23d05fb7..c16ce9066 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for sequence of T.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for sequence of T.html @@ -98,9 +98,9 @@ function Pairwise<T, Res>(Self: sequence of T; func: (T,T)->Res): sequence of Res;
         , func function Partition<T>(Self: sequence of T; cond: T->boolean): (sequence of T, sequence of T); -
         +
         . function Partition<T>(Self: sequence of T; cond: (T,integer)->boolean): (sequence of T, sequence of T); -
         , +
         , . function Print<T>(Self: sequence of T; delim: string): sequence of T;
         , delim function Print<T>(Self: sequence of T): sequence of T; @@ -124,7 +124,7 @@ function SortedDescending<T>(Self: sequence of T): sequence of T;
         function SplitAt<T>(Self: sequence of T; ind: integer): (sequence of T, sequence of T); -
         ind +
         ind. function Tabulate<T, T1>(Self: sequence of T; F: T->T1): sequence of (T, T1);
         function TakeLast<T>(Self: sequence of T; count: integer): sequence of T; @@ -136,11 +136,11 @@ function ToSortedSet<T>(Self: sequence of T): SortedSet<T>;
         SortedSet function UnZipTuple<T, T1>(Self: sequence of (T, T1)): (sequence of T, sequence of T1); -
         +
         . function UnZipTuple<T, T1, T2>(Self: sequence of (T, T1, T2)): (sequence of T, sequence of T1, sequence of T2); -
         +
         . function UnZipTuple<T, T1, T2, T3>(Self: sequence of (T, T1, T2, T3)): (sequence of T, sequence of T1, sequence of T2, sequence of T3); -
         +
         . function WriteLines(Self: sequence of string; fname: string): sequence of string;
         function ZipTuple<T, T1>(Self: sequence of T; a: sequence of T1): sequence of (T, T1); diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for array of T.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for array of T.html index bd898a615..b9c7d58c0 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for array of T.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for array of T.html @@ -27,9 +27,9 @@
         procedure Reverse<T>(a: List<T>; index, count: integer);
         count, index -procedure SetLength(var a: array of T); +procedure SetLength(var a: array of T; n: integer);
         . -procedure SetLength(var a: array of T; n1,n2,...: integer); +procedure SetLength(var a: array [,...,] of T; n1,n2,...: integer);
         n- . procedure Shuffle<T>(a: array of T);
         diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for sequence generation.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for sequence generation.html index eb1e465e7..c5c3ded9e 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for sequence generation.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for sequence generation.html @@ -1,5 +1,5 @@ - + @@ -16,14 +16,12 @@

-
function Partition(a, b: real; n: integer): sequence of real; + -
function PartitionPoints(a, b: real; n: integer): sequence of real;
         [a,b] n
function Range(a, b: integer): sequence of integer;
         a b
function Range(c1, c2: char): sequence of char;
         c1 c2
function Range(a, b: real; n: integer): sequence of real; -
         [a,b] n ( Partition)
function Range(a, b, step: integer): sequence of integer;
         a b step
function ReadSeqInteger(n: integer): sequence of integer; diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index ea653e93f..0a7575115 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.4.2.1865' +!define VERSION '3.4.2.1869' diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas index d870d987b..67364b2c5 100644 --- a/bin/Lib/PABCSystem.pas +++ b/bin/Lib/PABCSystem.pas @@ -1675,12 +1675,12 @@ function Length(a: System.Array): integer; ///- function Length(a: array of T; dim: integer): integer; /// Возвращает длину динамического массива по размерности dim function Length(a: System.Array; dim: integer): integer; -///- procedure SetLength(var a: array of T); +///- procedure SetLength(var a: array of T; n: integer); /// Устанавливает длину одномерного динамического массива. Старое содержимое сохраняется -//procedure SetLength(var a: System.Array); -///- procedure SetLength(var a: array of T; n1,n2,...: integer); +//procedure SetLength(var a: array of T; n: integer); +///- procedure SetLength(var a: array [,...,] of T; n1,n2,...: integer); /// Устанавливает размеры n-мерного динамического массива. Старое содержимое сохраняется -//procedure SetLength(var a: System.Array); +//procedure SetLength(var a: array[,...,] of T; n: integer); ///- function Copy(a: array of T): array of T; /// Создаёт копию динамического массива function Copy(a: System.Array): System.Array; @@ -1716,10 +1716,8 @@ procedure Shuffle(l: List); function Range(a, b: integer): sequence of integer; /// Возвращает последовательность символов от c1 до c2 function Range(c1, c2: char): sequence of char; -/// Возвращает последовательность вещественных в точках разбиения отрезка [a,b] на n равных частей (Используйте Partition) -function Range(a, b: real; n: integer): sequence of real; /// Возвращает последовательность вещественных в точках разбиения отрезка [a,b] на n равных частей -function Partition(a, b: real; n: integer): sequence of real; +function PartitionPoints(a, b: real; n: integer): sequence of real; /// Возвращает последовательность целых от a до b с шагом step function Range(a, b, step: integer): sequence of integer; /// Возвращает последовательность указанных элементов @@ -3934,7 +3932,7 @@ begin end; end; -function Partition(a, b: real; n: integer): sequence of real; +function PartitionPoints(a, b: real; n: integer): sequence of real; begin Result := Range(a, b, n) end; diff --git a/bin/PascalABCNET.chm b/bin/PascalABCNET.chm index 2b16c8575..4bfb3cd32 100644 Binary files a/bin/PascalABCNET.chm and b/bin/PascalABCNET.chm differ