diff options
| author | Pascal Obry <obry@adacore.com> | 2011-09-02 09:04:38 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-09-02 11:04:38 +0200 |
| commit | 735ca1b90d42bb9ceec2bc43d3ae99be603e0c5a (patch) | |
| tree | 3aa53a7a77238388dbc916900f15d64f8e1a699a /gcc | |
| parent | 86828d402fb5a42decd66f210038d31842ab10de (diff) | |
| download | gcc-735ca1b90d42bb9ceec2bc43d3ae99be603e0c5a.zip gcc-735ca1b90d42bb9ceec2bc43d3ae99be603e0c5a.tar.gz gcc-735ca1b90d42bb9ceec2bc43d3ae99be603e0c5a.tar.bz2 | |
prj.adb: Minor code refactoring.
2011-09-02 Pascal Obry <obry@adacore.com>
* prj.adb: Minor code refactoring. Move check for null project in
Project_Changed.
* projects.texi: Fix minor typos.
From-SVN: r178444
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ada/prj.adb | 27 | ||||
| -rw-r--r-- | gcc/ada/projects.texi | 4 |
3 files changed, 23 insertions, 14 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index f71dfc1..9a5fdea 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2011-09-02 Pascal Obry <obry@adacore.com> + + * prj.adb: Minor code refactoring. Move check for null project in + Project_Changed. + * projects.texi: Fix minor typos. + 2011-09-02 Ed Schonberg <schonberg@adacore.com> * sem_ch5.adb (Analyze_Iterator_Specification): If the domain diff --git a/gcc/ada/prj.adb b/gcc/ada/prj.adb index 1245361..acf1bbe 100644 --- a/gcc/ada/prj.adb +++ b/gcc/ada/prj.adb @@ -366,8 +366,10 @@ package body Prj is procedure Project_Changed (Iter : in out Source_Iterator) is begin - Iter.Language := Iter.Project.Project.Languages; - Language_Changed (Iter); + if Iter.Project /= null then + Iter.Language := Iter.Project.Project.Languages; + Language_Changed (Iter); + end if; end Project_Changed; ---------------------- @@ -392,9 +394,7 @@ package body Prj is if Iter.All_Projects then Iter.Project := Iter.Project.Next; - if Iter.Project /= null then - Project_Changed (Iter); - end if; + Project_Changed (Iter); else Iter.Project := null; @@ -493,7 +493,6 @@ package body Prj is Tree : Project_Tree_Ref) is List : Project_List; - Agg : Aggregated_Project_List; begin if not Get (Seen, Project) then @@ -525,12 +524,16 @@ package body Prj is if Include_Aggregated and then Project.Qualifier = Aggregate then - Agg := Project.Aggregated_Projects; - while Agg /= null loop - pragma Assert (Agg.Project /= No_Project); - Recursive_Check (Agg.Project, Agg.Tree); - Agg := Agg.Next; - end loop; + declare + Agg : Aggregated_Project_List; + begin + Agg := Project.Aggregated_Projects; + while Agg /= null loop + pragma Assert (Agg.Project /= No_Project); + Recursive_Check (Agg.Project, Agg.Tree); + Agg := Agg.Next; + end loop; + end; end if; if Imported_First then diff --git a/gcc/ada/projects.texi b/gcc/ada/projects.texi index 6f87ba5..ff0fac7 100644 --- a/gcc/ada/projects.texi +++ b/gcc/ada/projects.texi @@ -2307,7 +2307,7 @@ attributes and packages are forbidden in an aggregate project. Here is the @itemize @bullet @item Languages -@item Source_files, Source_List_File and other attributes dealing with +@item Source_Files, Source_List_File and other attributes dealing with list of sources. @item Source_Dirs, Exec_Dir and Object_Dir @item Library_Dir, Library_Name and other library-related attributes @@ -2317,7 +2317,7 @@ attributes and packages are forbidden in an aggregate project. Here is the @item Inherit_Source_Path @item Excluded_Source_Dirs @item Locally_Removed_Files -@item Excluded_Source_Fies +@item Excluded_Source_Files @item Excluded_Source_List_File @item Interfaces @end itemize |