From a25bfc6b84c08e16b6a9aed0a5f8f07ca5405081 Mon Sep 17 00:00:00 2001 From: charlet Date: Tue, 2 Aug 2011 09:28:26 +0000 Subject: [PATCH] 2011-08-02 Yannick Moy * sem_aggr.adb (Resolve_Aggregate): Fix thinko. 2011-08-02 Robert Dewar * impunit.adb: Add comment. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177108 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/ChangeLog | 8 ++++++++ gcc/ada/a-cfdlli.adb | 4 ---- gcc/ada/a-cfhama.adb | 4 ---- gcc/ada/a-cfhase.adb | 4 ---- gcc/ada/a-cforma.adb | 4 ---- gcc/ada/a-cforse.adb | 4 ---- gcc/ada/a-cofove.adb | 4 ---- gcc/ada/impunit.adb | 5 +++++ gcc/ada/sem_aggr.adb | 8 +++++--- 9 files changed, 18 insertions(+), 27 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 2eae3c872d1e..fdec71f66120 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2011-08-02 Yannick Moy + + * sem_aggr.adb (Resolve_Aggregate): Fix thinko. + +2011-08-02 Robert Dewar + + * impunit.adb: Add comment. + 2011-08-02 Yannick Moy * 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 ed34d0e3f276..4f70f8174f62 100644 --- 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 bc83c9d140a9..34a8a43f1fcb 100644 --- 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 0df686d303a5..ed514c826d65 100644 --- 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 f4519173095c..705fd618e9f0 100644 --- 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 229af23996b4..30a0f97a31d6 100644 --- 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 a0fddf97ffc2..fd30ca9cda71 100644 --- 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 788afa4c18b1..e911b0ac22df 100644 --- 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 566995d4cfd5..131379f33b62 100644 --- 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); -- 2.39.2