2011-09-06 Robert Dewar <dewar@adacore.com>

	* sem_attr.adb, prj-nmsc.adb, exp_aggr.adb: Minor reformatting.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@178589 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index da553f8..9451718 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-06  Robert Dewar  <dewar@adacore.com>
+
+       * sem_attr.adb, prj-nmsc.adb, exp_aggr.adb: Minor reformatting.
+
 2011-09-06  Ed Schonberg  <schonberg@adacore.com>
 
        * lib-xref.adb (OK_To_Set_Referenced): A reference to a formal

diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb
index f79353a..2dd052e 100644 (file)
--- a/gcc/ada/exp_aggr.adb
+++ b/gcc/ada/exp_aggr.adb
@@ -107,9 +107,9 @@ package body Exp_Aggr is
    ------------------------------------------------------
 
    function Build_Record_Aggr_Code
-     (N                             : Node_Id;
-      Typ                           : Entity_Id;
-      Lhs                           : Node_Id) return List_Id;
+     (N   : Node_Id;
+      Typ : Entity_Id;
+      Lhs : Node_Id) return List_Id;
    --  N is an N_Aggregate or an N_Extension_Aggregate. Typ is the type of the
    --  aggregate. Target is an expression containing the location on which the
    --  component by component assignments will take place. Returns the list of
@@ -1729,9 +1729,9 @@ package body Exp_Aggr is
    ----------------------------
 
    function Build_Record_Aggr_Code
-     (N                             : Node_Id;
-      Typ                           : Entity_Id;
-      Lhs                           : Node_Id) return List_Id
+     (N   : Node_Id;
+      Typ : Entity_Id;
+      Lhs : Node_Id) return List_Id
    is
       Loc     : constant Source_Ptr := Sloc (N);
       L       : constant List_Id    := New_List;
@@ -2331,10 +2331,10 @@ package body Exp_Aggr is
                Generate_Finalization_Actions;
 
                Append_List_To (L,
-                  Build_Record_Aggr_Code (
-                    N   => Unqualify (Ancestor),
-                    Typ => Etype (Unqualify (Ancestor)),
-                    Lhs => Target));
+                  Build_Record_Aggr_Code
+                    (N   => Unqualify (Ancestor),
+                     Typ => Etype (Unqualify (Ancestor)),
+                     Lhs => Target));
 
             --  If the ancestor part is an expression "E", we generate
 

diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb
index 8c202a3..0ff3eda 100644 (file)
--- a/gcc/ada/prj-nmsc.adb
+++ b/gcc/ada/prj-nmsc.adb
@@ -6913,7 +6913,6 @@ package body Prj.Nmsc is
                         Name_Loc.Source.Unit.Name,
                         Name_Loc.Source.Unit);
                   end if;
-
                end if;
             end if;
          end if;
@@ -7103,7 +7102,8 @@ package body Prj.Nmsc is
             exit when Last = 0;
 
             if Name (1 .. Last) /= "."
-              and then Name (1 .. Last) /= ".."
+                 and then
+               Name (1 .. Last) /= ".."
             then
                declare
                   Path_Name : constant String :=
@@ -7256,6 +7256,7 @@ package body Prj.Nmsc is
          end if;
 
          if not Has_Error then
+
             --  Links have been resolved if necessary, and Path_Name
             --  always ends with a directory separator.
 
@@ -7368,7 +7369,6 @@ package body Prj.Nmsc is
 
                   loop
                      Read (Dir, Name, Last);
-
                      exit when Last = 0;
 
                      --  In fast project loading mode (without -eL), the user

diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb
index 9b33acd..eca9836 100644 (file)
--- a/gcc/ada/sem_attr.adb
+++ b/gcc/ada/sem_attr.adb
@@ -3024,8 +3024,10 @@ package body Sem_Attr is
          --  Attribute Descriptor_Size is relevant only in the context of an
          --  unconstrained array type.
 
+         --  Shouldn't it just return zero for types other than arrays or
+         --  constrained arrays ???
+
          if Is_Entity_Name (P)
-           and then Is_Type (Entity (P))
            and then Is_Array_Type (Entity (P))
            and then not Is_Constrained (Entity (P))
          then