aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/prj-part.adb
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2011-08-04 11:22:03 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2011-08-04 11:22:03 +0200
commit0180fd267e87d29e79230628d2a3858d89f498ca (patch)
treee66a7f20bfc819cec36dd2b9951ce8f23678a83e /gcc/ada/prj-part.adb
parent78efd7125942f0707f1853749c8a77f498061635 (diff)
downloadgcc-0180fd267e87d29e79230628d2a3858d89f498ca.zip
gcc-0180fd267e87d29e79230628d2a3858d89f498ca.tar.gz
gcc-0180fd267e87d29e79230628d2a3858d89f498ca.tar.bz2
[multiple changes]
2011-08-04 Yannick Moy <moy@adacore.com> * sem_attr.adb (Result): modify error message for misplaced 'Result 2011-08-04 Sergey Rybin <rybin@adacore.com> * gnat_rm.texi (pragma Annotate): Fix syntax description to make it clear that the second argument must be an identifier. 2011-08-04 Thomas Quinot <quinot@adacore.com> * exp_ch9.adb (Build_Barrier_Function): When compiling with -fpreserve-control-flow, insert an IF statement on the barrier condition to ensure that a conditional branch instruction is generated. 2011-08-04 Emmanuel Briot <briot@adacore.com> * prj-part.adb, prj.adb, prj.ads, prj-tree.ads (Processing_Flags.Ignore_Missing_With): new flag. 2011-08-04 Emmanuel Briot <briot@adacore.com> * prj-nmsc.adb (Find_Sources, Path_Name_Of): Fix handling of Source_List_File on case-insensitive systems where the file is actually on a case-sensitive file system (NFS,...). 2011-08-04 Hristian Kirtchev <kirtchev@adacore.com> * sem_ch6.adb (Analyze_Function_Return): In a rare case where a function return contains a controlled [extension] aggregate and the return statement is not part of a handled sequence of statements, wrap the return in a block. This ensures that all controlled temporaries generated during aggregate resolution will be picked up by the finalization machinery. 2011-08-04 Ed Schonberg <schonberg@adacore.com> * sem_aggr.adb (Resolve_Aggregate): If aggregate has box-initialized components, freeze type before resolution, to ensure that default initializations are present for all components. * sem_res.adb (Resolve_Actuals): the designated object of an accces-to-constant type is a legal actual in a call to an initialization procedure. 2011-08-04 Hristian Kirtchev <kirtchev@adacore.com> * exp_util.adb (Extract_Renamed_Object): Add N_Type_Conversion and N_Unchecked_Type_Conversion to the possible containers of a renamed transient variable. From-SVN: r177343
Diffstat (limited to 'gcc/ada/prj-part.adb')
-rw-r--r--gcc/ada/prj-part.adb35
1 files changed, 21 insertions, 14 deletions
diff --git a/gcc/ada/prj-part.adb b/gcc/ada/prj-part.adb
index dbb5473..8985e97 100644
--- a/gcc/ada/prj-part.adb
+++ b/gcc/ada/prj-part.adb
@@ -460,6 +460,8 @@ package body Prj.Part is
Path_Name_Id : Path_Name_Type;
begin
+ In_Tree.Incomplete_With := False;
+
if not Is_Initialized (Env.Project_Path) then
Prj.Env.Initialize_Default_Project_Path
(Env.Project_Path, Target_Name);
@@ -794,24 +796,29 @@ package body Prj.Part is
Path => Imported_Path_Name_Id);
if Imported_Path_Name_Id = No_Path then
+ if Env.Flags.Ignore_Missing_With then
+ In_Tree.Incomplete_With := True;
- -- The project file cannot be found
+ else
+ -- The project file cannot be found
- Error_Msg_File_1 := File_Name_Type (Current_With.Path);
- Error_Msg
- (Env.Flags, "unknown project file: {", Current_With.Location);
+ Error_Msg_File_1 := File_Name_Type (Current_With.Path);
+ Error_Msg
+ (Env.Flags, "unknown project file: {",
+ Current_With.Location);
- -- If this is not imported by the main project file, display
- -- the import path.
+ -- If this is not imported by the main project file, display
+ -- the import path.
- if Project_Stack.Last > 1 then
- for Index in reverse 1 .. Project_Stack.Last loop
- Error_Msg_File_1 :=
- File_Name_Type
- (Project_Stack.Table (Index).Path_Name);
- Error_Msg
- (Env.Flags, "\imported by {", Current_With.Location);
- end loop;
+ if Project_Stack.Last > 1 then
+ for Index in reverse 1 .. Project_Stack.Last loop
+ Error_Msg_File_1 :=
+ File_Name_Type
+ (Project_Stack.Table (Index).Path_Name);
+ Error_Msg
+ (Env.Flags, "\imported by {", Current_With.Location);
+ end loop;
+ end if;
end if;
else