paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-18 05:20:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

New version of TRegExpr

Browse Source
This commit is contained in:
Martin 2023-09-12 22:22:48 +02:00
parent 9fc524128f
commit d839cb8d75
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
components/lazedit/xregexpr.pas
View File

@ -309,6 +309,7 @@ type
FAllowBraceWithoutMin: boolean; FAllowBraceWithoutMin: boolean;
FAllowUnsafeLookBehind: boolean; FAllowUnsafeLookBehind: boolean;
FAllowLiteralBraceWithoutRange: boolean; FAllowLiteralBraceWithoutRange: boolean;
FMatchesCleared: Boolean;
GrpBounds: TRegExprBoundsArray; GrpBounds: TRegExprBoundsArray;
GrpIndexes: array [0 .. RegexMaxGroups - 1] of integer; // map global group index to _capturing_ group index GrpIndexes: array [0 .. RegexMaxGroups - 1] of integer; // map global group index to _capturing_ group index
GrpNames: array [0 .. RegexMaxGroups - 1] of RegExprString; // names of groups, if non-empty GrpNames: array [0 .. RegexMaxGroups - 1] of RegExprString; // names of groups, if non-empty
@ -892,7 +893,7 @@ uses
const const
// TRegExpr.VersionMajor/Minor return values of these constants: // TRegExpr.VersionMajor/Minor return values of these constants:
REVersionMajor = 1; REVersionMajor = 1;
REVersionMinor = 163; REVersionMinor = 164;
OpKind_End = REChar(1); OpKind_End = REChar(1);
OpKind_MetaClass = REChar(2); OpKind_MetaClass = REChar(2);
@ -5869,6 +5870,8 @@ begin
if regRecursion < RegexMaxRecursion then if regRecursion < RegexMaxRecursion then
begin begin
Inc(regRecursion); Inc(regRecursion);
FillChar(GrpBounds[regRecursion].GrpStart, SizeOf(GrpBounds[0].GrpStart[regRecursion])*regNumBrackets, 0);
FillChar(GrpBounds[regRecursion].GrpEnd, SizeOf(GrpBounds[0].GrpEnd[regRecursion]) *regNumBrackets, 0);
bound1 := MatchPrim(regCodeWork); bound1 := MatchPrim(regCodeWork);
Dec(regRecursion); Dec(regRecursion);
end end
@ -5890,6 +5893,8 @@ begin
saveSubCalled := GrpSubCalled[no]; saveSubCalled := GrpSubCalled[no];
GrpSubCalled[no] := True; GrpSubCalled[no] := True;
Inc(regRecursion); Inc(regRecursion);
FillChar(GrpBounds[regRecursion].GrpStart, SizeOf(GrpBounds[0].GrpStart[regRecursion])*regNumBrackets, 0);
FillChar(GrpBounds[regRecursion].GrpEnd, SizeOf(GrpBounds[0].GrpEnd[regRecursion]) *regNumBrackets, 0);
bound1 := MatchPrim(save); bound1 := MatchPrim(save);
Dec(regRecursion); Dec(regRecursion);
GrpSubCalled[no] := saveSubCalled; GrpSubCalled[no] := saveSubCalled;
@ -5976,14 +5981,18 @@ end;
procedure TRegExpr.ClearMatches; procedure TRegExpr.ClearMatches;
begin begin
FillChar(GrpBounds, SizeOf(GrpBounds), 0); if FMatchesCleared then
FillChar(GrpSubCalled, SizeOf(GrpSubCalled), 0); exit;
FMatchesCleared := True;
FillChar(GrpBounds[0].GrpStart, SizeOf(GrpBounds[0].GrpStart[0])*regNumBrackets, 0);
FillChar(GrpBounds[0].GrpEnd, SizeOf(GrpBounds[0].GrpEnd[0]) *regNumBrackets, 0);
FillChar(GrpSubCalled[0], SizeOf(GrpSubCalled[0])*regNumBrackets, 0);
end; end;
procedure TRegExpr.ClearInternalExecData; procedure TRegExpr.ClearInternalExecData;
begin begin
fLastError := reeOk; fLastError := reeOk;
FillChar(GrpBacktrackingAsAtom, SizeOf(GrpBacktrackingAsAtom), 0); FillChar(GrpBacktrackingAsAtom[0], SizeOf(GrpBacktrackingAsAtom[0])*regNumBrackets, 0);
IsBacktrackingGroupAsAtom := False; IsBacktrackingGroupAsAtom := False;
{$IFDEF ComplexBraces} {$IFDEF ComplexBraces}
// no loops started // no loops started
@ -5996,9 +6005,8 @@ procedure TRegExpr.ClearInternalIndexes;
var var
i: integer; i: integer;
begin begin
FillChar(GrpBounds, SizeOf(GrpBounds), 0); FillChar(GrpBounds[0], SizeOf(GrpBounds[0]), 0);
FillChar(GrpAtomic, SizeOf(GrpAtomic), 0); FillChar(GrpAtomic, SizeOf(GrpAtomic), 0);
FillChar(GrpSubCalled, SizeOf(GrpSubCalled), 0);
FillChar(GrpOpCodes, SizeOf(GrpOpCodes), 0); FillChar(GrpOpCodes, SizeOf(GrpOpCodes), 0);
for i := 0 to RegexMaxGroups - 1 do for i := 0 to RegexMaxGroups - 1 do
@ -6060,6 +6068,7 @@ begin
if StrLPos(fInputStart, PRegExprChar(regMustString), fInputEnd - fInputStart, length(regMustString)) = nil then if StrLPos(fInputStart, PRegExprChar(regMustString), fInputEnd - fInputStart, length(regMustString)) = nil then
exit; exit;
FMatchesCleared := False;
// ATryOnce or anchored match (it needs to be tried only once). // ATryOnce or anchored match (it needs to be tried only once).
if (ATryMatchOnlyStartingBefore = AOffset + 1) or (regAnchored in [raBOL, raOnlyOnce, raContinue]) then if (ATryMatchOnlyStartingBefore = AOffset + 1) or (regAnchored in [raBOL, raOnlyOnce, raContinue]) then
begin begin