diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-13 10:52:34 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-13 10:52:34 +0000 |
| commit | 5d6b98f60dbf269c822dce4af2b15d341a8f22f4 (patch) | |
| tree | 21ef9fb1d95b2a33218ce793d8e33d15360d0784 /gcc/ada/prj-tree.adb | |
| parent | d15bad045d8514e6c767e0bdc1cd2b2956274dbd (diff) | |
| download | gcc-5d6b98f60dbf269c822dce4af2b15d341a8f22f4.tar.gz | |
2009-07-13 Emmanuel Briot <briot@adacore.com>
* prj.adb, prj.ads, prj-env.adb, prj-conf.adb, prj-tree.adb,
mlib-prj.adb (Private_Part.Ada_Prj_Objects_File_Set,
Ada_Prj_Include_File_Set): Removed, since not needed
Code clean up.
2009-07-13 Ed Schonberg <schonberg@adacore.com>
* sem_ch4.adb (Analyze_Set_Membership): New procedure, subsidiary of
Analyze_Membership_Op.
* sem_res.adb (Resolve_Set_Membership): New procedure, subsidiary of
Resolve_Membership_Op.
* exp_ch4.adb (Expand_Set_Membership): New procedure, subsidiary of
Expand_N_In.
2009-07-13 Robert Dewar <dewar@adacore.com>
* clean.adb: Minor reformattting
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149569 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-tree.adb')
| -rw-r--r-- | gcc/ada/prj-tree.adb | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/gcc/ada/prj-tree.adb b/gcc/ada/prj-tree.adb index 42b281fad1e..f054976e321 100644 --- a/gcc/ada/prj-tree.adb +++ b/gcc/ada/prj-tree.adb @@ -2848,15 +2848,17 @@ package body Prj.Tree is Qualifier := Configuration; end if; - Prj.Tree.Tree_Private_Part.Projects_Htable.Set - (In_Tree.Projects_HT, - Name, - Prj.Tree.Tree_Private_Part.Project_Name_And_Node' - (Name => Name, - Canonical_Path => No_Path, - Node => Project, - Extended => False, - Proj_Qualifier => Qualifier)); + if not Is_Config_File then + Prj.Tree.Tree_Private_Part.Projects_Htable.Set + (In_Tree.Projects_HT, + Name, + Prj.Tree.Tree_Private_Part.Project_Name_And_Node' + (Name => Name, + Canonical_Path => No_Path, + Node => Project, + Extended => False, + Proj_Qualifier => Qualifier)); + end if; return Project; end Create_Project; @@ -3044,7 +3046,9 @@ package body Prj.Tree is -- Find out the case sensitivity of the attribute - if Kind_Of (Prj_Or_Pkg, Tree) = N_Package_Declaration then + if Prj_Or_Pkg /= Empty_Node + and then Kind_Of (Prj_Or_Pkg, Tree) = N_Package_Declaration + then Pkg := Prj.Attr.Package_Node_Id_Of (Name_Of (Prj_Or_Pkg, Tree)); Start_At := First_Attribute_Of (Pkg); else |