diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/gnat_ugn.texi | 19 | ||||
| -rw-r--r-- | gcc/ada/sinfo.ads | 1 |
3 files changed, 15 insertions, 10 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index cff6725..f4003ad 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,10 @@ 2011-12-02 Robert Dewar <dewar@adacore.com> + * sinfo.ads: Minor reformatting. + * gnat_ugn.texi: Fix confusion in use of term "type name". + +2011-12-02 Robert Dewar <dewar@adacore.com> + * sem_ch6.adb: Minor change in error message. 2011-12-02 Robert Dewar <dewar@adacore.com> diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index ba5737a..a741c33 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -13190,20 +13190,21 @@ setting. @cindex @option{^-nt@var{x}^/TYPE_CASING^} (@command{gnatpp}) @item ^-neD^/TYPE_CASING=AS_DECLARED^ -Type and subtype name casing for defining occurrences are as they appear in -the source file. Overrides ^-n^/NAME_CASING^ casing setting. +Names introduced by type and subtype declarations are always +cased as they appear in the declaration in the source file. +Overrides ^-n^/NAME_CASING^ casing setting. @item ^-ntU^/TYPE_CASING=UPPER_CASE^ -Type and subtype names are in upper case. Overrides ^-n^/NAME_CASING^ casing -setting. +Names introduced by type and subtype declarations are always in +upper case. Overrides ^-n^/NAME_CASING^ casing setting. @item ^-ntL^/TYPE_CASING=LOWER_CASE^ -Type and subtype names are in lower case. Overrides ^-n^/NAME_CASING^ casing -setting. +Names introduced by type and subtype declarations are always in +lower case. Overrides ^-n^/NAME_CASING^ casing setting. @item ^-ntM^/TYPE_CASING=MIXED_CASE^ -Type and subtype names are in mixed case. Overrides ^-n^/NAME_CASING^ casing -setting. +Names introduced by type and subtype declarations are always in +mixed case. Overrides ^-n^/NAME_CASING^ casing setting. @cindex @option{^-p@var{x}^/PRAGMA_CASING^} (@command{gnatpp}) @item ^-pL^/PRAGMA_CASING=LOWER_CASE^ @@ -26370,7 +26371,7 @@ of the methodological principle known as the ``contract model'', the generic declaration explicitly indicates whether or not such instantiations are permitted. If a generic formal parameter has explicit unknown discriminants, indicated by using @code{(<>)} after the -type name, then it can be instantiated with indefinite types, but no +subtype name, then it can be instantiated with indefinite types, but no stand-alone variables can be declared of this type. Any attempt to declare such a variable will result in an illegality at the time the generic is declared. If the @code{(<>)} notation is not used, then it is illegal diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads index 7e308ec..be4f8dc 100644 --- a/gcc/ada/sinfo.ads +++ b/gcc/ada/sinfo.ads @@ -2176,7 +2176,6 @@ package Sinfo is -- type DEFINING_IDENTIFIER [KNOWN_DISCRIMINANT_PART] -- is TYPE_DEFINITION -- [ASPECT_SPECIFICATIONS]; - -- | TASK_TYPE_DECLARATION -- | PROTECTED_TYPE_DECLARATION |