diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2013-07-08 10:11:50 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2013-07-08 10:11:50 +0200 |
| commit | d7a3e18ca87744c3bd293396952a7ff36412d1ce (patch) | |
| tree | 00beb7041cf1daae8aa1a3f22f973ec78eb0472e /gcc/ada/restrict.adb | |
| parent | 046f1eeec356d116ef3dcfc512d0ef8085efc8bf (diff) | |
| download | gcc-d7a3e18ca87744c3bd293396952a7ff36412d1ce.zip gcc-d7a3e18ca87744c3bd293396952a7ff36412d1ce.tar.gz gcc-d7a3e18ca87744c3bd293396952a7ff36412d1ce.tar.bz2 | |
[multiple changes]
2013-07-08 Robert Dewar <dewar@adacore.com>
* gnat_rm.texi: Add documentation for Img returning a function.
* par-prag.adb: Minor reformatting.
* restrict.adb: Minor reformatting and code reorganization.
2013-07-08 Ed Schonberg <schonberg@adacore.com>
* sem_res.adb: add guard to ASIS transform.
From-SVN: r200769
Diffstat (limited to 'gcc/ada/restrict.adb')
| -rw-r--r-- | gcc/ada/restrict.adb | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/gcc/ada/restrict.adb b/gcc/ada/restrict.adb index f78236a..a90cf1a 100644 --- a/gcc/ada/restrict.adb +++ b/gcc/ada/restrict.adb @@ -1171,20 +1171,16 @@ package body Restrict is function Same_Unit (U1, U2 : Node_Id) return Boolean is begin - if Nkind (U1) = N_Identifier then - return Nkind (U2) = N_Identifier and then Chars (U1) = Chars (U2); + if Nkind (U1) = N_Identifier and then Nkind (U2) = N_Identifier then + return Chars (U1) = Chars (U2); - elsif Nkind (U2) = N_Identifier then - return False; - - elsif (Nkind (U1) = N_Selected_Component - or else Nkind (U1) = N_Expanded_Name) - and then - (Nkind (U2) = N_Selected_Component - or else Nkind (U2) = N_Expanded_Name) + elsif Nkind_In (U1, N_Selected_Component, N_Expanded_Name) + and then + Nkind_In (U2, N_Selected_Component, N_Expanded_Name) then return Same_Unit (Prefix (U1), Prefix (U2)) - and then Same_Unit (Selector_Name (U1), Selector_Name (U2)); + and then + Same_Unit (Selector_Name (U1), Selector_Name (U2)); else return False; end if; |