ToWords теперь работает со всеми разделителями слов по умолчанию
В RTL убраны SF, School, BlockFileT
This commit is contained in:
parent
390b4b8a95
commit
1a278a164b
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%COREVERSION%=1
|
||||
%REVISION%=2758
|
||||
%REVISION%=2760
|
||||
%MINOR%=7
|
||||
%MAJOR%=3
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3.7.1.2758
|
||||
3.7.1.2760
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
@ -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.
|
||||
|
|
@ -1 +1 @@
|
|||
!define VERSION '3.7.1.2758'
|
||||
!define VERSION '3.7.1.2760'
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue