[multiple changes]

2011-08-02  Yannick Moy  <moy@adacore.com>

	* sem_aggr.adb (Resolve_Aggregate): Fix thinko.

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

	* impunit.adb: Add comment.

From-SVN: r177108

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 2eae3c872d1e61b34a1c1871b6277a83d14bd834..fdec71f6612066b65391fb0d4342aa585fa5cb75 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-02  Yannick Moy  <moy@adacore.com>
+
+       * sem_aggr.adb (Resolve_Aggregate): Fix thinko.
+
+2011-08-02  Robert Dewar  <dewar@adacore.com>
+
+       * impunit.adb: Add comment.
+
 2011-08-02  Yannick Moy  <moy@adacore.com>
 
        * sem_aggr.adb (Check_Qualified_Aggregate): new procedure which checks

diff --git a/gcc/ada/a-cfdlli.adb b/gcc/ada/a-cfdlli.adb
index ed34d0e3f27644f31351bb76e641191b8b2fc523..4f70f8174f6214b131c13864b8e88c6ae51af142 100644 (file)
--- a/gcc/ada/a-cfdlli.adb
+++ b/gcc/ada/a-cfdlli.adb
@@ -8,10 +8,6 @@
 --                                                                          --
 --          Copyright (C) 2010, Free Software Foundation, Inc.              --
 --                                                                          --
--- This specification is derived from the Ada Reference Manual for use with --
--- GNAT. The copyright notice above, and the license provisions that follow --
--- apply solely to the  contents of the part following the private keyword. --
---                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
 -- ware  Foundation;  either version 3,  or (at your option) any later ver- --

diff --git a/gcc/ada/a-cfhama.adb b/gcc/ada/a-cfhama.adb
index bc83c9d140a97acf93936a7551249f446d3176f5..34a8a43f1fcbc663c328d796679b78e550382e55 100644 (file)
--- a/gcc/ada/a-cfhama.adb
+++ b/gcc/ada/a-cfhama.adb
@@ -8,10 +8,6 @@
 --                                                                          --
 --          Copyright (C) 2010, Free Software Foundation, Inc.              --
 --                                                                          --
--- This specification is derived from the Ada Reference Manual for use with --
--- GNAT. The copyright notice above, and the license provisions that follow --
--- apply solely to the  contents of the part following the private keyword. --
---                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
 -- ware  Foundation;  either version 3,  or (at your option) any later ver- --

diff --git a/gcc/ada/a-cfhase.adb b/gcc/ada/a-cfhase.adb
index 0df686d303a5699289592e533e9a4ac945ac13c8..ed514c826d65fcae5b06a5f076dd2e52b59a3c7e 100644 (file)
--- a/gcc/ada/a-cfhase.adb
+++ b/gcc/ada/a-cfhase.adb
@@ -8,10 +8,6 @@
 --                                                                          --
 --          Copyright (C) 2010, Free Software Foundation, Inc.              --
 --                                                                          --
--- This specification is derived from the Ada Reference Manual for use with --
--- GNAT. The copyright notice above, and the license provisions that follow --
--- apply solely to the  contents of the part following the private keyword. --
---                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
 -- ware  Foundation;  either version 3,  or (at your option) any later ver- --

diff --git a/gcc/ada/a-cforma.adb b/gcc/ada/a-cforma.adb
index f4519173095c4667bd06e2d75bfd298ddf41bd46..705fd618e9f0c4381ab12adbad7c5a105cbd1e3a 100644 (file)
--- a/gcc/ada/a-cforma.adb
+++ b/gcc/ada/a-cforma.adb
@@ -8,10 +8,6 @@
 --                                                                          --
 --          Copyright (C) 2010, Free Software Foundation, Inc.              --
 --                                                                          --
--- This specification is derived from the Ada Reference Manual for use with --
--- GNAT. The copyright notice above, and the license provisions that follow --
--- apply solely to the  contents of the part following the private keyword. --
---                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
 -- ware  Foundation;  either version 3,  or (at your option) any later ver- --

diff --git a/gcc/ada/a-cforse.adb b/gcc/ada/a-cforse.adb
index 229af23996b46ea75617109f4d4612842f71c38a..30a0f97a31d64ec37f4696b8c4d5c5c1e90df9c7 100644 (file)
--- a/gcc/ada/a-cforse.adb
+++ b/gcc/ada/a-cforse.adb
@@ -8,10 +8,6 @@
 --                                                                          --
 --          Copyright (C) 2010, Free Software Foundation, Inc.              --
 --                                                                          --
--- This specification is derived from the Ada Reference Manual for use with --
--- GNAT. The copyright notice above, and the license provisions that follow --
--- apply solely to the  contents of the part following the private keyword. --
---                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
 -- ware  Foundation;  either version 3,  or (at your option) any later ver- --

diff --git a/gcc/ada/a-cofove.adb b/gcc/ada/a-cofove.adb
index a0fddf97ffc251e7c2a00890be007b882c9ea73e..fd30ca9cda71a4951af5472628c8992dc08fb869 100644 (file)
--- a/gcc/ada/a-cofove.adb
+++ b/gcc/ada/a-cofove.adb
@@ -8,10 +8,6 @@
 --                                                                          --
 --          Copyright (C) 2010, Free Software Foundation, Inc.              --
 --                                                                          --
--- This specification is derived from the Ada Reference Manual for use with --
--- GNAT. The copyright notice above, and the license provisions that follow --
--- apply solely to the  contents of the part following the private keyword. --
---                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
 -- ware  Foundation;  either version 3,  or (at your option) any later ver- --

diff --git a/gcc/ada/impunit.adb b/gcc/ada/impunit.adb
index 788afa4c18b17ce187b8dafaecbf39b1cda52e07..e911b0ac22dff03ebf03e3a818c51fb5f0bdf488 100644 (file)
--- a/gcc/ada/impunit.adb
+++ b/gcc/ada/impunit.adb
@@ -513,6 +513,11 @@ package body Impunit is
      "a-cborma",    -- Ada.Containers.Bounded_Ordered_Maps
      "a-cbhase",    -- Ada.Containers.Bounded_Hashed_Sets
      "a-cbhama",    -- Ada.Containers.Bounded_Hashed_Maps
+
+   -----------------------------------------
+   -- GNAT Defined Additions to Ada 20012 --
+   -----------------------------------------
+
      "a-cofove",    -- Ada.Containers.Formal_Vectors
      "a-cfdlli",    -- Ada.Containers.Formal_Doubly_Linked_Lists
      "a-cforse",    -- Ada.Containers.Formal_Ordered_Sets

diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb
index 566995d4cfd5222f37189e00fdd0ae6884c17fbf..131379f33b62a8a7d43cb7d1daec33609703e5eb 100644 (file)
--- a/gcc/ada/sem_aggr.adb
+++ b/gcc/ada/sem_aggr.adb
@@ -993,10 +993,12 @@ package body Sem_Aggr is
          if Is_Array_Type (Typ)
            and then Nkind (Parent (N)) = N_Assignment_Statement
            and then not Is_Constrained (Etype (Name (Parent (N))))
-           and then not Is_Others_Aggregate (N)
          then
-            Check_Formal_Restriction
-              ("array aggregate should have only OTHERS", N);
+            if not Is_Others_Aggregate (N) then
+               Check_Formal_Restriction
+                 ("array aggregate should have only OTHERS", N);
+            end if;
+
          elsif Is_Top_Level_Aggregate (N) then
             Check_Formal_Restriction ("aggregate should be qualified", N);