Merge lp:~onox/deplo/deplo into lp:deplo

[onox]

I fixed a bunch of style warnings that are shown by GNAT if some -gnat options are added. Also introduced a change to deplo.gpr so that you can have different switches for debug builds and builds for users (no developers). There are still a couple of warnings (about redundant use type clauses and incorrect indention of labels) that remain.

I haven't actually tested the changes (bad bad I know :)), but my exams are over so I could afford to waste some time :p Feel free to merge it or not.

I usually also add a gnat.adc file to my projects to add some restrictions. Something like this:

pragma Restrictions (No_Obsolescent_Features);
pragma Restrictions (No_Recursion);
pragma Restrictions (No_Relative_Delay);

In that case you need to add to package Compiler in deplo.gpr the following:

for Local_Configuration_Pragmas use "gnat.adc";

=== modified file 'command_line_parameters.adb'
--- command_line_parameters.adb	2012-06-29 11:46:21 +0000
+++ command_line_parameters.adb	2012-07-05 20:01:18 +0000
@@ -22,14 +22,12 @@
 with Ada.Command_Line;
 with Generic_Line_Parser;
 with Ada.Strings.Fixed;
-with Package_Names;
 with Ada.Exceptions;
 with Sectioned_Text;
 with Line_Arrays;
 with Ada.Text_IO;
 
 package body Command_Line_Parameters is
-   use Ada.Strings.Unbounded;
    use Package_Names;
 
    package Line_Parsers is
@@ -65,8 +63,6 @@
    function "+" (X : Unbounded_String) return String
                  renames To_String;
 
-
-
    -------------------------
    -- Input_Name_Callback --
    -------------------------
@@ -92,11 +88,10 @@
 
       pragma Unreferenced (Name);
    begin
-      Ada.Text_Io.Put_Line ("SPEC: " & To_String (Value));
-      Result.Style_Spec.Append (Style_Spec(To_String (Value)));
+      Ada.Text_IO.Put_Line ("SPEC: " & To_String (Value));
+      Result.Style_Spec.Append (Style_Spec (To_String (Value)));
    end Style_Spec_Callback;
 
-
    ---------------------------
    -- Input_Format_Callback --
    ---------------------------
@@ -123,7 +118,6 @@
       Result.Output_Format := Value;
    end Output_Format_Callback;
 
-
    -------------------
    -- Trim_Callback --
    -------------------
@@ -170,8 +164,7 @@
          end if;
       end Iterate_Over_Section;
 
-
-      Classifier : Basic_Line_Classifier :=
+      Classifier : constant Basic_Line_Classifier :=
                      New_Classifier (Head          => "[",
                                      Tail          => "]",
                                      Comments      => "#",
@@ -180,7 +173,7 @@
                                      Trim_Comments => True,
                                      Ignore_Empty  => True);
 
-      Sections : Section_List := Parse (+Value, Classifier);
+      Sections : constant Section_List := Parse (+Value, Classifier);
    begin
       declare
          procedure Append (Pos : Line_Containers.Cursor) is
@@ -221,8 +214,7 @@
 
    end Config_Callback;
 
-
-   Syntax : Line_Parsers.Parameter_Descriptor_Array :=
+   Syntax : constant Line_Parsers.Parameter_Descriptor_Array :=
               ((Name      => +"input",
                 Default    => +"",
                 If_Missing => Line_Parsers.Ignore,
@@ -278,16 +270,15 @@
       Result := (Input_Name    => <>,
                  Style_Spec    => Style_Table.Style_Spec_Lists.Empty_List,
                  Input_Format  => +"ali",
-                 OutPut_Format => +"dot",
+                 Output_Format => +"dot",
                  Trim_Nodes    => Package_Names.Package_Lists.Empty_List,
                  Ignore        => Package_Names.Package_Lists.Empty_List);
 
-
       if Argument_Count = 1 and then Fixed.Index (Argument (1), "=") = 0 then
          declare
-            Arg : String := Argument (1);
+            Arg : constant String := Argument (1);
          begin
-            if Arg(Arg'First) /= '@' then
+            if Arg (Arg'First) /= '@' then
                Result.Input_Name.Append (Argument (1));
             else
                Config_Callback (Name   => Null_Unbounded_String,

=== modified file 'command_line_parameters.ads'
--- command_line_parameters.ads	2012-06-13 20:24:08 +0000
+++ command_line_parameters.ads	2012-07-05 20:01:18 +0000
@@ -27,7 +27,6 @@
 package Command_Line_Parameters is
    use Ada.Strings.Unbounded;
 
-
    package String_Lists is
      new Ada.Containers.Indefinite_Doubly_Linked_Lists (String);
 
@@ -45,4 +44,3 @@
 
    User_Error : exception;
 end Command_Line_Parameters;
-

=== modified file 'dependency_graphs.adb'
--- dependency_graphs.adb	2012-06-09 10:32:54 +0000
+++ dependency_graphs.adb	2012-07-05 20:01:18 +0000
@@ -20,8 +20,7 @@
 ----------------------------------------------------------------------------
 with Ada.Text_IO;
 
-package body dependency_graphs is
-   use Package_Trees;
+package body Dependency_Graphs is
 
    ------------
    -- Create --
@@ -30,7 +29,7 @@
    function Create (N_Nodes : Positive) return Graph_Access is
 
    begin
-      return new Dependency_Graph'(N_Nodes   => Package_Index(N_Nodes),
+      return new Dependency_Graph'(N_Nodes   => Package_Index (N_Nodes),
                                    Adjacency => (others => (others => False)));
    end Create;
 
@@ -44,7 +43,7 @@
       Withed : in     Package_Trees.Cursor)
    is
    begin
-     Graph.Adjacency(Index(Wither), Index(Withed)) := True;
+      Graph.Adjacency (Index (Wither), Index (Withed)) := True;
    end Add_Dependency;
 
    -----------------------
@@ -96,5 +95,4 @@
       end loop;
    end Dump;
 
-
-end dependency_graphs;
+end Dependency_Graphs;

=== modified file 'dependency_graphs.ads'
--- dependency_graphs.ads	2012-06-09 10:32:54 +0000
+++ dependency_graphs.ads	2012-07-05 20:01:18 +0000
@@ -34,8 +34,7 @@
 --
 with Package_Trees;
 
-
-package dependency_graphs is
+package Dependency_Graphs is
    type Dependency_Graph (<>) is tagged private;
 
    type Graph_Access is access Dependency_Graph;
@@ -50,7 +49,6 @@
                                 Wither : in     Package_Trees.Cursor;
                                 Withed : in     Package_Trees.Cursor);
 
-
    procedure Iterate_Over_Withed
       (Graph   : Dependency_Graph;
        Wither  : Package_Trees.Cursor;
@@ -71,4 +69,4 @@
       record
          Adjacency : Adjacency_Matrix (1 .. N_Nodes, 1 .. N_Nodes);
       end record;
-end dependency_graphs;
+end Dependency_Graphs;

=== modified file 'deplo.adb'
--- deplo.adb	2012-06-28 18:24:52 +0000
+++ deplo.adb	2012-07-05 20:01:18 +0000
@@ -50,8 +50,8 @@
    Parameters := Command_Line_Parameters.Parse_Command_Line;
 
    declare
-      Input_Format  : String := +Parameters.Input_Format;
-      Output_Format : String := +Parameters.Output_Format;
+      Input_Format  : constant String := +Parameters.Input_Format;
+      Output_Format : constant String := +Parameters.Output_Format;
    begin
       if not Input.Is_Known (Input_Format) then
          raise Command_Line_Parameters.User_Error

=== modified file 'deplo.gpr'
--- deplo.gpr	2012-06-16 09:35:15 +0000
+++ deplo.gpr	2012-07-05 20:01:18 +0000
@@ -4,20 +4,37 @@
    for Object_Dir use "obj/";
    for Source_Dirs use (".", "test");
 
+   type Mode_Type is ("debug", "release");
+
+   Mode : Mode_Type := external ("mode", "release");
+
    package Compiler is
-      for Default_Switches ("ada") use ("-g", "-O2", "-gnata", "-gnat05", "-fstack-check", "-gnato", "-gnatwu");
+      Ada_Switches := ("-O2", "-march=native", "-gnata", "-gnat05", "-fstack-check", "-gnato", "-gnatwu", "-gnatv", "-gnatf", "-gnatVa", "-gnatwa", "-gnaty", "-gnatyduxO", "-gnaty-ms");
+
+      case Mode is
+         when "debug" =>
+            for Default_Switches ("ada") use Ada_Switches & ("-g");
+         when "release" =>
+            for Default_Switches ("ada") use Ada_Switches & ("-fomit-frame-pointer");
+      end case;
    end Compiler;
 
    package Builder is
-      for Default_Switches ("ada") use ("-g", "-s");
+      case Mode is
+         when "debug" =>
+            for Default_Switches ("ada") use ("-g", "-s");
+      end case;
    end Builder;
 
    package Binder is
-      for Default_Switches ("ada") use ("-E");
+      for Default_Switches ("ada") use ("-E");  -- Store tracebacks in exception occurrences
    end Binder;
 
    package Linker is
-      for Default_Switches ("ada") use ("-g");
+      case Mode is
+         when "debug" =>
+            for Default_Switches ("ada") use ("-g");
+      end case;
    end Linker;
 
 end Deplo;

=== modified file 'generic_line_parser.adb'
--- generic_line_parser.adb	2012-06-14 13:00:27 +0000
+++ generic_line_parser.adb	2012-07-05 20:01:18 +0000
@@ -21,7 +21,6 @@
 --
 with Ada.Command_Line;
 with Ada.Strings.Fixed;
-with Ada.Text_IO;
 with Ada.Containers.Ordered_Maps;
 with Ada.Strings.Maps.Constants;
 with Ada.Containers.Doubly_Linked_Lists;
@@ -38,8 +37,8 @@
    function To_U (X : String) return Unbounded_String
                   renames To_Unbounded_String;
 
-   -- In order to handle parameter aliases (see comments in the specs)
-   -- we keep a table that maps parameter names to parameter "index"
+   --  In order to handle parameter aliases (see comments in the specs)
+   --  we keep a table that maps parameter names to parameter "index"
    package Name_To_Index_Maps is
      new Ada.Containers.Ordered_Maps (Key_Type     => Unbounded_String,
                                       Element_Type => Natural);
@@ -48,8 +47,8 @@
    -- Case_Normalize --
    --------------------
 
-   -- If the user required case insensitive matching, force the
-   -- name to lower case
+   --  If the user required case insensitive matching, force the
+   --  name to lower case
    procedure Case_Normalize (Name : in out Unbounded_String) is
    begin
       if not Case_Sensitive then
@@ -61,8 +60,8 @@
    -- Fill_Name_Table --
    ---------------------
 
-   -- Fill the Parameter Name -> parameter index table with the
-   -- parameter names
+   --  Fill the Parameter Name -> parameter index table with the
+   --  parameter names
    procedure Fill_Name_Table (Parameters : in     Parameter_Descriptor_Array;
                               Name_Table : in out Name_To_Index_Maps.Map)
    is
@@ -96,7 +95,7 @@
          end Trimmed_Name;
 
          Result    : Name_Lists.List;
-         Buffer    : String := To_S (Name);
+         Buffer    : constant String := To_S (Name);
          First     : Natural;
          Comma_Pos : Natural;
       begin
@@ -104,7 +103,7 @@
             raise Constraint_Error with "Option label '" & Buffer & "' has '='";
          end if;
 
-         if Buffer(Buffer'Last) = ',' then
+         if Buffer (Buffer'Last) = ',' then
             raise Constraint_Error
                with "Option label '" & Buffer & "' ends with ','";
          end if;
@@ -117,20 +116,20 @@
             exit when Comma_Pos = 0;
 
             if First = Comma_Pos then
-               -- First should always point to the beginning of a
-               -- label, therefore it cannot be Buffer(First) = ','
+               --  First should always point to the beginning of a
+               --  label, therefore it cannot be Buffer(First) = ','
                raise Constraint_Error
                   with "Wrong syntax in Option label '" & Buffer & "'";
             end if;
 
             pragma Assert (Comma_Pos > First);
 
-            Result.Append (Trimmed_Name (Buffer(First .. Comma_Pos - 1)));
+            Result.Append (Trimmed_Name (Buffer (First .. Comma_Pos - 1)));
 
             First := Comma_Pos + 1;
 
-            -- It cannot be First > Buffer'Last since Buffer(Comma_Pos) = '='
-            -- and Buffer(Buffer'Last) /= ','
+            --  It cannot be First > Buffer'Last since Buffer(Comma_Pos) = '='
+            --  and Buffer(Buffer'Last) /= ','
             pragma Assert (First <= Buffer'Last);
          end loop;
 
@@ -155,7 +154,7 @@
             Name := Name_Lists.Element (Position);
             Name_Lists.Next (Position);
 
-            Case_Normalize(Name);
+            Case_Normalize (Name);
 
             if Name_Table.Contains (Name) then
                raise Constraint_Error
@@ -167,7 +166,6 @@
       end loop;
    end Fill_Name_Table;
 
-
    ----------------
    -- To_Natural --
    ----------------
@@ -176,7 +174,7 @@
                         return Natural is
    begin
       if X = Null_Unbounded_String then
-         raise Bad_Command with "Invalid integer '" & To_S(X) & "'";
+         raise Bad_Command with "Invalid integer '" & To_S (X) & "'";
       end if;
 
       return Natural'Value (To_S (X));
@@ -190,13 +188,12 @@
                       return Float is
    begin
       if X = Null_Unbounded_String then
-         raise Bad_Command with "Invalid Float '" & To_S(X) & "'";
+         raise Bad_Command with "Invalid Float '" & To_S (X) & "'";
       end if;
 
       return Float'Value (To_S (X));
    end To_Float;
 
-
    ------------------------
    -- Parse_Command_Line --
    ------------------------
@@ -223,7 +220,7 @@
          Idx := Index (Source  => Param,
                        Pattern => "=");
 
-         if (Idx = 0) then
+         if Idx = 0 then
             Name  := To_U (Param);
             Value := Null_Unbounded_String;
          else
@@ -251,7 +248,7 @@
          begin
             Item.Iterate (Append'Access);
 
-            return To_String(Result);
+            return To_String (Result);
          end Join;
 
          use type Ada.Containers.Count_Type;
@@ -263,7 +260,6 @@
          end if;
       end Missing_Message;
 
-
       Found : array (Parameters'Range) of Boolean := (others => False);
 
       Name  : Unbounded_String;
@@ -341,7 +337,6 @@
             Name_To_Index_Maps.Next (Position);
          end loop;
 
-
          if not Missing.Is_Empty then
             raise Bad_Command with Missing_Message (Missing);
          end if;

=== modified file 'generic_line_parser.ads'
--- generic_line_parser.ads	2012-06-09 10:32:54 +0000
+++ generic_line_parser.ads	2012-07-05 20:01:18 +0000
@@ -20,63 +20,63 @@
 ----------------------------------------------------------------------------
 --
 
--- <summary>
--- <p>This is a generic package implementing a simple-to-use command line
--- parser.  Yes, I know, everyone makes his/her own command line parser...
--- so, I wrote mine.  As they say, every open source project starts
--- with a programmer that schratches its own itch. So I did... If
--- you find this useful, you are welcome to use it.</p>
---
--- <p>The ideas behind this package are the following
---
--- <itemize>
--- <item> <p>Parameters are nominal, non positional.  The syntax is of
---   "named parameter" type, that is, each command line parameter is
---   expected to have thefollowing format</p>
---
---      <center>label ['=' value]</center>
---
---    <p>where "label" is any string without '='.</p></item>
---
--- <item><p> Parsed value are written in a "configuration variable" whose type
---   is a formal parameter of this package.  The values are written
---   in the configuration variable by using some callbacks provided
---   by caller.</p></item>
--- </itemize>
--- </p>
--- The names of the parameters are given to the parser in "parameter
--- description array" that is an array of records that specify
---
---     + The parameter name
---
---     + A default value (if needed)
---
---     + What to do if the parameter is missing
---
---     + If it can be specified more than once
---
---     + The callback function to be called when the parameter is found
---
--- In order to parse the command line it suffices to call Parse_Command_Line
--- giving as argument the array of parameter descriptors and the configuration
--- variable to be written.  For every parameter found, the corresponding
--- callback function is called.  If at the end of the parsing there are some
--- optional parameters that were missing from the command line, the
--- corresponding callbacks are called with the default parameter.
--- </summary>
+--  <summary>
+--  <p>This is a generic package implementing a simple-to-use command line
+--  parser.  Yes, I know, everyone makes his/her own command line parser...
+--  so, I wrote mine.  As they say, every open source project starts
+--  with a programmer that schratches its own itch. So I did... If
+--  you find this useful, you are welcome to use it.</p>
+--
+--  <p>The ideas behind this package are the following
+--
+--  <itemize>
+--  <item> <p>Parameters are nominal, non positional.  The syntax is of
+--    "named parameter" type, that is, each command line parameter is
+--    expected to have thefollowing format</p>
+--
+--       <center>label ['=' value]</center>
+--
+--     <p>where "label" is any string without '='.</p></item>
+--
+--  <item><p> Parsed value are written in a "configuration variable" whose type
+--    is a formal parameter of this package.  The values are written
+--    in the configuration variable by using some callbacks provided
+--    by caller.</p></item>
+--  </itemize>
+--  </p>
+--  The names of the parameters are given to the parser in "parameter
+--  description array" that is an array of records that specify
+--
+--      + The parameter name
+--
+--      + A default value (if needed)
+--
+--      + What to do if the parameter is missing
+--
+--      + If it can be specified more than once
+--
+--      + The callback function to be called when the parameter is found
+--
+--  In order to parse the command line it suffices to call Parse_Command_Line
+--  giving as argument the array of parameter descriptors and the configuration
+--  variable to be written.  For every parameter found, the corresponding
+--  callback function is called.  If at the end of the parsing there are some
+--  optional parameters that were missing from the command line, the
+--  corresponding callbacks are called with the default parameter.
+--  </summary>
 
 with Ada.Strings.Unbounded;
 with Ada.Text_IO;
 
 generic
    type Config_Data (<>) is limited private;
-   -- The parameters read from the command line will be written in
-   -- a variable of this type
+   --  The parameters read from the command line will be written in
+   --  a variable of this type
 
    Case_Sensitive : Boolean := True;
-   -- Set this to False if you want case insensitive option matching.
-   -- For example, if you set this to False, "input", "Input", "INPUT"
-   -- and "InPuT" will be equivalent names for the option "input"
+   --  Set this to False if you want case insensitive option matching.
+   --  For example, if you set this to False, "input", "Input", "INPUT"
+   --  and "InPuT" will be equivalent names for the option "input"
 package Generic_Line_Parser is
    use Ada.Strings.Unbounded;
 
@@ -107,44 +107,40 @@
          Only_Once  : Boolean;             -- Parameter MUST NOT be given more than once
          Callback   : Parameter_Callback;  -- Called when parameter found
       end record;
-   -- <description>Record holding the description of a parameter.  The fields
-   --  should be self-explenatory (I hope).  The only field that needs some
-   -- explanation is Name since it allows to specify more than one
-   -- name for each parameter.  The syntax is very simple: just separate
-   -- the names with commas.  For example, if Name is "f,filename,input"
-   -- one can use on the command line, with the same effect  f=/tmp/a.txt or
-   -- filename=/tmp/a.txt or input=/tmp/a.txt.  Spaces at both ends of
-   -- the label name are trimmed, so that, for example, "f,filename,input"
-   -- is equivalent to "f ,    filename  ,input "
-   -- </description>
-
+   --  <description>Record holding the description of a parameter.  The fields
+   --   should be self-explenatory (I hope).  The only field that needs some
+   --  explanation is Name since it allows to specify more than one
+   --  name for each parameter.  The syntax is very simple: just separate
+   --  the names with commas.  For example, if Name is "f,filename,input"
+   --  one can use on the command line, with the same effect  f=/tmp/a.txt or
+   --  filename=/tmp/a.txt or input=/tmp/a.txt.  Spaces at both ends of
+   --  the label name are trimmed, so that, for example, "f,filename,input"
+   --  is equivalent to "f ,    filename  ,input "
+   --  </description>
 
    type Parameter_Descriptor_Array is
      array (Natural range <>) of Parameter_Descriptor;
 
-
    procedure Parse_Command_Line
      (Parameters  : in     Parameter_Descriptor_Array;
       Result      :    out Config_Data;
       Help_Line   : in     String := "";
       Help_Output : in     Ada.Text_IO.File_Type := Ada.Text_IO.Standard_Error);
-   -- Main exported method.  It parses the command line and it writes
-   -- the result in Result.  If some error is encountered, Bad_Command
-   -- is raised with an explicative exception message.  If Help_Line is
-   -- not empty, it is written to Help_Output in case of error.
+   --  Main exported method.  It parses the command line and it writes
+   --  the result in Result.  If some error is encountered, Bad_Command
+   --  is raised with an explicative exception message.  If Help_Line is
+   --  not empty, it is written to Help_Output in case of error.
 
    Bad_Command : exception;
 
-
-
    function To_Float (X : Unbounded_String)
                       return Float;
-   -- Convenient conversion function to Float that raise Bad_Command if
-   -- the argument has not a valid syntax
+   --  Convenient conversion function to Float that raise Bad_Command if
+   --  the argument has not a valid syntax
 
    function To_Natural (X : Unbounded_String)
                         return Natural;
-   -- Convenient conversion function to Float that raise Bad_Command if
-   -- the argument has not a valid syntax
+   --  Convenient conversion function to Float that raise Bad_Command if
+   --  the argument has not a valid syntax
 
 end Generic_Line_Parser;

=== modified file 'indented_io.adb'
--- indented_io.adb	2012-06-09 10:32:54 +0000
+++ indented_io.adb	2012-07-05 20:01:18 +0000
@@ -145,10 +145,10 @@
    -- DeCrease_Tab --
    ------------------
 
-   procedure DeCrease_Tab (Indenter : in out Indenter_Type) is
+   procedure Decrease_Tab (Indenter : in out Indenter_Type) is
    begin
       Indenter.Current_Indent :=
         Integer'Max (0, Indenter.Current_Indent - Indenter.Indent_Step);
-   end DeCrease_Tab;
+   end Decrease_Tab;
 
 end Indented_IO;

=== modified file 'indented_io.ads'
--- indented_io.ads	2012-06-09 10:32:54 +0000
+++ indented_io.ads	2012-07-05 20:01:18 +0000
@@ -62,12 +62,10 @@
    --  Equivalent to Put followed by New_Line
 
    procedure Increase_Tab (Indenter : in out Indenter_Type);
-   -- Increase the indentation level by the Tab amount
+   --  Increase the indentation level by the Tab amount
 
    procedure Decrease_Tab (Indenter : in out Indenter_Type);
-   -- Decrease the indentation level by the Tab amount
-
-
+   --  Decrease the indentation level by the Tab amount
 
    procedure Open_Block (Indenter : in out Indenter_Type;
                          Line     : in     String := "");
@@ -98,7 +96,7 @@
 private
    type Indenter_Type is tagged
       record
-         File           : Ada.Text_Io.File_Access;
+         File           : Ada.Text_IO.File_Access;
          Current_Indent : Natural := 0;
          Indent_Step    : Natural := 4;
          Begin_Of_Line  : Boolean := True;

=== modified file 'input.adb'
--- input.adb	2012-07-05 14:37:11 +0000
+++ input.adb	2012-07-05 20:01:18 +0000
@@ -28,7 +28,6 @@
 with Ada.Directories;
 with Package_Names;
 with Ada.Strings.Equal_Case_Insensitive;
-with Command_Line_Parameters;
 
 package body Input is
    use Package_Trees;
@@ -37,7 +36,6 @@
 
    type Filename_Type is new String;
 
-
    package Filename_Lists is
       new Ada.Containers.Indefinite_Doubly_Linked_Lists (Filename_Type);
 
@@ -48,10 +46,10 @@
    function Filename_To_Package (Item : Filename_Type) return Package_Name is
       use Ada.Strings;
 
-      Dash_To_Dot : Maps.Character_Mapping := Maps.To_Mapping (From => "-",
+      Dash_To_Dot : constant Maps.Character_Mapping := Maps.To_Mapping (From => "-",
                                                                To   => ".");
 
-      Basename    : String := Ada.Directories.Base_Name (String (Item));
+      Basename    : constant String := Ada.Directories.Base_Name (String (Item));
    begin
       return Package_Name (Fixed.Translate (Source  => String (Basename),
                                             Mapping => Dash_To_Dot));
@@ -62,8 +60,6 @@
                                    return Graph_Access
    is
       use Filename_Lists;
-      use Dependency_Graphs;
-
 
       function Extract_Dependencies (Filename : Filename_Type) return Package_Lists.List is
          use Ada.Text_IO;
@@ -95,7 +91,7 @@
 
          while not End_Of_File (Input) loop
             declare
-               Pkg_Name : Package_Name := Parse_W_Line (Get_Line (Input));
+               Pkg_Name : constant Package_Name := Parse_W_Line (Get_Line (Input));
             begin
                if DB.Contains (Pkg_Name) then
                   Result.Append (Pkg_Name);
@@ -107,11 +103,11 @@
          return Result;
       end Extract_Dependencies;
 
-      Result          : Graph_Access := Create (DB.Size);
+      Result : constant Graph_Access := Create (DB.Size);
 
       procedure Process_One_ALI (Position : Filename_Lists.Cursor) is
          Wither : Package_Trees.Cursor;
-         Filename : Filename_Type := Filename_Lists.Element (Position);
+         Filename : constant Filename_Type := Filename_Lists.Element (Position);
          Dependencies : Package_Lists.List;
 
          procedure Add_Dependency (Pos : Package_Lists.Cursor) is
@@ -129,10 +125,6 @@
          Dependencies.Iterate (Add_Dependency'Access);
       end Process_One_ALI;
 
-
-
-
-
    begin
       Filenames.Iterate (Process_One_ALI'Access);
 
@@ -166,7 +158,6 @@
               Process   => Process'Access);
    end Populate_Tree;
 
-
    ---------------------------
    -- Get_Package_Structure --
    ---------------------------
@@ -176,7 +167,6 @@
                                    return Package_DB.DB_Type
    is
       pragma Unreferenced (Format);
-      use Command_Line_Parameters;
 
       Filenames : Filename_Lists.List;
       Result : Package_DB.DB_Type;

=== modified file 'line_arrays.adb'
--- line_arrays.adb	2012-06-28 17:58:41 +0000
+++ line_arrays.adb	2012-07-05 20:01:18 +0000
@@ -108,7 +108,6 @@
       Terminator : String)
       return String
    is
-      use Ada.Strings.Unbounded;
       use Line_Containers;
 
       Result : Unbounded_String := Null_Unbounded_String;
@@ -124,7 +123,6 @@
       return To_String (Result);
    end Join;
 
-
    ----------
    -- Join --
    ----------
@@ -149,7 +147,7 @@
    is
       use Ada.Containers;
 
-      Diff : Integer := Right.First_Index - Left.First_Index;
+      Diff : constant Integer := Right.First_Index - Left.First_Index;
    begin
       if Left.Length /= Right.Length then
          return False;
@@ -203,5 +201,4 @@
       return Result;
    end Read;
 
-
 end Line_Arrays;

=== modified file 'line_arrays.ads'
--- line_arrays.ads	2012-06-28 17:58:41 +0000
+++ line_arrays.ads	2012-07-05 20:01:18 +0000
@@ -68,7 +68,6 @@
    --  Read a file and split its content a string into an array of lines,
    --  splitting at the specified line terminator
 
-
    function Join
      (Input      : Line_Array;
       Terminator : Valid_Line_Terminator := CR)

=== modified file 'node_processing.adb'
--- node_processing.adb	2012-06-09 10:32:54 +0000
+++ node_processing.adb	2012-07-05 20:01:18 +0000
@@ -19,9 +19,6 @@
 --      along with DePlo.  If not, see <http://www.gnu.org/licenses/>.
 ----------------------------------------------------------------------------
 
-with Package_Trees;
-with Dependency_Graphs;
-
 package body Node_Processing is
    ------------------------
    -- Clean_Dependencies --
@@ -68,7 +65,6 @@
       end loop;
    end Clean_Dependencies;
 
-
    ---------------------
    -- Removed_Ignored --
    ---------------------
@@ -81,7 +77,6 @@
       use Package_Names;
       use Dependency_Graphs;
 
-
       procedure Copy_Not_Ignored (Target  : in out Package_Tree;
                                   Source  : in     Package_Tree;
                                   Ignored : in     Package_List)
@@ -97,7 +92,7 @@
                Target.Add (Name (Pos));
 
                declare
-                  P : Package_Trees.Cursor := Target.Find (Name (Pos));
+                  P : constant Package_Trees.Cursor := Target.Find (Name (Pos));
 
                   procedure Copy_Attribute (Name, Value : String) is
                   begin
@@ -120,10 +115,9 @@
 
          procedure Process (Wither : Package_Trees.Cursor;
                             Withed : Package_Trees.Cursor) is
-            use Package_Trees;
 
-            Wither_Pos : Cursor := Target.Tree.Find (Name (Wither));
-            Withed_Pos : Cursor := Target.Tree.Find (Name (Withed));
+            Wither_Pos : constant Cursor := Target.Tree.Find (Name (Wither));
+            Withed_Pos : constant Cursor := Target.Tree.Find (Name (Withed));
          begin
             if Wither_Pos /= No_Element and Withed_Pos /= No_Element then
                Target.Graph.Add_Dependency (Wither => Wither_Pos,
@@ -200,7 +194,7 @@
                                 Trim_List : Package_List)
                                 return Package_Trees.Cursor
             is
-               Ancestor : Package_Name := Find_Ancestor (Trim_List, Name (Node));
+               Ancestor : constant Package_Name := Find_Ancestor (Trim_List, Name (Node));
             begin
                if Ancestor = "" then
                   return Target.Tree.Find (Name (Node));
@@ -215,7 +209,7 @@
          end Process;
       begin
          for Index in Source.Tree.First_Index .. Source.Tree.Last_Index loop
-            Source.Graph.Iterate_Over_Withed (Wither  => Source.Tree.Position(Index),
+            Source.Graph.Iterate_Over_Withed (Wither  => Source.Tree.Position (Index),
                                               Process => Process'Access);
          end loop;
       end Collapse_Edges;
@@ -235,5 +229,4 @@
       return Result;
    end Collapse_Nodes;
 
-
 end Node_Processing;

=== modified file 'node_processing.ads'
--- node_processing.ads	2012-06-09 10:32:54 +0000
+++ node_processing.ads	2012-07-05 20:01:18 +0000
@@ -28,7 +28,7 @@
 
 with Package_DB;
 with Package_Names;
-with dependency_graphs;
+with Dependency_Graphs;
 with Package_Trees;
 
 package Node_Processing is
@@ -67,5 +67,4 @@
    --      * If a package depends both from a package and an ancestor of
    --        it, remove the dependence from the ancestor.
 
-
 end Node_Processing;

=== modified file 'output.adb'
--- output.adb	2012-06-28 18:24:52 +0000
+++ output.adb	2012-07-05 20:01:18 +0000
@@ -25,8 +25,6 @@
 with Ada.Strings.Fixed;
 with Indented_IO;
 with Ada.Strings.Equal_Case_Insensitive;
-with Style_Table;
-
 
 package body Output is
 
@@ -38,7 +36,6 @@
       & "dot.collapsed-shape = folder;"
       & "dot.collapsed-color = blue";
 
-
    function To_S (Idx : Package_Trees.Package_Index) return String is
       use Package_Trees;
       use Ada.Strings.Fixed;
@@ -77,7 +74,7 @@
          end if;
 
          declare
-            Item : String := String (Name)
+            Item : constant String := String (Name)
                & "="
                & '"' & String (Value) & '"'
                & Terminator;
@@ -96,18 +93,14 @@
 
    end Print_Style;
 
-
-
    procedure Print_Node_List (Indenter : in out Indented_IO.Indenter_Type;
                               DB       : Package_Trees.Package_Tree) is
       use Package_Trees;
 
-
       procedure Print_Tree (Pos : Cursor) is
          use Ada.Strings.Fixed;
 
          procedure Print_Node (Pos : Cursor) is
-
          begin
             Indenter.Put (Node_Name (Pos));
             Indenter.Put ("[label="
@@ -151,7 +144,7 @@
             Indenter.Close_Block ("}");
          end Close_Subgraph;
 
-         Desc : Cursor_Array := Children (Pos);
+         Desc : constant Cursor_Array := Children (Pos);
       begin
          if Desc'Length = 0 then
             pragma Assert (Is_A_Leaf (Pos));
@@ -168,7 +161,7 @@
          end if;
       end Print_Tree;
 
-      Roots : Cursor_Array := DB.Roots;
+      Roots : constant Cursor_Array := DB.Roots;
    begin
       for I in Roots'Range loop
          Print_Tree (Roots (I));
@@ -200,7 +193,7 @@
                return Root;
             else
                declare
-                  Kids : Cursor_Array := Children (Root);
+                  Kids : constant Cursor_Array := Children (Root);
                begin
                   --  First search among the direct descendants of Root
                   for I in Kids'Range loop
@@ -236,7 +229,6 @@
          pragma Assert (Is_A_Leaf (True_To));
          pragma Assert (Is_A_Leaf (True_From));
 
-
          --  Make an edge between the two leaves
          Indenter.Put (Node_Name (True_From)
                        & " -> "
@@ -302,20 +294,17 @@
       Indenter.Close_Block ("}");
    end Print_Trailer;
 
-
-
    -----------------
    -- Print_Graph --
    -----------------
 
    procedure Print_Graph (Format : String;
                           Item   : Package_DB.DB_Type)
-
    is
       pragma Unreferenced (Format);
       Indenter : Indented_IO.Indenter_Type := Indented_IO.Create;
 
-      Collapsed : Package_DB.DB_Type := Item;
+      Collapsed : constant Package_DB.DB_Type := Item;
    begin
       Print_Header (Indenter);
       Print_Node_List (Indenter, Collapsed.Tree);

=== modified file 'output.ads'
--- output.ads	2012-06-14 18:15:19 +0000
+++ output.ads	2012-07-05 20:01:18 +0000
@@ -20,7 +20,8 @@
 ----------------------------------------------------------------------------
 with Package_DB;
 with Style_Table;
-package output is
+
+package Output is
    function Is_Known (Format : String) return Boolean;
 
    function Style_Defaults (Format : String) return Style_Table.Style_Spec;
@@ -28,4 +29,4 @@
    procedure Print_Graph (Format : String;
                           Item   : Package_DB.DB_Type);
 
-end output;
+end Output;

=== modified file 'package_db.ads'
--- package_db.ads	2012-06-09 10:32:54 +0000
+++ package_db.ads	2012-07-05 20:01:18 +0000
@@ -46,4 +46,3 @@
          Graph : Graph_Access;
       end record;
 end Package_DB;
-

=== modified file 'package_names.adb'
--- package_names.adb	2012-06-09 10:32:54 +0000
+++ package_names.adb	2012-07-05 20:01:18 +0000
@@ -96,8 +96,6 @@
          Put_Line (Standard_Error, ")");
       end Print_Warning;
 
-
-
       Result     : Package_List;
       Removed    : Package_List;
    begin
@@ -107,7 +105,7 @@
          -------------
 
          procedure Process (Pos : Package_Lists.Cursor) is
-            Name : Package_Name := Package_Lists.Element (Pos);
+            Name : constant Package_Name := Package_Lists.Element (Pos);
          begin
             if Package_Names.Find_Ancestor (Input, Name) /= "" then
                Removed.Append (Name);
@@ -141,17 +139,17 @@
       Input  : Ada.Text_IO.File_Type;
    begin
       Ada.Text_IO.Open (File => Input,
-                        Mode => Ada.Text_Io.In_File,
+                        Mode => Ada.Text_IO.In_File,
                         Name => Filename);
 
       while not Ada.Text_IO.End_Of_File (Input) loop
          declare
-            Line : String := Fixed.Trim (Source => Get_Line (Input),
-                                         Left   => Spaces,
-                                         Right  => Spaces);
+            Line : constant String := Fixed.Trim (Source => Get_Line (Input),
+                                                  Left   => Spaces,
+                                                  Right  => Spaces);
          begin
             if Line'Length >= 1 and then Line (Line'First) /= '#' then
-               if Is_Valid_Package_Name(Line) then
+               if Is_Valid_Package_Name (Line) then
                   List.Append (Package_Name (Line));
                else
                   raise Program_Error
@@ -178,11 +176,10 @@
 
       function To_Package_List (Input : Token_List) return Package_List is
          Result : Package_List;
-
       begin
          declare
             procedure Append (Pos : String_Vectors.Cursor) is
-               V : String := Fixed.Trim (+String_Vectors.Element (Pos), Both);
+               V : constant String := Fixed.Trim (+String_Vectors.Element (Pos), Both);
             begin
                if Is_Valid_Package_Name (V) then
                   Result.Append (Package_Name (V));
@@ -200,7 +197,7 @@
 
    begin
       if Param (Param'First) = '@' then
-          return Read_Package_List (Param (Param'First + 1 .. Param'Last));
+         return Read_Package_List (Param (Param'First + 1 .. Param'Last));
       else
          return To_Package_List (Split (Param, ','));
       end if;

=== modified file 'package_names.ads'
--- package_names.ads	2012-06-09 10:32:54 +0000
+++ package_names.ads	2012-07-05 20:01:18 +0000
@@ -52,7 +52,7 @@
    --  found.  If no ancestor is found, return the empty string.
    --  If more than ancestor is present, return the first found.
 
-   function Parse_Package_List (Param : String)return Package_List;
+   function Parse_Package_List (Param : String) return Package_List;
    --  If Param begins with '@', the rest of the string is interpreted
    --  as the name of a file to be read via Read_Package_List; if Param
    --  does not begin with '@', it is expected to be a list of package
@@ -70,9 +70,6 @@
    --  package).  If a package is the ancestor of another, the ancestor
    --  is kept and the descendant is removed.
 
-
-
-
    -- ================== --
    -- PACKAGE COMPONENTS --
    -- ================== --

=== modified file 'package_trees.adb'
--- package_trees.adb	2012-06-09 10:32:54 +0000
+++ package_trees.adb	2012-07-05 20:01:18 +0000
@@ -19,10 +19,8 @@
 --      along with DePlo.  If not, see <http://www.gnu.org/licenses/>.
 ----------------------------------------------------------------------------
 with Ada.Strings.Hash;
-with Ada.Containers.Hashed_Maps;
 
 package body Package_Trees is
-   use Ada.Strings.Unbounded;
 
    ---------
    -- Add --
@@ -61,7 +59,7 @@
       end if;
 
       declare
-         Idx : Package_Index := DB.DB.Package_Data.Last_Index + 1;
+         Idx : constant Package_Index := DB.DB.Package_Data.Last_Index + 1;
 
          procedure Add_Child (Item : in out Package_Descriptor) is
          begin
@@ -72,7 +70,7 @@
 
          DB.DB.Package_Data.Append ((Index           => Idx,
                                      Parent          => Parent,
-                                     Name            => To_Unbounded_String (String(To_Name (Key))),
+                                     Name            => To_Unbounded_String (String (To_Name (Key))),
                                      Name_Components => Key,
                                      Children        => Index_Lists.Empty_List,
                                      Attributes      => Attribute_Lists.Empty_Map));
@@ -103,7 +101,7 @@
       Name : Package_Name)
       return Cursor
    is
-      Key : Component_List := To_Component_List (Name);
+      Key : constant Component_List := To_Component_List (Name);
    begin
       if not DB.DB.Name_To_Index.Contains (Key) then
          return No_Element;
@@ -121,7 +119,7 @@
      (Position : Cursor)
       return Cursor
    is
-      Parent_Idx : Package_Index := Position.DB.Package_Data.Element (Position.Index).Parent;
+      Parent_Idx : constant Package_Index := Position.DB.Package_Data.Element (Position.Index).Parent;
    begin
       if Parent_Idx = No_Index then
          return No_Element;
@@ -181,7 +179,6 @@
                      Index => Index);
    end Position;
 
-
    --------------
    -- Contains --
    --------------
@@ -306,7 +303,6 @@
       use type Package_Lists.Cursor;
       use type Ada.Containers.Count_Type;
 
-
       Pos_L : Package_Lists.Cursor := Left.First;
       Pos_R : Package_Lists.Cursor := Right.First;
    begin

=== modified file 'package_trees.ads'
--- package_trees.ads	2012-06-09 10:32:54 +0000
+++ package_trees.ads	2012-07-05 20:01:18 +0000
@@ -60,7 +60,6 @@
       private;
    --  The type representing the package tree
 
-
    type Cursor is private;
 
    No_Element : constant Cursor;
@@ -98,7 +97,6 @@
                                 Process  : access procedure (Name, Value : String));
    --  Call Process for every attribute of the node
 
-
    function Find (DB   : Package_Tree;
                   Name : Package_Name)
                   return Cursor;
@@ -114,7 +112,6 @@
                     return Cursor;
    --  Return the parent of the node identified by the cursor
 
-
    function Children (Pos : Cursor)
                       return Cursor_Array;
    --  Return the cursors associated with the children of the specified node
@@ -124,13 +121,11 @@
    --  Return true if the node has no children.  Equivalent to
    --  Children(pos)'length = 0
 
-
    function Roots (DB : Package_Tree)
                    return Cursor_Array;
    --  Return the cursors of the nodes that have no ancestor.  (Yes, the
    --  "package tree" is actually a forest)
 
-
    function Index (Position : Cursor)
                    return Package_Index;
    --  Return the unique index assigned to the package identified by the cursor
@@ -147,7 +142,6 @@
    --  Return the cursor associated with the specified package index in
    --  the specified tree
 
-
    function Position (Pos : Cursor;
                       Index : Package_Index)
                       return Cursor;
@@ -155,7 +149,6 @@
    --  the same tree of the specified cursor. (Funny as it may seem, it is
    --  useful)
 
-
    function Size (DB : Package_Tree) return Natural;
    --  Return the number of nodes in the tree
 
@@ -176,14 +169,12 @@
 
    No_Index : constant Package_Index := Package_Index'Last;
 
-
    function Name_List_Hash (Item : Component_List)
                             return Ada.Containers.Hash_Type;
 
    function "=" (Left, Right : Component_List)
                  return Boolean;
 
-
    package Name_To_Index_Maps is
      new Ada.Containers.Hashed_Maps (Key_Type        => Component_List,
                                      Element_Type    => Package_Index,
@@ -224,7 +215,7 @@
 
    type DB_Access is access Basic_DB_Type;
 
-   type Package_Tree Is new
+   type Package_Tree is new
      Ada.Finalization.Controlled
    with
       record

=== modified file 'sectioned_text.adb'
--- sectioned_text.adb	2012-06-28 18:24:52 +0000
+++ sectioned_text.adb	2012-07-05 20:01:18 +0000
@@ -18,11 +18,9 @@
 --      You should have received a copy of the GNU General Public License    --
 --      along with DePlo.  If not, see <http://www.gnu.org/licenses/>.       --
 -------------------------------------------------------------------------------
-with Ada.Strings.Unbounded;
 with Ada.Strings.Fixed;
 
 package body Sectioned_Text is
-   use Ada.Strings.Unbounded;
 
    function To_S (X : Unbounded_String) return String
                   renames To_String;
@@ -56,7 +54,7 @@
    begin
       for I in Skip + Lines.First_Index .. Lines.Last_Index loop
          declare
-            Classified : Classified_Line := Classifier.Classify (Lines.Element (I));
+            Classified : constant Classified_Line := Classifier.Classify (Lines.Element (I));
          begin
             case Classified.Class is
                when Section =>
@@ -64,7 +62,7 @@
                   Current_Sect.Clear;
                   Section_Name := Classified.Name;
                when Normal =>
-                  Current_Sect.Append (To_S(Classified.Content));
+                  Current_Sect.Append (To_S (Classified.Content));
                when Comment =>
                   null;
             end case;
@@ -94,7 +92,7 @@
    is
       Separator : constant String := Lines.First_Element;
 
-      Classifier : Basic_Line_Classifier := New_Classifier (Head => Separator);
+      Classifier : constant Basic_Line_Classifier := New_Classifier (Head => Separator);
    begin
       return Parse (Lines      => Lines,
                     Classifier => Classifier,
@@ -111,8 +109,6 @@
       return Parse (Line_Arrays.Read (Filename));
    end Parse;
 
-
-
    ----------------
    -- New_Parser --
    ----------------
@@ -145,14 +141,13 @@
                       Input  : String)
                       return Classified_Line
    is
-      use Ada.Strings.Unbounded;
       use Ada.Strings;
 
       function Begin_With (Input : String;
                            Head  : Unbounded_String)
                            return Boolean
       is
-         H : String := To_S (Head);
+         H : constant String := To_S (Head);
       begin
          return
            H = "" or else
@@ -165,7 +160,7 @@
                          Skip  : Natural)
                          return Boolean
       is
-         T : String := To_S (Tail);
+         T : constant String := To_S (Tail);
       begin
          return T = ""
            or else
@@ -179,7 +174,7 @@
                       Trim  : Boolean)
                       return Unbounded_String
       is
-         Section : String :=
+         Section : constant String :=
                      Input (Input'First + Length (Head) .. Input'Last - Length (Tail));
       begin
          if Trim then
@@ -189,17 +184,16 @@
          end if;
       end Strip;
 
-
       function Is_To_Be_Ignored (Input : String) return Boolean is
-         Trimmed : String := Fixed.Trim (Input, Both);
+         Trimmed : constant String := Fixed.Trim (Input, Both);
       begin
          if Length (Parser.Comments) > 0 then
             if Begin_With (Input, Parser.Comments) then
                return True;
             end if;
 
-              if (Parser.Trim_Comments
-                  and then Begin_With (Trimmed, Parser.Comments)) then
+            if Parser.Trim_Comments
+              and then Begin_With (Trimmed, Parser.Comments) then
                return True;
             end if;
          end if;
@@ -233,9 +227,6 @@
 
 end Sectioned_Text;
 
-
-
-
 --        function Check (X : String) return String is
 --           use Ada.Strings.Fixed;
 --

=== modified file 'sectioned_text.ads'
--- sectioned_text.ads	2012-06-28 17:58:41 +0000
+++ sectioned_text.ads	2012-07-05 20:01:18 +0000
@@ -57,7 +57,6 @@
 
    subtype Section_List is Line_Array_Maps.Map;
 
-
    type Line_Class is (Normal, Section, Comment);
 
    type Classified_Line (Class : Line_Class) is
@@ -93,7 +92,6 @@
       Skip        : Integer := 0)
       return Section_List;
 
-
    function Parse (Lines : Line_Array) return Section_List;
 
    function Parse (Filename : String) return Section_List;
@@ -120,7 +118,6 @@
    --  the section name are stripped, so that "%foo" is equivalent to "%  foo"
    --  "%foo  ".
 
-
    type Basic_Line_Classifier (<>) is new
      Abstract_Classifier
    with
@@ -139,10 +136,8 @@
                       Input  : String)
                       return Classified_Line;
 
-
 private
 
-
    type Basic_Line_Classifier is new
      Abstract_Classifier
    with
@@ -156,5 +151,4 @@
          Ignore_Empty  : Boolean;
       end record;
 
-
 end Sectioned_Text;

=== modified file 'style_table.adb'
--- style_table.adb	2012-06-29 11:46:21 +0000
+++ style_table.adb	2012-07-05 20:01:18 +0000
@@ -19,7 +19,6 @@
 --      along with DePlo.  If not, see <http://www.gnu.org/licenses/>.       --
 -------------------------------------------------------------------------------
 
-with Ada.Strings.Unbounded;
 with Ada.Strings.Hash_Case_Insensitive;
 with Ada.Strings.Equal_Case_Insensitive;
 with Ada.Containers.Indefinite_Hashed_Maps;
@@ -27,14 +26,11 @@
 with Ada.Text_IO;
 
 package body Style_Table is
-   use Ada.Strings.Unbounded;
 
    function To_U (X : String) return Unbounded_String
                   renames To_Unbounded_String;
    pragma Unreferenced (To_U);
 
-
-
    function To_S (X : Unbounded_String) return String
       renames To_String;
 
@@ -54,10 +50,9 @@
 
    function Attribute_Name_Hash (X : Attribute_Name) return Ada.Containers.Hash_Type is
    begin
-     return Ada.Strings.Hash (String (X));
+      return Ada.Strings.Hash (String (X));
    end Attribute_Name_Hash;
 
-
    package Attribute_Maps is
      new Ada.Containers.Indefinite_Hashed_Maps
        (Key_Type        => Attribute_Name,
@@ -68,7 +63,7 @@
 
    function Class_Hash (X : Node_Class) return Ada.Containers.Hash_Type is
    begin
-     return Ada.Strings.Hash_Case_Insensitive (String (X));
+      return Ada.Strings.Hash_Case_Insensitive (String (X));
    end Class_Hash;
 
    function Class_Equal (X, Y : Node_Class) return Boolean is
@@ -153,7 +148,7 @@
       end Next;
 
       function Get_Char return Character is
-         Result : Character := Peek;
+         Result : constant Character := Peek;
       begin
          Next;
          return Result;
@@ -256,7 +251,7 @@
 
                Extract_String_Value;
 
-               -- Skip optional spaces after the last '"'
+               --  Skip optional spaces after the last '"'
                Skip_Spaces;
 
                --  Now the next char, if it exists, can only be a ';'
@@ -332,8 +327,6 @@
       end loop;
    end Parse_And_Add;
 
-
-
    -------------------
    -- Parse_And_Add --
    -------------------
@@ -352,14 +345,14 @@
    -------------
 
    procedure Iterate
-     (Class : Node_Class;
-      Process : not null access procedure (Name : Attribute_Name;
-                                            Value : Attribute_Value))
+     (Class   : Node_Class;
+      Process : not null access procedure (Name  : Attribute_Name;
+                                           Value : Attribute_Value))
    is
       procedure Dispatch (Pos : Attribute_Maps.Cursor) is
       begin
-         Process (Name  => Attribute_Maps.Key(Pos),
-                  Value => Attribute_Maps.Element(Pos));
+         Process (Name  => Attribute_Maps.Key (Pos),
+                  Value => Attribute_Maps.Element (Pos));
       end Dispatch;
    begin
 --        Ada.Text_IO.Put_Line ("Iterate : " & String (Class) & "->" & Boolean'Image (Table.Contains (Class)));
@@ -368,14 +361,14 @@
       end if;
    end Iterate;
 
-   procedure Dump(List : Style_Spec_Lists.List)
+   procedure Dump (List : Style_Spec_Lists.List)
    is
-      procedure Print(Pos : Style_Spec_Lists.Cursor) is
+      procedure Print (Pos : Style_Spec_Lists.Cursor) is
       begin
-         Ada.Text_Io.Put_Line(String(Style_Spec_Lists.Element(Pos)));
+         Ada.Text_IO.Put_Line (String (Style_Spec_Lists.Element (Pos)));
       end Print;
    begin
-      List.Iterate(Print'Access);
+      List.Iterate (Print'Access);
    end Dump;
 
 end Style_Table;

=== modified file 'style_table.ads'
--- style_table.ads	2012-06-29 11:46:21 +0000
+++ style_table.ads	2012-07-05 20:01:18 +0000
@@ -75,7 +75,7 @@
    package Style_Spec_Lists is
       new Ada.Containers.Indefinite_Doubly_Linked_Lists (Style_Spec);
 
-   procedure Dump(List : Style_Spec_Lists.List);
+   procedure Dump (List : Style_Spec_Lists.List);
 
    procedure Add (Class  : Node_Class;
                   Name   : Attribute_Name;
@@ -127,8 +127,6 @@
    --  Call Extract_Spec_Data for every entry in the list of
    --  style specs and add the result to the style table
 
-
-
    procedure Iterate
       (Class : Node_Class;
        Process : not null access procedure (Name : Attribute_Name;

=== modified file 'test/test_sectioned_text.adb'
--- test/test_sectioned_text.adb	2012-06-28 17:58:41 +0000
+++ test/test_sectioned_text.adb	2012-07-05 20:01:18 +0000
@@ -30,7 +30,7 @@
       use Sectioned_Text.Line_Array_Maps;
 
       procedure Print_Section (Pos : Cursor) is
-         Lines : Line_Array := Element (Pos);
+         Lines : constant Line_Array := Element (Pos);
       begin
          Put_Line ("[" & Key (Pos) & "]");
 
@@ -42,9 +42,9 @@
       X.Iterate (Print_Section'Access);
    end Print;
 
-   Sectioned : Section_List := Parse	 ("test_sectioned_text.txt");
+   Sectioned : constant Section_List := Parse ("test_sectioned_text.txt");
 
-   Classifier : Basic_Line_Classifier :=
+   Classifier : constant Basic_Line_Classifier :=
                   New_Classifier (Head          => "[",
                                   Tail          => "]",
                                   Comments      => "%",
@@ -53,7 +53,7 @@
                                   Trim_Comments => True,
                                   Ignore_Empty  => True);
 
-   Classifier_2 : Basic_Line_Classifier :=
+   Classifier_2 : constant Basic_Line_Classifier :=
                     New_Classifier (Head          => "[",
                                     Tail          => "]",
                                     Comments      => "%",
@@ -62,16 +62,15 @@
                                     Trim_Comments => False,
                                     Ignore_Empty  => False);
 
-
-   Sectioned_2 : Section_List := Parse (Filename   => "test_sectioned_text2.txt",
+   Sectioned_2 : constant Section_List := Parse (Filename   => "test_sectioned_text2.txt",
                                         Classifier => Classifier);
 
-   Sectioned_3 : Section_List := Parse (Filename   => "test_sectioned_text2.txt",
+   Sectioned_3 : constant Section_List := Parse (Filename   => "test_sectioned_text2.txt",
                                         Classifier => Classifier_2);
 begin
    Print (Sectioned);
    Put_Line ("-------------------------");
    Print (Sectioned_2);
-   Put_Line("-------------------------");
+   Put_Line ("-------------------------");
    Print (Sectioned_3);
 end Test_Sectioned_Text;

=== modified file 'tokenize.adb'
--- tokenize.adb	2012-06-09 10:32:54 +0000
+++ tokenize.adb	2012-07-05 20:01:18 +0000
@@ -20,9 +20,9 @@
 ----------------------------------------------------------------------------
 package body Tokenize is
 
-   -- Called by Split when the separator is a space.  According to
-   -- Ruby convention, space is a special separator in the sense
-   -- that consecutive spaces do not give rise to empty tokens.
+   --  Called by Split when the separator is a space.  According to
+   --  Ruby convention, space is a special separator in the sense
+   --  that consecutive spaces do not give rise to empty tokens.
    function Collated_Split (To_Be_Splitted : String;
                             Separator      : Character)
                             return Token_List is
@@ -32,38 +32,38 @@
 
       Current := To_Be_Splitted'First;
 
-  Main_Loop:
+   Main_Loop:
       while Current <= To_Be_Splitted'Last loop
 
      Search_For_Begin:
-         -- Since we are doing a Collated split, we need to skip
-         -- all the separators
+         --  Since we are doing a Collated split, we need to skip
+         --  all the separators
          while Current <= To_Be_Splitted'Last and then
-           To_Be_Splitted(Current) = Separator loop
-            Current := Current+1;
+           To_Be_Splitted (Current) = Separator loop
+            Current := Current + 1;
          end loop Search_For_Begin;
 
-         -- If I am here or Current points after the end of
-         -- the string of To_Be_Splitted(Current) is a non-sep
-         -- character
-
-         exit when (Current > To_Be_Splitted'Last);
-
-         -- If I am here, To_Be_Splitted(Current) is a
-         -- non-separator character
+         --  If I am here or Current points after the end of
+         --  the string of To_Be_Splitted(Current) is a non-sep
+         --  character
+
+         exit when Current > To_Be_Splitted'Last;
+
+         --  If I am here, To_Be_Splitted(Current) is a
+         --  non-separator character
 
          First := Current;
 
      Search_For_End:
          while Current <= To_Be_Splitted'Last and then
-           To_Be_Splitted(Current) /= Separator loop
-            Current := Current+1;
+           To_Be_Splitted (Current) /= Separator loop
+            Current := Current + 1;
          end loop Search_For_End;
 
          String_Vectors.Append (Result,
-                                To_Unbounded_String(To_Be_Splitted(First..Current-1)));
+                                To_Unbounded_String (To_Be_Splitted (First .. Current - 1)));
 
-         Current := Current+1;
+         Current := Current + 1;
       end loop Main_Loop;
 
       return Result;
@@ -88,49 +88,46 @@
 
      Search_For_End:
          while Current <= To_Be_Splitted'Last and then
-           To_Be_Splitted(Current) /= Separator loop
-            Current := Current+1;
+           To_Be_Splitted (Current) /= Separator loop
+            Current := Current + 1;
          end loop Search_For_End;
 
-         String_Vectors.Append(Result,
-                               To_Unbounded_String(To_Be_Splitted(First..Current-1)));
+         String_Vectors.Append (Result,
+                                To_Unbounded_String (To_Be_Splitted (First .. Current - 1)));
 
-         if (Current = To_Be_Splitted'Last) then
-            String_Vectors.Append(Result, Null_Unbounded_String);
+         if Current = To_Be_Splitted'Last then
+            String_Vectors.Append (Result, Null_Unbounded_String);
          end if;
 
-         Current := Current+1;
+         Current := Current + 1;
       end loop Main_Loop;
 
       return Result;
    end Uncollated_Split;
 
-   function Split(To_Be_Splitted    : String;
-                  Separator         : Character;
-                  Collate_Separator : Boolean)
-                 return Token_List is
+   function Split (To_Be_Splitted    : String;
+                   Separator         : Character;
+                   Collate_Separator : Boolean)
+                  return Token_List is
    begin
-      if (Collate_Separator) then
-         return Collated_Split(To_Be_Splitted, Separator);
+      if Collate_Separator then
+         return Collated_Split (To_Be_Splitted, Separator);
       else
-         return Uncollated_Split(To_Be_Splitted, Separator);
+         return Uncollated_Split (To_Be_Splitted, Separator);
       end if;
    end Split;
 
-
-   --
-   -- Similar to the three-parameter version, but the Separator
-   -- char defaults to the space and Collate_Separator is True
-   -- if Separator is the space, false otherwise
-   --
-   function Split(To_Be_Splitted : String;
-                  Separator      : Character := ' ')
-                 return Token_List is
+   --  Similar to the three-parameter version, but the Separator
+   --  char defaults to the space and Collate_Separator is True
+   --  if Separator is the space, false otherwise
+   function Split (To_Be_Splitted : String;
+                   Separator      : Character := ' ')
+                  return Token_List is
    begin
-      if (Separator=' ') then
-         return Collated_Split(To_Be_Splitted, Separator);
+      if Separator = ' ' then
+         return Collated_Split (To_Be_Splitted, Separator);
       else
-         return Uncollated_Split(To_Be_Splitted, Separator);
+         return Uncollated_Split (To_Be_Splitted, Separator);
       end if;
    end Split;
 
@@ -141,18 +138,17 @@
       return To_Array (Split (To_Be_Splitted, Separator));
    end Split;
 
-
-   function Length(Container : Token_List) return Natural is
+   function Length (Container : Token_List) return Natural is
    begin
-      return Natural(String_Vectors.Length(Container));
+      return Natural (String_Vectors.Length (Container));
    end Length;
 
    function To_Array (List : Token_List)
                      return Token_Array is
-      Result : Token_Array(1..Length(List));
+      Result : Token_Array (1 .. Length (List));
    begin
       for I in Result'Range loop
-         Result(I) := Element(List, I);
+         Result (I) := Element (List, I);
       end loop;
 
       return Result;

=== modified file 'tokenize.ads'
--- tokenize.ads	2012-06-09 10:32:54 +0000
+++ tokenize.ads	2012-07-05 20:01:18 +0000
@@ -29,60 +29,53 @@
 --  Update Count    : 1
 --  Status          : <TESTED>
 
---
--- This package provides a function Split which divides its input
--- string in smaller strings, separated by a "separator" (much as the
--- split function in Perl, Ruby, and so on...).  Function Split returns
--- a Token_List (defined by this package)  whose elements can be accessed
--- by the function Element.
---
--- Function Split can accept a third Boolean value Collate_Separator.
--- If Collate_Separator is true, consecutive istances of the separator are
--- considered as a single one.  If Collate_Separator is False, for every
--- pair of consecutive separator characters an empty string will be returned.
--- Moreover, if Collate_Separator is True, any separator at the beginning of
--- the string is ignored.  Separators at the end are always ignored.
---
--- The default value of Collate_Separator is true if the separator
--- is the space, false otherwise.
---
--- Examples:
---
---   Split("Hello   there")               returns "Hello" and "there"
---   Split("Hello   there", ' ', False)   returns "Hello", "" and "there"
---   Split("Hello::there", ':')           returns "Hello", "" and "there"
---   Split("Hello::there", ':', True)     returns "Hello" and "there"
---
+--  This package provides a function Split which divides its input
+--  string in smaller strings, separated by a "separator" (much as the
+--  split function in Perl, Ruby, and so on...).  Function Split returns
+--  a Token_List (defined by this package)  whose elements can be accessed
+--  by the function Element.
+--
+--  Function Split can accept a third Boolean value Collate_Separator.
+--  If Collate_Separator is true, consecutive istances of the separator are
+--  considered as a single one.  If Collate_Separator is False, for every
+--  pair of consecutive separator characters an empty string will be returned.
+--  Moreover, if Collate_Separator is True, any separator at the beginning of
+--  the string is ignored.  Separators at the end are always ignored.
+--
+--  The default value of Collate_Separator is true if the separator
+--  is the space, false otherwise.
+--
+--  Examples:
+--
+--    Split("Hello   there")               returns "Hello" and "there"
+--    Split("Hello   there", ' ', False)   returns "Hello", "" and "there"
+--    Split("Hello::there", ':')           returns "Hello", "" and "there"
+--    Split("Hello::there", ':', True)     returns "Hello" and "there"
 with Ada.Containers.Vectors;
 with Ada.Strings.Unbounded;
 use  Ada.Strings.Unbounded;
 
 package Tokenize is
    package String_Vectors is
-      new Ada.Containers.Vectors(Index_Type   => Positive,
-                                 Element_Type => Unbounded_String);
+      new Ada.Containers.Vectors (Index_Type   => Positive,
+                                  Element_Type => Unbounded_String);
 
    subtype Token_List is String_Vectors.Vector;
    type    Token_Array is array (Positive range <>) of Unbounded_String;
    use type Token_List;
 
-
-   function Split(To_Be_Splitted    : String;
-                  Separator         : Character;
-                  Collate_Separator : Boolean) return Token_List;
-   --
-   -- Split string To_Be_Splitted in substring separated by
-   -- Separator.  If Collate_Separator is true consider consecutive
-   -- istances of Separator as a single one
-   --
-
-   function Split(To_Be_Splitted : String;
-                  Separator      : Character := ' ') return Token_List;
-   --
-   -- Similar to the three-parameter version, but the Separator
-   -- char defaults to the space and Collate_Separator is True
-   -- if Separator is the space, false otherwise
-   --
+   function Split (To_Be_Splitted    : String;
+                   Separator         : Character;
+                   Collate_Separator : Boolean) return Token_List;
+   --  Split string To_Be_Splitted in substring separated by
+   --  Separator.  If Collate_Separator is true consider consecutive
+   --  istances of Separator as a single one
+
+   function Split (To_Be_Splitted : String;
+                   Separator      : Character := ' ') return Token_List;
+   --  Similar to the three-parameter version, but the Separator
+   --  char defaults to the space and Collate_Separator is True
+   --  if Separator is the space, false otherwise
 
    function Split (To_Be_Splitted : String;
                    Separator      : Character := ' ') return Token_Array;
@@ -90,18 +83,13 @@
    --  instead of a vector.  The reason for the presence of this procedure
    --  is mainly historical.
 
-   function Element(Container : Token_List;
-                    Index : Positive) return Unbounded_String
+   function Element (Container : Token_List;
+                     Index : Positive) return Unbounded_String
                     renames String_Vectors.Element;
-   --
-   -- Return the Index-th token
-   --
-
+   --  Return the Index-th token
 
    function Length (Container : Token_List) return Natural;
-   --
-   -- Return the number of tokens
-   --
+   --  Return the number of tokens
 
    function To_Array (List : Token_List) return Token_Array;
 end Tokenize;