paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-02 17:50:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix bug #34085, small refactoring: introduce IsSpaceChar

Browse Source 
git-svn-id: trunk@39557 -
This commit is contained in:
michael 2018-08-03 18:08:18 +00:00
parent a921002c49
commit ddbad9d5c7
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/regexpr/src/regexpr.pas
View File

@ -52,6 +52,7 @@ interface
{$IFDEF FPC}
{$MODE DELPHI} // Delphi-compatible mode in FreePascal
{$INLINE ON}
{$ENDIF}
// ======== Determine compiler
@ -209,6 +210,8 @@ type
TRegExprReplaceFunction = function (ARegExpr : TRegExpr): RegExprString of object;
{ TRegExpr }
TRegExpr = class
private
startp : array [0 .. NSUBEXP - 1] of PRegExprChar; // founded expr starting points
@ -289,6 +292,7 @@ type
{$IFNDEF UniCode}
fLineSeparatorsSet : set of REChar;
{$ENDIF}
Function IsSpaceChar(AChar : PRegExprChar) : Boolean; inline;
// Mark programm as having to be [re]compiled
procedure InvalidateProgramm;
@ -1474,6 +1478,11 @@ procedure TRegExpr.SetModifier (AIndex : integer; ASet : boolean);
{==================== Compiler section =======================}
{=============================================================}
function TRegExpr.IsSpaceChar(AChar: PRegExprChar): Boolean;
begin
Result:=Pos(AChar^,fSpaceChars)>0;
end;
procedure TRegExpr.InvalidateProgramm;
begin
if programm <> nil then begin
@ -2798,13 +2807,13 @@ function TRegExpr.regrepeat (p : PRegExprChar; AMax : PtrInt) : PtrInt;
end;
ANYSPACE:
while (Result < TheMax) and
(Pos (scan^, fSpaceChars) > 0) do begin
IsSpaceChar(scan) do begin
inc (Result);
inc (scan);
end;
NOTSPACE:
while (Result < TheMax) and
(Pos (scan^, fSpaceChars) <= 0) do begin
Not IsSpaceChar(scan) do begin
inc (Result);
inc (scan);
end;
@ -3004,12 +3013,12 @@ function TRegExpr.MatchPrim (prog : PRegExprChar) : boolean;
inc (reginput);
end;
ANYSPACE: begin
if (reginput^ = #0) or not (Pos (reginput^, fSpaceChars) > 0) //###0.943
if (reginput^ = #0) or not IsSpaceChar(reginput) //###0.943
then EXIT;
inc (reginput);
end;
NOTSPACE: begin
if (reginput^ = #0) or (Pos (reginput^, fSpaceChars) > 0) //###0.943
if (reginput^ = #0) or IsSpaceChar(reginput) //###0.943
then EXIT;
inc (reginput);
end;
@ -3652,6 +3661,7 @@ function TRegExpr.ExecPrim (AOffset: PtrInt) : boolean;
end; { of function TRegExpr.ExecPrim
--------------------------------------------------------------}
function TRegExpr.ExecNext : boolean;
var offset : PtrInt;
begin