[multiple changes]

2011-09-02  Vincent Celier  <celier@adacore.com>

	* prj-nmsc.adb: (Find_Sources): When the list of sources is
	explicitly declared in an extending project, do not warn if a source
	for an inherited naming exception is not found.

2011-09-02  Gary Dismukes  <dismukes@adacore.com>

	* exp_ch6.adb: (Is_Build_In_Place_Function_Call): Return False if
	expansion is inactive.

2011-09-02  Ed Schonberg  <schonberg@adacore.com>

	* sem_util.adb (Note_Possible_Modification): If the entity
	being modified is the renaming generated for an Ada2012 iterator
	element, the enclosing container or array is modified as well.

From-SVN: r178434

8 files changed, 38 insertions, 42 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index f53ca65..936169a 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-02  Robert Dewar  <dewar@adacore.com>
+
+	* prj-proc.adb, prj.ads, sem_util.adb, s-taprop-linux.adb,
+	prj-nmsc.adb, prj-util.ads, prj-env.adb: Minor reformatting.
+
 2011-09-02  Vincent Celier  <celier@adacore.com>
 
 	* prj-nmsc.adb: (Find_Sources): When the list of sources is
diff --git a/gcc/ada/prj-env.adb b/gcc/ada/prj-env.adb
index c60fa37..6cca2e2 100644
--- a/gcc/ada/prj-env.adb
+++ b/gcc/ada/prj-env.adb
@@ -1348,16 +1348,16 @@ package body Prj.Env is
               and then Unit.File_Names (Spec).File /= No_File
               and then
                 (Namet.Get_Name_String
-                     (Unit.File_Names (Spec).File) = Original_Name
-                 or else (Unit.File_Names (Spec).Path /=
-                            No_Path_Information
+                   (Unit.File_Names (Spec).File) = Original_Name
+                 or else (Unit.File_Names (Spec).Path /= No_Path_Information
                           and then
                             Namet.Get_Name_String
-                              (Unit.File_Names (Spec).Path.Name) =
-                            Original_Name))
+                               (Unit.File_Names (Spec).Path.Name) =
+                                                           Original_Name))
             then
-               Project := Ultimate_Extending_Project_Of
-                          (Unit.File_Names (Spec).Project);
+               Project :=
+                 Ultimate_Extending_Project_Of
+                   (Unit.File_Names (Spec).Project);
                Path := Unit.File_Names (Spec).Path.Display_Name;
 
                if Current_Verbosity > Default then
@@ -1373,14 +1373,14 @@ package body Prj.Env is
               and then
                 (Namet.Get_Name_String
                    (Unit.File_Names (Impl).File) = Original_Name
-                 or else (Unit.File_Names (Impl).Path /=
-                            No_Path_Information
-                          and then Namet.Get_Name_String
-                            (Unit.File_Names (Impl).Path.Name) =
-                            Original_Name))
+                  or else (Unit.File_Names (Impl).Path /= No_Path_Information
+                            and then Namet.Get_Name_String
+                                       (Unit.File_Names (Impl).Path.Name) =
+                                                              Original_Name))
             then
-               Project := Ultimate_Extending_Project_Of
-                            (Unit.File_Names (Impl).Project);
+               Project :=
+                 Ultimate_Extending_Project_Of
+                   (Unit.File_Names (Impl).Project);
                Path := Unit.File_Names (Impl).Path.Display_Name;
 
                if Current_Verbosity > Default then
diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb
index bc35622..1a8c211 100644
--- a/gcc/ada/prj-nmsc.adb
+++ b/gcc/ada/prj-nmsc.adb
@@ -6407,8 +6407,9 @@ package body Prj.Nmsc is
                      if Source.Index /= 0 then  --  Only multi-unit files
                         declare
                            S : Source_Id :=
-                             Source_Files_Htable.Get
-                               (Data.Tree.Source_Files_HT, Source.File);
+                                 Source_Files_Htable.Get
+                                   (Data.Tree.Source_Files_HT, Source.File);
+
                         begin
                            while S /= null loop
                               if S.Path /= No_Path_Information then
@@ -6890,15 +6891,7 @@ package body Prj.Nmsc is
                Name_Loc.Source := Source;
                Source_Names_Htable.Set
                  (Project.Source_Names, File_Name, Name_Loc);
-
             end if;
-
---            if Source /= No_Source and then Source.Unit /= No_Unit_Index then
---               Units_Htable.Set
---                 (Data.Tree.Units_HT,
---                  Source.Unit.Name,
---                  Source.Unit);
---            end if;
          end if;
       end if;
 
diff --git a/gcc/ada/prj-proc.adb b/gcc/ada/prj-proc.adb
index cbe5142..b6049cc 100644
--- a/gcc/ada/prj-proc.adb
+++ b/gcc/ada/prj-proc.adb
@@ -432,6 +432,7 @@ package body Prj.Proc is
             Elm.Next := No_Array_Element;
 
             Elm.Restricted := Restricted;
+
             --  Change the location
 
             Elm.Value.Location := New_Loc;
@@ -440,8 +441,7 @@ package body Prj.Proc is
             --  Create new array element
 
             if Arr.Value = No_Array_Element then
-               Arr.Value :=
-                 Array_Element_Table.Last (Shared.Array_Elements);
+               Arr.Value := Array_Element_Table.Last (Shared.Array_Elements);
             else
                Shared.Array_Elements.Table (E2).Next :=
                  Array_Element_Table.Last (Shared.Array_Elements);
diff --git a/gcc/ada/prj-util.ads b/gcc/ada/prj-util.ads
index b457a5e..89a6491 100644
--- a/gcc/ada/prj-util.ads
+++ b/gcc/ada/prj-util.ads
@@ -208,8 +208,8 @@ package Prj.Util is
       Kind                : Source_Kind;
       Display_Path_Name   : Name_Id;
       Path_Name           : Name_Id;
-      Unit_Name           : Name_Id := No_Name;
-      Index               : Int := 0;
+      Unit_Name           : Name_Id               := No_Name;
+      Index               : Int                   := 0;
       Naming_Exception    : Naming_Exception_Type := No;
    end record;
    --  Data read from a source info file for a single source
diff --git a/gcc/ada/prj.ads b/gcc/ada/prj.ads
index 0c40420..a9943ca 100644
--- a/gcc/ada/prj.ads
+++ b/gcc/ada/prj.ads
@@ -187,9 +187,9 @@ package Prj is
    No_Array_Element : constant Array_Element_Id := 0;
    type Array_Element is record
       Index                : Name_Id;
-      Restricted : Boolean := False;
-      Src_Index            : Int := 0;
-      Index_Case_Sensitive : Boolean := True;
+      Restricted           : Boolean          := False;
+      Src_Index            : Int              := 0;
+      Index_Case_Sensitive : Boolean          := True;
       Value                : Variable_Value;
       Next                 : Array_Element_Id := No_Array_Element;
    end record;
diff --git a/gcc/ada/s-taprop-linux.adb b/gcc/ada/s-taprop-linux.adb
index f4f5bc3..8d381ab 100644
--- a/gcc/ada/s-taprop-linux.adb
+++ b/gcc/ada/s-taprop-linux.adb
@@ -781,8 +781,8 @@ package body System.Task_Primitives.Operations is
          Result := pthread_mutexattr_init (Mutex_Attr'Access);
          pragma Assert (Result = 0);
 
-         Result := pthread_mutex_init (Self_ID.Common.LL.L'Access,
-           Mutex_Attr'Access);
+         Result :=
+           pthread_mutex_init (Self_ID.Common.LL.L'Access, Mutex_Attr'Access);
          pragma Assert (Result = 0 or else Result = ENOMEM);
 
          if Result /= 0 then
@@ -794,8 +794,8 @@ package body System.Task_Primitives.Operations is
       Result := pthread_condattr_init (Cond_Attr'Access);
       pragma Assert (Result = 0);
 
-      Result := pthread_cond_init (Self_ID.Common.LL.CV'Access,
-        Cond_Attr'Access);
+      Result :=
+        pthread_cond_init (Self_ID.Common.LL.CV'Access, Cond_Attr'Access);
       pragma Assert (Result = 0 or else Result = ENOMEM);
 
       if Result = 0 then
@@ -828,8 +828,8 @@ package body System.Task_Primitives.Operations is
       use type System.Multiprocessors.CPU_Range;
 
    begin
-      --  Check whether both Dispatching_Domain and CPU are specified for the
-      --  task, and the CPU value is not contained within the range of
+      --  Check whether both Dispatching_Domain and CPU are specified for
+      --  the task, and the CPU value is not contained within the range of
       --  processors for the domain.
 
       if T.Common.Domain /= null
@@ -854,8 +854,7 @@ package body System.Task_Primitives.Operations is
       end if;
 
       Result :=
-        pthread_attr_setstacksize
-          (Attributes'Access, Adjusted_Stack_Size);
+        pthread_attr_setstacksize (Attributes'Access, Adjusted_Stack_Size);
       pragma Assert (Result = 0);
 
       Result :=
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index cdc37c0..2b9d79d 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -10717,9 +10717,8 @@ package body Sem_Util is
                --  a modification of the container.
 
                elsif Comes_From_Source (Original_Node (Exp))
-                 and then
-                   Nkind_In (Original_Node (Exp),
-                     N_Selected_Component, N_Indexed_Component)
+                 and then Nkind_In (Original_Node (Exp), N_Selected_Component,
+                                                         N_Indexed_Component)
                then
                   Exp := Prefix (Original_Node (Exp));
                   goto Continue;