summaryrefslogtreecommitdiff
path: root/gcc/ada/prj-attr.adb
diff options
context:
space:
mode:
authorcharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2009-04-07 15:01:27 +0000
committercharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2009-04-07 15:01:27 +0000
commit38d2fa31f60fb5aaf3dea1214bbf9001ab94f600 (patch)
tree97de4be619b593f2d66a2fa45de2b0a01f1177c0 /gcc/ada/prj-attr.adb
parent4076879ffa527f474935dec2d6c49acdaa9d5353 (diff)
downloadgcc-38d2fa31f60fb5aaf3dea1214bbf9001ab94f600.tar.gz
2009-04-07 Robert Dewar <dewar@adacore.com>
(Osint.Fail): Change calling sequence to have one string arg (Make.Make_Failed): Same change All callers are adjusted to use concatenation 2009-04-07 Robert Dewar <dewar@adacore.com> * exp_ch4.adb: Fix documentation typo 2009-04-07 Robert Dewar <dewar@adacore.com> * tbuild.ads: Minor reformatting 2009-04-07 Javier Miranda <miranda@adacore.com> * exp_disp.adb (Make_DT): Avoid the generation of the OSD_Table when compiling under ZFP runtime. 2009-04-07 Robert Dewar <dewar@adacore.com> * g-comlin.adb: Minor reformatting 2009-04-07 Thomas Quinot <quinot@adacore.com> * socket.c, g-socthi-vms.adb, g-socthi-vms.ads, g-socthi-vxworks.adb, g-socthi-vxworks.ads, g-socthi-mingw.adb, g-socthi-mingw.ads, g-socthi.adb, g-socthi.ads, g-socket.adb, g-socket.ads, g-sothco.ads: Remove dynamic allocation of Fd_Set in Socket_Set_Type objects. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@145678 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-attr.adb')
-rw-r--r--gcc/ada/prj-attr.adb45
1 files changed, 26 insertions, 19 deletions
diff --git a/gcc/ada/prj-attr.adb b/gcc/ada/prj-attr.adb
index 63651f94d9b..250a412e58d 100644
--- a/gcc/ada/prj-attr.adb
+++ b/gcc/ada/prj-attr.adb
@@ -467,9 +467,9 @@ package body Prj.Attr is
for Index in First_Package .. Package_Attributes.Last loop
if Package_Name = Package_Attributes.Table (Index).Name then
- Osint.Fail ("duplicate name """,
- Initialization_Data (Start .. Finish - 1),
- """ in predefined packages.");
+ Osint.Fail ("duplicate name """
+ & Initialization_Data (Start .. Finish - 1)
+ & """ in predefined packages.");
end if;
end loop;
@@ -576,9 +576,9 @@ package body Prj.Attr is
for Index in First_Attribute .. Attrs.Last - 1 loop
if Attribute_Name = Attrs.Table (Index).Name then
- Osint.Fail ("duplicate attribute """,
- Initialization_Data (Start .. Finish - 1),
- """ in " & Attribute_Location);
+ Osint.Fail ("duplicate attribute """
+ & Initialization_Data (Start .. Finish - 1)
+ & """ in " & Attribute_Location);
end if;
end loop;
@@ -716,8 +716,9 @@ package body Prj.Attr is
end if;
if In_Package = Empty_Package then
- Fail ("attempt to add attribute """, Name,
- """ to an undefined package");
+ Fail ("attempt to add attribute """
+ & Name
+ & """ to an undefined package");
raise Project_Error;
end if;
@@ -731,11 +732,12 @@ package body Prj.Attr is
Curr_Attr := First_Attr;
while Curr_Attr /= Empty_Attr loop
if Attrs.Table (Curr_Attr).Name = Attr_Name then
- Fail ("duplicate attribute name """, Name,
- """ in package """ &
- Get_Name_String
- (Package_Attributes.Table (In_Package.Value).Name) &
- """");
+ Fail ("duplicate attribute name """
+ & Name
+ & """ in package """
+ & Get_Name_String
+ (Package_Attributes.Table (In_Package.Value).Name)
+ & """");
raise Project_Error;
end if;
@@ -794,8 +796,9 @@ package body Prj.Attr is
for Index in Package_Attributes.First .. Package_Attributes.Last loop
if Package_Attributes.Table (Index).Name = Pkg_Name then
- Fail ("cannot register a package with a non unique name""",
- Name, """");
+ Fail ("cannot register a package with a non unique name"""
+ & Name
+ & """");
Id := Empty_Package;
return;
end if;
@@ -831,8 +834,9 @@ package body Prj.Attr is
for Index in Package_Attributes.First .. Package_Attributes.Last loop
if Package_Attributes.Table (Index).Name = Pkg_Name then
- Fail ("cannot register a package with a non unique name""",
- Name, """");
+ Fail ("cannot register a package with a non unique name"""
+ & Name
+ & """");
raise Project_Error;
end if;
end loop;
@@ -843,8 +847,11 @@ package body Prj.Attr is
Curr_Attr := First_Attr;
while Curr_Attr /= Empty_Attr loop
if Attrs.Table (Curr_Attr).Name = Attr_Name then
- Fail ("duplicate attribute name """, Attributes (Index).Name,
- """ in new package """ & Name & """");
+ Fail ("duplicate attribute name """
+ & Attributes (Index).Name
+ & """ in new package """
+ & Name
+ & """");
raise Project_Error;
end if;