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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 68bd2691710e75d48652cc34ec4b166b968d3582..16d0156851f3fcd23151942c4e54b4ef63ae0f6f 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,15 @@
+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>
 
        * sem_prag.adb (Usage_Error): Remove local

diff --git a/gcc/ada/a-cbdlli.adb b/gcc/ada/a-cbdlli.adb
index 993522a88beb75cd3b7b6048abeab9747e902424..d36239abc9c39ba0fec2c2dc4909fdcb9612eaaa 100644 (file)
--- a/gcc/ada/a-cbdlli.adb
+++ b/gcc/ada/a-cbdlli.adb
@@ -1085,7 +1085,7 @@ package body Ada.Containers.Bounded_Doubly_Linked_Lists is
       end if;
 
       if Container.Length > Container.Capacity - Count then
-         raise Constraint_Error with "new length exceeds capacity";
+         raise Capacity_Error with "capacity exceeded";
       end if;
 
       if Container.Busy > 0 then

diff --git a/gcc/ada/a-cbmutr.adb b/gcc/ada/a-cbmutr.adb
index e36bca72608f67d889a809330be5b51fce086cf3..aa754149067dc4ed0aa929cd3423743129c1fce1 100644 (file)
--- a/gcc/ada/a-cbmutr.adb
+++ b/gcc/ada/a-cbmutr.adb
@@ -397,7 +397,7 @@ package body Ada.Containers.Bounded_Multiway_Trees is
       end if;
 
       if Container.Count > Container.Capacity - Count then
-         raise Constraint_Error
+         raise Capacity_Error
            with "requested count exceeds available storage";
       end if;
 
@@ -1538,7 +1538,7 @@ package body Ada.Containers.Bounded_Multiway_Trees is
       end if;
 
       if Container.Count > Container.Capacity - Count then
-         raise Constraint_Error
+         raise Capacity_Error
            with "requested count exceeds available storage";
       end if;
 
@@ -1614,7 +1614,7 @@ package body Ada.Containers.Bounded_Multiway_Trees is
       end if;
 
       if Container.Count > Container.Capacity - Count then
-         raise Constraint_Error
+         raise Capacity_Error
            with "requested count exceeds available storage";
       end if;
 
@@ -2237,7 +2237,7 @@ package body Ada.Containers.Bounded_Multiway_Trees is
       end if;
 
       if Container.Count > Container.Capacity - Count then
-         raise Constraint_Error
+         raise Capacity_Error
            with "requested count exceeds available storage";
       end if;
 

diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi
index d6fe3f51e8385df64d88c16f34d025bd22c77e40..f8974492aeb4453e2f18bab61068300452e9b689 100644 (file)
--- a/gcc/ada/gnat_ugn.texi
+++ b/gcc/ada/gnat_ugn.texi
@@ -11283,6 +11283,17 @@ Display Copyright and version, then exit disregarding all other options.
 @cindex @option{--help} @command{gnatelim}
 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}
 @cindex @option{^-files^/FILES^} (@code{gnatelim})
 Take the argument source files from the specified file. This file should be an
@@ -11296,9 +11307,11 @@ an explicit list of files.
 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.
 
+@ignore
 @item ^-log^/LOGFILE^=@var{filename}
 @cindex @option{^-log^/LOGFILE^} (@command{gnatelim})
 Duplicate all the output sent to @file{stderr} into a specified log file.
+@end ignore
 
 @cindex @option{^--no-elim-dispatch^/NO_DISPATCH^} (@command{gnatelim})
 @item ^--no-elim-dispatch^/NO_DISPATCH^
@@ -16655,7 +16668,7 @@ Display Copyright and version, then exit disregarding all other options.
 Display usage, then exit disregarding all other options.
 
 @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
 to be processed. The exact set of argument sources depends on other options
 specified, see below.
@@ -16668,14 +16681,13 @@ all the units of the closure of the argument project. Otherwise this option
 has no effect.
 
 @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
 specified (either directly or by means of @option{-files} option), process
 the closure of units rooted at @var{main_unit}. Otherwise this option
 has no effect.
 
 @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
 has the @var{value} value. Has no effect if no project is specified as
 tool argument.
@@ -16717,11 +16729,13 @@ a trace of sources being processed.
 Quiet mode.
 @end table
 
+@ignore
 @noindent
 If a project file is specified and no argument source is explicitly
 specified (either directly or by means of @option{-files} option), and no
 @option{-U} is specified, then the set of processed sources is
 all the immediate units of the argument project.
+@end ignore
 
 
 @ignore
@@ -19549,6 +19563,17 @@ Display Copyright and version, then exit disregarding all other options.
 @cindex @option{--help} @command{gnatstub}
 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^
 @cindex @option{^-f^/FULL^} (@command{gnatstub})
 If the destination directory already contains a file with the name of the

diff --git a/gcc/ada/sem_ch5.adb b/gcc/ada/sem_ch5.adb
index e5ea4cefe1e0ec014556afa0f7df56878e29e3b0..e03525e560a05a7f5336c1ad42c60e8d422a3ee1 100644 (file)
--- a/gcc/ada/sem_ch5.adb
+++ b/gcc/ada/sem_ch5.adb
@@ -1955,8 +1955,13 @@ package body Sem_Ch5 is
 
       --  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.
+      --  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
            ("loop parameter cannot be volatile (SPARK RM 7.1.3(6))", Ent);
       end if;

diff --git a/gcc/ada/vms_data.ads b/gcc/ada/vms_data.ads
index e6cacd854909aa934dfa5e79a5521f768e41cadb..42aaffe4955d04c6a69ee95d6b76d67d2847307c 100644 (file)
--- a/gcc/ada/vms_data.ads
+++ b/gcc/ada/vms_data.ads
@@ -4049,14 +4049,14 @@ package VMS_Data is
    --   text file.
 
    S_Elim_Log     : aliased constant S := "/LOG "                          &
-                                          "-l";
+                                          "-log";
    --        /NOLOG (D)
    --        /LOG
    --
    --   Duplicate all the output sent to Stderr into a default log file.
 
    S_Elim_Logfile : aliased constant S := "/LOGFILE=@"                     &
-                                          "-l@";
+                                          "-log@";
 
    --      /LOGFILE=logfilename
    --