gnat_rm.texi, [...]: Document new syntax for pragma Annotate

2009-11-30  Ed Schonberg  <schonberg@adacore.com>

	* gnat_rm.texi, gnat_ugn.texi: Document new syntax for pragma Annotate

From-SVN: r154805

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e5cd72b4de9656fb63be4f4f75ed80dac5e82543..a735c0710da649c752162059b9fcee66dedbf04f 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-30  Ed Schonberg  <schonberg@adacore.com>
+
+       * gnat_rm.texi, gnat_ugn.texi: Document new syntax for pragma Annotate
+
 2009-11-30  Robert Dewar  <dewar@adacore.com>
 
        * scans.ads (Wide_Wide_Character_Found): New flag

diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi
index 7744f155b560fcc230364237a4cfac8b7c1eccd1..1c7f64e3680c396c24620af26d0b76a4f6b3ba22 100644 (file)
--- a/gcc/ada/gnat_rm.texi
+++ b/gcc/ada/gnat_rm.texi
@@ -929,7 +929,7 @@ same syntax and effect.
 @noindent
 Syntax:
 @smallexample @c ada
-pragma Annotate (IDENTIFIER @{, ARG@});
+pragma Annotate (IDENTIFIER [,IDENTIFIER] @{, ARG@});
 
 ARG ::= NAME | EXPRESSION
 @end smallexample
@@ -937,11 +937,14 @@ ARG ::= NAME | EXPRESSION
 @noindent
 This pragma is used to annotate programs.  @var{identifier} identifies
 the type of annotation.  GNAT verifies that it is an identifier, but does
-not otherwise analyze it.  The @var{arg} argument
-can be either a string literal or an
-expression.  String literals are assumed to be of type
-@code{Standard.String}.  Names of entities are simply analyzed as entity
-names.  All other expressions are analyzed as expressions, and must be
+not otherwise analyze it. The second optional identifier is also left
+unanalyzed, and by convention is used to control the action of the tool to
+which the annotation is addressed.  The remaining @var{arg} arguments
+can be either string literals or more generally expressions.
+String literals are assumed to be either of type
+@code{Standard.String} or else @code{Wide_String} or @code{Wide_Wide_String}
+depending on the character literals they contain.
+All other kinds of arguments are analyzed as expressions, and must be
 unambiguous.
 
 The analyzed pragma is retained in the tree, but not otherwise processed

diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi
index 87faf97d0ede6f409688d31472a4a31b1801d682..78bbf56837ffc76b138b2938a7c78cf1c728218a 100644 (file)
--- a/gcc/ada/gnat_ugn.texi
+++ b/gcc/ada/gnat_ugn.texi
@@ -21028,7 +21028,7 @@ exemption control annotations is as follows:
 @group
 pragma Annotate (gnatcheck, @i{exemption_control}, @i{Rule_Name}, [@i{justification}]);
 
-@i{exemption_control} ::= "Exempt_On" | "Exempt_Off"
+@i{exemption_control} ::= Exempt_On | Exempt_Off
 
 @i{Rule_Name}         ::= string_literal
 
@@ -21052,9 +21052,9 @@ A source code section where an exemption is active for a given rule is
 delimited by an @code{exempt_on} and @code{exempt_off} annotation pair:
 
 @smallexample @c ada
-pragma Annotate (gnatcheck, "Exempt_On", Rule_Name, "justification");
+pragma Annotate (gnatcheck, Exempt_On, Rule_Name, "justification");
 -- source code section
-pragma Annotate (gnatcheck, "Exempt_Off", Rule_Name);
+pragma Annotate (gnatcheck, Exempt_Off, Rule_Name);
 @end smallexample