diff options
author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-01-06 10:30:54 +0000 |
---|---|---|
committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-01-06 10:30:54 +0000 |
commit | f7cb0e8847f3b0a0e4e7c36f460e7f3425835440 (patch) | |
tree | c895f7df1a184cfc7034b830555d10913c43d454 /gcc/ada/sem_util.adb | |
parent | 555d84e1ceaf256028d14e5cd025ee7efcf77d9e (diff) | |
download | gcc-f7cb0e8847f3b0a0e4e7c36f460e7f3425835440.tar.gz |
2015-01-06 Pascal Obry <obry@adacore.com>
* bindgen.adb: Minor style fix.
2015-01-06 Robert Dewar <dewar@adacore.com>
* sem_util.ads, sem_util.adb: Minor reformatting.
2015-01-06 Vincent Celier <celier@adacore.com>
* prj-conf.adb (Parse_Project_And_Apply_Config): Reset incomplete
with flags before parsing the projects.
* prj-err.adb (Error_Msg): Do nothing if there are incomplete withs.
* prj-part.adb (Post_Parse_Context_Clause): Set Incomplete_Withs
to True in the flags, when Ignore_Missing_With is True and an
imported project cannot be found.
* prj-proc.adb (Expression): When there are incomplete withs and
a variable or attribute is not found, set the variable/attribute
to unknown.
* prj.ads (Processing_Flags): New flag Incomplete_Withs,
defaulted to False.
2015-01-06 Vasiliy Fofanov <fofanov@adacore.com>
* prj-proc.adb, prj-part.adb, prj.adb, prj.ads, prj-conf.adb,
prj-err.adb: Add new switch --no-command-line.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219252 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/sem_util.adb')
-rw-r--r-- | gcc/ada/sem_util.adb | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index b8e22ea8be2..b0fcc17da47 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -5065,23 +5065,22 @@ package body Sem_Util is end if; end Select_Node; - -- Start of processing for Designate_Next_Unit + -- Start of processing for Designate_Same_Unit begin - if (K1 = N_Identifier or else K1 = N_Defining_Identifier) + if Nkind_In (K1, N_Identifier, N_Defining_Identifier) and then - (K2 = N_Identifier or else K2 = N_Defining_Identifier) + Nkind_In (K2, N_Identifier, N_Defining_Identifier) then return Chars (Name1) = Chars (Name2); - elsif - (K1 = N_Expanded_Name or else - K1 = N_Selected_Component or else - K1 = N_Defining_Program_Unit_Name) - and then - (K2 = N_Expanded_Name or else - K2 = N_Selected_Component or else - K2 = N_Defining_Program_Unit_Name) + elsif Nkind_In (K1, N_Expanded_Name, + N_Selected_Component, + N_Defining_Program_Unit_Name) + and then + Nkind_In (K2, N_Expanded_Name, + N_Selected_Component, + N_Defining_Program_Unit_Name) then return (Chars (Select_Node (Name1)) = Chars (Select_Node (Name2))) |