From 1a278a164b5e3775605160f3a324f6d60ed37f64 Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Sat, 5 Dec 2020 21:00:32 +0300 Subject: [PATCH] =?UTF-8?q?ToWords=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C?= =?UTF-8?q?=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20=D1=81?= =?UTF-8?q?=D0=BE=20=D0=B2=D1=81=D0=B5=D0=BC=D0=B8=20=D1=80=D0=B0=D0=B7?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B8=D1=82=D0=B5=D0=BB=D1=8F=D0=BC=D0=B8=20?= =?UTF-8?q?=D1=81=D0=BB=D0=BE=D0=B2=20=D0=BF=D0=BE=20=D1=83=D0=BC=D0=BE?= =?UTF-8?q?=D0=BB=D1=87=D0=B0=D0=BD=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit В RTL убраны SF, School, BlockFileT --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 2 +- Release/pabcversion.txt | 2 +- ReleaseGenerators/PABCRtl/PABCRtl.pas | 2 +- ReleaseGenerators/PABCRtl/PABCRtl32.pas | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- TestSuite/CompilationSamples/PABCSystem.pas | 8 ++++++++ bin/Lib/PABCSystem.pas | 8 ++++++++ 8 files changed, 22 insertions(+), 6 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 419586a14..0aa102a17 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 = "7"; public const string Build = "1"; - public const string Revision = "2758"; + public const string Revision = "2760"; 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 3685fd305..9abd75a08 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %COREVERSION%=1 -%REVISION%=2758 +%REVISION%=2760 %MINOR%=7 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 9381be71d..99e98bb82 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.7.1.2758 +3.7.1.2760 diff --git a/ReleaseGenerators/PABCRtl/PABCRtl.pas b/ReleaseGenerators/PABCRtl/PABCRtl.pas index 449c65873..fda7ed00f 100644 --- a/ReleaseGenerators/PABCRtl/PABCRtl.pas +++ b/ReleaseGenerators/PABCRtl/PABCRtl.pas @@ -5,7 +5,7 @@ uses ABCSprites, CRT, DMCollect, DMTaskMaker, DMZadan, Drawman, DrawManField, Events, FilesOperations, GraphABC, GraphABCHelper, IniFile, PointerTools, PointRect, Robot, RobotField, - RobotTaskMaker, RobotZadan, Sockets, Utils, VCL, Timers, PT4TaskMakerNET, RBDMUtils, SF, School, BlockFileOfT, + RobotTaskMaker, RobotZadan, Sockets, Utils, VCL, Timers, PT4TaskMakerNET, RBDMUtils, FormsABC, Collections, Arrays, ClientServer, WPFObjects, Controls, Graph3D, GraphWPF, __RedirectIOMode, __RunMode, __RtlUtils; end. \ No newline at end of file diff --git a/ReleaseGenerators/PABCRtl/PABCRtl32.pas b/ReleaseGenerators/PABCRtl/PABCRtl32.pas index d66f9f06e..0947bd71c 100644 --- a/ReleaseGenerators/PABCRtl/PABCRtl32.pas +++ b/ReleaseGenerators/PABCRtl/PABCRtl32.pas @@ -5,7 +5,7 @@ uses ABCSprites, CRT, DMCollect, DMTaskMaker, DMZadan, Drawman, DrawManField, Events, FilesOperations, GraphABC, GraphABCHelper, IniFile, PointerTools, PointRect, Robot, RobotField, - RobotTaskMaker, RobotZadan, Sockets, Utils, VCL, Timers, PT4, PT4TaskMakerNET, RBDMUtils, SF, School, BlockFileOfT, + RobotTaskMaker, RobotZadan, Sockets, Utils, VCL, Timers, PT4, PT4TaskMakerNET, RBDMUtils, FormsABC, Collections, Arrays, ClientServer, Graph3D, GraphWPF, WPFObjects, Controls, __RedirectIOMode, __RunMode, __RtlUtils; end. \ No newline at end of file diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 819ba03e3..bd7cfdec3 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.7.1.2758' +!define VERSION '3.7.1.2760' diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas index dc34d1587..265dfc9de 100644 --- a/TestSuite/CompilationSamples/PABCSystem.pas +++ b/TestSuite/CompilationSamples/PABCSystem.pas @@ -12296,6 +12296,14 @@ begin Result := Self.Split(delim, System.StringSplitOptions.RemoveEmptyEntries); end; +const AllWordDelimiters = ' <>=^`|~$№§!"#%&''()*,+-./:;?@[\]_{}«­·»'#9#10#13; + +/// Преобразует строку в массив слов, используя в качестве разделителей символы из строки delim +function ToWords(Self: string; delim: string := AllWordDelimiters): array of string; extensionmethod; +begin + Result := Self.Split(delim.ToCharArray, System.StringSplitOptions.RemoveEmptyEntries); +end; + procedure PassSpaces(var s: string; var from: integer); begin while (from <= s.Length) and (s[from]=' ') do diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas index dc34d1587..265dfc9de 100644 --- a/bin/Lib/PABCSystem.pas +++ b/bin/Lib/PABCSystem.pas @@ -12296,6 +12296,14 @@ begin Result := Self.Split(delim, System.StringSplitOptions.RemoveEmptyEntries); end; +const AllWordDelimiters = ' <>=^`|~$№§!"#%&''()*,+-./:;?@[\]_{}«­·»'#9#10#13; + +/// Преобразует строку в массив слов, используя в качестве разделителей символы из строки delim +function ToWords(Self: string; delim: string := AllWordDelimiters): array of string; extensionmethod; +begin + Result := Self.Split(delim.ToCharArray, System.StringSplitOptions.RemoveEmptyEntries); +end; + procedure PassSpaces(var s: string; var from: integer); begin while (from <= s.Length) and (s[from]=' ') do