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

* Fixed detection of regular strings, so that a normal search is performed

Browse Source 
* Strings with a braces, parentheses and pipe-symbols are always handled as regex-patterns

git-svn-id: trunk@16537 -
This commit is contained in:
joost 2010-12-10 15:40:33 +00:00
parent af2ef60a29
commit 6182f885f8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -454,7 +454,7 @@ begin
if FStateCount=length(FStateTable) then
setlength(FStateTable,(FStateCount * 3) div 2);
if not (aMatchType in [mtChar,mtTerminal]) then FRegexType := rtRegEx;
if not (aMatchType in [mtChar,mtTerminal,mtNone]) then FRegexType := rtRegEx;
end;
{--------}
procedure TRegexEngine.rcClear;
@ -706,6 +706,8 @@ begin
end;
{move past the close parenthesis}
inc(FPosn);
{always handle expressions with parentheses as regular-expression}
FRegexType := rtRegEx;
end;
'[' :
begin
@ -954,6 +956,8 @@ begin
{now set the end state for the initial term to point to the final
end state for the second expr and the overall expr}
rcSetState(EndState1, FStateCount, UnusedState);
{always handle expressions with a pipe as regular-expression}
FRegexType := rtRegEx;
end;
end;
{--------}
@ -1092,11 +1096,10 @@ begin
if m = -1 then
rcAddState(mtNone, #0, nil, NewFinalState, TempEndStateAtom);
if FRegexType <> rtRegEx then
FRegexType := rtRegEx;
Result := StartStateAtom;
end;
{always handle expressions with braces as regular-expression}
FRegexType := rtRegEx;
end;
else