Merge pull request #267 from Alexey-T/master

fix #266

Author: andgineer

History.txt

@@ -6,6 +6,12 @@
                                      (-) - bugfix
                                      (^) - improvement
 
+ v. 1.155 2022.04.28
+ -=- (-) Fix Substitute() result for not-real group index like '$9' in regex '(b)'.
+  By Alexey Torgashin.
+ -=- (-) Fix UnQuoteChar() range check for Substitute() call.
+  By @delphicz and Alexey T.
+
  v. 1.153 2021.07.04
  -=- (^) Compatability with Delphi 7. By Alexey Torgashin.
 

src/regexpr.pas

@@ -485,7 +485,7 @@   TRegExpr = class
 
     function HexDig(Ch: REChar): integer;
 
-    function UnQuoteChar(var APtr: PRegExprChar): REChar;
+    function UnQuoteChar(var APtr, AEnd: PRegExprChar): REChar;
 
     // the lowest level
     function ParseAtom(var FlagParse: integer): PRegExprChar;
@@ -819,7 +819,7 @@ implementation
 const
   // TRegExpr.VersionMajor/Minor return values of these constants:
   REVersionMajor = 1;
-  REVersionMinor = 153;
+  REVersionMinor = 155;
 
   OpKind_End = REChar(1);
   OpKind_MetaClass = REChar(2);
@@ -3412,7 +3412,7 @@ function TRegExpr.HexDig(Ch: REChar): integer;
   end;
 end;
 
-function TRegExpr.UnQuoteChar(var APtr: PRegExprChar): REChar;
+function TRegExpr.UnQuoteChar(var APtr, AEnd: PRegExprChar): REChar;
 var
   Ch: REChar;
 begin
@@ -3433,7 +3433,7 @@ function TRegExpr.UnQuoteChar(var APtr: PRegExprChar): REChar;
       begin // \cK => code for Ctrl+K
         Result := #0;
         Inc(APtr);
-        if APtr >= fRegexEnd then
+        if APtr >= AEnd then
           Error(reeNoLetterAfterBSlashC);
         Ch := APtr^;
         case Ch of
@@ -3449,7 +3449,7 @@ function TRegExpr.UnQuoteChar(var APtr: PRegExprChar): REChar;
       begin // \x: hex char
         Result := #0;
         Inc(APtr);
-        if APtr >= fRegexEnd then
+        if APtr >= AEnd then
         begin
           Error(reeNoHexCodeAfterBSlashX);
           Exit;
@@ -3458,7 +3458,7 @@ function TRegExpr.UnQuoteChar(var APtr: PRegExprChar): REChar;
         begin // \x{nnnn} //###0.936
           repeat
             Inc(APtr);
-            if APtr >= fRegexEnd then
+            if APtr >= AEnd then
             begin
               Error(reeNoHexCodeAfterBSlashX);
               Exit;
@@ -3482,7 +3482,7 @@ function TRegExpr.UnQuoteChar(var APtr: PRegExprChar): REChar;
           Result := REChar(HexDig(APtr^));
           // HexDig will cause Error if bad hex digit found
           Inc(APtr);
-          if APtr >= fRegexEnd then
+          if APtr >= AEnd then
           begin
             Error(reeNoHexCodeAfterBSlashX);
             Exit;
@@ -3693,7 +3693,7 @@ function TRegExpr.ParseAtom(var FlagParse: integer): PRegExprChar;
                 Exit;
               end;
               Inc(regParse);
-              RangeEnd := UnQuoteChar(regParse);
+              RangeEnd := UnQuoteChar(regParse, fRegexEnd);
             end;
 
             // special handling for Russian range a-YA, add 2 ranges: a-ya and A-YA
@@ -3764,7 +3764,7 @@ function TRegExpr.ParseAtom(var FlagParse: integer): PRegExprChar;
               else
               {$ENDIF}
               begin
-                TempChar := UnQuoteChar(regParse);
+                TempChar := UnQuoteChar(regParse, fRegexEnd);
                 // False if '-' is last char in []
                 DashForRange :=
                   (regParse + 2 < fRegexEnd) and
@@ -4207,7 +4207,7 @@ function TRegExpr.ParseAtom(var FlagParse: integer): PRegExprChar;
             end;
           {$ENDIF}
         else
-          EmitExactly(UnQuoteChar(regParse));
+          EmitExactly(UnQuoteChar(regParse, fRegexEnd));
         end; { of case }
         Inc(regParse);
       end;
@@ -5746,10 +5746,11 @@ function TRegExpr.Substitute(const ATemplate: RegExprString): RegExprString;
     APtr := p;
   end;
 
-  procedure FindSubstGroupIndex(var p: PRegExprChar; var Idx: integer);
+  procedure FindSubstGroupIndex(var p: PRegExprChar; var Idx: integer; var NumberFound: boolean);
   begin
     Idx := ParseVarName(p);
-    if (Idx >= 0) and (Idx <= High(GrpIndexes)) then
+    NumberFound := (Idx >= 0) and (Idx <= High(GrpIndexes));
+    if NumberFound then
       Idx := GrpIndexes[Idx];
   end;
 
@@ -5760,6 +5761,7 @@ function TRegExpr.Substitute(const ATemplate: RegExprString): RegExprString;
   p, p0, p1, ResultPtr: PRegExprChar;
   ResultLen, n: integer;
   Ch, QuotedChar: REChar;
+  GroupFound: boolean;
 begin
   // Check programm and input string
   if not IsProgrammOk then
@@ -5781,11 +5783,13 @@ function TRegExpr.Substitute(const ATemplate: RegExprString): RegExprString;
     Ch := p^;
     Inc(p);
     n := -1;
+    GroupFound := False;
     if Ch = SubstituteGroupChar then
-      FindSubstGroupIndex(p, n);
-    if n >= 0 then
+      FindSubstGroupIndex(p, n, GroupFound);
+    if GroupFound then
     begin
-      Inc(ResultLen, GrpEnd[n] - GrpStart[n]);
+      if n >= 0 then
+        Inc(ResultLen, GrpEnd[n] - GrpStart[n]);
     end
     else
     begin
@@ -5836,12 +5840,18 @@ function TRegExpr.Substitute(const ATemplate: RegExprString): RegExprString;
     Inc(p);
     p1 := p;
     n := -1;
+    GroupFound := False;
     if Ch = SubstituteGroupChar then
-      FindSubstGroupIndex(p, n);
-    if (n >= 0) then
+      FindSubstGroupIndex(p, n, GroupFound);
+    if GroupFound then
     begin
-      p0 := GrpStart[n];
-      p1 := GrpEnd[n];
+      if n >= 0 then
+      begin
+        p0 := GrpStart[n];
+        p1 := GrpEnd[n];
+      end
+      else
+        p1 := p0;
     end
     else
     begin
@@ -5859,7 +5869,7 @@ function TRegExpr.Substitute(const ATemplate: RegExprString): RegExprString;
             begin
               p := p - 1;
               // UnquoteChar expects the escaped char under the pointer
-              QuotedChar := UnQuoteChar(p);
+              QuotedChar := UnQuoteChar(p, TemplateEnd);
               p := p + 1;
               // Skip after last part of the escaped sequence - UnquoteChar stops on the last symbol of it
               p0 := @QuotedChar;

test/tests.pas

@@ -124,6 +124,7 @@   TTestRegexpr= class(TTestCase)
     procedure RunTest67;
     procedure RunTest68;
     procedure RunTest69;
+    procedure RunTest70;
   end;
 
 implementation
@@ -157,7 +158,7 @@ function PrintableString(const S: RegExprString): string;
 
 
 const
-  testCases: array [1 .. 69] of TRegExTest = (
+  testCases: array [1 .. 70] of TRegExTest = (
     // 1
     (
     expression: '\nd';
@@ -709,6 +710,14 @@ function PrintableString(const S: RegExprString): string;
     substitutionText: '';
     expectedResult: '';
     matchStart: 1
+    ),
+    // 70
+    (
+    expression: '(b)';
+    inputText: 'abc';
+    substitutionText: '$1$2$9';
+    expectedResult: 'abc';
+    matchStart: 1
     )
   );
 
@@ -1165,6 +1174,11 @@ procedure TTestRegexpr.RunTest69;
   RunRETest(69);
 end;
 
+procedure TTestRegexpr.RunTest70;
+begin
+  RunRETest(70);
+end;
+
 
 procedure TTestRegexpr.TestGroups;
 var