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

* Merging revisions r44181,r44182 from trunk:

Browse Source 
------------------------------------------------------------------------
    r44181 | michael | 2020-02-15 15:18:42 +0100 (Sat, 15 Feb 2020) | 1 line
    
    * Correct typo
    ------------------------------------------------------------------------
    r44182 | michael | 2020-02-15 16:47:39 +0100 (Sat, 15 Feb 2020) | 1 line
    
    * Fix bug ID #36701
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@46578 -
This commit is contained in:
michael 2020-08-23 09:11:02 +00:00
parent fe716c890b
commit d5c1c95d9b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ interface
{$MODE DELPHI} // Delphi-compatible mode in FreePascal {$MODE DELPHI} // Delphi-compatible mode in FreePascal
// Disabling for now, seems to cause bug in Lazarus (bug ID 36603) // Disabling for now, seems to cause bug in Lazarus (bug ID 36603)
{ $INLINE ON} {$INLINE ON}
// ======== Define base compiler options // ======== Define base compiler options
{$BOOLEVAL OFF} {$BOOLEVAL OFF}
@ -280,7 +280,7 @@ type
{$IFDEF UnicodeWordDetection} {$IFDEF UnicodeWordDetection}
FUseUnicodeWordDetection: boolean; FUseUnicodeWordDetection: boolean;
{$ENDIF} {$ENDIF}
FEmptyImputRaisesError : Boolean; FEmptyInputRaisesError : Boolean;
CharCheckers: TRegExprCharCheckerArray; CharCheckers: TRegExprCharCheckerArray;
CharCheckerInfos: TRegExprCharCheckerInfos; CharCheckerInfos: TRegExprCharCheckerInfos;
@ -621,7 +621,7 @@ type
property SlowChecksSizeMax: integer read fSlowChecksSizeMax write fSlowChecksSizeMax; property SlowChecksSizeMax: integer read fSlowChecksSizeMax write fSlowChecksSizeMax;
// Raise error when input string is empty // Raise error when input string is empty
Property EmptyImputRaisesError : Boolean Read FEmptyImputRaisesError Write FEmptyImputRaisesError; Property EmptyInputRaisesError : Boolean Read FEmptyInputRaisesError Write FEmptyInputRaisesError;
end; end;
type type
@ -1440,6 +1440,7 @@ begin
programm := nil; programm := nil;
fExpression := ''; fExpression := '';
fInputString := ''; fInputString := '';
FEmptyInputRaisesError := False;
regexpBegin := nil; regexpBegin := nil;
regexpIsCompiled := False; regexpIsCompiled := False;
@ -4217,7 +4218,7 @@ begin
// Check InputString presence // Check InputString presence
if fInputString = '' then if fInputString = '' then
begin begin
if EmptyImputRaisesError then if EmptyInputRaisesError then
Error(reeNoInputStringSpecified); Error(reeNoInputStringSpecified);
Exit; Exit;
end; end;
@ -4450,7 +4451,7 @@ begin
Exit; Exit;
if fInputString = '' then if fInputString = '' then
begin begin
if EmptyImputRaisesError then if EmptyInputRaisesError then
Error(reeNoInputStringSpecified); Error(reeNoInputStringSpecified);
Exit; Exit;
end; end;