[Ada] misc clean ups
Arnaud Charlet
charlet@adacore.com
Thu Jun 16 09:52:00 GMT 2005
Tested on i686-linux, committed on mainline.
Various clean ups and comments updates.
2005-06-10 Arnaud Charlet <charlet@adacore.com>
* Makefile.in: Add initialize.o when needed.
Adapt to new VMS package body Symbols and subunits
No specialized version of a-sytaco is needed for VxWorks.
* a-wichun.ads, a-wichun.adb, a-zchuni.ads, a-zchuni.adb: New files.
* a-zchara.ads, a-widcha.ads: New files.
* system-hpux-ia64.ads: New file.
* i-vxwork-x86.ads, i-vxwork.ads (intContext): Add this function which
is imported from the VxWorks kernel.
2005-06-14 Robert Dewar <dewar@adacore.com>
* g-soliop-mingw.ads, g-soccon-vms.adb, a-swmwco.ads, exp_smem.adb,
fmap.adb, a-szmzco.ads, s-traent-vms.adb, s-traent-vms.ads,
a-direio.ads, a-exctra.ads, a-exexda.adb, a-exextr.adb, a-stream.ads,
s-restri.ads, s-restri.adb, s-traent.adb, s-traent.ads, a-slcain.adb,
a-stzhas.ads, a-tiinau.adb, comperr.adb, exp_ch11.adb, g-boubuf.adb,
g-calend.adb, g-debpoo.ads, g-moreex.ads, gprep.adb, g-regpat.ads,
i-cexten.ads, i-os2thr.ads, makeutl.ads, memroot.adb, mlib-prj.adb,
namet.adb, namet.ads, prj-makr.adb, prj-proc.adb, sem_dist.adb,
sem_elim.ads, s-valint.adb, s-vallli.adb, s-vallli.adb, s-vallli.ads,
s-valllu.adb, s-valllu.ads, s-valrea.adb, s-valrea.ads, scn.adb,
s-tasinf.adb, targparm.adb, uname.adb, uname.ads, xnmake.adb,
xsinfo.adb, a-direct.ads: Remove extra blank lines. Minor reformatting.
2005-06-14 Thomas Quinot <quinot@adacore.com>
* xeinfo.adb: Fix typo in comment
2005-06-14 Javier Miranda <miranda@adacore.com>
* repinfo.ads: Fix typo in comment
2005-06-14 Gary Dismukes <dismukes@adacore.com>
* s-finimp.adb (Parent_Tag): Delete this imported function (function
Parent_Tag is now in the visible part of Ada.Tags).
(Get_Deep_Controller): Call Ada.Tags.Parent_Tag directly instead of
using imported function.
2005-06-14 Bernard Banner <banner@adacore.com>
* vxaddr2line.adb: Add support for Windows hosted x86 vxworks. Should
also apply for handling support for VxSim 653.
2005-06-14 Eric Botcazou <ebotcazou@adacore.com>
* xsnames.adb: Add automatic generation of snames.h.
2005-06-14 Thomas Quinot <quinot@adacore.com>
* gen-soccon.c: Add IP_MULTICAST_IF constant
Minor reformatting and adjustments to prevent warnings.
2005-06-14 Pascal Obry <obry@adacore.com>
* seh_init.c: Do not include <sys/stat.h>. This is not needed.
-------------- next part --------------
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/Makefile.in,v
retrieving revision 1.117
diff -u -p -r1.117 Makefile.in
--- Makefile.in 16 May 2005 11:58:43 -0000 1.117
+++ Makefile.in 15 Jun 2005 15:50:04 -0000
@@ -457,8 +457,6 @@ endif
ifeq ($(strip $(filter-out alpha% dec vx%,$(targ))),)
LIBGNAT_TARGET_PAIRS = \
- a-sytaco.ads<a-sytaco-vxworks.ads \
- a-sytaco.adb<a-sytaco-vxworks.adb \
a-intnam.ads<a-intnam-vxworks.ads \
a-numaux.ads<a-numaux-vxworks.ads \
s-inmaop.adb<s-inmaop-posix.adb \
@@ -485,8 +483,6 @@ endif
ifeq ($(strip $(filter-out m68k% wrs vx%,$(targ))),)
LIBGNAT_TARGET_PAIRS = \
- a-sytaco.ads<a-sytaco-vxworks.ads \
- a-sytaco.adb<a-sytaco-vxworks.adb \
a-intnam.ads<a-intnam-vxworks.ads \
a-numaux.ads<a-numaux-vxworks.ads \
s-inmaop.adb<s-inmaop-posix.adb \
@@ -524,8 +520,6 @@ endif
ifeq ($(strip $(filter-out powerpc% wrs vxworks,$(targ))),)
LIBGNAT_TARGET_PAIRS = \
- a-sytaco.ads<a-sytaco-vxworks.ads \
- a-sytaco.adb<a-sytaco-vxworks.adb \
a-intnam.ads<a-intnam-vxworks.ads \
a-numaux.ads<a-numaux-vxworks.ads \
s-inmaop.adb<s-inmaop-posix.adb \
@@ -563,8 +557,6 @@ endif
ifeq ($(strip $(filter-out sparc% wrs vx%,$(targ))),)
LIBGNAT_TARGET_PAIRS = \
- a-sytaco.ads<a-sytaco-vxworks.ads \
- a-sytaco.adb<a-sytaco-vxworks.adb \
a-intnam.ads<a-intnam-vxworks.ads \
a-numaux.ads<a-numaux-vxworks.ads \
s-inmaop.adb<s-inmaop-posix.adb \
@@ -593,8 +585,6 @@ endif
ifeq ($(strip $(filter-out %86 wrs vxworks,$(targ))),)
LIBGNAT_TARGET_PAIRS = \
- a-sytaco.ads<a-sytaco-vxworks.ads \
- a-sytaco.adb<a-sytaco-vxworks.adb \
a-intnam.ads<a-intnam-vxworks.ads \
i-vxwork.ads<i-vxwork-x86.ads \
s-inmaop.adb<s-inmaop-posix.adb \
@@ -634,8 +624,6 @@ endif
ifeq ($(strip $(filter-out xscale% coff wrs vx%,$(targ))),)
LIBGNAT_TARGET_PAIRS = \
- a-sytaco.ads<a-sytaco-vxworks.ads \
- a-sytaco.adb<a-sytaco-vxworks.adb \
a-intnam.ads<a-intnam-vxworks.ads \
a-numaux.ads<a-numaux-vxworks.ads \
s-inmaop.adb<s-inmaop-posix.adb \
@@ -664,8 +652,6 @@ endif
ifeq ($(strip $(filter-out mips% wrs vx%,$(targ))),)
LIBGNAT_TARGET_PAIRS = \
- a-sytaco.ads<a-sytaco-vxworks.ads \
- a-sytaco.adb<a-sytaco-vxworks.adb \
a-intnam.ads<a-intnam-vxworks.ads \
a-numaux.ads<a-numaux-vxworks.ads \
s-inmaop.adb<s-inmaop-posix.adb \
@@ -1251,11 +1237,13 @@ endif
ifeq ($(strip $(filter-out ia64 hp vms% openvms%,$(targ))),)
TOOLS_TARGET_PAIRS= \
mlib-tgt.adb<mlib-tgt-vms-ia64.adb \
- symbols.adb<symbols-vms-ia64.adb
+ symbols.adb<symbols-vms.adb \
+ symbols-processing.adb<symbols-processing-vms-ia64.adb
else
TOOLS_TARGET_PAIRS= \
mlib-tgt.adb<mlib-tgt-vms-alpha.adb \
- symbols.adb<symbols-vms-alpha.adb
+ symbols.adb<symbols-vms.adb \
+ symbols-processing.adb<symbols-processing-vms-alpha.adb
endif
GNATLIB_SHARED=gnatlib-shared-vms
@@ -1507,12 +1495,12 @@ endif
# subdirectory and copied.
LIBGNAT_SRCS = ada.h adaint.c adaint.h argv.c cio.c cstreams.c \
errno.c exit.c cal.c ctrl_c.c \
- raise.h raise.c sysdep.c aux-io.c init.c seh_init.c \
+ raise.h raise.c sysdep.c aux-io.c init.c initialize.c seh_init.c \
final.c tracebak.c tb-alvms.c tb-alvxw.c expect.c mkdir.c socket.c gsocket.h \
$(EXTRA_LIBGNAT_SRCS)
LIBGNAT_OBJS = adaint.o argv.o cio.o cstreams.o ctrl_c.o errno.o exit.o \
- raise.o sysdep.o aux-io.o init.o seh_init.o cal.o final.o \
+ raise.o sysdep.o aux-io.o init.o initialize.o seh_init.o cal.o final.o \
tracebak.o expect.o mkdir.o socket.o $(EXTRA_LIBGNAT_OBJS)
# NOTE ??? - when the -I option for compiling Ada code is made to work,
@@ -2029,26 +2017,30 @@ socket.o : socket.c gsocket.h
sysdep.o : sysdep.c
gen-soccon: gen-soccon.c gsocket.h
- $(CC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(RT_FLAGS) \
- $(ALL_CPPFLAGS) $(INCLUDES) -DTARGET=\"$(target_alias)\" \
+ $(CC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+ -UIN_GCC -DTARGET=\"$(target_alias)\" \
$< $(OUTPUT_OPTION)
cio.o : cio.c
- $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(RT_FLAGS) \
+ $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) \
$(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
init.o : init.c ada.h types.h raise.h
- $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(RT_FLAGS) \
+ $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) \
+ $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
+
+initialize.o : initialize.c
+ $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) \
$(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
# No optimization to compile this file as optimizations (-O1 or above) breaks
# the SEH handling on Windows. The reasons are not clear.
seh_init.o : seh_init.c raise.h
- $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(RT_FLAGS) -O0 \
+ $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) -O0 \
$(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
raise.o : raise.c raise.h
- $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(RT_FLAGS) \
+ $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) \
$(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
# Need to keep the frame pointer in this file to pop the stack properly on
Index: i-vxwork-x86.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/i-vxwork-x86.ads,v
retrieving revision 1.1
diff -u -p -r1.1 i-vxwork-x86.ads
--- i-vxwork-x86.ads 4 Oct 2004 15:01:52 -0000 1.1
+++ i-vxwork-x86.ads 15 Jun 2005 15:50:04 -0000
@@ -1,12 +1,12 @@
------------------------------------------------------------------------------
-- --
--- GNU ADA RUN-TIME LIBRARY (GNARL) COMPONENTS --
+-- GNAT RUN-TIME LIBRARY (GNARL) COMPONENTS --
-- --
-- I N T E R F A C E S . V X W O R K S --
-- --
-- S p e c --
-- --
--- Copyright (C) 1999-2004 Ada Core Technologies, Inc. --
+-- Copyright (C) 1999-2005, AdaCore --
-- --
-- GNARL 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- --
@@ -137,6 +137,10 @@ package Interfaces.VxWorks is
-- user handler. The routine generates a wrapper around the user
-- handler to save and restore context
+ function intContext return int;
+ -- Binding to the C routine intContext. This function returns 1 only
+ -- if the current execution state is in interrupt context.
+
function intVecGet
(Vector : Interrupt_Vector) return VOIDFUNCPTR;
-- Binding to the C routine intVecGet. Use this to get the
@@ -200,6 +204,7 @@ private
-- Target-dependent floating point context type
pragma Import (C, intConnect, "intConnect");
+ pragma Import (C, intContext, "intContext");
pragma Import (C, intVecGet, "intVecGet");
pragma Import (C, intVecSet, "intVecSet");
pragma Import (C, intVecGet2, "intVecGet2");
Index: i-vxwork.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/i-vxwork.ads,v
retrieving revision 1.5
diff -u -p -r1.5 i-vxwork.ads
--- i-vxwork.ads 21 Oct 2003 13:42:09 -0000 1.5
+++ i-vxwork.ads 15 Jun 2005 15:50:04 -0000
@@ -1,12 +1,12 @@
------------------------------------------------------------------------------
-- --
--- GNU ADA RUN-TIME LIBRARY (GNARL) COMPONENTS --
+-- GNAT RUN-TIME LIBRARY (GNARL) COMPONENTS --
-- --
-- I N T E R F A C E S . V X W O R K S --
-- --
-- S p e c --
-- --
--- Copyright (C) 1999-2003 Ada Core Technologies, Inc. --
+-- Copyright (C) 1999-2005, AdaCore --
-- --
-- GNARL 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- --
@@ -138,6 +138,10 @@ package Interfaces.VxWorks is
-- user handler. The routine generates a wrapper around the user
-- handler to save and restore context
+ function intContext return int;
+ -- Binding to the C routine intContext. This function returns 1 only
+ -- if the current execution state is in interrupt context.
+
function intVecGet
(Vector : Interrupt_Vector) return VOIDFUNCPTR;
-- Binding to the C routine intVecGet. Use this to get the
@@ -192,6 +196,7 @@ private
-- Target-dependent floating point context type
pragma Import (C, intConnect, "intConnect");
+ pragma Import (C, intContext, "intContext");
pragma Import (C, intVecGet, "intVecGet");
pragma Import (C, intVecSet, "intVecSet");
pragma Import (C, INUM_TO_IVEC, "__gnat_inum_to_ivec");
Index: g-soliop-mingw.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/g-soliop-mingw.ads,v
retrieving revision 1.1
diff -u -p -r1.1 g-soliop-mingw.ads
--- g-soliop-mingw.ads 14 May 2004 10:01:59 -0000 1.1
+++ g-soliop-mingw.ads 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 2001-2003 Ada Core Technologies, Inc. --
+-- Copyright (C) 2001-2005 Ada Core Technologies, Inc. --
-- --
-- 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- --
@@ -36,7 +36,6 @@
-- This is the Windows/NT version of this package
-
package GNAT.Sockets.Linker_Options is
private
pragma Linker_Options ("-lwsock32");
Index: g-soccon-vms.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/g-soccon-vms.adb,v
retrieving revision 1.2
diff -u -p -r1.2 g-soccon-vms.adb
--- g-soccon-vms.adb 4 Oct 2004 14:49:35 -0000 1.2
+++ g-soccon-vms.adb 15 Jun 2005 15:50:04 -0000
@@ -4,9 +4,9 @@
-- --
-- G N A T . S O C K E T S . C O N S T A N T S --
-- --
--- S p e c --
+-- B o d y --
-- --
--- Copyright (C) 2000-2004 Free Software Foundation, Inc. --
+-- Copyright (C) 2000-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
Index: a-swmwco.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/a-swmwco.ads,v
retrieving revision 1.4
diff -u -p -r1.4 a-swmwco.ads
--- a-swmwco.ads 24 Apr 2003 17:53:54 -0000 1.4
+++ a-swmwco.ads 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 1992-2001 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005 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 --
@@ -182,7 +182,6 @@ private
(AF.Controlled with
Character_Ranges'Unrestricted_Access);
-
Lower_Case_Mapping : aliased constant Wide_Character_Mapping_Values :=
(Length => 56,
Index: exp_smem.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/exp_smem.adb,v
retrieving revision 1.5
diff -u -p -r1.5 exp_smem.adb
--- exp_smem.adb 15 Mar 2005 16:01:34 -0000 1.5
+++ exp_smem.adb 15 Jun 2005 15:50:04 -0000
@@ -492,5 +492,4 @@ package body Exp_Smem is
end if;
end On_Lhs_Of_Assignment;
-
end Exp_Smem;
Index: fmap.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/fmap.adb,v
retrieving revision 1.8
diff -u -p -r1.8 fmap.adb
--- fmap.adb 1 Dec 2003 13:29:27 -0000 1.8
+++ fmap.adb 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 2001-2003, Free Software Foundation, Inc. --
+-- Copyright (C) 2001-2005, Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -297,7 +297,6 @@ package body Fmap is
return;
end if;
-
Name_Len := Last - First + 1;
Name_Buffer (1 .. Name_Len) := SP (First .. Last);
Uname := Find_Name;
Index: a-szmzco.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/a-szmzco.ads,v
retrieving revision 1.1
diff -u -p -r1.1 a-szmzco.ads
--- a-szmzco.ads 9 Feb 2005 11:14:41 -0000 1.1
+++ a-szmzco.ads 15 Jun 2005 15:50:04 -0000
@@ -182,7 +182,6 @@ private
(AF.Controlled with
Character_Ranges'Unrestricted_Access);
-
Lower_Case_Mapping : aliased constant Wide_Wide_Character_Mapping_Values :=
(Length => 56,
Index: s-traent-vms.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/s-traent-vms.adb,v
retrieving revision 1.1
diff -u -p -r1.1 s-traent-vms.adb
--- s-traent-vms.adb 14 May 2004 10:02:00 -0000 1.1
+++ s-traent-vms.adb 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 2003 Free Software Foundation, Inc. --
+-- Copyright (C) 2003-2005 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 --
@@ -65,4 +65,3 @@ package body System.Traceback_Entries is
end TB_Entry_For;
end System.Traceback_Entries;
-
Index: s-traent-vms.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/s-traent-vms.ads,v
retrieving revision 1.1
diff -u -p -r1.1 s-traent-vms.ads
--- s-traent-vms.ads 14 May 2004 10:02:00 -0000 1.1
+++ s-traent-vms.ads 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 2003 Free Software Foundation, Inc. --
+-- Copyright (C) 2003-2005 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 --
@@ -56,4 +56,3 @@ package System.Traceback_Entries is
function TB_Entry_For (PC : System.Address) return Traceback_Entry;
end System.Traceback_Entries;
-
Index: a-direio.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/a-direio.ads,v
retrieving revision 1.5
diff -u -p -r1.5 a-direio.ads
--- a-direio.ads 15 Jul 2004 20:34:34 -0000 1.5
+++ a-direio.ads 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 1992-2004 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005 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 --
@@ -35,7 +35,6 @@
-- --
------------------------------------------------------------------------------
-
with Ada.IO_Exceptions;
with System.Direct_IO;
with Interfaces.C_Streams;
Index: a-exctra.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/a-exctra.ads,v
retrieving revision 1.5
diff -u -p -r1.5 a-exctra.ads
--- a-exctra.ads 21 Oct 2003 13:41:53 -0000 1.5
+++ a-exctra.ads 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 1999-2003 Free Software Foundation, Inc. --
+-- Copyright (C) 1999-2005 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 --
@@ -35,7 +35,7 @@
-- --
------------------------------------------------------------------------------
--- This package is part of the support for tracebacks on exceptions.
+-- This package is part of the support for tracebacks on exceptions
with System.Traceback_Entries;
@@ -47,7 +47,7 @@ package Ada.Exceptions.Traceback is
-- Code location in executing program
type Tracebacks_Array is array (Positive range <>) of TBE.Traceback_Entry;
- -- A traceback array is an array of traceback entries.
+ -- A traceback array is an array of traceback entries
function Tracebacks (E : Exception_Occurrence) return Tracebacks_Array;
-- This function extracts the traceback information from an exception
Index: a-exexda.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/a-exexda.adb,v
retrieving revision 1.3
diff -u -p -r1.3 a-exexda.adb
--- a-exexda.adb 20 Jul 2004 10:26:51 -0000 1.3
+++ a-exexda.adb 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2004 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -152,7 +152,6 @@ package body Exception_Data is
Info : in out String;
Ptr : in out Natural);
-
-- The "functional" interface to the exception information not involving
-- a traceback decorator uses preallocated intermediate buffers to avoid
-- the use of secondary stack. Preallocation requires preliminary length
Index: a-exextr.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/a-exextr.adb,v
retrieving revision 1.4
diff -u -p -r1.4 a-exextr.adb
--- a-exextr.adb 20 Jul 2004 10:26:51 -0000 1.4
+++ a-exextr.adb 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2004 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -190,7 +190,6 @@ package body Exception_Traces is
Last_Chance_Handler (Excep.all);
end Unhandled_Exception_Terminate;
-
------------------------------------
-- Handling GNAT.Exception_Traces --
------------------------------------
Index: a-stream.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/a-stream.ads,v
retrieving revision 1.5
diff -u -p -r1.5 a-stream.ads
--- a-stream.ads 24 Apr 2003 17:53:54 -0000 1.5
+++ a-stream.ads 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 1992-2001 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005 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 --
@@ -35,7 +35,6 @@
-- --
------------------------------------------------------------------------------
-
package Ada.Streams is
pragma Pure (Streams);
Index: s-restri.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/s-restri.ads,v
retrieving revision 1.4
diff -u -p -r1.4 s-restri.ads
--- s-restri.ads 17 May 2004 13:20:44 -0000 1.4
+++ s-restri.ads 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 2004 Free Software Foundation, Inc. --
+-- Copyright (C) 2004-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -65,5 +65,3 @@ package System.Restrictions is
-- must be False, and Max_Tasks must not be set to zero.
end System.Restrictions;
-
-
Index: s-restri.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/s-restri.adb,v
retrieving revision 1.2
diff -u -p -r1.2 s-restri.adb
--- s-restri.adb 4 Feb 2004 11:06:19 -0000 1.2
+++ s-restri.adb 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 2004 Free Software Foundation, Inc. --
+-- Copyright (C) 2004-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -145,4 +145,3 @@ begin
end loop;
end Acquire_Restrictions;
end System.Restrictions;
-
Index: s-traent.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/s-traent.adb,v
retrieving revision 1.1
diff -u -p -r1.1 s-traent.adb
--- s-traent.adb 21 Oct 2003 13:42:18 -0000 1.1
+++ s-traent.adb 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 2003 Free Software Foundation, Inc. --
+-- Copyright (C) 2003-2005 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 --
@@ -35,7 +35,6 @@
-- --
------------------------------------------------------------------------------
-
package body System.Traceback_Entries is
------------
Index: s-traent.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/s-traent.ads,v
retrieving revision 1.1
diff -u -p -r1.1 s-traent.ads
--- s-traent.ads 21 Oct 2003 13:42:18 -0000 1.1
+++ s-traent.ads 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 2003 Free Software Foundation, Inc. --
+-- Copyright (C) 2003-2005 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 --
@@ -58,5 +58,3 @@ package System.Traceback_Entries is
-- Returns an entry representing a frame for a call instruction at PC.
end System.Traceback_Entries;
-
-
Index: a-slcain.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/a-slcain.adb,v
retrieving revision 1.1
diff -u -p -r1.1 a-slcain.adb
--- a-slcain.adb 9 Feb 2005 11:14:40 -0000 1.1
+++ a-slcain.adb 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 2004 Free Software Foundation, Inc. --
+-- Copyright (C) 2004-2005 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 --
@@ -76,5 +76,3 @@ begin
RI := RI + 1;
end loop;
end Ada.Strings.Less_Case_Insensitive;
-
-
Index: a-stzhas.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/a-stzhas.ads,v
retrieving revision 1.1
diff -u -p -r1.1 a-stzhas.ads
--- a-stzhas.ads 9 Feb 2005 11:14:41 -0000 1.1
+++ a-stzhas.ads 15 Jun 2005 15:50:04 -0000
@@ -19,6 +19,3 @@ function Ada.Strings.Wide_Wide_Hash
(Key : Wide_Wide_String) return Containers.Hash_Type;
pragma Pure (Ada.Strings.Wide_Wide_Hash);
-
-
-
Index: a-tiinau.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/a-tiinau.adb,v
retrieving revision 1.7
diff -u -p -r1.7 a-tiinau.adb
--- a-tiinau.adb 11 Dec 2003 16:21:39 -0000 1.7
+++ a-tiinau.adb 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2003 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -52,7 +52,7 @@ package body Ada.Text_IO.Integer_Aux is
(File : in File_Type;
Buf : out String;
Ptr : in out Natural);
- -- This is an auxiliary routine that is used to load an possibly signed
+ -- This is an auxiliary routine that is used to load a possibly signed
-- integer literal value from the input file into Buf, starting at Ptr + 1.
-- On return, Ptr is set to the last character stored.
Index: comperr.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/comperr.adb,v
retrieving revision 1.13
diff -u -p -r1.13 comperr.adb
--- comperr.adb 15 Mar 2005 16:19:37 -0000 1.13
+++ comperr.adb 15 Jun 2005 15:50:04 -0000
@@ -294,7 +294,6 @@ package body Comperr is
End_Line;
end if;
-
Write_Str
("| Use a subject line meaningful to you" &
" and us to track the bug.");
Index: exp_ch11.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/exp_ch11.adb,v
retrieving revision 1.11
diff -u -p -r1.11 exp_ch11.adb
--- exp_ch11.adb 15 Mar 2005 15:54:12 -0000 1.11
+++ exp_ch11.adb 15 Jun 2005 15:50:04 -0000
@@ -730,7 +730,6 @@ package body Exp_Ch11 is
end;
end if;
-
-- If an exception occurrence is present, then we must declare it
-- and initialize it from the value stored in the TSD
@@ -1175,7 +1174,6 @@ package body Exp_Ch11 is
Name_Buffer (Name_Len) := ASCII.NUL;
end if;
-
if Opt.Exception_Locations_Suppressed then
Name_Len := 0;
end if;
Index: g-boubuf.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/g-boubuf.adb,v
retrieving revision 1.1
diff -u -p -r1.1 g-boubuf.adb
--- g-boubuf.adb 21 Oct 2003 13:42:00 -0000 1.1
+++ g-boubuf.adb 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 2003 Ada Core Technologies, Inc. --
+-- Copyright (C) 2003-2005, AdaCore --
-- --
-- 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- --
@@ -89,5 +89,4 @@ package body GNAT.Bounded_Buffers is
end Bounded_Buffer;
-
end GNAT.Bounded_Buffers;
Index: g-calend.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/g-calend.adb,v
retrieving revision 1.3
diff -u -p -r1.3 g-calend.adb
--- g-calend.adb 24 Apr 2003 17:54:02 -0000 1.3
+++ g-calend.adb 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1999-2001 Ada Core Technologies, Inc. --
+-- Copyright (C) 1999-2005 Ada Core Technologies, Inc. --
-- --
-- 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- --
@@ -253,7 +253,6 @@ package body GNAT.Calendar is
sec : aliased C.long;
usec : aliased C.long;
-
begin
timeval_to_duration (T, sec'Access, usec'Access);
return Duration (sec) + Duration (usec) / Micro;
Index: g-debpoo.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/g-debpoo.ads,v
retrieving revision 1.8
diff -u -p -r1.8 g-debpoo.ads
--- g-debpoo.ads 25 Jun 2004 16:39:27 -0000 1.8
+++ g-debpoo.ads 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 1992-2004 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -85,7 +85,6 @@
-- This allows faster checks, and limits the performance impact of using
-- this pool.
-
with System; use System;
with System.Storage_Elements; use System.Storage_Elements;
with System.Checked_Pools;
Index: g-moreex.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/g-moreex.ads,v
retrieving revision 1.3
diff -u -p -r1.3 g-moreex.ads
--- g-moreex.ads 24 Apr 2003 17:54:03 -0000 1.3
+++ g-moreex.ads 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 2000 Ada Core Technologies, Inc. --
+-- Copyright (C) 2000-2005, AdaCore --
-- --
-- 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- --
@@ -45,9 +45,9 @@ package GNAT.Most_Recent_Exception is
function Occurrence
return Ada.Exceptions.Exception_Occurrence;
- -- Returns the Exception_Occurrence for the most recently raised
- -- exception in the current task. If no exception has been raised
- -- in the current task prior to the call, returns Null_Occurrence.
+ -- Returns the Exception_Occurrence for the most recently raised exception
+ -- in the current task. If no exception has been raised in the current task
+ -- prior to the call, returns Null_Occurrence.
function Occurrence_Access
return Ada.Exceptions.Exception_Occurrence_Access;
@@ -73,5 +73,4 @@ package GNAT.Most_Recent_Exception is
-- -- not about the Constraint_Error exception being handled
-- -- by the current handler code.
-
end GNAT.Most_Recent_Exception;
Index: gprep.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/gprep.adb,v
retrieving revision 1.5
diff -u -p -r1.5 gprep.adb
--- gprep.adb 3 Jan 2005 15:32:18 -0000 1.5
+++ gprep.adb 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 2002-2004, Free Software Foundation, Inc. --
+-- Copyright (C) 2002-2005, Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -312,7 +312,6 @@ package body GPrep is
null;
end Obsolescent_Check;
-
---------------
-- Post_Scan --
---------------
Index: g-regpat.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/g-regpat.ads,v
retrieving revision 1.7
diff -u -p -r1.7 g-regpat.ads
--- g-regpat.ads 5 May 2004 10:09:54 -0000 1.7
+++ g-regpat.ads 15 Jun 2005 15:50:04 -0000
@@ -7,7 +7,7 @@
-- S p e c --
-- --
-- Copyright (C) 1986 by University of Toronto. --
--- Copyright (C) 1996-2004 Ada Core Technologies, Inc. --
+-- Copyright (C) 1996-2005 Ada Core Technologies, Inc. --
-- --
-- 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- --
@@ -524,7 +524,6 @@ pragma Preelaborate (Regpat);
-- Expression_Error is raised if the given expression is not a legal
-- regular expression.
-
procedure Match
(Expression : String;
Data : String;
Index: i-cexten.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/i-cexten.ads,v
retrieving revision 1.4
diff -u -p -r1.4 i-cexten.ads
--- i-cexten.ads 24 Apr 2003 17:54:05 -0000 1.4
+++ i-cexten.ads 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 1992,1993,1994,1995 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -247,5 +247,4 @@ package Interfaces.C.Extensions is
type Signed_32 is range -2 ** 31 .. 2 ** 31 - 1;
for Signed_32'Size use 32;
-
end Interfaces.C.Extensions;
Index: i-os2thr.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/i-os2thr.ads,v
retrieving revision 1.5
diff -u -p -r1.5 i-os2thr.ads
--- i-os2thr.ads 6 Jul 2004 13:57:30 -0000 1.5
+++ i-os2thr.ads 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 1993-2004 Free Software Foundation, Inc. --
+-- Copyright (C) 1993-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -91,7 +91,6 @@ pragma Preelaborate (Threads);
function DosKillThread (Id : TID) return APIRET;
pragma Import (C, DosKillThread, "DosKillThread");
-
DCWW_WAIT : constant := 0;
DCWW_NOWAIT : constant := 1;
-- Values for "Option" parameter in DosWaitThread call
Index: makeutl.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/makeutl.ads,v
retrieving revision 1.4
diff -u -p -r1.4 makeutl.ads
--- makeutl.ads 15 Mar 2005 15:46:43 -0000 1.4
+++ makeutl.ads 15 Jun 2005 15:50:04 -0000
@@ -63,7 +63,6 @@ package Makeutl is
-- of project Project, in project tree In_Tree, and in the projects that
-- it imports directly or indirectly, and returns the result.
-
-- Package Mains is used to store the mains specified on the command line
-- and to retrieve them when a project file is used, to verify that the
-- files exist and that they belong to a project file.
Index: memroot.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/memroot.adb,v
retrieving revision 1.5
diff -u -p -r1.5 memroot.adb
--- memroot.adb 21 Oct 2003 13:42:09 -0000 1.5
+++ memroot.adb 15 Jun 2005 15:50:04 -0000
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1997-2003 Ada Core Technologies, Inc. --
+-- Copyright (C) 1997-2005, AdaCore --
-- --
-- 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- --
@@ -425,6 +425,7 @@ package body Memroot is
pragma Warnings (Off, Line);
procedure Find_File;
+ pragma Inline (Find_File);
-- Position Curs1 and Curs2 so that Line (Curs1 .. Curs2) contains
-- the file name. The file name may not be on the current line since
-- a frame may be printed on more than one line when there is a lot
@@ -432,21 +433,21 @@ package body Memroot is
-- lines of input.
procedure Find_Line;
+ pragma Inline (Find_Line);
-- Position Curs1 and Curs2 so that Line (Curs1 .. Curs2) contains
-- the line number.
procedure Find_Name;
+ pragma Inline (Find_Name);
-- Position Curs1 and Curs2 so that Line (Curs1 .. Curs2) contains
-- the subprogram name.
function Skip_To_Space (Pos : Integer) return Integer;
+ pragma Inline (Skip_To_Space);
-- Scans Line starting with position Pos, returning the position
-- immediately before the first space, or the value of Last if no
-- spaces were found
-
- pragma Inline (Find_File, Find_Line, Find_Name, Skip_To_Space);
-
---------------
-- Find_File --
---------------
Index: mlib-prj.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/mlib-prj.adb,v
retrieving revision 1.23
diff -u -p -r1.23 mlib-prj.adb
--- mlib-prj.adb 15 Mar 2005 15:46:43 -0000 1.23
+++ mlib-prj.adb 15 Jun 2005 15:50:04 -0000
@@ -811,7 +811,7 @@ package body MLib.Prj is
(B_Start & Get_Name_String (Data.Library_Name) & ".adb");
Add_Argument ("-L" & Get_Name_String (Data.Library_Name));
- -- Check if Binder'Default_Switches ("Ada) is defined. If it is,
+ -- Check if Binder'Default_Switches ("Ada") is defined. If it is,
-- add these switches to call gnatbind.
declare
Index: namet.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/namet.adb,v
retrieving revision 1.11
diff -u -p -r1.11 namet.adb
--- namet.adb 18 Mar 2005 11:50:30 -0000 1.11
+++ namet.adb 15 Jun 2005 15:50:05 -0000
@@ -120,7 +120,6 @@ package body Namet is
end loop;
end Add_Str_To_Name_Buffer;
-
--------------
-- Finalize --
--------------
@@ -314,7 +313,6 @@ package body Namet is
Insert_Character (Character'Val (Hex (2)));
end if;
-
-- WW (wide wide character insertion)
elsif C = 'W'
Index: namet.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/namet.ads,v
retrieving revision 1.9
diff -u -p -r1.9 namet.ads
--- namet.ads 10 Feb 2005 13:50:27 -0000 1.9
+++ namet.ads 15 Jun 2005 15:50:05 -0000
@@ -61,7 +61,6 @@ package Namet is
-- followed by an upper case letter (other than the WW
-- sequence), or an underscore.
-
-- Operator symbols Stored with an initial letter O, and the remainder
-- of the name is the lower case characters XXX where
-- the name is Name_Op_XXX, see Snames spec for a full
Index: prj-makr.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/prj-makr.adb,v
retrieving revision 1.12
diff -u -p -r1.12 prj-makr.adb
--- prj-makr.adb 15 Mar 2005 15:46:47 -0000 1.12
+++ prj-makr.adb 15 Jun 2005 15:50:05 -0000
@@ -119,8 +119,6 @@ package body Prj.Makr is
is
Tree : constant Project_Node_Tree_Ref := new Project_Node_Tree_Data;
-
-
Path_Name : String (1 .. File_Path'Length +
Project_File_Extension'Length);
Path_Last : Natural := File_Path'Length;
Index: prj-proc.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/prj-proc.adb,v
retrieving revision 1.23
diff -u -p -r1.23 prj-proc.adb
--- prj-proc.adb 29 Mar 2005 16:18:31 -0000 1.23
+++ prj-proc.adb 15 Jun 2005 15:50:05 -0000
@@ -2185,7 +2185,6 @@ package body Prj.Proc is
Location_Of
(From_Project_Node, From_Project_Node_Tree);
-
begin
Project := Processed_Projects.Get (Name);
Index: sem_dist.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/sem_dist.adb,v
retrieving revision 1.16
diff -u -p -r1.16 sem_dist.adb
--- sem_dist.adb 18 Mar 2005 11:49:26 -0000 1.16
+++ sem_dist.adb 15 Jun 2005 15:50:05 -0000
@@ -425,7 +425,6 @@ package body Sem_Dist is
(Loc, New_External_Name (
Chars (User_Type), 'R'));
-
Full_Obj_Type : constant Entity_Id :=
Make_Defining_Identifier
(Loc, Chars (Obj_Type));
Index: sem_elim.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/sem_elim.ads,v
retrieving revision 1.7
diff -u -p -r1.7 sem_elim.ads
--- sem_elim.ads 19 Apr 2004 15:20:06 -0000 1.7
+++ sem_elim.ads 15 Jun 2005 15:50:05 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 1997-2004 Free Software Foundation, Inc. --
+-- Copyright (C) 1997-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -58,6 +58,4 @@ package Sem_Elim is
-- subprogram. N is the node for the call, and E is the entity of
-- the subprogram being eliminated.
-
-
end Sem_Elim;
Index: s-valint.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/s-valint.adb,v
retrieving revision 1.4
diff -u -p -r1.4 s-valint.adb
--- s-valint.adb 24 Apr 2003 17:54:14 -0000 1.4
+++ s-valint.adb 15 Jun 2005 15:50:05 -0000
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1992,1993,1994,1995,1996 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -44,8 +44,7 @@ package body System.Val_Int is
function Scan_Integer
(Str : String;
Ptr : access Integer;
- Max : Integer)
- return Integer
+ Max : Integer) return Integer
is
Uval : Unsigned;
-- Unsigned result
@@ -79,7 +78,6 @@ package body System.Val_Int is
else
return Integer (Uval);
end if;
-
end Scan_Integer;
-------------------
@@ -89,7 +87,6 @@ package body System.Val_Int is
function Value_Integer (Str : String) return Integer is
V : Integer;
P : aliased Integer := Str'First;
-
begin
V := Scan_Integer (Str, P'Access, Str'Last);
Scan_Trailing_Blanks (Str, P);
Index: s-vallli.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/s-vallli.adb,v
retrieving revision 1.4
diff -u -p -r1.4 s-vallli.adb
--- s-vallli.adb 24 Apr 2003 17:54:14 -0000 1.4
+++ s-vallli.adb 15 Jun 2005 15:50:05 -0000
@@ -4,9 +4,9 @@
-- --
-- S Y S T E M . V A L _ L L I --
-- --
--- S p e c --
+-- B o d y --
-- --
--- Copyright (C) 1992,1993,1994,1995,1996 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -44,8 +44,7 @@ package body System.Val_LLI is
function Scan_Long_Long_Integer
(Str : String;
Ptr : access Integer;
- Max : Integer)
- return Long_Long_Integer
+ Max : Integer) return Long_Long_Integer
is
Uval : Long_Long_Unsigned;
-- Unsigned result
@@ -80,7 +79,6 @@ package body System.Val_LLI is
else
return Long_Long_Integer (Uval);
end if;
-
end Scan_Long_Long_Integer;
-----------------------------
@@ -95,7 +93,6 @@ package body System.Val_LLI is
V := Scan_Long_Long_Integer (Str, P'Access, Str'Last);
Scan_Trailing_Blanks (Str, P);
return V;
-
end Value_Long_Long_Integer;
end System.Val_LLI;
Index: s-vallli.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/s-vallli.ads,v
retrieving revision 1.4
diff -u -p -r1.4 s-vallli.ads
--- s-vallli.ads 24 Apr 2003 17:54:14 -0000 1.4
+++ s-vallli.ads 15 Jun 2005 15:50:05 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 1992,1993,1994,1995,1996 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -40,8 +40,7 @@ pragma Pure (Val_LLI);
function Scan_Long_Long_Integer
(Str : String;
Ptr : access Integer;
- Max : Integer)
- return Long_Long_Integer;
+ Max : Integer) return Long_Long_Integer;
-- This function scans the string starting at Str (Ptr.all) for a valid
-- integer according to the syntax described in (RM 3.5(43)). The substring
-- scanned extends no further than Str (Max). There are three cases for the
Index: s-valllu.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/s-valllu.adb,v
retrieving revision 1.4
diff -u -p -r1.4 s-valllu.adb
--- s-valllu.adb 24 Apr 2003 17:54:14 -0000 1.4
+++ s-valllu.adb 15 Jun 2005 15:50:05 -0000
@@ -4,9 +4,9 @@
-- --
-- S Y S T E M . V A L _ L L U --
-- --
--- S p e c --
+-- B o d y --
-- --
--- Copyright (C) 1992-1997 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -43,8 +43,7 @@ package body System.Val_LLU is
function Scan_Long_Long_Unsigned
(Str : String;
Ptr : access Integer;
- Max : Integer)
- return Long_Long_Unsigned
+ Max : Integer) return Long_Long_Unsigned
is
P : Integer;
-- Local copy of the pointer
@@ -286,8 +285,7 @@ package body System.Val_LLU is
------------------------------
function Value_Long_Long_Unsigned
- (Str : String)
- return Long_Long_Unsigned
+ (Str : String) return Long_Long_Unsigned
is
V : Long_Long_Unsigned;
P : aliased Integer := Str'First;
@@ -296,7 +294,6 @@ package body System.Val_LLU is
V := Scan_Long_Long_Unsigned (Str, P'Access, Str'Last);
Scan_Trailing_Blanks (Str, P);
return V;
-
end Value_Long_Long_Unsigned;
end System.Val_LLU;
Index: s-valllu.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/s-valllu.ads,v
retrieving revision 1.4
diff -u -p -r1.4 s-valllu.ads
--- s-valllu.ads 24 Apr 2003 17:54:14 -0000 1.4
+++ s-valllu.ads 15 Jun 2005 15:50:05 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 1992,1993,1994,1995,1996 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -42,8 +42,7 @@ pragma Pure (Val_LLU);
function Scan_Long_Long_Unsigned
(Str : String;
Ptr : access Integer;
- Max : Integer)
- return System.Unsigned_Types.Long_Long_Unsigned;
+ Max : Integer) return System.Unsigned_Types.Long_Long_Unsigned;
-- This function scans the string starting at Str (Ptr.all) for a valid
-- integer according to the syntax described in (RM 3.5(43)). The substring
-- scanned extends no further than Str (Max). There are three cases for the
@@ -71,8 +70,7 @@ pragma Pure (Val_LLU);
-- is greater than Max as required in this case.
function Value_Long_Long_Unsigned
- (Str : String)
- return System.Unsigned_Types.Long_Long_Unsigned;
+ (Str : String) return System.Unsigned_Types.Long_Long_Unsigned;
-- Used in computing X'Value (Str) where X is a modular integer type whose
-- modulus exceeds the range of System.Unsigned_Types.Unsigned. Str is the
-- string argument of the attribute. Constraint_Error is raised if the
Index: s-valrea.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/s-valrea.adb,v
retrieving revision 1.5
diff -u -p -r1.5 s-valrea.adb
--- s-valrea.adb 21 Oct 2003 13:42:18 -0000 1.5
+++ s-valrea.adb 15 Jun 2005 15:50:05 -0000
@@ -4,9 +4,9 @@
-- --
-- S Y S T E M . V A L _ R E A L --
-- --
--- S p e c --
+-- B o d y --
-- --
--- Copyright (C) 1992-2003 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -43,8 +43,7 @@ package body System.Val_Real is
function Scan_Real
(Str : String;
Ptr : access Integer;
- Max : Integer)
- return Long_Long_Float
+ Max : Integer) return Long_Long_Float
is
procedure Reset;
pragma Import (C, Reset, "__gnat_init_float");
@@ -369,7 +368,6 @@ package body System.Val_Real is
return Uval;
end if;
end if;
-
end Scan_Real;
----------------
@@ -384,7 +382,6 @@ package body System.Val_Real is
V := Scan_Real (Str, P'Access, Str'Last);
Scan_Trailing_Blanks (Str, P);
return V;
-
end Value_Real;
end System.Val_Real;
Index: s-valrea.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/s-valrea.ads,v
retrieving revision 1.4
diff -u -p -r1.4 s-valrea.ads
--- s-valrea.ads 24 Apr 2003 17:54:14 -0000 1.4
+++ s-valrea.ads 15 Jun 2005 15:50:05 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 1992,1993,1994,1995,1996 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -37,8 +37,7 @@ pragma Pure (Val_Real);
function Scan_Real
(Str : String;
Ptr : access Integer;
- Max : Integer)
- return Long_Long_Float;
+ Max : Integer) return Long_Long_Float;
-- This function scans the string starting at Str (Ptr.all) for a valid
-- real literal according to the syntax described in (RM 3.5(43)). The
-- substring scanned extends no further than Str (Max). There are three
Index: scn.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/scn.adb,v
retrieving revision 1.15
diff -u -p -r1.15 scn.adb
--- scn.adb 10 Feb 2005 13:50:28 -0000 1.15
+++ scn.adb 15 Jun 2005 15:50:05 -0000
@@ -45,8 +45,8 @@ package body Scn is
-- keyword as an identifier once for a given keyword).
procedure Check_End_Of_Line;
- -- Called when end of line encountered. Checks that line is not
- -- too long, and that other style checks for the end of line are met.
+ -- Called when end of line encountered. Checks that line is not too long,
+ -- and that other style checks for the end of line are met.
function Determine_License return License_Type;
-- Scan header of file and check that it has an appropriate GNAT-style
Index: s-tasinf.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/s-tasinf.adb,v
retrieving revision 1.5
diff -u -p -r1.5 s-tasinf.adb
--- s-tasinf.adb 21 Oct 2003 13:42:15 -0000 1.5
+++ s-tasinf.adb 15 Jun 2005 15:50:05 -0000
@@ -4,10 +4,10 @@
-- --
-- S Y S T E M . T A S K _ I N F O --
-- --
--- S p e c --
+-- B o d y --
-- (Compiler Interface) --
-- --
--- Copyright (C) 1998-2002 Free Software Foundation, Inc. --
+-- Copyright (C) 1998-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -40,5 +40,4 @@
-- implementation of the Task_Info pragma.
package body System.Task_Info is
-
end System.Task_Info;
Index: targparm.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/targparm.adb,v
retrieving revision 1.13
diff -u -p -r1.13 targparm.adb
--- targparm.adb 15 Mar 2005 15:45:59 -0000 1.13
+++ targparm.adb 15 Jun 2005 15:50:05 -0000
@@ -628,7 +628,6 @@ package body Targparm is
end loop;
end if;
-
if Fatal then
raise Unrecoverable_Error;
end if;
Index: uname.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/uname.adb,v
retrieving revision 1.6
diff -u -p -r1.6 uname.adb
--- uname.adb 6 Jul 2004 13:57:32 -0000 1.6
+++ uname.adb 15 Jun 2005 15:50:05 -0000
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2004, Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005, Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -527,8 +527,7 @@ package body Uname is
function New_Child
(Old : Unit_Name_Type;
- Newp : Unit_Name_Type)
- return Unit_Name_Type
+ Newp : Unit_Name_Type) return Unit_Name_Type
is
P : Natural;
Index: uname.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/uname.ads,v
retrieving revision 1.4
diff -u -p -r1.4 uname.ads
--- uname.ads 24 Apr 2003 17:54:20 -0000 1.4
+++ uname.ads 15 Jun 2005 15:50:05 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 1992-1998, Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005, Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -140,8 +140,7 @@ package Uname is
function New_Child
(Old : Unit_Name_Type;
- Newp : Unit_Name_Type)
- return Unit_Name_Type;
+ Newp : Unit_Name_Type) return Unit_Name_Type;
-- Old is a child unit name (for either a body or spec). Newp is the
-- unit name of the actual parent (this may be different from the
-- parent in old). The returned unit name is formed by taking the
Index: xnmake.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/xnmake.adb,v
retrieving revision 1.8
diff -u -p -r1.8 xnmake.adb
--- xnmake.adb 29 Mar 2005 16:22:15 -0000 1.8
+++ xnmake.adb 15 Jun 2005 15:50:05 -0000
@@ -283,8 +283,12 @@ begin
end loop;
end if;
+ -- Loop keeps going until "package" keyword written
+
exit when Match (Line, "package");
+ -- Deal with WITH lines, writing to body or spec as appropriate
+
if Match (Line, Body_Only, M) then
Replace (M, X);
WriteB (Line);
@@ -293,6 +297,8 @@ begin
Replace (M, X);
WriteS (Line);
+ -- Change header from Template to Spec and write to spec file
+
else
if Match (Line, Templ, M) then
Replace (M, A & " S p e c ");
@@ -300,6 +306,8 @@ begin
WriteS (Line);
+ -- Write header line to body file
+
if Match (Line, Spec, M) then
Replace (M, A & "B o d y");
end if;
Index: xsinfo.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/xsinfo.adb,v
retrieving revision 1.5
diff -u -p -r1.5 xsinfo.adb
--- xsinfo.adb 10 Feb 2005 13:57:00 -0000 1.5
+++ xsinfo.adb 15 Jun 2005 15:50:05 -0000
@@ -88,9 +88,12 @@ procedure XSinfo is
M : Match_Result;
-
procedure Getline;
- -- Get non-comment, non-blank line. Also skips "for " rep clauses.
+ -- Get non-comment, non-blank line. Also skips "for " rep clauses
+
+ -------------
+ -- Getline --
+ -------------
procedure Getline is
begin
Index: a-direct.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/a-direct.ads,v
retrieving revision 1.4
diff -u -p -r1.4 a-direct.ads
--- a-direct.ads 29 Mar 2005 16:22:32 -0000 1.4
+++ a-direct.ads 15 Jun 2005 15:50:05 -0000
@@ -178,8 +178,9 @@ package Ada.Directories is
-- and form given by Form, or copying of the file with the name given by
-- Source_Name (in the absence of Name_Error).
-
- -- File and directory name operations:
+ ----------------------------------------
+ -- File and directory name operations --
+ ----------------------------------------
function Full_Name (Name : String) return String;
-- Returns the full name corresponding to the file name specified by Name.
@@ -231,15 +232,16 @@ package Ada.Directories is
-- Name is not a possible simple name (if Extension is null) or base name
-- (if Extension is non-null).
-
- -- File and directory queries:
+ --------------------------------
+ -- File and directory queries --
+ --------------------------------
type File_Kind is (Directory, Ordinary_File, Special_File);
-- The type File_Kind represents the kind of file represented by an
-- external file or directory.
type File_Size is range 0 .. Long_Long_Integer'Last;
- -- The type File_Size represents the size of an external file.
+ -- The type File_Size represents the size of an external file
function Exists (Name : String) return Boolean;
-- Returns True if external file represented by Name exists, and False
@@ -403,19 +405,16 @@ private
-- Search_Type need to be a controlled type, because it includes component
-- of type Dir_Type (in GNAT.Directory_Operations) that need to be closed
- -- (if opened) during finalization.
- -- The component need to be an access value, because Search_Data is not
- -- fully defined in the spec.
+ -- (if opened) during finalization. The component need to be an access
+ -- value, because Search_Data is not fully defined in the spec.
type Search_Type is new Ada.Finalization.Controlled with record
Value : Search_Ptr;
end record;
procedure Finalize (Search : in out Search_Type);
- -- Close the directory, if opened, and deallocate Value.
+ -- Close the directory, if opened, and deallocate Value
procedure End_Search (Search : in out Search_Type) renames Finalize;
end Ada.Directories;
-
-
Index: xeinfo.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/xeinfo.adb,v
retrieving revision 1.7
diff -u -p -r1.7 xeinfo.adb
--- xeinfo.adb 21 Oct 2003 13:42:23 -0000 1.7
+++ xeinfo.adb 15 Jun 2005 15:50:05 -0000
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 1992-2002 Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -25,7 +25,7 @@
------------------------------------------------------------------------------
-- Program to construct C header file a-einfo.h (C version of einfo.ads spec)
--- for use by Gigi. This header file contaInF all definitions and access
+-- for use by Gigi. This header file contains all definitions and access
-- functions, but does not contain set procedures, since Gigi is not allowed
-- to modify the GNAT tree)
Index: repinfo.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/repinfo.ads,v
retrieving revision 1.6
diff -u -p -r1.6 repinfo.ads
--- repinfo.ads 3 Jan 2005 15:43:23 -0000 1.6
+++ repinfo.ads 15 Jun 2005 15:50:05 -0000
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 1999-2004 Free Software Foundation, Inc. --
+-- Copyright (C) 1999-2005 Free Software Foundation, Inc. --
-- --
-- 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- --
@@ -55,7 +55,7 @@ package Repinfo is
-- For composite types, there are three cases:
-- 1. In some cases the front end knows the values statically,
- -- for example in the ase where representation clauses or
+ -- for example in the case where representation clauses or
-- pragmas specify the values.
-- 2. If Backend_Layout is True, then the backend is responsible
Index: s-finimp.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/s-finimp.adb,v
retrieving revision 1.13
diff -u -p -r1.13 s-finimp.adb
--- s-finimp.adb 15 Mar 2005 16:19:36 -0000 1.13
+++ s-finimp.adb 15 Jun 2005 15:50:05 -0000
@@ -85,9 +85,6 @@ package body System.Finalization_Impleme
return SSE.Storage_Count;
pragma Import (Ada, Parent_Size, "ada__tags__parent_size");
- function Parent_Tag (T : Ada.Tags.Tag) return Ada.Tags.Tag;
- pragma Import (Ada, Parent_Tag, "ada__tags__parent_tag");
-
function Get_Deep_Controller (Obj : System.Address) return RC_Ptr;
-- Given the address (obj) of a tagged object, return a
-- pointer to the record controller of this object.
@@ -473,7 +470,7 @@ package body System.Finalization_Impleme
-- when there are no controller at this level
while Offset = -2 loop
- The_Tag := Parent_Tag (The_Tag);
+ The_Tag := Ada.Tags.Parent_Tag (The_Tag);
Offset := RC_Offset (The_Tag);
end loop;
Index: vxaddr2line.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/vxaddr2line.adb,v
retrieving revision 1.3
diff -u -p -r1.3 vxaddr2line.adb
--- vxaddr2line.adb 8 Dec 2004 11:49:07 -0000 1.3
+++ vxaddr2line.adb 15 Jun 2005 15:50:05 -0000
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- Copyright (C) 2002-2004 Ada Core Technologies, Inc. --
+-- Copyright (C) 2002-2005 Ada Core Technologies, Inc. --
-- --
-- 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- --
@@ -83,6 +83,7 @@ procedure VxAddr2Line is
type Architecture is
(SOLARIS_I586,
WINDOWS_POWERPC,
+ WINDOWS_I586,
WINDOWS_M68K,
SOLARIS_POWERPC,
DEC_ALPHA);
@@ -121,6 +122,11 @@ procedure VxAddr2Line is
Nm_Binary => null,
Addr_Digits_To_Skip => 0,
Bt_Offset_From_Call => -4),
+ WINDOWS_I586 =>
+ (Addr2line_Binary => null,
+ Nm_Binary => null,
+ Addr_Digits_To_Skip => 0,
+ Bt_Offset_From_Call => -2),
SOLARIS_POWERPC =>
(Addr2line_Binary => null,
Nm_Binary => null,
Index: xsnames.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/xsnames.adb,v
retrieving revision 1.6
diff -u -p -r1.6 xsnames.adb
--- xsnames.adb 10 Feb 2005 13:57:00 -0000 1.6
+++ xsnames.adb 15 Jun 2005 15:50:05 -0000
@@ -24,10 +24,11 @@
-- --
------------------------------------------------------------------------------
--- This utility is used to make a new version of the Snames package when
--- new names are added to the spec, the existing versions of snames.ads and
--- snames.adb are read, and updated to match the set of names in snames.ads.
--- The updated versions are written to snames.ns and snames.nb (new spec/body)
+-- This utility is used to make a new version of the Snames package when new
+-- names are added to the spec, the existing versions of snames.ads and
+-- snames.adb and snames.h are read, and updated to match the set of names in
+-- snames.ads. The updated versions are written to snames.ns, snames.nb (new
+-- spec/body), and snames.nh (new header file).
with Ada.Strings.Unbounded; use Ada.Strings.Unbounded;
with Ada.Strings.Unbounded.Text_IO; use Ada.Strings.Unbounded.Text_IO;
@@ -44,6 +45,8 @@ procedure XSnames is
InS : File_Type;
OutS : File_Type;
OutB : File_Type;
+ InH : File_Type;
+ OutH : File_Type;
A, B : VString := Nul;
Line : VString := Nul;
@@ -74,12 +77,90 @@ procedure XSnames is
M : Match_Result;
+ type Header_Symbol is (None, Attr, Conv, Prag);
+ -- A symbol in the header file
+
+ -- Prefixes used in the header file
+
+ Header_Attr : aliased String := "Attr";
+ Header_Conv : aliased String := "Convention";
+ Header_Prag : aliased String := "Pragma";
+
+ type String_Ptr is access all String;
+ Header_Prefix : constant array (Header_Symbol) of String_Ptr :=
+ (null,
+ Header_Attr'Access,
+ Header_Conv'Access,
+ Header_Prag'Access);
+
+ -- Patterns used in the spec file
+
+ Get_Attr : Pattern := Span (' ') & "Attribute_" & Break (",)") * Name1;
+ Get_Conv : Pattern := Span (' ') & "Convention_" & Break (",)") * Name1;
+ Get_Prag : Pattern := Span (' ') & "Pragma_" & Break (",)") * Name1;
+
+ type Header_Symbol_Counter is array (Header_Symbol) of Natural;
+ Header_Counter : Header_Symbol_Counter := (0, 0, 0, 0);
+
+ Header_Current_Symbol : Header_Symbol := None;
+ Header_Pending_Line : VString := Nul;
+
+ ------------------------
+ -- Output_Header_Line --
+ ------------------------
+
+ procedure Output_Header_Line (S : Header_Symbol) is
+ begin
+ -- Skip all the #define for S-prefixed symbols in the header.
+ -- Of course we are making implicit assumptions:
+ -- (1) No newline between symbols with the same prefix.
+ -- (2) Prefix order is the same as in snames.ads.
+
+ if Header_Current_Symbol /= S then
+ declare
+ Pat : String := "#define " & Header_Prefix (S).all;
+ In_Pat : Boolean := False;
+
+ begin
+ if Header_Current_Symbol /= None then
+ Put_Line (OutH, Header_Pending_Line);
+ end if;
+
+ loop
+ Line := Get_Line (InH);
+
+ if Match (Line, Pat) then
+ In_Pat := true;
+ elsif In_Pat then
+ Header_Pending_Line := Line;
+ exit;
+ else
+ Put_Line (OutH, Line);
+ end if;
+ end loop;
+
+ Header_Current_Symbol := S;
+ end;
+ end if;
+
+ -- Now output the line
+
+ Put_Line (OutH, "#define " & Header_Prefix (S).all
+ & "_" & Name1 & (30 - Length (Name1)) * ' '
+ & Header_Counter (S));
+ Header_Counter (S) := Header_Counter (S) + 1;
+ end Output_Header_Line;
+
+-- Start of processing for XSnames
+
begin
Open (InB, In_File, "snames.adb");
Open (InS, In_File, "snames.ads");
+ Open (InH, In_File, "snames.h");
Create (OutS, Out_File, "snames.ns");
Create (OutB, Out_File, "snames.nb");
+ Create (OutH, Out_File, "snames.nh");
Anchored_Mode := True;
Oname := Nul;
@@ -99,6 +180,13 @@ begin
if not Match (Line, Name_Ref) then
Put_Line (OutS, Line);
+ if Match (Line, Get_Attr) then
+ Output_Header_Line (Attr);
+ elsif Match (Line, Get_Conv) then
+ Output_Header_Line (Conv);
+ elsif Match (Line, Get_Prag) then
+ Output_Header_Line (Prag);
+ end if;
else
Oval := Lpad (V (Val), 3, '0');
@@ -144,6 +232,13 @@ begin
Put_Line (OutB, Line);
while not End_Of_File (InB) loop
- Put_Line (OutB, Get_Line (InB));
+ Line := Get_Line (InB);
+ Put_Line (OutB, Line);
+ end loop;
+
+ Put_Line (OutH, Header_Pending_Line);
+ while not End_Of_File (InH) loop
+ Line := Get_Line (InH);
+ Put_Line (OutH, Line);
end loop;
end XSnames;
Index: gen-soccon.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/gen-soccon.c,v
retrieving revision 1.1
diff -u -p -r1.1 gen-soccon.c
--- gen-soccon.c 3 Jan 2005 15:30:02 -0000 1.1
+++ gen-soccon.c 15 Jun 2005 15:50:05 -0000
@@ -4,7 +4,7 @@
** **
** G E N - S O C C O N **
** **
-** Copyright (C) 2004 Free Software Foundation, Inc. **
+** Copyright (C) 2004-2005 Free Software Foundation, Inc. **
** **
** 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- **
@@ -27,11 +27,16 @@
#include <stdio.h>
#include <string.h>
-#include "socket.h"
+#include "gsocket.h"
+
+#ifdef __MINGW32__
+#include <winsock2.h>
+#else
#include <netinet/in.h>
#include <netinet/tcp.h>
-#include <sys/filio.h>
+#include <sys/ioctl.h>
#include <netdb.h>
+#endif
struct line {
char *text;
@@ -48,8 +53,8 @@ struct line *first = NULL, *last = NULL;
#define _NL TXT("")
/* Empty line */
-#define itoad(n) itoa ("%d", n)
-#define itoax(n) itoa ("16#%08x#", n)
+#define itoad(n) f_itoa ("%d", n)
+#define itoax(n) f_itoa ("16#%08x#", n)
#define CND(name,comment) add_line(#name, itoad (name), comment);
/* Constant (decimal) */
@@ -63,12 +68,13 @@ struct line *first = NULL, *last = NULL;
void output (void);
/* Generate output spec */
-char *itoa (char *, int);
+char *f_itoa (char *, int);
/* int to string */
void add_line (char *, char*, char*);
-void main (void) {
+int
+main (void) {
TXT("------------------------------------------------------------------------------")
TXT("-- --")
@@ -78,7 +84,7 @@ TXT("-- G N A T . S O C K
TXT("-- --")
TXT("-- S p e c --")
TXT("-- --")
-TXT("-- Copyright (C) 2000-2004 Free Software Foundation, Inc. --")
+TXT("-- Copyright (C) 2000-2005 Free Software Foundation, Inc. --")
TXT("-- --")
TXT("-- GNAT is free software; you can redistribute it and/or modify it under --")
TXT("-- terms of the GNU General Public License as published by the Free Soft- --")
@@ -507,15 +513,10 @@ CND(SO_ERROR, "Get/clear error status")
#endif
CND(SO_BROADCAST, "Can send broadcast msgs")
-#ifndef IP_ADD_MEMBERSHIP
-#define IP_ADD_MEMBERSHIP -1
-#endif
-CND(IP_ADD_MEMBERSHIP, "Join a multicast group")
-
-#ifndef IP_DROP_MEMBERSHIP
-#define IP_DROP_MEMBERSHIP -1
+#ifndef IP_MULTICAST_IF
+#define IP_MULTICAST_IF -1
#endif
-CND(IP_DROP_MEMBERSHIP, "Leave a multicast group")
+CND(IP_MULTICAST_IF, "Set/get mcast interface")
#ifndef IP_MULTICAST_TTL
#define IP_MULTICAST_TTL -1
@@ -526,10 +527,22 @@ CND(IP_MULTICAST_TTL, "Set/get multicast
#define IP_MULTICAST_LOOP -1
#endif
CND(IP_MULTICAST_LOOP, "Set/get mcast loopback")
+
+#ifndef IP_ADD_MEMBERSHIP
+#define IP_ADD_MEMBERSHIP -1
+#endif
+CND(IP_ADD_MEMBERSHIP, "Join a multicast group")
+
+#ifndef IP_DROP_MEMBERSHIP
+#define IP_DROP_MEMBERSHIP -1
+#endif
+CND(IP_DROP_MEMBERSHIP, "Leave a multicast group")
+
_NL
TXT("end GNAT.Sockets.Constants;")
-output ();
+ output ();
+ return 0;
}
void
@@ -563,13 +576,14 @@ output (void) {
}
char *
-itoa (char *fmt, int n) {
+f_itoa (char *fmt, int n) {
char buf[32];
sprintf (buf, fmt, n);
return strdup (buf);
}
-void add_line (char *_text, char *_value, char *_comment) {
+void
+add_line (char *_text, char *_value, char *_comment) {
struct line *l = (struct line *) malloc (sizeof (struct line));
l->text = _text;
l->value = _value;
Index: seh_init.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/seh_init.c,v
retrieving revision 1.2
diff -u -p -r1.2 seh_init.c
--- seh_init.c 27 Feb 2005 01:12:13 -0000 1.2
+++ seh_init.c 15 Jun 2005 15:50:05 -0000
@@ -36,7 +36,6 @@
#ifdef IN_RTS
#include "tconfig.h"
#include "tsystem.h"
-#include <sys/stat.h>
/* We don't have libiberty, so us malloc. */
#define xmalloc(S) malloc (S)
More information about the Gcc-patches
mailing list