Commit 350b83cc by Arnaud Charlet

2014-02-20 Sergey Rybin <rybin@adacore.com frybin>

	* gnat_ugn.texi, vms_data.ads (gnatelim): Add description of
	project-specific options.

2014-02-20  Ed Schonberg  <schonberg@adacore.com>

	* a-cbdlli.adb (Insert): When capacity exceeded, raise Capacity_Error,
	not Constraint_Error.
	* a-cbmutr.adb (Append_Child, Insert_Child, Prepend_Child): Ditto.
	* sem_ch5.adb: Code clean up.

From-SVN: r207954
parent 8880426d
2014-02-20 Sergey Rybin <rybin@adacore.com frybin>
* gnat_ugn.texi, vms_data.ads (gnatelim): Add description of
project-specific options.
2014-02-20 Ed Schonberg <schonberg@adacore.com>
* a-cbdlli.adb (Insert): When capacity exceeded, raise Capacity_Error,
not Constraint_Error.
* a-cbmutr.adb (Append_Child, Insert_Child, Prepend_Child): Ditto.
* sem_ch5.adb: Code clean up.
2014-02-20 Hristian Kirtchev <kirtchev@adacore.com> 2014-02-20 Hristian Kirtchev <kirtchev@adacore.com>
* sem_prag.adb (Usage_Error): Remove local * sem_prag.adb (Usage_Error): Remove local
......
...@@ -1085,7 +1085,7 @@ package body Ada.Containers.Bounded_Doubly_Linked_Lists is ...@@ -1085,7 +1085,7 @@ package body Ada.Containers.Bounded_Doubly_Linked_Lists is
end if; end if;
if Container.Length > Container.Capacity - Count then if Container.Length > Container.Capacity - Count then
raise Constraint_Error with "new length exceeds capacity"; raise Capacity_Error with "capacity exceeded";
end if; end if;
if Container.Busy > 0 then if Container.Busy > 0 then
......
...@@ -397,7 +397,7 @@ package body Ada.Containers.Bounded_Multiway_Trees is ...@@ -397,7 +397,7 @@ package body Ada.Containers.Bounded_Multiway_Trees is
end if; end if;
if Container.Count > Container.Capacity - Count then if Container.Count > Container.Capacity - Count then
raise Constraint_Error raise Capacity_Error
with "requested count exceeds available storage"; with "requested count exceeds available storage";
end if; end if;
...@@ -1538,7 +1538,7 @@ package body Ada.Containers.Bounded_Multiway_Trees is ...@@ -1538,7 +1538,7 @@ package body Ada.Containers.Bounded_Multiway_Trees is
end if; end if;
if Container.Count > Container.Capacity - Count then if Container.Count > Container.Capacity - Count then
raise Constraint_Error raise Capacity_Error
with "requested count exceeds available storage"; with "requested count exceeds available storage";
end if; end if;
...@@ -1614,7 +1614,7 @@ package body Ada.Containers.Bounded_Multiway_Trees is ...@@ -1614,7 +1614,7 @@ package body Ada.Containers.Bounded_Multiway_Trees is
end if; end if;
if Container.Count > Container.Capacity - Count then if Container.Count > Container.Capacity - Count then
raise Constraint_Error raise Capacity_Error
with "requested count exceeds available storage"; with "requested count exceeds available storage";
end if; end if;
...@@ -2237,7 +2237,7 @@ package body Ada.Containers.Bounded_Multiway_Trees is ...@@ -2237,7 +2237,7 @@ package body Ada.Containers.Bounded_Multiway_Trees is
end if; end if;
if Container.Count > Container.Capacity - Count then if Container.Count > Container.Capacity - Count then
raise Constraint_Error raise Capacity_Error
with "requested count exceeds available storage"; with "requested count exceeds available storage";
end if; end if;
......
...@@ -11283,6 +11283,17 @@ Display Copyright and version, then exit disregarding all other options. ...@@ -11283,6 +11283,17 @@ Display Copyright and version, then exit disregarding all other options.
@cindex @option{--help} @command{gnatelim} @cindex @option{--help} @command{gnatelim}
Display usage, then exit disregarding all other options. Display usage, then exit disregarding all other options.
@item -P @var{file}
@cindex @option{-P} @command{gnatelim}
Indicates the name of the project file that describes the set of sources
to be processed.
@item -X@var{name}=@var{value}
@cindex @option{-X} @command{gnatelim}
Indicates that external variable @var{name} in the argument project
has the @var{value} value. Has no effect if no project is specified as
tool argument.
@item ^-files^/FILES^=@var{filename} @item ^-files^/FILES^=@var{filename}
@cindex @option{^-files^/FILES^} (@code{gnatelim}) @cindex @option{^-files^/FILES^} (@code{gnatelim})
Take the argument source files from the specified file. This file should be an Take the argument source files from the specified file. This file should be an
...@@ -11296,9 +11307,11 @@ an explicit list of files. ...@@ -11296,9 +11307,11 @@ an explicit list of files.
Duplicate all the output sent to @file{stderr} into a log file. The log file Duplicate all the output sent to @file{stderr} into a log file. The log file
is named @file{gnatelim.log} and is located in the current directory. is named @file{gnatelim.log} and is located in the current directory.
@ignore
@item ^-log^/LOGFILE^=@var{filename} @item ^-log^/LOGFILE^=@var{filename}
@cindex @option{^-log^/LOGFILE^} (@command{gnatelim}) @cindex @option{^-log^/LOGFILE^} (@command{gnatelim})
Duplicate all the output sent to @file{stderr} into a specified log file. Duplicate all the output sent to @file{stderr} into a specified log file.
@end ignore
@cindex @option{^--no-elim-dispatch^/NO_DISPATCH^} (@command{gnatelim}) @cindex @option{^--no-elim-dispatch^/NO_DISPATCH^} (@command{gnatelim})
@item ^--no-elim-dispatch^/NO_DISPATCH^ @item ^--no-elim-dispatch^/NO_DISPATCH^
...@@ -16655,7 +16668,7 @@ Display Copyright and version, then exit disregarding all other options. ...@@ -16655,7 +16668,7 @@ Display Copyright and version, then exit disregarding all other options.
Display usage, then exit disregarding all other options. Display usage, then exit disregarding all other options.
@item -P @var{file} @item -P @var{file}
@cindex @option{-P @var{file}} @command{gnatmetric} @cindex @option{-P} @command{gnatmetric}
Indicates the name of the project file that describes the set of sources Indicates the name of the project file that describes the set of sources
to be processed. The exact set of argument sources depends on other options to be processed. The exact set of argument sources depends on other options
specified, see below. specified, see below.
...@@ -16668,14 +16681,13 @@ all the units of the closure of the argument project. Otherwise this option ...@@ -16668,14 +16681,13 @@ all the units of the closure of the argument project. Otherwise this option
has no effect. has no effect.
@item -U @var{main_unit} @item -U @var{main_unit}
@cindex @option{-U @var{main_unit}} @command{gnatmetric}
If a project file is specified and no argument source is explicitly If a project file is specified and no argument source is explicitly
specified (either directly or by means of @option{-files} option), process specified (either directly or by means of @option{-files} option), process
the closure of units rooted at @var{main_unit}. Otherwise this option the closure of units rooted at @var{main_unit}. Otherwise this option
has no effect. has no effect.
@item -X@var{name}=@var{value} @item -X@var{name}=@var{value}
@cindex @option{-X@var{name}=@var{value}} @command{gnatmetric} @cindex @option{-X} @command{gnatmetric}
Indicates that external variable @var{name} in the argument project Indicates that external variable @var{name} in the argument project
has the @var{value} value. Has no effect if no project is specified as has the @var{value} value. Has no effect if no project is specified as
tool argument. tool argument.
...@@ -16717,11 +16729,13 @@ a trace of sources being processed. ...@@ -16717,11 +16729,13 @@ a trace of sources being processed.
Quiet mode. Quiet mode.
@end table @end table
@ignore
@noindent @noindent
If a project file is specified and no argument source is explicitly If a project file is specified and no argument source is explicitly
specified (either directly or by means of @option{-files} option), and no specified (either directly or by means of @option{-files} option), and no
@option{-U} is specified, then the set of processed sources is @option{-U} is specified, then the set of processed sources is
all the immediate units of the argument project. all the immediate units of the argument project.
@end ignore
@ignore @ignore
...@@ -19549,6 +19563,17 @@ Display Copyright and version, then exit disregarding all other options. ...@@ -19549,6 +19563,17 @@ Display Copyright and version, then exit disregarding all other options.
@cindex @option{--help} @command{gnatstub} @cindex @option{--help} @command{gnatstub}
Display usage, then exit disregarding all other options. Display usage, then exit disregarding all other options.
@item -P @var{file}
@cindex @option{-P} @command{gnatstub}
Indicates the name of the project file that describes the set of sources
to be processed.
@item -X@var{name}=@var{value}
@cindex @option{-X} @command{gnatstub}
Indicates that external variable @var{name} in the argument project
has the @var{value} value. Has no effect if no project is specified as
tool argument.
@item ^-f^/FULL^ @item ^-f^/FULL^
@cindex @option{^-f^/FULL^} (@command{gnatstub}) @cindex @option{^-f^/FULL^} (@command{gnatstub})
If the destination directory already contains a file with the name of the If the destination directory already contains a file with the name of the
...@@ -1955,8 +1955,13 @@ package body Sem_Ch5 is ...@@ -1955,8 +1955,13 @@ package body Sem_Ch5 is
-- A loop parameter cannot be volatile. This check is peformed only when -- A loop parameter cannot be volatile. This check is peformed only when
-- SPARK_Mode is on as it is not a standard Ada legality check. -- SPARK_Mode is on as it is not a standard Ada legality check.
-- Not clear whether this applies to element iterators, where the
-- cursor is not an explicit entity ???
if SPARK_Mode = On and then Is_SPARK_Volatile_Object (Ent) then if SPARK_Mode = On
and then not Of_Present (N)
and then Is_SPARK_Volatile_Object (Ent)
then
Error_Msg_N Error_Msg_N
("loop parameter cannot be volatile (SPARK RM 7.1.3(6))", Ent); ("loop parameter cannot be volatile (SPARK RM 7.1.3(6))", Ent);
end if; end if;
......
...@@ -4049,14 +4049,14 @@ package VMS_Data is ...@@ -4049,14 +4049,14 @@ package VMS_Data is
-- text file. -- text file.
S_Elim_Log : aliased constant S := "/LOG " & S_Elim_Log : aliased constant S := "/LOG " &
"-l"; "-log";
-- /NOLOG (D) -- /NOLOG (D)
-- /LOG -- /LOG
-- --
-- Duplicate all the output sent to Stderr into a default log file. -- Duplicate all the output sent to Stderr into a default log file.
S_Elim_Logfile : aliased constant S := "/LOGFILE=@" & S_Elim_Logfile : aliased constant S := "/LOGFILE=@" &
"-l@"; "-log@";
-- /LOGFILE=logfilename -- /LOGFILE=logfilename
-- --
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment