diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-03-26 20:02:45 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-03-26 20:02:45 +0000 |
| commit | 261a23bc4f7fbd525cb2f73582743252d2d2f8ac (patch) | |
| tree | f3c8a991bcf4caac8dd5516247a2d92c9f77ee3b /gcc/ada/prj-tree.adb | |
| parent | 0c164b6eab526a1d0db4a3d08058262ddd476be6 (diff) | |
| download | gcc-261a23bc4f7fbd525cb2f73582743252d2d2f8ac.tar.gz | |
2008-03-26 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r133612 (in particular gcc/Makefile.in with auto dependencies)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@133613 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-tree.adb')
| -rw-r--r-- | gcc/ada/prj-tree.adb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gcc/ada/prj-tree.adb b/gcc/ada/prj-tree.adb index ee206058557..db32e4a0a07 100644 --- a/gcc/ada/prj-tree.adb +++ b/gcc/ada/prj-tree.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2001-2007, Free Software Foundation, Inc. -- +-- Copyright (C) 2001-2008, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -1047,18 +1047,18 @@ package body Prj.Tree is With_Clause := Next_With_Clause_Of (With_Clause, In_Tree); end loop; - -- If it is not an imported project, it might be the imported project + -- If it is not an imported project, it might be an extended project if With_Clause = Empty_Node then - Result := - Extended_Project_Of - (Project_Declaration_Of (Project, In_Tree), In_Tree); - - if Result /= Empty_Node - and then Name_Of (Result, In_Tree) /= With_Name - then - Result := Empty_Node; - end if; + Result := Project; + loop + Result := + Extended_Project_Of + (Project_Declaration_Of (Result, In_Tree), In_Tree); + + exit when Result = Empty_Node + or else Name_Of (Result, In_Tree) = With_Name; + end loop; end if; return Result; |