a-strhas.ads, [...]: Minor reformatting/code reorganization.

2012-01-30  Robert Dewar  <dewar@adacore.com>

	* a-strhas.ads, einfo.adb, einfo.ads, exp_ch7.adb, exp_ch9.adb,
	freeze.adb, prj.adb, prj.ads, prj-nmsc.adb, prj-proc.adb, s-llflex.ads,
	s-ransee.adb, s-ransee.ads, sem_ch13.adb, sem_dim.adb, sem_prag.adb:
	Minor reformatting/code reorganization.

From-SVN: r183710

gcc/ada/ChangeLog

+2012-01-30  Robert Dewar  <dewar@adacore.com>
+
+	* a-strhas.ads, einfo.adb, einfo.ads, exp_ch7.adb, exp_ch9.adb,
+	freeze.adb, prj.adb, prj.ads, prj-nmsc.adb, prj-proc.adb, s-llflex.ads,
+	s-ransee.adb, s-ransee.ads, sem_ch13.adb, sem_dim.adb, sem_prag.adb:
+	Minor reformatting/code reorganization.
+
 2012-01-30  Thomas Quinot  <quinot@adacore.com>
 
 	* s-rannum.adb, s-ransee.adb, s-ransee.ads (Get_Seed): Return

gcc/ada/a-strhas.ads

@@ -18,8 +18,8 @@ pragma Compiler_Unit;
 with Ada.Containers;
 
 function Ada.Strings.Hash (Key : String) return Containers.Hash_Type;
---  Note: this hash function has predictable collisions and is subject
---  to equivalent substring attacks. It is not suitable to construct a hash
---  table keyed on possibly malicious user input.
+--  Note: this hash function has predictable collisions and is subject to
+--  equivalent substring attacks. It is not suitable for construction of a
+--  hash table keyed on possibly malicious user input.
 
 pragma Pure (Ada.Strings.Hash);

gcc/ada/einfo.adb

@@ -161,8 +161,8 @@ package body Einfo is
 
    --    Body_Entity                     Node19
    --    Corresponding_Discriminant      Node19
-   --    Default_Aspect_Value            Node19
    --    Default_Aspect_Component_Value  Node19
+   --    Default_Aspect_Value            Node19
    --    Extra_Accessibility_Of_Result   Node19
    --    Parent_Subtype                  Node19
    --    Size_Check_Code                 Node19
@@ -775,18 +775,18 @@ package body Einfo is
       return Node25 (Id);
    end Debug_Renaming_Link;
 
-   function Default_Aspect_Value (Id : E) return N is
-   begin
-      pragma Assert (Is_Scalar_Type (Id));
-      return Node19 (Id);
-   end Default_Aspect_Value;
-
    function Default_Aspect_Component_Value (Id : E) return N is
    begin
       pragma Assert (Is_Array_Type (Id));
       return Node19 (Id);
    end Default_Aspect_Component_Value;
 
+   function Default_Aspect_Value (Id : E) return N is
+   begin
+      pragma Assert (Is_Scalar_Type (Id));
+      return Node19 (Id);
+   end Default_Aspect_Value;
+
    function Default_Expr_Function (Id : E) return E is
    begin
       pragma Assert (Is_Formal (Id));
@@ -3276,18 +3276,18 @@ package body Einfo is
       Set_Node25 (Id, V);
    end Set_Debug_Renaming_Link;
 
-   procedure Set_Default_Aspect_Value (Id : E; V : E) is
-   begin
-      pragma Assert (Is_Scalar_Type (Id));
-      Set_Node19 (Id, V);
-   end Set_Default_Aspect_Value;
-
    procedure Set_Default_Aspect_Component_Value (Id : E; V : E) is
    begin
       pragma Assert (Is_Array_Type (Id));
       Set_Node19 (Id, V);
    end Set_Default_Aspect_Component_Value;
 
+   procedure Set_Default_Aspect_Value (Id : E; V : E) is
+   begin
+      pragma Assert (Is_Scalar_Type (Id));
+      Set_Node19 (Id, V);
+   end Set_Default_Aspect_Value;
+
    procedure Set_Default_Expr_Function (Id : E; V : E) is
    begin
       pragma Assert (Is_Formal (Id));

gcc/ada/exp_ch7.adb

@@ -2844,7 +2844,7 @@ package body Exp_Ch7 is
       --  which belongs to a protected type.
 
       Loc : constant Source_Ptr := No_Location;
-      HSS : Node_Id := Handled_Statement_Sequence (N);
+      HSS : Node_Id;
 
    begin
       --  Do not perform this expansion in Alfa mode because we do not create
@@ -2856,6 +2856,7 @@ package body Exp_Ch7 is
 
       --  The At_End handler should have been assimilated by the finalizer
 
+      HSS := Handled_Statement_Sequence (N);
       pragma Assert (No (At_End_Proc (HSS)));
 
       --  If the construct to be cleaned up is a protected subprogram body, the

gcc/ada/exp_ch9.adb

@@ -9023,13 +9023,14 @@ package body Exp_Ch9 is
          --  table parameter. Generate:
 
          --    Ada.Tags.Get_Entry_Index
-         --      (T => To_Tag_Ptr (Obj'Address).all,
-         --       Position => Ada.Tags.Get_Offset_Index
-         --                    (Ada.Tags.Tag (Concval),
-         --         i           <interface dispatch table position of Ename>));
+         --      (T        => To_Tag_Ptr (Obj'Address).all,
+         --       Position =>
+         --         Ada.Tags.Get_Offset_Index
+         --           (Ada.Tags.Tag (Concval),
+         --            <interface dispatch table position of Ename>));
 
          --  Note that Obj'Address is recursively expanded into a call to
-         --  Base_Address (Obj)
+         --  Base_Address (Obj).
 
          if Tagged_Type_Expansion then
             Prepend_To (Params,
@@ -9054,7 +9055,6 @@ package body Exp_Ch9 is
 
          else
             Prepend_To (Params,
-
               Make_Function_Call (Loc,
                 Name => New_Reference_To (RTE (RE_Get_Entry_Index), Loc),
                 Parameter_Associations => New_List (

gcc/ada/freeze.adb

@@ -4165,9 +4165,9 @@ package body Freeze is
 
          if Is_First_Subtype (E) and then Has_Default_Aspect (E) then
             declare
-               Nam    : Name_Id;
-               Exp    : Node_Id;
-               Typ    : Entity_Id;
+               Nam : Name_Id;
+               Exp : Node_Id;
+               Typ : Entity_Id;
 
             begin
                if Is_Scalar_Type (E) then
@@ -4176,8 +4176,8 @@ package body Freeze is
                   Exp := Default_Aspect_Value (Typ);
                else
                   Nam := Name_Default_Component_Value;
-                  Exp := Default_Aspect_Component_Value (E);
                   Typ := Component_Type (E);
+                  Exp := Default_Aspect_Component_Value (E);
                end if;
 
                Analyze_And_Resolve (Exp, Typ);

gcc/ada/prj-nmsc.adb

@@ -2546,18 +2546,17 @@ package body Prj.Nmsc is
                                Project.Decl.Attributes,
                                Shared);
 
-      List      : String_List_Id;
-      Element   : String_Element;
-      Name      : File_Name_Type;
-      Iter      : Source_Iterator;
-      Source    : Source_Id;
-      Project_2 : Project_Id;
-      Other     : Source_Id;
+      List       : String_List_Id;
+      Element    : String_Element;
+      Name       : File_Name_Type;
+      Iter       : Source_Iterator;
+      Source     : Source_Id;
+      Project_2  : Project_Id;
+      Other      : Source_Id;
+      Unit_Found : Boolean;
 
       Interface_ALIs : String_List_Id := Nil_String;
 
-      Unit_Found : Boolean;
-
    begin
       if not Interfaces.Default then
 
@@ -2583,9 +2582,9 @@ package body Prj.Nmsc is
             Name := Canonical_Case_File_Name (Element.Value);
 
             Project_2 := Project;
-            Big_Loop :
-            while Project_2 /= No_Project loop
+            Big_Loop : while Project_2 /= No_Project loop
                if Project.Qualifier = Aggregate_Library then
+
                   --  For an aggregate library we want to consider sources of
                   --  all aggregated projects.
 
@@ -2693,9 +2692,9 @@ package body Prj.Nmsc is
             Unit_Found := False;
 
             Project_2 := Project;
-            Big_Loop_2 :
-            while Project_2 /= No_Project loop
+            Big_Loop_2 : while Project_2 /= No_Project loop
                if Project.Qualifier = Aggregate_Library then
+
                   --  For an aggregate library we want to consider sources of
                   --  all aggregated projects.
 
@@ -4492,8 +4491,8 @@ package body Prj.Nmsc is
             end if;
          end if;
 
-         --  Check value of attribute Library_Auto_Init and set
-         --  Lib_Auto_Init accordingly.
+         --  Check value of attribute Library_Auto_Init and set Lib_Auto_Init
+         --  accordingly.
 
          if Lib_Auto_Init.Default then
 

gcc/ada/prj-proc.adb

@@ -2920,6 +2920,7 @@ package body Prj.Proc is
                                       Shared);
                List            : Project_List := In_Tree.Projects;
                Is_Encapsulated : Boolean;
+
             begin
                Get_Name_String (Lib_Standalone.Value);
                To_Lower (Name_Buffer (1 .. Name_Len));

gcc/ada/prj.adb

@@ -619,7 +619,7 @@ package body Prj is
                     (List.Project, Tree,
                      In_Aggregate_Lib,
                      From_Encapsulated_Lib
-                       or (Project.Standalone_Library = Encapsulated));
+                       or else Project.Standalone_Library = Encapsulated);
                   List := List.Next;
                end loop;
 
@@ -644,8 +644,9 @@ package body Prj is
                            Recursive_Check
                              (Agg.Project, T,
                               True,
-                              From_Encapsulated_Lib or
-                                Project.Standalone_Library = Encapsulated);
+                              From_Encapsulated_Lib
+                                or else
+                                  Project.Standalone_Library = Encapsulated);
 
                         else
                            T := Agg.Tree;

gcc/ada/prj.ads

@@ -938,8 +938,8 @@ package Prj is
    type Project_List_Element;
    type Project_List is access all Project_List_Element;
    type Project_List_Element is record
-      Project               : Project_Id := No_Project;
-      From_Encapsulated_Lib : Boolean := False;
+      Project               : Project_Id   := No_Project;
+      From_Encapsulated_Lib : Boolean      := False;
       Next                  : Project_List := null;
    end record;
    --  A list of projects
@@ -1408,8 +1408,8 @@ package Prj is
    function For_Each_Source
      (In_Tree           : Project_Tree_Ref;
       Project           : Project_Id := No_Project;
-      Language          : Name_Id := No_Name;
-      Encapsulated_Libs : Boolean := True) return Source_Iterator;
+      Language          : Name_Id    := No_Name;
+      Encapsulated_Libs : Boolean    := True) return Source_Iterator;
    --  Returns an iterator for all the sources of a project tree, or a specific
    --  project, or a specific language. Include sources from aggregated libs if
    --  Aggregated_Libs is True.
@@ -1601,8 +1601,9 @@ package Prj is
    --  aggregated projects, since they might not be using the same tree as 'By'
 
    type Project_Context is record
-      In_Aggregate_Lib      : Boolean;
+      In_Aggregate_Lib : Boolean;
       --  True if the project is part of an aggregate library
+
       From_Encapsulated_Lib : Boolean;
       --  True if the project is imported from an encapsulated library
    end record;
@@ -1850,7 +1851,7 @@ private
       Language_Name : Name_Id;
       --  Only sources of this language will be returned (or all if No_Name)
 
-      Current      : Source_Id;
+      Current : Source_Id;
 
       Encapsulated_Libs : Boolean;
       --  True if we want to include the sources from encapsulated libs

gcc/ada/s-llflex.ads

@@ -29,8 +29,8 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
---  This package contains an instantiation of the exponentiation between two
---  long long floats.
+--  This package contains an instantiation of the exponentiation operator
+--  between two long long floats.
 
 with Ada.Numerics.Long_Long_Elementary_Functions;
 

gcc/ada/s-ransee.adb

@@ -2,7 +2,7 @@
 --                                                                          --
 --                         GNAT RUN-TIME COMPONENTS                         --
 --                                                                          --
---                  S Y S T E M . R A N D O M _ S E E D                     --
+--                   S Y S T E M . R A N D O M _ S E E D                    --
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --

gcc/ada/s-ransee.ads

@@ -2,7 +2,7 @@
 --                                                                          --
 --                         GNAT RUN-TIME COMPONENTS                         --
 --                                                                          --
---                  S Y S T E M . R A N D O M _ S E E D                     --
+--                   S Y S T E M . R A N D O M _ S E E D                    --
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --

gcc/ada/sem_ch13.adb

@@ -1429,6 +1429,7 @@ package body Sem_Ch13 is
                   --  Make sure we have a freeze node (it might otherwise be
                   --  missing in cases like subtype X is Y, and we would not
                   --  have a place to build the predicate function).
+
                   --  If the type is private, indicate that its completion
                   --  has a freeze node, because that is the one that will be
                   --  visible at freeze time.
@@ -5068,9 +5069,7 @@ package body Sem_Ch13 is
 
          --  The predicate function is shared between views of a type.
 
-         if Is_Private_Type (Typ)
-           and then Present (Full_View (Typ))
-         then
+         if Is_Private_Type (Typ) and then Present (Full_View (Typ)) then
             Set_Predicate_Function (Full_View (Typ), SId);
          end if;
 
@@ -6036,7 +6035,8 @@ package body Sem_Ch13 is
          --  partial view is visible. The expression must be scalar, so use
          --  the full view to resolve.
 
-         elsif (A_Id = Aspect_Default_Value or else
+         elsif (A_Id = Aspect_Default_Value
+                  or else
                 A_Id = Aspect_Default_Component_Value)
             and then Is_Private_Type (T)
          then

gcc/ada/sem_dim.adb

@@ -2248,7 +2248,8 @@ package body Sem_Dim is
 
                   return
                     Package_Name = Name_Dim_Float_IO
-                      or else Package_Name = Name_Dim_Integer_IO;
+                      or else
+                    Package_Name = Name_Dim_Integer_IO;
                end if;
             end if;
          end if;
@@ -2261,13 +2262,12 @@ package body Sem_Dim is
       -----------------
 
       function Item_Actual return Node_Id is
-         Actual            : Node_Id;
+         Actual : Node_Id;
 
       begin
-         Actual := First (Actuals);
-
          --  Look for the item actual as a parameter association
 
+         Actual := First (Actuals);
          while Present (Actual) loop
             if Nkind (Actual) = N_Parameter_Association
               and then Chars (Selector_Name (Actual)) = Name_Item
@@ -2295,9 +2295,7 @@ package body Sem_Dim is
    --  Start of processing for Expand_Put_Call_With_Dimension_Symbol
 
    begin
-      if Is_Procedure_Put_Call
-        and then not Has_Dimension_Symbols
-      then
+      if Is_Procedure_Put_Call and then not Has_Dimension_Symbols then
          Actual := Item_Actual;
          Dims_Of_Actual := Dimensions_Of (Actual);
          Etyp := Etype (Actual);
@@ -2315,6 +2313,7 @@ package body Sem_Dim is
             New_Str_Lit := Make_String_Literal (Loc, End_String);
 
          --  Check that the item is not dimensionless
+
          --  Create the new String_Literal with the new String_Id generated by
          --  the routine From_Dimension_To_String.
 
@@ -2326,39 +2325,37 @@ package body Sem_Dim is
          end if;
 
          if Present (New_Str_Lit) then
+
             --  Insert all actuals in New_Actuals
 
             Actual := First (Actuals);
-
             while Present (Actual) loop
+
                --  Copy every actuals in New_Actuals except the Symbols
                --  parameter association.
 
                if Nkind (Actual) = N_Parameter_Association
                  and then Chars (Selector_Name (Actual)) /= Name_Symbols
                then
-                  Append (
+                  Append_To (New_Actuals,
                      Make_Parameter_Association (Loc,
                         Selector_Name => New_Copy (Selector_Name (Actual)),
                         Explicit_Actual_Parameter =>
-                           New_Copy (Explicit_Actual_Parameter (Actual))),
-                     New_Actuals);
+                           New_Copy (Explicit_Actual_Parameter (Actual))));
 
                elsif Nkind (Actual) /= N_Parameter_Association then
-                  Append (New_Copy (Actual), New_Actuals);
+                  Append_To (New_Actuals, New_Copy (Actual));
                end if;
 
                Next (Actual);
             end loop;
 
-            --  Create the new Symbols parameter association and append it in
-            --  New_Actuals.
+            --  Create new Symbols param association and append to New_Actuals
 
-            Append (
+            Append_To (New_Actuals,
               Make_Parameter_Association (Loc,
                 Selector_Name => Make_Identifier (Loc, Name_Symbols),
-                Explicit_Actual_Parameter => New_Str_Lit),
-              New_Actuals);
+                Explicit_Actual_Parameter => New_Str_Lit));
 
             --  Rewrite and analyze the procedure call
 

gcc/ada/sem_prag.adb

@@ -7084,7 +7084,7 @@ package body Sem_Prag is
                Check_Interrupt_Or_Attach_Handler;
 
                --  The expression that designates the attribute may depend on a
-               --  discriminant, and is therefore a per- object expression, to
+               --  discriminant, and is therefore a per-object expression, to
                --  be expanded in the init proc. If expansion is enabled, then
                --  perform semantic checks on a copy only.
 
@@ -15308,13 +15308,12 @@ package body Sem_Prag is
 
                --  Make an aspect from any PPC pragma
 
-               Append (
+               Append_To (Aspects,
                  Make_Aspect_Specification (Loc,
                    Identifier =>
                      Make_Identifier (Loc, Chars (Pragma_Identifier (Prag))),
                    Expression =>
-                     Copy_Separate_Tree (Expression (Prag_Arg_Ass))),
-                 Aspects);
+                     Copy_Separate_Tree (Expression (Prag_Arg_Ass))));
 
                --  Generate the analysis information in the pragma expression
                --  and then set the pragma node analyzed to avoid any further