paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 15:29:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

* regex patch from Joao Morais, fixed random exceptions. Mantis #14425

Browse Source 
git-svn-id: trunk@19020 -
This commit is contained in:
marco 2011-09-07 19:59:57 +00:00
parent 01526fa582
commit 7d717cde37
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/regexpr/src/regex.pp
View File

@ -73,6 +73,7 @@ type
mtAnyChar, {..any character} mtAnyChar, {..any character}
mtChar, {..a particular character} mtChar, {..a particular character}
mtClass, {..a character class} mtClass, {..a character class}
mtDupClass, {..a character class beying referenced}
mtNegClass, {..a negated character class} mtNegClass, {..a negated character class}
mtTerminal, {..the final state--no matching} mtTerminal, {..the final state--no matching}
mtUnused); {..an unused state--no matching} mtUnused); {..an unused state--no matching}
@ -446,7 +447,7 @@ begin
sdMatchType := aMatchType; sdMatchType := aMatchType;
if (aMatchType = mtChar) then if (aMatchType = mtChar) then
sdChar := aChar sdChar := aChar
else if (aMatchType = mtClass) or (aMatchType = mtNegClass) then else if aMatchType in [mtClass, mtDupClass, mtNegClass] then
sdClass := aCharClass; sdClass := aCharClass;
end; end;
Result := FStateCount; Result := FStateCount;
@ -590,7 +591,7 @@ begin
if not (Ch in newline) then if not (Ch in newline) then
DequeEnqueue(sdNextState1); DequeEnqueue(sdNextState1);
end; end;
mtClass : mtClass, mtDupClass :
begin begin
{for a match within a class, enqueue the next state} {for a match within a class, enqueue the next state}
if (Ch in sdClass^) then if (Ch in sdClass^) then
@ -1067,6 +1068,8 @@ begin
FStateTable[FStateCount].sdNextState1 := i+FStateTable[FStateCount].sdNextState1+ (EndStateAtom-StartStateAtom) *i; FStateTable[FStateCount].sdNextState1 := i+FStateTable[FStateCount].sdNextState1+ (EndStateAtom-StartStateAtom) *i;
if FStateTable[FStateCount].sdNextState2 in [StartStateAtom..EndStateAtom+1] then if FStateTable[FStateCount].sdNextState2 in [StartStateAtom..EndStateAtom+1] then
FStateTable[FStateCount].sdNextState2 := i+FStateTable[FStateCount].sdNextState2 + (EndStateAtom-StartStateAtom) *i; FStateTable[FStateCount].sdNextState2 := i+FStateTable[FStateCount].sdNextState2 + (EndStateAtom-StartStateAtom) *i;
if FStateTable[FStateCount].sdMatchType = mtClass then
FStateTable[FStateCount].sdMatchType := mtDupClass;
inc(FStateCount); inc(FStateCount);
if FStateCount=length(FStateTable) then if FStateCount=length(FStateTable) then
@ -1086,6 +1089,8 @@ begin
FStateTable[FStateCount].sdNextState1 := i+FStateTable[FStateCount].sdNextState1+ (EndStateAtom-StartStateAtom) * i+(i-n+1); FStateTable[FStateCount].sdNextState1 := i+FStateTable[FStateCount].sdNextState1+ (EndStateAtom-StartStateAtom) * i+(i-n+1);
if FStateTable[FStateCount].sdNextState2 in [StartStateAtom..EndStateAtom+1] then if FStateTable[FStateCount].sdNextState2 in [StartStateAtom..EndStateAtom+1] then
FStateTable[FStateCount].sdNextState2 := i+FStateTable[FStateCount].sdNextState2 + (EndStateAtom-StartStateAtom) * i+(i-n+1); FStateTable[FStateCount].sdNextState2 := i+FStateTable[FStateCount].sdNextState2 + (EndStateAtom-StartStateAtom) * i+(i-n+1);
if FStateTable[FStateCount].sdMatchType = mtClass then
FStateTable[FStateCount].sdMatchType := mtDupClass;
inc(FStateCount); inc(FStateCount);
if FStateCount=length(FStateTable) then if FStateCount=length(FStateTable) then