From d5c1c95d9bb14d57cae31275bf65d75f658801ab Mon Sep 17 00:00:00 2001 From: michael Date: Sun, 23 Aug 2020 09:11:02 +0000 Subject: [PATCH] * Merging revisions r44181,r44182 from trunk: ------------------------------------------------------------------------ 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 - --- packages/regexpr/src/regexpr.pas | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/regexpr/src/regexpr.pas b/packages/regexpr/src/regexpr.pas index 438fddd07b..2e433aadb5 100644 --- a/packages/regexpr/src/regexpr.pas +++ b/packages/regexpr/src/regexpr.pas @@ -50,7 +50,7 @@ interface {$MODE DELPHI} // Delphi-compatible mode in FreePascal // Disabling for now, seems to cause bug in Lazarus (bug ID 36603) -{ $INLINE ON} +{$INLINE ON} // ======== Define base compiler options {$BOOLEVAL OFF} @@ -280,7 +280,7 @@ type {$IFDEF UnicodeWordDetection} FUseUnicodeWordDetection: boolean; {$ENDIF} - FEmptyImputRaisesError : Boolean; + FEmptyInputRaisesError : Boolean; CharCheckers: TRegExprCharCheckerArray; CharCheckerInfos: TRegExprCharCheckerInfos; @@ -621,7 +621,7 @@ type property SlowChecksSizeMax: integer read fSlowChecksSizeMax write fSlowChecksSizeMax; // Raise error when input string is empty - Property EmptyImputRaisesError : Boolean Read FEmptyImputRaisesError Write FEmptyImputRaisesError; + Property EmptyInputRaisesError : Boolean Read FEmptyInputRaisesError Write FEmptyInputRaisesError; end; type @@ -1440,6 +1440,7 @@ begin programm := nil; fExpression := ''; fInputString := ''; + FEmptyInputRaisesError := False; regexpBegin := nil; regexpIsCompiled := False; @@ -4217,7 +4218,7 @@ begin // Check InputString presence if fInputString = '' then begin - if EmptyImputRaisesError then + if EmptyInputRaisesError then Error(reeNoInputStringSpecified); Exit; end; @@ -4450,7 +4451,7 @@ begin Exit; if fInputString = '' then begin - if EmptyImputRaisesError then + if EmptyInputRaisesError then Error(reeNoInputStringSpecified); Exit; end;