Minor code clean-up and reformatting.

Author: TurboGit

src/templates_parser-cached_files.adb

@@ -63,7 +63,7 @@ package body Cached_Files is
    procedure Add
      (Filename : String;
       T        : Tree;
-      Old      :    out Tree)
+      Old      : out Tree)
    is
       L_Filename : constant Unbounded_String := To_Unbounded_String (Filename);
 
@@ -255,6 +255,7 @@ package body Cached_Files is
          pragma Assert (T.Info.Next /= T.C_Info);
          Release (T.C_Info, Include => False);
       end if;
+
       Templates_Parser_Tasking.Unlock;
    exception
       when others =>
@@ -319,6 +320,7 @@ package body Cached_Files is
          if not Result then
             return False;
          end if;
+
          P := P.Next;
       end loop;
 

src/templates_parser-data.adb

@@ -473,6 +473,7 @@ package body Data is
                   --  ??? check for string literal
                   exit when Tag (Stop + 1) = '(' or else Stop = Tag'First;
                end loop;
+
                MP_Start := Stop + 1;
             end if;
 
@@ -870,6 +871,7 @@ package body Data is
                   else
                      Text_IO.Put (Value);
                   end if;
+
                   if Value'Length > 0 then
                      NL := Value (Value'Last) = ASCII.LF;
                   else
@@ -953,6 +955,7 @@ package body Data is
       for K in P'Range loop
          P (K) := Data.Parse (To_String (Parameters (K)), 0);
       end loop;
+
       return P;
    end To_Data_Parameters;
 

src/templates_parser-debug.adb

@@ -65,6 +65,7 @@ package body Templates_Parser.Debug is
             else
                Print (N.VS.all, K + 1);
             end if;
+
             N := N.Next;
          end loop;
 

src/templates_parser-expr.adb

@@ -546,8 +546,8 @@ package body Expr is
 
          elsif Expression (Index) = '"' then
             --  This is a string, return it
-            Current_Token
-              := (Kind => Value, Start => Index + 1, Stop => Index);
+            Current_Token :=
+              (Kind => Value, Start => Index + 1, Stop => Index);
 
             loop
                if Current_Token.Stop = Expression'Last then
@@ -558,6 +558,7 @@ package body Expr is
                   Current_Token.Stop := Current_Token.Stop + 1;
                end if;
             end loop;
+
             Index := Current_Token.Stop + 2;
 
          else
@@ -632,13 +633,13 @@ package body Expr is
                      Error ("variable end not found");
 
                   else
-                     Current_Token
-                       := (Kind  => Var, Start => I, Stop  => Index - 1);
+                     Current_Token :=
+                       (Kind  => Var, Start => I, Stop  => Index - 1);
                   end if;
 
                else
-                  Current_Token
-                    := (Kind => Value, Start => I, Stop => Index - 1);
+                  Current_Token :=
+                    (Kind => Value, Start => I, Stop => Index - 1);
                end if;
             end;
          end if;
@@ -683,6 +684,7 @@ package body Expr is
             end case;
 
             Next_Token;
+
             if Current_Token.Kind = Binary_Op
               and then Current_Token.Bin_Op = O_Cat
             then
@@ -702,6 +704,7 @@ package body Expr is
             when Open_Par =>
                Next_Token;
                Result := Expr;
+
                if Current_Token.Kind = Close_Par then
                   Next_Token;
                   return Result;

src/templates_parser-filter.adb

@@ -473,11 +473,13 @@ package body Filter is
             Upper := False;
          else
             Result (K) := Characters.Handling.To_Lower (S (K));
+
             if Result (K) = ' ' or else Result (K) = '_' then
                Upper := True;
             end if;
          end if;
       end loop;
+
       return Result;
    end Capitalize;
 
@@ -528,6 +530,7 @@ package body Filter is
             Result (K) := ' ';
          end if;
       end loop;
+
       return Result;
    end Clean_Text;
 
@@ -573,9 +576,7 @@ package body Filter is
       Check_Null_Parameter (P);
 
       for K in S'Range loop
-
          if S (K) = ' ' then
-
             if Space = False then
                Space := True;
 
@@ -641,14 +642,13 @@ package body Filter is
 
       else
          declare
-            Pos : constant Natural := Strings.Fixed.Index (S, Param);
+            Pos         : constant Natural := Strings.Fixed.Index (S, Param);
             First, Last : Natural;
          begin
             if Pos < E
               or else
                 (Pos + Len <= S'Last
-                 and then S (Pos + Len) /= '='
-                 and then S (Pos + Len) /= '&')
+                 and then S (Pos + Len) not in '=' | '&')
             then
                --  The parameter is not present, return original string
                return S;
@@ -896,8 +896,10 @@ package body Filter is
             U := Filter_Map.Element (C);
             Unchecked_Free (U.CBT);
          end if;
+
          Filter_Map.Next (C);
       end loop;
+
       Filter_Map.Clear (User_Filters);
    end Free_Filters;
 
@@ -927,9 +929,12 @@ package body Filter is
 
       else
          case P.Mode is
-            when Str          => return '(' & To_String (P.S) & ')';
-            when Regexp       => return '(' & To_String (P.R_Str) & ')';
-            when Regpat       => return
+            when Str          =>
+               return '(' & To_String (P.S) & ')';
+            when Regexp       =>
+               return '(' & To_String (P.R_Str) & ')';
+            when Regpat       =>
+               return
                  '(' & To_String (P.P_Str) & '/' & To_String (P.Param) & ')';
             when Slice        =>
                return '(' & Utils.Image (P.First)
@@ -1145,14 +1150,15 @@ package body Filter is
 
             if Table (K).Name.all < Name then
                F := K;
+
                if F /= Mode'Last then
                   F := Mode'Succ (F);
                end if;
 
                exit when Table (F).Name.all > Name;
-
             else
                L := K;
+
                if L /= Mode'First then
                   L := Mode'Pred (L);
                end if;
@@ -1726,6 +1732,7 @@ package body Filter is
       for K in S'Range loop
          Result (Result'Last - K + Result'First) := S (K);
       end loop;
+
       return Result;
    end Reverse_Data;
 
@@ -2078,8 +2085,8 @@ package body Filter is
             else
                --  There is only one word on the line: cut it
 
-                  Append (Result, S (First .. Last - 1) & ASCII.LF);
-                  First := Last;
+               Append (Result, S (First .. Last - 1) & ASCII.LF);
+               First := Last;
             end if;
 
             Last_Space := Last_Space_Init;

src/templates_parser-input.ads

@@ -56,8 +56,8 @@ package Templates_Parser.Input is
 
    procedure Get_Line
      (File   : File_Type;
-      Buffer :    out String;
-      Last   :    out Natural);
+      Buffer : out String;
+      Last   : out Natural);
    --  Like Text_IO.Get_Line. Raises Text_IO.Status_Error is file is not open
 
 private

src/templates_parser-macro.adb

@@ -123,6 +123,7 @@ package body Macro is
          Set.Delete (Name);
          Release (Old);
       end if;
+
       Set.Insert (Name, T);
    end Register;
 
@@ -216,6 +217,7 @@ package body Macro is
                   Old := C;
                   Prev.Next := C.Next;
                end if;
+
                Data.Release (Old, Single => True);
             end Delete_Node;
 
@@ -230,6 +232,7 @@ package body Macro is
                New_Node : constant Data.Tree := Data.Clone (Parameters (Ref));
             begin
                New_Node.Next := C.Next;
+
                if Prev = null then
                   Data.Release (T, Single => True);
                   T := New_Node;
@@ -393,7 +396,6 @@ package body Macro is
                case Parameters (Ref).Kind is
                   when Data.Text =>
                      --  We need to evaluate the value against the filters
-
                      Replace
                        (T,
                         Data.Translate

src/templates_parser-simplifier.adb

@@ -49,6 +49,7 @@ package body Simplifier is
          while N.Next /= null loop
             N := N.Next;
          end loop;
+
          N.Next := To;
          Link := N;
       end Link_End;

src/templates_parser-utils.adb

@@ -221,14 +221,17 @@ package body Templates_Parser.Utils is
          Result : Unbounded_String;
       begin
          Append (Result, """");
+
          for K in Str'Range loop
             if Str (K) = '"' then
                Append (Result, """""");
             else
                Append (Result, Str (K));
             end if;
          end loop;
+
          Append (Result, """");
+
          return To_String (Result);
       end Quote;
 
@@ -300,6 +303,7 @@ package body Templates_Parser.Utils is
                Append (Result, Str (K));
             end if;
          end loop;
+
          return To_String (Result);
       end Clear_Quote;