sem_ch5.adb, [...]: Minor reformatting.

2014-10-17  Robert Dewar  <dewar@adacore.com>

	* sem_ch5.adb, sem_ch7.adb, prj-nmsc.adb, sem_ch13.adb, exp_ch3.adb:
	Minor reformatting.

From-SVN: r216381

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 63cf230a00152095cc58f45cc181d24629cd14d0..f8c114560edf3d931132b6551f05d7a83d1bcffe 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-17  Robert Dewar  <dewar@adacore.com>
+
+       * sem_ch5.adb, sem_ch7.adb, prj-nmsc.adb, sem_ch13.adb, exp_ch3.adb:
+       Minor reformatting.
+
 2014-10-17  Ed Schonberg  <schonberg@adacore.com>
 
        * exp_ch3.adb (Build_Component_Invariant_Call): Retrieve Invariant

diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb
index dd6d34e00267c92fa872e2fa69d8cf5b539002e3..d57fadca63967fa467f7876521f09ed7f7aacf84 100644 (file)
--- a/gcc/ada/exp_ch3.adb
+++ b/gcc/ada/exp_ch3.adb
@@ -3720,7 +3720,7 @@ package body Exp_Ch3 is
             end if;
          end if;
 
-         --  The aspect is type-specific, so retrieve it from the base type.
+         --  The aspect is type-specific, so retrieve it from the base type
 
          Call :=
            Make_Procedure_Call_Statement (Loc,

diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb
index 0e0117af7b40cc1e7d52d9b43bfbdbb6e578ce12..5d3d6290799bf2752692b4a5abf93cb82c0a7716 100644 (file)
--- a/gcc/ada/prj-nmsc.adb
+++ b/gcc/ada/prj-nmsc.adb
@@ -5032,7 +5032,8 @@ package body Prj.Nmsc is
                if OK then
                   for J in 1 .. Name_Len loop
                      if Name_Buffer (J) = '/'
-                       or else Name_Buffer (J) = Directory_Separator
+                          or else
+                        Name_Buffer (J) = Directory_Separator
                      then
                         OK := False;
                         exit;
@@ -5498,15 +5499,16 @@ package body Prj.Nmsc is
       Dir_Exists : Boolean;
 
       No_Sources : constant Boolean :=
-                     Project.Qualifier = Abstract_Project
-                       or else
-                     (((not Source_Files.Default
-                        and then Source_Files.Values = Nil_String)
-                       or else (not Source_Dirs.Default
-                                 and then Source_Dirs.Values = Nil_String)
-                       or else (not Languages.Default
-                                 and then Languages.Values = Nil_String))
-                     and then Project.Extends = No_Project);
+        Project.Qualifier = Abstract_Project
+          or else (((not Source_Files.Default
+                      and then Source_Files.Values = Nil_String)
+                    or else
+                    (not Source_Dirs.Default
+                      and then Source_Dirs.Values  = Nil_String)
+                    or else
+                     (not Languages.Default
+                      and then Languages.Values    = Nil_String))
+                   and then Project.Extends = No_Project);
 
    --  Start of processing for Get_Directories
 
@@ -6305,7 +6307,7 @@ package body Prj.Nmsc is
 
          Dir_Exists := Is_Directory (Full_Path_Name.all);
 
-         if not Must_Exist or else Dir_Exists then
+         if not Must_Exist or Dir_Exists then
             declare
                Normed : constant String :=
                           Normalize_Pathname
@@ -6484,7 +6486,8 @@ package body Prj.Nmsc is
 
                         for J in 1 .. Last loop
                            if Line (J) = '/'
-                             or else Line (J) = Directory_Separator
+                                or else
+                              Line (J) = Directory_Separator
                            then
                               Error_Msg_File_1 := Name;
                               Error_Msg
@@ -6598,7 +6601,8 @@ package body Prj.Nmsc is
 
                for J in 1 .. Name_Len loop
                   if Name_Buffer (J) = '/'
-                    or else Name_Buffer (J) = Directory_Separator
+                       or else
+                     Name_Buffer (J) = Directory_Separator
                   then
                      Error_Msg_File_1 := Name;
                      Error_Msg

diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index 71442ae7263493ccda2929c9a15b924f018cd485..ba5a1ee9c224f92c013f97e3bae5af18a28ff5cd 100644 (file)
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -3903,15 +3903,13 @@ package body Sem_Ch13 is
 
          if Ctrl = Ent
            or else Ctrl = Class_Wide_Type (Ent)
-
            or else
              (Ekind (Ctrl) = E_Anonymous_Access_Type
-               and then
-                 (Designated_Type (Ctrl) = Ent
-                   or else Designated_Type (Ctrl) = Class_Wide_Type (Ent)))
+               and then (Designated_Type (Ctrl) = Ent
+                           or else
+                         Designated_Type (Ctrl) = Class_Wide_Type (Ent)))
          then
             null;
-
          else
             return False;
          end if;

diff --git a/gcc/ada/sem_ch5.adb b/gcc/ada/sem_ch5.adb
index c8d27f1384be6078a860da86a0877e1ce7e82958..925db4a780c550b4d5c5169cca04308bf7dcae24 100644 (file)
--- a/gcc/ada/sem_ch5.adb
+++ b/gcc/ada/sem_ch5.adb
@@ -1839,7 +1839,7 @@ package body Sem_Ch5 is
             else
                Typ := Etype (Iter_Name);
 
-               --  Verify that the expression produces an iterator.
+               --  Verify that the expression produces an iterator
 
                if not Of_Present (N) and then not Is_Iterator (Typ)
                  and then not Is_Array_Type (Typ)
@@ -1847,7 +1847,7 @@ package body Sem_Ch5 is
                then
                   Error_Msg_N
                     ("expect object that implements iterator interface",
-                        Iter_Name);
+                     Iter_Name);
                end if;
             end if;
 

diff --git a/gcc/ada/sem_ch7.adb b/gcc/ada/sem_ch7.adb
index bfbf85893d95f5236d347bb43cd36f14678d1075..70f8a095580d55bc93c844d529dc8dc53054fbf7 100644 (file)
--- a/gcc/ada/sem_ch7.adb
+++ b/gcc/ada/sem_ch7.adb
@@ -1383,6 +1383,9 @@ package body Sem_Ch7 is
                Inherit_Default_Init_Cond_Procedure (E);
             end if;
 
+            --  If invariants are present, build the invariant procedure for a
+            --  private type, but not any of its subtypes.
+
             if Has_Invariants (E) then
                if Ekind (E) = E_Private_Subtype then
                   null;