vms_conv.ads, [...]: Remove "Library" command.

2005-06-14  Doug Rupp  <rupp@adacore.com>
	    Vincent Celier  <celier@adacore.com>

	* vms_conv.ads, vms_conv.adb: Remove "Library" command.
	Update copyright.

	* vms_data.ads: Add entry for -gnaty/Y [NO]ADA_2005_COMPATIBILITY
	Remove "Library" command.
	Change keyword for style check -gnatyd from NOCRLF to
	DOS_LINE_ENDINGS.
	Remove useless second style check keyword NONE
	Remove help documentation for inexistent style check keyword
	RM_COLUMN_LAYOUT.
	Add help documentation for style check keywords DOS_LINE_ENDINGS,
	UNNECESSARY_BLANK_LINES and XTRA_PARENS
	Add UNNECESSARY_BLANK_LINES for -gnatyu
	Add qualifiers /ALL_PROJECTS (-U) for GNAT PRETTY and GNAT METRIC

        * ug_words: Add entry for -gnaty/Y [NO]ADA_2005_COMPATIBILITY

From-SVN: r101067

diff --git a/gcc/ada/ug_words b/gcc/ada/ug_words
index 03e43251eeefe5b05b4a8c2c6648c47eda310bd0..8203ee546c15b8e999b44a2b37cc65ac50cf516d 100644 (file)
--- a/gcc/ada/ug_words
+++ b/gcc/ada/ug_words
@@ -142,6 +142,8 @@ gcc -c          ^ GNAT COMPILE
 -gnatwV         ^ /WARNINGS=NOVARIABLES_UNINITIALIZED
 -gnatwx         ^ /WARNINGS=IMPORT_EXPORT_PRAGMAS
 -gnatwX         ^ /WARNINGS=NOIMPORT_EXPORT_PRAGMAS
+-gnatwy         ^ /WARNINGS=ADA_2005_COMPATIBILITY
+-gnatwY         ^ /WARNINGS=NOADA_2005_COMPATIBILITY
 -gnatwz         ^ /WARNINGS=UNCHECKED_CONVERSIONS
 -gnatwZ         ^ /WARNINGS=NOUNCHECKED_CONVERSIONS
 -gnatW8         ^ /WIDE_CHARACTER_ENCODING=UTF8

diff --git a/gcc/ada/vms_conv.adb b/gcc/ada/vms_conv.adb
index ac66690eadcb202647a7a833d2911152548d4508..77d174fb31bf53db8a89b1682285497cf4151753 100644 (file)
--- a/gcc/ada/vms_conv.adb
+++ b/gcc/ada/vms_conv.adb
@@ -274,17 +274,6 @@ package body VMS_Conv is
             Params   => new Parameter_Array'(1 => File),
             Defext   => "   "),
 
-         Library =>
-           (Cname    => new S'("LIBRARY"),
-            Usage    => new S'("GNAT LIBRARY /[CREATE | SET | DELETE]"
-                               & "=directory [/CONFIG=file]"),
-            VMS_Only => True,
-            Unixcmd  => new S'("gnatlbr"),
-            Unixsws  => null,
-            Switches => Lbr_Switches'Access,
-            Params   => new Parameter_Array'(1 .. 0 => File),
-            Defext   => "   "),
-
          Link =>
            (Cname    => new S'("LINK"),
             Usage    => new S'("GNAT LINK file[.ali]"

diff --git a/gcc/ada/vms_conv.ads b/gcc/ada/vms_conv.ads
index 1682c879142f6960cf0c3e512c7378b8f5fdd473..3ee0d0290ab16aced95c901eb5087795d60c0734 100644 (file)
--- a/gcc/ada/vms_conv.ads
+++ b/gcc/ada/vms_conv.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 2003-2004 Free Software Foundation, Inc.          --
+--          Copyright (C) 2003-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- --
@@ -101,7 +101,6 @@ package VMS_Conv is
       Elim,
       Find,
       Krunch,
-      Library,
       Link,
       List,
       Make,

diff --git a/gcc/ada/vms_data.ads b/gcc/ada/vms_data.ads
index 40a262f684d71487c838b16d275e4541e302a76b..b970fea1053b4ec609b7501f056648c29656f72e 100644 (file)
--- a/gcc/ada/vms_data.ads
+++ b/gcc/ada/vms_data.ads
@@ -1800,7 +1800,7 @@ package VMS_Data is
                                                "-gnatyb "                  &
                                             "COMMENTS "                    &
                                                "-gnatyc "                  &
-                                            "NOCRLF"                       &
+                                            "DOS_LINE_ENDINGS "            &
                                                "-gnatyd "                  &
                                             "END "                         &
                                                "-gnatye "                  &
@@ -1824,8 +1824,6 @@ package VMS_Data is
                                                "-gnatyn "                  &
                                             "ORDERED_SUBPROGRAMS "         &
                                                "-gnatyo "                  &
-                                            "NONE "                        &
-                                               "!-gnatg,!-gnaty* "         &
                                             "PRAGMA "                      &
                                                "-gnatyp "                  &
                                             "REFERENCES "                  &
@@ -1834,6 +1832,8 @@ package VMS_Data is
                                                "-gnatys "                  &
                                             "TOKEN "                       &
                                                "-gnatyt "                  &
+                                            "UNNECESSARY_BLANK_LINES "     &
+                                               "-gnatyu "                  &
                                             "XTRA_PARENS "                 &
                                                "-gnatyx ";
    --        /NOSTYLE_CHECKS (D)
@@ -1917,6 +1917,11 @@ package VMS_Data is
    --                               -- This is a box comment --
    --                               ---------------------------
    --
+   --      DOS_LINE_ENDINGS     Check that no DOS line terminators are present
+   --                           All lines must be terminated by a single
+   --                           ASCII.LF character. In particular the DOS line
+   --                           terminator sequence CR / LF is not allowed).
+   --
    --      END                  Check end/exit labels.
    --                           Optional labels on end statements ending
    --                           subprograms and on exit statements exiting
@@ -2046,8 +2051,6 @@ package VMS_Data is
    --                           in the ordering (e.g. Junk2 comes before
    --                           Junk10).
    --
-   --      NONE                 The default behavior.  Same as /NOSTYLE_CHECKS.
-   --
    --      PRAGMA               Check pragma casing.
    --                           Pragma names must be written in mixed case,
    --                           that is, the initial letter and any letter
@@ -2061,15 +2064,6 @@ package VMS_Data is
    --                           identifiers. The only requirement is for
    --                           consistency of references with declarations.
    --
-   --      RM_COLUMN_LAYOUT     Enforce the layout conventions suggested by
-   --                           the examples and syntax rules of the Ada
-   --                           Language Reference Manual. For example, an
-   --                           "else" must line up with an "if" and code in
-   --                           the "then" and "else" parts must be indented.
-   --                           The compiler considers violations of the
-   --                           layout rules a syntax error if you specify
-   --                           this keyword.
-   --
    --      SPECS                Check separate specs.
    --                           Separate declarations ("specs") are required
    --                           for subprograms (a body is not allowed to serve
@@ -2140,9 +2134,20 @@ package VMS_Data is
    --                           or as meeting a requirement for no following
    --                           space.
    --
+   --      UNNECESSARY_BLANK_LINES
+   --                           Check for unnecessary blank lines.
+   --                           A blank line is considered unnecessary if it
+   --                           appears at the end of the file, or if more
+   --                           than one blank line occurs in sequence.
+   --
    --      VTABS                No form feeds or vertical tabs.
    --                           Form feeds or vertical tab characters are not
    --                           permitted in the source text.
+   --
+   --      XTRA_PARENS          Check for the use of an unnecessary extra
+   --                           level of parentheses (C - style) around
+   --                           conditions in if statements, while statements
+   --                           and exit statements.
 
    S_GCC_StyleX  : aliased constant S := "/NOSTYLE_CHECKS "                &
                                             "!-gnatg,!-gnaty*";
@@ -2439,6 +2444,10 @@ package VMS_Data is
                                                "-gnatwx "                  &
                                             "NOIMPORT_EXPORT_PRAGMAS "     &
                                                "-gnatwX "                  &
+                                            "ADA_2005_COMPATIBILITY "      &
+                                               "-gnatwy "                  &
+                                            "NOADA_2005_COMPATIBILITY "    &
+                                               "-gnatwY "                  &
                                             "UNCHECKED_CONVERSIONS "       &
                                                "-gnatwz "                  &
                                             "NOUNCHECKED_CONVERSIONS "     &
@@ -3198,40 +3207,6 @@ package VMS_Data is
    Krunch_Switches : aliased constant Switches  :=
      (1 .. 1 => S_Krunch_Count  'Access);
 
-   -------------------------------
-   -- Switches for GNAT LIBRARY --
-   -------------------------------
-
-   S_Lbr_Config    : aliased constant S := "/CONFIG=@"                     &
-                                            "--config=@";
-   --        /CONFIG=file
-   --
-   --   File containing configuration pragmas.
-
-   S_Lbr_Create    : aliased constant S := "/CREATE=%"                     &
-                                            "--create=%";
-   --        /CREATE=directory
-   --
-   --   Directory to create and build alternate library in.
-
-   S_Lbr_Delete    : aliased constant S := "/DELETE=%"                     &
-                                            "--delete=%";
-   --        /DELETE=directory
-   --
-   --   Directory containing alternate library to be deleted.
-
-   S_Lbr_Set       : aliased constant S := "/SET=%"                        &
-                                            "--set=%";
-   --        /SET=directory
-   --
-   --   Directory containing alternate library to be made the current library.
-
-   Lbr_Switches : aliased constant Switches  :=
-     (S_Lbr_Config 'Access,
-      S_Lbr_Create 'Access,
-      S_Lbr_Delete 'Access,
-      S_Lbr_Set    'Access);
-
    ----------------------------
    -- Switches for GNAT LINK --
    ----------------------------
@@ -3650,7 +3625,7 @@ package VMS_Data is
    --
    --   Implies /Unique.
    --   When used without project files, it is equivalent to /UNIQUE.
-   --   When used with a project file wit no main (neither on the command
+   --   When used with a project file with no main (neither on the command
    --   line nor in the attribute Main) check every source of every project,
    --   recompile all sources that are not up to date and rebuild libraries
    --   if necessary.
@@ -4074,6 +4049,14 @@ package VMS_Data is
    -- Switches for GNAT METRIC --
    ------------------------------
 
+   S_Metric_All_Prjs : aliased constant S := "/ALL_PROJECTS "              &
+                                               "-U";
+   --        /NOALL_PROJECTS (D)
+   --        /ALL_PROJECTS
+   --   When GNAT METRIC is used with a Project File and no source is
+   --   specified, the underlying tool gnatmetric is called for all the
+   --   sources of all the Project Files in the project tree.
+
    S_Metric_Debug    : aliased constant S := "/DEBUG_OUTPUT "               &
                                              "-dv";
    --      /DEBUG_OUTPUT
@@ -4294,7 +4277,8 @@ package VMS_Data is
    --   Place the XML output into the specified file
 
    Metric_Switches : aliased constant Switches :=
-     (S_Metric_Debug    'Access,
+     (S_Metric_All_Prjs 'Access,
+      S_Metric_Debug    'Access,
       S_Metric_Direct   'Access,
       S_Metric_Element  'Access,
       S_Metric_Ext      'Access,
@@ -4529,6 +4513,14 @@ package VMS_Data is
    --   Specifying one of the ON options without first specifying the OFF
    --   option has no effect, because by default all alignments are set to ON.
 
+   S_Pretty_All_Prjs : aliased constant S := "/ALL_PROJECTS "             &
+                                              "-U";
+   --        /NOALL_PROJECTS (D)
+   --        /ALL_PROJECTS
+   --   When GNAT PRETTY is used with a Project File and no source is
+   --   specified, the underlying tool gnatpp is called for all the
+   --   sources of all the Project Files in the project tree.
+
    S_Pretty_Attrib : aliased constant S := "/ATTRIBUTE_CASING="            &
                                            "MIXED_CASE "                   &
                                                "-aM "                      &
@@ -4926,6 +4918,7 @@ package VMS_Data is
 
    Pretty_Switches : aliased constant Switches :=
      (S_Pretty_Align     'Access,
+      S_Pretty_All_Prjs  'Access,
       S_Pretty_Attrib    'Access,
       S_Pretty_Comments  'Access,
       S_Pretty_Config    'Access,