Merge branch 'po/filters-update' into 'master'

TurboGit · TurboGit · commit 645536ce8df1 · 2024-08-23T15:53:29.000Z
Ensure that the regexp/regpat is cloned.

See merge request eng/toolchain/templates-parser!9
diff --git a/docs/tags.rst b/docs/tags.rst
@@ -345,6 +345,12 @@ parser.
   character if needed. Returns the input string as-is if the parameter
   is not found.
 
+**END_WITH(VALUE)**
+  .. index:: Filter, END_WITH
+
+  Returns **True** if variable ends with VALUE given as parameter
+  and **False** otherwise.
+
 **EXIST**
   .. index:: Filter, EXIST
 
@@ -585,6 +591,12 @@ parser.
   that 0 matches the last character of the string, -1 matches the character
   just before,...
 
+**START_WITH(VALUE)**
+  .. index:: Filter, START_WITH
+
+  Returns **True** if variable starts with VALUE given as parameter
+  and **False** otherwise.
+
 **STRIP**
   .. index:: Filter, STRIP
 
diff --git a/regtests/tests/0144_start_end_with/test.out b/regtests/tests/0144_start_end_with/test.out
@@ -0,0 +1,24 @@
+
+Test START_WITH() routine.
+
+TRUE  = TRUE
+TRUE  = TRUE
+TRUE  = TRUE
+TRUE  = TRUE
+FALSE = FALSE
+FALSE = FALSE
+FALSE = FALSE
+FALSE = FALSE
+FALSE = FALSE
+
+Test END_WITH() routine.
+
+TRUE  = TRUE
+TRUE  = TRUE
+TRUE  = TRUE
+TRUE  = TRUE
+FALSE = FALSE
+FALSE = FALSE
+FALSE = FALSE
+FALSE = FALSE
+FALSE = FALSE
diff --git a/regtests/tests/0144_start_end_with/test.py b/regtests/tests/0144_start_end_with/test.py
@@ -0,0 +1,3 @@
+from test_support import *
+
+run('testme', ["testme144.tmplt"])
diff --git a/regtests/tests/0144_start_end_with/test.yaml b/regtests/tests/0144_start_end_with/test.yaml
diff --git a/regtests/tests/0144_start_end_with/testme144.tmplt b/regtests/tests/0144_start_end_with/testme144.tmplt
@@ -0,0 +1,24 @@
+
+Test START_WITH() routine.
+
+TRUE  = @_START_WITH(a):VAR1_@
+TRUE  = @_START_WITH(a ):VAR1_@
+TRUE  = @_START_WITH(a valu):VAR1_@
+TRUE  = @_START_WITH(a value):VAR1_@
+FALSE = @_START_WITH(w):VAR1_@
+FALSE = @_START_WITH(x value):VAR1_@
+FALSE = @_START_WITH(a valux):VAR1_@
+FALSE = @_START_WITH( value):VAR1_@
+FALSE = @_START_WITH(xxxxxxxxxxxxxxxxxxxxxxxxxxx):VAR1_@
+
+Test END_WITH() routine.
+
+TRUE  = @_END_WITH(e):VAR1_@
+TRUE  = @_END_WITH(lue):VAR1_@
+TRUE  = @_END_WITH( value):VAR1_@
+TRUE  = @_END_WITH(a value):VAR1_@
+FALSE = @_END_WITH(w):VAR1_@
+FALSE = @_END_WITH(x value):VAR1_@
+FALSE = @_END_WITH(a valux):VAR1_@
+FALSE = @_END_WITH(a valu):VAR1_@
+FALSE = @_END_WITH(xxxxxxxxxxxxxxxxxxxxxxxxxxxx):VAR1_@
diff --git a/regtests/tests/0145_regex_macro/test.out b/regtests/tests/0145_regex_macro/test.out
@@ -0,0 +1,6 @@
+
+Test MATCH into a MACRO
+
+
+ONE
+TWO
diff --git a/regtests/tests/0145_regex_macro/test.py b/regtests/tests/0145_regex_macro/test.py
@@ -0,0 +1,3 @@
+from test_support import *
+
+run('testme', ["testme145.tmplt"])
diff --git a/regtests/tests/0145_regex_macro/test.yaml b/regtests/tests/0145_regex_macro/test.yaml
diff --git a/regtests/tests/0145_regex_macro/testme145.tmplt b/regtests/tests/0145_regex_macro/testme145.tmplt
@@ -0,0 +1,13 @@
+
+Test MATCH into a MACRO
+
+@@MACRO(CHECK)@@
+@@IF@@ @_MATCH(.*value):VAR1_@
+@_$1_@
+@@ELSE@@
+FALSE
+@@END_IF@@
+@@END_MACRO@@
+
+@_CHECK(ONE)_@
+@_CHECK(TWO)_@
diff --git a/src/templates_parser-data.adb b/src/templates_parser-data.adb
@@ -642,6 +642,10 @@ package body Data is
    begin
       if R.Filters /= null then
          R.Filters := new Filter.Set'(R.Filters.all);
+
+         for K in R.Filters'Range loop
+            R.Filters (K) := Filter.Clone (@);
+         end loop;
       end if;
 
       if R.Is_Macro then
diff --git a/src/templates_parser-filter.adb b/src/templates_parser-filter.adb
@@ -52,21 +52,21 @@ package body Filter is
 
    --  Filter tokens
 
-   Multiply_Token      : aliased constant String := """*""";
-   Plus_Token          : aliased constant String := """+""";
-   Minus_Token         : aliased constant String := """-""";
-   Divide_Token        : aliased constant String := """/""";
    Abs_Token           : aliased constant String := "ABS";
-   Add_Token           : aliased constant String := "ADD";
    Add_Param_Token     : aliased constant String := "ADD_PARAM";
+   Add_Token           : aliased constant String := "ADD";
+   Alternate_Token     : aliased constant String := "ALTERNATE";
    BR_2_EOL_Token      : aliased constant String := "BR_2_EOL";
    BR_2_LF_Token       : aliased constant String := "BR_2_LF";
    Capitalize_Token    : aliased constant String := "CAPITALIZE";
    Clean_Text_Token    : aliased constant String := "CLEAN_TEXT";
    Coma_2_Point_Token  : aliased constant String := "COMA_2_POINT";
    Contract_Token      : aliased constant String := "CONTRACT";
+   Default_Token       : aliased constant String := "DEFAULT";
    Del_Param_Token     : aliased constant String := "DEL_PARAM";
    Div_Token           : aliased constant String := "DIV";
+   Divide_Token        : aliased constant String := """/""";
+   End_With_Token      : aliased constant String := "END_WITH";
    Exist_Token         : aliased constant String := "EXIST";
    File_Exists_Token   : aliased constant String := "FILE_EXISTS";
    Format_Date_Token   : aliased constant String := "FORMAT_DATE";
@@ -77,22 +77,26 @@ package body Filter is
    Match_Token         : aliased constant String := "MATCH";
    Max_Token           : aliased constant String := "MAX";
    Min_Token           : aliased constant String := "MIN";
+   Minus_Token         : aliased constant String := """-""";
    Modulo_Token        : aliased constant String := "MOD";
    Mult_Token          : aliased constant String := "MULT";
+   Multiply_Token      : aliased constant String := """*""";
    Neg_Token           : aliased constant String := "NEG";
    No_Digit_Token      : aliased constant String := "NO_DIGIT";
    No_Dynamic_Token    : aliased constant String := "NO_DYNAMIC";
    No_Letter_Token     : aliased constant String := "NO_LETTER";
    No_Space_Token      : aliased constant String := "NO_SPACE";
    Oui_Non_Token       : aliased constant String := "OUI_NON";
+   Plus_Token          : aliased constant String := """+""";
    Point_2_Coma_Token  : aliased constant String := "POINT_2_COMA";
    Repeat_Token        : aliased constant String := "REPEAT";
-   Replace_Token       : aliased constant String := "REPLACE";
    Replace_All_Token   : aliased constant String := "REPLACE_ALL";
    Replace_Param_Token : aliased constant String := "REPLACE_PARAM";
+   Replace_Token       : aliased constant String := "REPLACE";
    Reverse_Token       : aliased constant String := "REVERSE";
    Size_Token          : aliased constant String := "SIZE";
    Slice_Token         : aliased constant String := "SLICE";
+   Start_With_Token    : aliased constant String := "START_WITH";
    Strip_Token         : aliased constant String := "STRIP";
    Sub_Token           : aliased constant String := "SUB";
    Trim_Token          : aliased constant String := "TRIM";
@@ -103,8 +107,6 @@ package body Filter is
    Web_NBSP_Token      : aliased constant String := "WEB_NBSP";
    Wrap_Token          : aliased constant String := "WRAP";
    Yes_No_Token        : aliased constant String := "YES_NO";
-   Default_Token       : aliased constant String := "DEFAULT";
-   Alternate_Token     : aliased constant String := "ALTERNATE";
 
    --  Filters Table
 
@@ -265,6 +267,12 @@ package body Filter is
               Wrap           =>
                 (Wrap_Token'Access,           Wrap'Access),
 
+              Start_With     =>
+                (Start_With_Token'Access,     Start_With'Access),
+
+              End_With       =>
+                (End_With_Token'Access,       End_With'Access),
+
               Yes_No         =>
                 (Yes_No_Token'Access,         Yes_No'Access)
              ];
@@ -536,6 +544,25 @@ package body Filter is
       return Result;
    end Clean_Text;
 
+   -----------
+   -- Clone --
+   -----------
+
+   function Clone (P : Routine) return Routine is
+      D : Parameter_Data := P.Parameters;
+   begin
+      case D.Mode is
+         when Regpat =>
+            D.Regpat := new GNAT.Regpat.Pattern_Matcher'(D.Regpat.all);
+         when Regexp =>
+            D.Regexp := new GNAT.Regpat.Pattern_Matcher'(D.Regexp.all);
+         when others =>
+            null;
+      end case;
+
+      return (P with delta Parameters => D);
+   end Clone;
+
    ------------------
    -- Coma_2_Point --
    ------------------
@@ -708,6 +735,34 @@ package body Filter is
       end;
    end Divide;
 
+   --------------
+   -- End_With --
+   --------------
+
+   function End_With
+     (S : String;
+      C : not null access Filter_Context;
+      P : Parameter_Data := No_Parameter) return String
+   is
+      pragma Unreferenced (C);
+   begin
+      if P = No_Parameter then
+         raise Template_Error with "missing parameter for END_WITH filter";
+      end if;
+
+      declare
+         Sub : constant String := To_String (P.S);
+      begin
+         if S'Length >= Sub'Length
+           and then S (S'Last - Sub'Length + 1 .. S'Last) = Sub
+         then
+            return "TRUE";
+         else
+            return "FALSE";
+         end if;
+      end;
+   end End_With;
+
    -----------
    -- Exist --
    -----------
@@ -1041,17 +1096,13 @@ package body Filter is
       P : Parameter_Data := No_Parameter) return String
    is
       pragma Unreferenced (C);
-      use type GNAT.Regpat.Match_Location;
-
-      Matches : GNAT.Regpat.Match_Array (0 .. 0);
    begin
       if P = No_Parameter then
          raise Template_Error with "missing parameter for MATCH filter";
-      end if;
 
-      GNAT.Regpat.Match (P.Regexp.all, S, Matches);
+      end if;
 
-      if Matches (0) = GNAT.Regpat.No_Match then
+      if GNAT.Regpat.Match (P.Regexp.all, S) = S'First - 1 then
          return "FALSE";
       else
          return "TRUE";
@@ -1789,6 +1840,34 @@ package body Filter is
       end if;
    end Slice;
 
+   ----------------
+   -- Start_With --
+   ----------------
+
+   function Start_With
+     (S : String;
+      C : not null access Filter_Context;
+      P : Parameter_Data := No_Parameter) return String
+   is
+      pragma Unreferenced (C);
+   begin
+      if P = No_Parameter then
+         raise Template_Error with "missing parameter for START_WITH filter";
+      end if;
+
+      declare
+         Sub : constant String := To_String (P.S);
+      begin
+         if S'Length >= Sub'Length
+           and then S (S'First .. S'First + Sub'Length - 1) = Sub
+         then
+            return "TRUE";
+         else
+            return "FALSE";
+         end if;
+      end;
+   end Start_With;
+
    -----------
    -- Strip --
    -----------
diff --git a/src/templates_parser.adb b/src/templates_parser.adb
@@ -161,6 +161,9 @@ package body Templates_Parser is
          Div,
          --  Divide the given parameter to the string
 
+         End_With,
+         --  Returns TRUE if string ends with parameter
+
          Exist,
          --  Returns "TRUE" if var is not empty and "FALSE" otherwise
 
@@ -254,6 +257,9 @@ package body Templates_Parser is
          Slice,
          --  Returns a slice of the string
 
+         Start_With,
+         --  Returns TRUE if string starts with parameter
+
          Strip,
          --  Trim leading and trailing spaces and characters HT, LF, CR, NUL
 
@@ -359,6 +365,9 @@ package body Templates_Parser is
       procedure Release (S : in out Set);
       --  Release all memory allocated P
 
+      function Clone (P : Routine) return Routine;
+      --  Clone parameter data
+
       type String_Access is access constant String;
 
       type Filter_Record is record
@@ -445,6 +454,11 @@ package body Templates_Parser is
          C : not null access Filter_Context;
          P : Parameter_Data := No_Parameter) return String;
 
+      function End_With
+        (S : String;
+         C : not null access Filter_Context;
+         P : Parameter_Data := No_Parameter) return String;
+
       function Exist
         (S : String;
          C : not null access Filter_Context;
@@ -565,6 +579,11 @@ package body Templates_Parser is
          C : not null access Filter_Context;
          P : Parameter_Data := No_Parameter) return String;
 
+      function Start_With
+        (S : String;
+         C : not null access Filter_Context;
+         P : Parameter_Data := No_Parameter) return String;
+
       function Strip
         (S : String;
          C : not null access Filter_Context;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from test_support import *`
	`2`	`+`
	`3`	`+run('testme', ["testme144.tmplt"])`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
++
 +Test MATCH into a MACRO
++
++
 +ONE
 +TWO
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from test_support import *`
	`2`	`+`
	`3`	`+run('testme', ["testme145.tmplt"])`