diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/sem_ch4.adb | 1 | ||||
| -rw-r--r-- | gcc/ada/sinfo.ads | 31 |
3 files changed, 21 insertions, 16 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index d2ce7e3..c688822 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,10 @@ 2010-10-22 Robert Dewar <dewar@adacore.com> + * sem_ch4.adb: Minor reformatting. + * sinfo.ads: Minor comment fixes for Ada 2012 syntax. + +2010-10-22 Robert Dewar <dewar@adacore.com> + * par-ch5.adb: Minor reformatting. * gcc-interface/Make-lang.in: Update dependencies. diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb index ab33375..ac3fa03 100644 --- a/gcc/ada/sem_ch4.adb +++ b/gcc/ada/sem_ch4.adb @@ -5650,7 +5650,6 @@ package body Sem_Ch4 is or else Is_Array_Type (Etype (L)) or else Is_Array_Type (Etype (R))) then - if Nkind (N) = N_Op_Concat then if Etype (L) /= Any_Composite and then Is_Array_Type (Etype (L)) diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads index 91897b1..d306afe 100644 --- a/gcc/ada/sinfo.ads +++ b/gcc/ada/sinfo.ads @@ -1941,7 +1941,7 @@ package Sinfo is -- Note: the value of an integer literal node created by the front end -- is never outside the range of values of the base type. However, it - -- can be the case that the value is outside the range of the + -- can be the case that the created value is outside the range of the -- particular subtype. This happens in the case of integer overflows -- with checks suppressed. @@ -3633,8 +3633,13 @@ package Sinfo is --------------------------- -- RELATION ::= - -- SIMPLE_EXPRESSION [not] in RANGE - -- | SIMPLE_EXPRESSION [not] in SUBTYPE_MARK + -- SIMPLE_EXPRESSION [not] in MEMBERSHIP_CHOICE_LIST + + -- MEMBERSHIP_CHOICE_LIST ::= + -- MEMBERSHIP_CHOICE {'|' MEMBERSHIP CHOICE} + + -- MEMBERSHIP_CHOICE ::= + -- CHOICE_EXPRESSION | RANGE | SUBTYPE_MARK -- Note: although the grammar above allows only a range or a subtype -- mark, the parser in fact will accept any simple expression in place @@ -3642,19 +3647,15 @@ package Sinfo is -- to deal with, and diagnose a simple expression other than a name for -- the right operand. This simplifies error recovery in the parser. - -- If extensions are enabled, the grammar is as follows: - - -- RELATION ::= - -- SIMPLE_EXPRESSION [not] in SET_ALTERNATIVE {| SET_ALTERNATIVE} - - -- SET_ALTERNATIVE ::= RANGE | SUBTYPE_MARK + -- The Alternatives field below is present only if there is more + -- than one Membership_Choice present (which is legitimate only in + -- Ada 2012 mode) in which case Right_Opnd is Empty, and Alternatives + -- contains the list of choices. In the tree passed to the back end, + -- Alternatives is always No_List, and Right_Opnd is set (i.e. the + -- expansion circuitry expands out the complex set membership case + -- using simple membership operations). - -- The Alternatives field below is present only if there is more than - -- one Set_Alternative present, in which case Right_Opnd is set to - -- Empty, and Alternatives contains the list of alternatives. In the - -- tree passed to the back end, Alternatives is always No_List, and - -- Right_Opnd is set (i.e. the expansion circuitry expands out the - -- complex set membership case using simple membership operations). + -- Should we rename Alternatives here to Membership_Choices ??? -- N_In -- Sloc points to IN |