aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Trojanek <trojanek@adacore.com>2019-07-09 07:53:50 +0000
committerPierre-Marie de Rodat <pmderodat@gcc.gnu.org>2019-07-09 07:53:50 +0000
commita569f21920e9f53489a59be84c44d6345bbbfa6d (patch)
tree15504c95a96d601b31cca86da6a2c46ac085a4d9
parent995d28c7551ce6a65bd34355169106aab9ee65b6 (diff)
downloadgcc-a569f21920e9f53489a59be84c44d6345bbbfa6d.zip
gcc-a569f21920e9f53489a59be84c44d6345bbbfa6d.tar.gz
gcc-a569f21920e9f53489a59be84c44d6345bbbfa6d.tar.bz2
[Ada] Reword "wild card" to "wildcard"
2019-07-09 Piotr Trojanek <trojanek@adacore.com> gcc/ada/ * doc/gnat_rm/the_gnat_library.rst, doc/gnat_ugn/building_executable_programs_with_gnat.rst, erroutc.adb, libgnat/g-comlin.adb, libgnat/g-comlin.ads, libgnat/g-regexp.ads, libgnat/g-regpat.ads, libgnat/g-spipat.ads, libgnat/s-os_lib.ads, libgnat/s-regexp.ads: Reword "wild card" to "wildcard". * gnat_rm.texi, gnat_ugn.texi: Regenerate. From-SVN: r273272
-rw-r--r--gcc/ada/ChangeLog10
-rw-r--r--gcc/ada/doc/gnat_rm/the_gnat_library.rst2
-rw-r--r--gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst2
-rw-r--r--gcc/ada/erroutc.adb2
-rw-r--r--gcc/ada/gnat_rm.texi2
-rw-r--r--gcc/ada/gnat_ugn.texi2
-rw-r--r--gcc/ada/libgnat/g-comlin.adb2
-rw-r--r--gcc/ada/libgnat/g-comlin.ads6
-rw-r--r--gcc/ada/libgnat/g-regexp.ads2
-rw-r--r--gcc/ada/libgnat/g-regpat.ads2
-rw-r--r--gcc/ada/libgnat/g-spipat.ads2
-rw-r--r--gcc/ada/libgnat/s-os_lib.ads2
-rw-r--r--gcc/ada/libgnat/s-regexp.ads2
13 files changed, 24 insertions, 14 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 86b02b3..ed8dfda 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,13 @@
+2019-07-09 Piotr Trojanek <trojanek@adacore.com>
+
+ * doc/gnat_rm/the_gnat_library.rst,
+ doc/gnat_ugn/building_executable_programs_with_gnat.rst,
+ erroutc.adb, libgnat/g-comlin.adb, libgnat/g-comlin.ads,
+ libgnat/g-regexp.ads, libgnat/g-regpat.ads,
+ libgnat/g-spipat.ads, libgnat/s-os_lib.ads,
+ libgnat/s-regexp.ads: Reword "wild card" to "wildcard".
+ * gnat_rm.texi, gnat_ugn.texi: Regenerate.
+
2019-07-09 Yannick Moy <moy@adacore.com>
* sem_spark.adb (Check_Expression): Handle correctly implicit
diff --git a/gcc/ada/doc/gnat_rm/the_gnat_library.rst b/gcc/ada/doc/gnat_rm/the_gnat_library.rst
index e15e239..08497f3 100644
--- a/gcc/ada/doc/gnat_rm/the_gnat_library.rst
+++ b/gcc/ada/doc/gnat_rm/the_gnat_library.rst
@@ -937,7 +937,7 @@ programs written in Ada.
Provides a high level interface to ``Ada.Command_Line`` facilities,
including the ability to scan for named switches with optional parameters
-and expand file names using wild card notations.
+and expand file names using wildcard notations.
.. _`GNAT.Compiler_Version_(g-comver.ads)`:
diff --git a/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst b/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst
index 57c3fe1..93956be 100644
--- a/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst
+++ b/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst
@@ -5290,7 +5290,7 @@ Using ``gcc`` for Syntax Checking
compiles file :file:`x.adb` in syntax-check-only mode. You can check a
series of files in a single command
- , and can use wild cards to specify such a group of files.
+ , and can use wildcards to specify such a group of files.
Note that you must specify the :switch:`-c` (compile
only) flag in addition to the :switch:`-gnats` flag.
diff --git a/gcc/ada/erroutc.adb b/gcc/ada/erroutc.adb
index 2ea0c2d..81e2910 100644
--- a/gcc/ada/erroutc.adb
+++ b/gcc/ada/erroutc.adb
@@ -53,7 +53,7 @@ package body Erroutc is
function Matches (S : String; P : String) return Boolean;
-- Returns true if the String S patches the pattern P, which can contain
- -- wild card chars (*). The entire pattern must match the entire string.
+ -- wildcard chars (*). The entire pattern must match the entire string.
-- Case is ignored in the comparison (so X matches x).
function Sloc_In_Range (Loc, Start, Stop : Source_Ptr) return Boolean;
diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi
index 91ac523..2de8802 100644
--- a/gcc/ada/gnat_rm.texi
+++ b/gcc/ada/gnat_rm.texi
@@ -24044,7 +24044,7 @@ programs written in Ada.
Provides a high level interface to @code{Ada.Command_Line} facilities,
including the ability to scan for named switches with optional parameters
-and expand file names using wild card notations.
+and expand file names using wildcard notations.
@node GNAT Compiler_Version g-comver ads,GNAT Ctrl_C g-ctrl_c ads,GNAT Command_Line g-comlin ads,The GNAT Library
@anchor{gnat_rm/the_gnat_library gnat-compiler-version-g-comver-ads}@anchor{346}@anchor{gnat_rm/the_gnat_library id61}@anchor{347}
diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi
index 3f99340..2867018 100644
--- a/gcc/ada/gnat_ugn.texi
+++ b/gcc/ada/gnat_ugn.texi
@@ -14285,7 +14285,7 @@ $ gcc -c -gnats x.adb
compiles file @code{x.adb} in syntax-check-only mode. You can check a
series of files in a single command
-, and can use wild cards to specify such a group of files.
+, and can use wildcards to specify such a group of files.
Note that you must specify the @code{-c} (compile
only) flag in addition to the @code{-gnats} flag.
diff --git a/gcc/ada/libgnat/g-comlin.adb b/gcc/ada/libgnat/g-comlin.adb
index 0f527c6..29100af 100644
--- a/gcc/ada/libgnat/g-comlin.adb
+++ b/gcc/ada/libgnat/g-comlin.adb
@@ -443,7 +443,7 @@ package body GNAT.Command_Line is
Parser.Current_Argument := Parser.Current_Argument + 1;
- -- Could it be a file name with wild cards to expand?
+ -- Could it be a file name with wildcards to expand?
if Do_Expansion then
declare
diff --git a/gcc/ada/libgnat/g-comlin.ads b/gcc/ada/libgnat/g-comlin.ads
index 8306f9a..f1251b6 100644
--- a/gcc/ada/libgnat/g-comlin.ads
+++ b/gcc/ada/libgnat/g-comlin.ads
@@ -466,9 +466,9 @@ package GNAT.Command_Line is
-- function should not be called before Getopt has returned ASCII.NUL.
--
-- If Do_Expansion is True, then the parameter on the command line will
- -- be considered as a filename with wild cards, and will be expanded. The
+ -- be considered as a filename with wildcards, and will be expanded. The
-- matching file names will be returned one at a time. This is useful in
- -- non-Unix systems for obtaining normal expansion of wild card references.
+ -- non-Unix systems for obtaining normal expansion of wildcard references.
-- When there are no more arguments on the command line, this function
-- returns an empty string.
@@ -515,7 +515,7 @@ package GNAT.Command_Line is
Pattern : String;
Directory : String := "";
Basic_Regexp : Boolean := True);
- -- Initialize a wild card expansion. The next calls to Expansion will
+ -- Initialize a wildcard expansion. The next calls to Expansion will
-- return the next file name in Directory which match Pattern (Pattern
-- is a regular expression, using only the Unix shell and DOS syntax if
-- Basic_Regexp is True). When Directory is an empty string, the current
diff --git a/gcc/ada/libgnat/g-regexp.ads b/gcc/ada/libgnat/g-regexp.ads
index 50c992d..162738b 100644
--- a/gcc/ada/libgnat/g-regexp.ads
+++ b/gcc/ada/libgnat/g-regexp.ads
@@ -50,7 +50,7 @@
-- matching with the restriction that it matches entire strings. It
-- is particularly useful for file name matching, and in particular
-- it provides "globbing patterns" that are useful in implementing
--- unix or DOS style wild card matching for file names.
+-- unix or DOS style wildcard matching for file names.
-- GNAT.Regpat (files g-regpat.ads/s-regpat.ads/g-regpat.adb)
-- This is a more complete implementation of Unix-style regular
diff --git a/gcc/ada/libgnat/g-regpat.ads b/gcc/ada/libgnat/g-regpat.ads
index bac4d74..62fc2e8 100644
--- a/gcc/ada/libgnat/g-regpat.ads
+++ b/gcc/ada/libgnat/g-regpat.ads
@@ -53,7 +53,7 @@
-- matching with the restriction that it matches entire strings. It
-- is particularly useful for file name matching, and in particular
-- it provides "globbing patterns" that are useful in implementing
--- unix or DOS style wild card matching for file names.
+-- unix or DOS style wildcard matching for file names.
-- GNAT.Regpat (files g-regpat.ads/s-regpat.ads/s-regpat.adb)
-- This is a more complete implementation of Unix-style regular
diff --git a/gcc/ada/libgnat/g-spipat.ads b/gcc/ada/libgnat/g-spipat.ads
index 4d6a7f8..4dfc25a 100644
--- a/gcc/ada/libgnat/g-spipat.ads
+++ b/gcc/ada/libgnat/g-spipat.ads
@@ -48,7 +48,7 @@
-- matching with the restriction that it matches entire strings. It
-- is particularly useful for file name matching, and in particular
-- it provides "globbing patterns" that are useful in implementing
--- unix or DOS style wild card matching for file names.
+-- unix or DOS style wildcard matching for file names.
-- GNAT.Regpat (files g-regpat.ads/g-regpat.adb)
-- This is a more complete implementation of Unix-style regular
diff --git a/gcc/ada/libgnat/s-os_lib.ads b/gcc/ada/libgnat/s-os_lib.ads
index 8b21aa7..3e8c21d 100644
--- a/gcc/ada/libgnat/s-os_lib.ads
+++ b/gcc/ada/libgnat/s-os_lib.ads
@@ -246,7 +246,7 @@ package System.OS_Lib is
Success : out Boolean;
Mode : Copy_Mode := Copy;
Preserve : Attribute := Time_Stamps);
- -- Copy a file. Name must designate a single file (no wild cards allowed).
+ -- Copy a file. Name must designate a single file (no wildcards allowed).
-- Pathname can be a filename or directory name. In the latter case Name
-- is copied into the directory preserving the same file name. Mode
-- defines the kind of copy, see above with the default being a normal
diff --git a/gcc/ada/libgnat/s-regexp.ads b/gcc/ada/libgnat/s-regexp.ads
index f521f91..4d9fb5b 100644
--- a/gcc/ada/libgnat/s-regexp.ads
+++ b/gcc/ada/libgnat/s-regexp.ads
@@ -77,7 +77,7 @@ package System.Regexp is
-- See also regexp(1) man page on Unix systems for further details
-- A second kind of regular expressions is provided. This one is more
- -- like the wild card patterns used in file names by the Unix shell (or
+ -- like the wildcard patterns used in file names by the Unix shell (or
-- DOS prompt) command lines. The grammar is the following:
-- regexp ::= term