2011-08-29 Robert Dewar <dewar@adacore.com>

	* snames.adb-tmpl, sem_ch13.adb: Minor reformatting
	Minor code reorganization.

2011-08-29  Bob Duff  <duff@adacore.com>

	* usage.adb (-gnatwy): Fix documentation: this switch applies to Ada
	2012, not just Ada 2005.

2011-08-29  Vincent Celier  <celier@adacore.com>

	* gnat_ugn.texi: Indicate that when the compiler is called by gnatmake
	with a project file or with gprbuid, if -gnatep= is specified, the
	builder may need to be invoked with -x.

2011-08-29  Tristan Gingold  <gingold@adacore.com>

	* a-exexpr-gcc.adb: Minor comment fix.



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

6 files changed, 43 insertions, 25 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 00a24d26458..d6e5955949a 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,25 @@
 2011-08-29  Robert Dewar  <dewar@adacore.com>
 
+	* snames.adb-tmpl, sem_ch13.adb: Minor reformatting
+	Minor code reorganization.
+
+2011-08-29  Bob Duff  <duff@adacore.com>
+
+	* usage.adb (-gnatwy): Fix documentation: this switch applies to Ada
+	2012, not just Ada 2005.
+
+2011-08-29  Vincent Celier  <celier@adacore.com>
+
+	* gnat_ugn.texi: Indicate that when the compiler is called by gnatmake
+	with a project file or with gprbuid, if -gnatep= is specified, the
+	builder may need to be invoked with -x.
+
+2011-08-29  Tristan Gingold  <gingold@adacore.com>
+
+	* a-exexpr-gcc.adb: Minor comment fix.
+
+2011-08-29  Robert Dewar  <dewar@adacore.com>
+
 	* sem_ch8.adb: Minor reformatting.
 
 2011-08-29  Bob Duff  <duff@adacore.com>
diff --git a/gcc/ada/a-exexpr-gcc.adb b/gcc/ada/a-exexpr-gcc.adb
index 00dab03826f..ac0272df8a0 100644
--- a/gcc/ada/a-exexpr-gcc.adb
+++ b/gcc/ada/a-exexpr-gcc.adb
@@ -567,8 +567,7 @@ package body Exception_Propagation is
 
       --  Perform a standard raise first. If a regular handler is found, it
       --  will be entered after all the intermediate cleanups have run. If
-      --  there is no regular handler, control will get back to after the
-      --  call.
+      --  there is no regular handler, it will return.
 
       Unwind_RaiseException (GCC_Exception);
 
diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi
index cc30638fff3..64a4489fbd2 100644
--- a/gcc/ada/gnat_ugn.texi
+++ b/gcc/ada/gnat_ugn.texi
@@ -7638,7 +7638,10 @@ preprocessing is triggered and parameterized.
 @cindex @option{-gnatep} (@command{gcc})
 This switch indicates to the compiler the file name (without directory
 information) of the preprocessor data file to use. The preprocessor data file
-should be found in the source directories.
+should be found in the source directories. Note that when the compiler is
+called by a builder (@command{gnatmake} or @command{gprbuild}) with a project
+file, if the object directory is not also a source directory, the builder needs
+to be called with @option{-x}.
 
 @noindent
 A preprocessing data file is a text file with significant lines indicating
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index 1856647c0da..f7944012722 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -1541,10 +1541,10 @@ package body Sem_Ch13 is
 
       procedure Check_Iterator_Functions;
       --  Check that there is a single function in Default_Iterator attribute
-      --  that  has the  proper type structure.
+      --  has the proper type structure.
 
       function Check_Primitive_Function (Subp : Entity_Id) return Boolean;
-      --  Common legality check for the previoous two.
+      --  Common legality check for the previoous two
 
       -----------------------------------
       -- Analyze_Stream_TSS_Definition --
@@ -1688,6 +1688,7 @@ package body Sem_Ch13 is
       ------------------------------
 
       procedure Check_Indexing_Functions is
+
          procedure Check_One_Function (Subp : Entity_Id);
          --  Check one possible interpretation
 
@@ -1752,7 +1753,7 @@ package body Sem_Ch13 is
          Default : Entity_Id;
 
          function Valid_Default_Iterator (Subp : Entity_Id) return Boolean;
-         --  Check one possible interpretation.
+         --  Check one possible interpretation for validity
 
          ----------------------------
          -- Valid_Default_Iterator --
@@ -1768,23 +1769,18 @@ package body Sem_Ch13 is
                Formal := First_Formal (Subp);
             end if;
 
-            Formal := Next_Formal (Formal);
-
-            --  I don't see why the if is required here, we will return
-            --  True anyway if Present (Formal) is false on first loop ???
+            --  False if any subsequent formal has no default expression
 
-            if No (Formal) then
-               return True;
+            Formal := Next_Formal (Formal);
+            while Present (Formal) loop
+               if No (Expression (Parent (Formal))) then
+                  return False;
+               end if;
 
-            else
-               while Present (Formal) loop
-                  if No (Expression (Parent (Formal))) then
-                     return False;
-                  end if;
+               Next_Formal (Formal);
+            end loop;
 
-                  Next_Formal (Formal);
-               end loop;
-            end if;
+            --  True if all subsequent formals have default expressions
 
             return True;
          end Valid_Default_Iterator;
diff --git a/gcc/ada/snames.adb-tmpl b/gcc/ada/snames.adb-tmpl
index 197cb350fb4..e6753b583de 100644
--- a/gcc/ada/snames.adb-tmpl
+++ b/gcc/ada/snames.adb-tmpl
@@ -377,11 +377,11 @@ package body Snames is
    begin
       return Get_Name_Table_Byte (N) /= 0
         and then (Ada_Version >= Ada_95
-                  or else N not in Ada_95_Reserved_Words)
+                   or else N not in Ada_95_Reserved_Words)
         and then (Ada_Version >= Ada_2005
-                  or else N not in Ada_2005_Reserved_Words)
+                   or else N not in Ada_2005_Reserved_Words)
         and then (Ada_Version >= Ada_2012
-                  or else N not in Ada_2012_Reserved_Words);
+                   or else N not in Ada_2012_Reserved_Words);
    end Is_Keyword_Name;
 
    ----------------------------
diff --git a/gcc/ada/usage.adb b/gcc/ada/usage.adb
index 6c9839ddd14..a4f0948369a 100644
--- a/gcc/ada/usage.adb
+++ b/gcc/ada/usage.adb
@@ -501,8 +501,8 @@ begin
    Write_Line ("        X    turn off warnings for export/import");
    Write_Line ("        .x+  turn on warnings for non-local exception");
    Write_Line ("        .X*  turn off warnings for non-local exception");
-   Write_Line ("        y*+  turn on warnings for Ada 2005 incompatibility");
-   Write_Line ("        Y    turn off warnings for Ada 2005 incompatibility");
+   Write_Line ("        y*+  turn on warnings for Ada compatibility issues");
+   Write_Line ("        Y    turn off warnings for Ada compatibility issues");
    Write_Line ("        z*+  turn on warnings for suspicious " &
                                                   "unchecked conversion");
    Write_Line ("        Z    turn off warnings for suspicious " &