diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-08-04 11:22:03 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-08-04 11:22:03 +0200 |
| commit | 0180fd267e87d29e79230628d2a3858d89f498ca (patch) | |
| tree | e66a7f20bfc819cec36dd2b9951ce8f23678a83e /gcc/ada/prj-nmsc.adb | |
| parent | 78efd7125942f0707f1853749c8a77f498061635 (diff) | |
| download | gcc-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-nmsc.adb')
| -rw-r--r-- | gcc/ada/prj-nmsc.adb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index a2058e2..70d0b2b 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -6262,7 +6262,7 @@ package body Prj.Nmsc is Source_File_Path_Name : constant String := Path_Name_Of (File_Name_Type (Source_List_File.Value), - Project.Project.Directory.Name); + Project.Project.Directory.Display_Name); begin Has_Explicit_Sources := True; @@ -7819,6 +7819,9 @@ package body Prj.Nmsc is The_Directory : constant String := Get_Name_String (Directory); begin + Debug_Output ("Path_Name_Of file_name=", Name_Id (File_Name)); + Debug_Output ("Path_Name_Of directory=", + Name_Id (Directory)); Get_Name_String (File_Name); Result := Locate_Regular_File @@ -7829,10 +7832,9 @@ package body Prj.Nmsc is return ""; else declare - R : String := Result.all; + R : constant String := Result.all; begin Free (Result); - Canonical_Case_File_Name (R); return R; end; end if; |