Changeset 186 for trunk

Timestamp:

Jul 11, 2018, 3:34:11 PM (6 years ago)

Author:

chronos

Message:

• Modified: Faster substring searching with PosFromIndex function without unnecessary string copying.

Location:

trunk

Files:

• Forms/UFormCheck.pas (modified) (3 diffs)
• Packages/Common/UCommon.pas (modified) (2 diffs)

trunk/Forms/UFormCheck.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, ComCtrls, UAcronym, URegistry, Registry;
+  ExtCtrls, ComCtrls, UAcronym, URegistry, Registry, UCommon;
 
 type
@@ -49 +49 @@
     function SearchLine(Lines: TStrings; Text: string; Start: Integer = 0): Integer;
     function SearchLineReverse(Lines: TStrings; Text: string; Start: Integer = -1): Integer;
-    function PosFromIndex(SubStr: string; Text: string; StartIndex: Integer): Integer;
-    function PosFromIndexReverse(SubStr: string; Text: string; StartIndex: Integer): Integer;
     procedure FindInSummary;
     procedure FindInContent;
@@ -173 +171 @@
     else Result := Start;
   while (Result >= 0) and (Pos(Text, Lines[Result]) = 0) do Dec(Result);
-end;
-
-function TFormCheck.PosFromIndex(SubStr: string; Text: string;
-  StartIndex: Integer): Integer;
-begin
-  Delete(Text, 1, StartIndex);
-  Result := Pos(SubStr, Text);
-  if Result <> 0 then Result := Result + StartIndex;
-end;
-
-function TFormCheck.PosFromIndexReverse(SubStr: string; Text: string;
-  StartIndex: Integer): Integer;
-begin
-  Delete(Text, StartIndex + 1, Length(Text));
-  Result := LastDelimiter(SubStr, Text);
 end;
 

trunk/Packages/Common/UCommon.pas

@@ -75 +75 @@
   FilterMethod: TFilterMethodMethod);
 function GetStringPart(var Text: string; Separator: string): string;
+function PosFromIndex(SubStr: string; Text: string;
+  StartIndex: Integer): Integer;
+function PosFromIndexReverse(SubStr: string; Text: string;
+  StartIndex: Integer): Integer;
 
 
@@ -559 +563 @@
 end;
 
-
+function PosFromIndex(SubStr: string; Text: string;
+  StartIndex: Integer): Integer;
+var
+  I, MaxLen: SizeInt;
+  Ptr: PAnsiChar;
+begin
+  Result := 0;
+  if (StartIndex < 1) or (StartIndex > Length(Text) - Length(SubStr)) then Exit;
+  if Length(SubStr) > 0 then begin
+    MaxLen := Length(Text) - Length(SubStr) + 1;
+    I := StartIndex;
+    Ptr := @Text[StartIndex];
+    while (I <= MaxLen) do begin
+      if (SubStr[1] = Ptr^) and (CompareByte(Substr[1], Ptr^, Length(SubStr)) = 0) then begin
+        Result := I;
+        Exit;
+      end;
+      Inc(I);
+      Inc(Ptr);
+    end;
+  end;
+end;
+
+function PosFromIndexReverse(SubStr: string; Text: string;
+  StartIndex: Integer): Integer;
+var
+  I: SizeInt;
+  Ptr: PAnsiChar;
+begin
+  Result := 0;
+  if (StartIndex < 1) or (StartIndex > Length(Text)) then Exit;
+  if Length(SubStr) > 0 then begin
+    I := StartIndex;
+    Ptr := @Text[StartIndex];
+    while (I > 0) do begin
+      if (SubStr[1] = Ptr^) and (CompareByte(Substr[1], Ptr^, Length(SubStr)) = 0) then begin
+        Result := I;
+        Exit;
+      end;
+      Dec(I);
+      Dec(Ptr);
+    end;
+  end;
+end;
 
 initialization