[multiple changes]

2012-08-06  Robert Dewar  <dewar@adacore.com>

	* s-oscons-tmplt.c, sem_ch9.adb, osint.adb: Minor reformatting.

2012-08-06  Hristian Kirtchev  <kirtchev@adacore.com>

	* sem_ch5.adb (Analyze_Loop_Parameter_Specification): Remove obsolete
	Alfa-specific guard. The code is a leftover from an early
	implementation of iterators which is no longer in use.

2012-08-06  Vincent Celier  <celier@adacore.com>

	* par-ch13.adb (Get_Aspect_Specifications): Do not consider
	No_Aspect when checking for a mispelled aspect.

From-SVN: r190158

6 files changed, 26 insertions, 19 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index df4334b..8f7c9ca 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,20 @@
 2012-08-06  Robert Dewar  <dewar@adacore.com>
 
+	* s-oscons-tmplt.c, sem_ch9.adb, osint.adb: Minor reformatting.
+
+2012-08-06  Hristian Kirtchev  <kirtchev@adacore.com>
+
+	* sem_ch5.adb (Analyze_Loop_Parameter_Specification): Remove obsolete
+	Alfa-specific guard. The code is a leftover from an early
+	implementation of iterators which is no longer in use.
+
+2012-08-06  Vincent Celier  <celier@adacore.com>
+
+	* par-ch13.adb (Get_Aspect_Specifications): Do not consider
+	No_Aspect when checking for a mispelled aspect.
+
+2012-08-06  Robert Dewar  <dewar@adacore.com>
+
 	* s-htable.adb: Minor reformatting.
 
 2012-08-06  Thomas Quinot  <quinot@adacore.com>
diff --git a/gcc/ada/osint.adb b/gcc/ada/osint.adb
index 9a2e7ee..d42a48e 100644
--- a/gcc/ada/osint.adb
+++ b/gcc/ada/osint.adb
@@ -3103,9 +3103,9 @@ package body Osint is
          return null;
    end To_Canonical_Path_Spec;
 
-   ---------------------------
+   ----------------------
    -- To_Host_Dir_Spec --
-   ---------------------------
+   ----------------------
 
    function To_Host_Dir_Spec
      (Canonical_Dir : String;
@@ -3138,9 +3138,9 @@ package body Osint is
       end if;
    end To_Host_Dir_Spec;
 
-   ----------------------------
+   -----------------------
    -- To_Host_File_Spec --
-   ----------------------------
+   -----------------------
 
    function To_Host_File_Spec
      (Canonical_File : String) return String_Access
diff --git a/gcc/ada/par-ch13.adb b/gcc/ada/par-ch13.adb
index 030f929..f6927ed 100644
--- a/gcc/ada/par-ch13.adb
+++ b/gcc/ada/par-ch13.adb
@@ -188,7 +188,9 @@ package body Ch13 is
             --  Check bad spelling
 
             for J in Aspect_Id loop
-               if Is_Bad_Spelling_Of (Token_Name, Aspect_Names (J)) then
+               if J /= No_Aspect and then
+                  Is_Bad_Spelling_Of (Token_Name, Aspect_Names (J))
+               then
                   Error_Msg_Name_1 := Aspect_Names (J);
                   Error_Msg_SC -- CODEFIX
                     ("\possible misspelling of%");
diff --git a/gcc/ada/s-oscons-tmplt.c b/gcc/ada/s-oscons-tmplt.c
index dbfab4e..8583784 100644
--- a/gcc/ada/s-oscons-tmplt.c
+++ b/gcc/ada/s-oscons-tmplt.c
@@ -267,7 +267,7 @@ C("Target_OS", OS_Type, TARGET_OS, "")
 /*
    pragma Warnings (Off, Target_OS);
    --  Suppress warnings on Target_OS since it is in general tested for
-   --  equality with a constant valueto implement conditional compilation,
+   --  equality with a constant value to implement conditional compilation,
    --  which normally generates a constant condition warning.
 
 */
diff --git a/gcc/ada/sem_ch5.adb b/gcc/ada/sem_ch5.adb
index da0e901..d2e9d91 100644
--- a/gcc/ada/sem_ch5.adb
+++ b/gcc/ada/sem_ch5.adb
@@ -2226,18 +2226,8 @@ package body Sem_Ch5 is
          --  Ada 2012: If the domain of iteration is a function call, it is the
          --  new iterator form.
 
-         --  We have also implemented the shorter form : for X in S for Alfa
-         --  use. In this case, 'Old and 'Result must be treated as entity
-         --  names over which iterators are legal.
-
          if Nkind (DS_Copy) = N_Function_Call
            or else
-             (Alfa_Mode
-               and then (Nkind (DS_Copy) = N_Attribute_Reference
-               and then
-                 (Attribute_Name (DS_Copy) = Name_Result
-                   or else Attribute_Name (DS_Copy) = Name_Old)))
-           or else
              (Is_Entity_Name (DS_Copy)
                and then not Is_Type (Entity (DS_Copy)))
          then
diff --git a/gcc/ada/sem_ch9.adb b/gcc/ada/sem_ch9.adb
index 1b34c03..e033afa 100644
--- a/gcc/ada/sem_ch9.adb
+++ b/gcc/ada/sem_ch9.adb
@@ -350,9 +350,9 @@ package body Sem_Ch9 is
                                         Get_Aspect_Id (Asp_Name);
 
                         begin
-                           if Asp_Id = Aspect_Address
-                             or else Asp_Id = Aspect_Export
-                             or else Asp_Id = Aspect_Import
+                           if Asp_Id = Aspect_Address or else
+                              Asp_Id = Aspect_Export  or else
+                              Asp_Id = Aspect_Import
                            then
                               Error_Msg_Name_1 := Asp_Name;