[multiple changes]

2015-05-21  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch5.adb: minor reformatting.

2015-05-21  Robert Dewar  <dewar@adacore.com>

	* freeze.adb (Freeze_Entity): Properly tag -gnatw.z messages.

From-SVN: r223482

gcc/ada/ChangeLog

+2015-05-21  Ed Schonberg  <schonberg@adacore.com>
+
+	* sem_ch5.adb: minor reformatting.
+
+2015-05-21  Robert Dewar  <dewar@adacore.com>
+
+	* freeze.adb (Freeze_Entity): Properly tag -gnatw.z messages.
+
 2015-05-21  Robert Dewar  <dewar@adacore.com>
 
 	* freeze.adb: Minor reformatting.

gcc/ada/freeze.adb

@@ -5256,22 +5256,24 @@ package body Freeze is
                   if Sloc (SC) > Sloc (AC) then
                      Loc := SC;
                      Error_Msg_NE
-                       ("??size is not a multiple of alignment for &", Loc, E);
+                       ("?Z?size is not a multiple of alignment for &",
+                        Loc, E);
                      Error_Msg_Sloc := Sloc (AC);
                      Error_Msg_Uint_1 := Alignment (E);
-                     Error_Msg_N ("\??alignment of ^ specified #", Loc);
+                     Error_Msg_N ("\?Z?alignment of ^ specified #", Loc);
 
                   else
                      Loc := AC;
                      Error_Msg_NE
-                       ("??size is not a multiple of alignment for &", Loc, E);
+                       ("?Z?size is not a multiple of alignment for &",
+                        Loc, E);
                      Error_Msg_Sloc := Sloc (SC);
                      Error_Msg_Uint_1 := RM_Size (E);
-                     Error_Msg_N ("\??size of ^ specified #", Loc);
+                     Error_Msg_N ("\?Z?size of ^ specified #", Loc);
                   end if;
 
                   Error_Msg_Uint_1 := ((RM_Size (E) / Abits) + 1) * Abits;
-                  Error_Msg_N ("\??Object_Size will be increased to ^", Loc);
+                  Error_Msg_N ("\?Z?Object_Size will be increased to ^", Loc);
                end if;
             end;
          end if;

gcc/ada/sem_ch5.adb

@@ -1727,9 +1727,9 @@ package body Sem_Ch5 is
       --  implements the reversible iterator interface.
 
       function Get_Cursor_Type (Typ : Entity_Id) return Entity_Id;
-      --  For containers with Iterator and related aspects, the cursor the
-      --  is obtained by locating an entity with the proper name in the
-      --  scope of the type.
+      --  For containers with Iterator and related aspects, the cursor is
+      --  obtained by locating an entity with the proper name in the scope
+      --  of the type.
 
       -----------------------------
       -- Check_Reverse_Iteration --
@@ -2179,8 +2179,7 @@ package body Sem_Ch5 is
                   elsif Iter_Kind = N_Function_Call then
                      Obj := First_Actual (Original_Node (Iter_Name));
 
-                  --  If neither, likely previous error, make sure Obj has some
-                  --  reasonable value in such a case.
+                  --  If neither, the name comes from source
 
                   else
                      Obj := Iter_Name;