From 4672940951fd298f1a8ffd5e32a53fb5a08c3877 Mon Sep 17 00:00:00 2001 From: Robert Dewar Date: Fri, 5 Jul 2013 09:52:38 +0000 Subject: [PATCH] gnat_rm.texi, [...]: Minor comment/text fixes. 2013-07-05 Robert Dewar * gnat_rm.texi, sem_prag.adb: Minor comment/text fixes. From-SVN: r200697 --- gcc/ada/ChangeLog | 4 ++++ gcc/ada/gnat_rm.texi | 6 ++++++ gcc/ada/sem_prag.adb | 8 +++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 26d7be1..01d84ba 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,9 @@ 2013-07-05 Robert Dewar + * gnat_rm.texi, sem_prag.adb: Minor comment/text fixes. + +2013-07-05 Robert Dewar + * gnat_rm.texi: Add missing doc for various pragmas. 2013-07-05 Robert Dewar diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi index 11d8186..312e0a8 100644 --- a/gcc/ada/gnat_rm.texi +++ b/gcc/ada/gnat_rm.texi @@ -5540,6 +5540,12 @@ semantics are identical to pragma Atomic. @node Pragma Short_Circuit_And_Or @unnumberedsec Pragma Short_Circuit_And_Or @findex Short_Circuit_And_Or +@noindent +Syntax: + +@smallexample @c ada +pragma Short_Circuit_And_Or; +@end smallexample @noindent This configuration pragma causes any occurrence of the AND operator applied to diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 233f83f..553ce21 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -5997,6 +5997,8 @@ package body Sem_Prag is Check_No_Identifiers; Check_At_Least_N_Arguments (1); + -- Check all arguments are names of generic units or instances + Arg := Arg1; while Present (Arg) loop Exp := Get_Pragma_Arg (Arg); @@ -16059,6 +16061,8 @@ package body Sem_Prag is -- Short_Circuit_And_Or -- -------------------------- + -- pragma Short_Circuit_And_Or; + when Pragma_Short_Circuit_And_Or => GNAT_Pragma; Check_Arg_Count (0); @@ -16069,7 +16073,9 @@ package body Sem_Prag is -- Share_Generic -- ------------------- - -- pragma Share_Generic (NAME {, NAME}); + -- pragma Share_Generic (GNAME {, GNAME}); + + -- GNAME ::= generic_unit_NAME | generic_instance_NAME when Pragma_Share_Generic => GNAT_Pragma; -- 2.7.4