diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-06-23 11:49:38 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-06-23 11:49:38 +0200 |
| commit | d6a24cdbbf6412c8b716a9dfddefb0b6796222b6 (patch) | |
| tree | 8c7c8114c8cd4bd5b787f13806517937d979cc1a /gcc/ada/prj-part.adb | |
| parent | f91c36dc88741e66ea0210ac26b8bea004b1d776 (diff) | |
| download | gcc-d6a24cdbbf6412c8b716a9dfddefb0b6796222b6.zip gcc-d6a24cdbbf6412c8b716a9dfddefb0b6796222b6.tar.gz gcc-d6a24cdbbf6412c8b716a9dfddefb0b6796222b6.tar.bz2 | |
[multiple changes]
2009-06-23 Javier Miranda <miranda@adacore.com>
* exp_ch4.adb (Displace_Allocator_Pointer, Expand_N_Allocator): Handle
designated types referencing entities from the limited view.
2009-06-23 Matthew Gingell <gingell@adacore.com>
* a-stzhas.ads, a-szfzha.ads: Fix typo.
* Makefile.rtl: Ada.Strings.Wide_Wide_Fixed.Wide_Wide_Hash depends on
Ada.Strings.Wide_Wide_Hash. So we need to include a-stzhas in
the list of RTS files.
2009-06-23 Thomas Quinot <quinot@adacore.com>
* ali.adb: Minor reformatting
2009-06-23 Ed Schonberg <schonberg@adacore.com>
* sem_ch8.adb: Improve error message.
2009-06-23 Emmanuel Briot <briot@adacore.com>
* prj-nmsc.adb: Minor reformating
* prj-conf.adb, prj-conf.ads: Remove use of Osint.Fail everywhere
(Do_Autoconf): accepts an empty Normalized_Hostname
(Process_Project_And_Apply_Config): New subprogram
(Parse_Project_And_Apply_Config): On_Load_Config now applies to the
project tree rather than the project view.
* prj-part.adb, prj.ads (Project_Qualifier): New possible value
Configuration.
From-SVN: r148838
Diffstat (limited to 'gcc/ada/prj-part.adb')
| -rw-r--r-- | gcc/ada/prj-part.adb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gcc/ada/prj-part.adb b/gcc/ada/prj-part.adb index 871517c..3c203f0 100644 --- a/gcc/ada/prj-part.adb +++ b/gcc/ada/prj-part.adb @@ -1218,6 +1218,7 @@ package body Prj.Part is Token_Ptr); end if; + Proj_Qualifier := Configuration; Scan (In_Tree); when others => @@ -1225,8 +1226,18 @@ package body Prj.Part is end case; end if; + if Is_Config_File and then Proj_Qualifier = Unspecified then + -- Set the qualifier to Configuration, even if the token doesn't + -- exist in the source file itself, so that we can differentiate + -- project files and configuration files later on. + + Proj_Qualifier := Configuration; + end if; + if Proj_Qualifier /= Unspecified then - if Is_Config_File then + if Is_Config_File + and then Proj_Qualifier /= Configuration + then Error_Msg ("a configuration project cannot be qualified except " & "as configuration project", Qualifier_Location); |