summaryrefslogtreecommitdiff
path: root/gcc/ada/prj-nmsc.adb
diff options
context:
space:
mode:
authorRobert Dewar <dewar@adacore.com>2011-08-03 09:47:07 +0000
committerArnaud Charlet <charlet@gcc.gnu.org>2011-08-03 11:47:07 +0200
commite917aec294d1a0e602aaf31a70df3a784f7a48b9 (patch)
treebf32fcc18f39f261c97a358abbe5ce7237af61a1 /gcc/ada/prj-nmsc.adb
parent49bfcf43817fb7d36f168ef2ba992b652747e0b2 (diff)
downloadgcc-e917aec294d1a0e602aaf31a70df3a784f7a48b9.tar.gz
sem_aggr.adb, [...]: Minor reformatting
2011-08-03 Robert Dewar <dewar@adacore.com> * sem_aggr.adb, sem_ch3.adb, lib.ads, gnatcmd.adb, prj-proc.adb, make.adb, lib-writ.adb, prj-part.adb, prj-part.ads, prj-ext.adb, fname-uf.adb, prj-ext.ads, prj.adb, prj.ads, sem_attr.adb, alfa.adb, prj-makr.adb, errout.adb, makeutl.adb, makeutl.ads, restrict.ads, sem_ch6.adb, g-pehage.adb, clean.adb, put_alfa.adb, lib-xref-alfa.adb, prj-nmsc.adb, prj-nmsc.ads, sem_ch8.adb, prj-pars.ads, exp_aggr.adb, prj-attr.ads, sem_ch13.adb, get_alfa.adb, prj-env.adb, prj-env.ads, alfa_test.adb, prj-tree.adb, prj-tree.ads, einfo.ads: Minor reformatting 2011-08-03 Robert Dewar <dewar@adacore.com> * repinfo.adb (List_Mechanism): Add handling of Convention_Ada_Pass_By_XXX. * sem_mech.adb (Set_Mechanism): Ditto. * sem_prag.adb (Process_Convention): Add entries for Convention_Ada_Pass_By_XXX. * snames.adb-tmpl, snames.ads-tmpl: Ditto. From-SVN: r177252
Diffstat (limited to 'gcc/ada/prj-nmsc.adb')
-rw-r--r--gcc/ada/prj-nmsc.adb39
1 files changed, 20 insertions, 19 deletions
diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb
index d05af1b39f2..743a1fc79ca 100644
--- a/gcc/ada/prj-nmsc.adb
+++ b/gcc/ada/prj-nmsc.adb
@@ -197,8 +197,8 @@ package body Prj.Nmsc is
-- Free the memory occupied by Data
procedure Check
- (Project : Project_Id;
- Data : in out Tree_Processing_Data);
+ (Project : Project_Id;
+ Data : in out Tree_Processing_Data);
-- Process the naming scheme for a single project
procedure Initialize
@@ -241,12 +241,15 @@ package body Prj.Nmsc is
-- directories that match the globbing patterns found in Patterns (for
-- instance "**/*.adb"). Typically, Patterns will be the value of the
-- Source_Dirs or Excluded_Source_Dirs attributes.
+ --
-- Every time such a file or directory is found, the callback is called.
-- Resolve_Links indicates whether we should resolve links while
-- normalizing names.
+ --
-- In the callback, Pattern_Index is the index within Patterns where the
-- expanded pattern was found (1 for the first element of Patterns and
-- all its matching directories, then 2,...).
+ --
-- We use a generic and not an access-to-subprogram because in some cases
-- this code is compiled with the restriction No_Implicit_Dynamic_Code.
-- An error message is raised if a pattern does not match any file.
@@ -269,15 +272,12 @@ package body Prj.Nmsc is
Location : Source_Ptr := No_Location);
-- Add a new source to the different lists: list of all sources in the
-- project tree, list of source of a project and list of sources of a
- -- language.
- --
- -- If Path is specified, the file is also added to Source_Paths_HT.
- --
- -- Location is used for error messages
+ -- language. If Path is specified, the file is also added to
+ -- Source_Paths_HT. Location is used for error messages
function Canonical_Case_File_Name (Name : Name_Id) return File_Name_Type;
-- Same as Osint.Canonical_Case_File_Name but applies to Name_Id.
- -- This alters Name_Buffer
+ -- This alters Name_Buffer.
function Suffix_Matches
(Filename : String;
@@ -924,16 +924,16 @@ package body Prj.Nmsc is
---------------------------------
procedure Process_Aggregated_Projects
- (Tree : Project_Tree_Ref;
- Project : Project_Id;
- Node_Tree : Prj.Tree.Project_Node_Tree_Ref;
- Flags : Processing_Flags)
+ (Tree : Project_Tree_Ref;
+ Project : Project_Id;
+ Node_Tree : Prj.Tree.Project_Node_Tree_Ref;
+ Flags : Processing_Flags)
is
Data : Tree_Processing_Data :=
- (Tree => Tree,
- Node_Tree => Node_Tree,
- File_To_Source => Files_Htable.Nil,
- Flags => Flags);
+ (Tree => Tree,
+ Node_Tree => Node_Tree,
+ File_To_Source => Files_Htable.Nil,
+ Flags => Flags);
Project_Files : constant Prj.Variable_Value :=
Prj.Util.Value_Of
@@ -949,8 +949,7 @@ package body Prj.Nmsc is
procedure Expand_Project_Files is
new Expand_Subdirectory_Pattern (Callback => Found_Project_File);
-- Search for all project files referenced by the patterns given in
- -- parameter.
- -- Calls Found_Project_File for each of them
+ -- parameter. Calls Found_Project_File for each of them.
------------------------
-- Found_Project_File --
@@ -966,6 +965,7 @@ package body Prj.Nmsc is
-- can only do this when processing the aggregate project, since the
-- exact list of project files or project directories can depend on
-- scenario variables.
+ --
-- We only load the projects explicitly here, but do not process
-- them. For the processing, Prj.Proc will take care of processing
-- them, within the same call to Recursive_Process (thus avoiding the
@@ -1065,7 +1065,7 @@ package body Prj.Nmsc is
(Project : Project_Id;
Data : in out Tree_Processing_Data)
is
- Prj_Data : Project_Processing_Data;
+ Prj_Data : Project_Processing_Data;
begin
Debug_Increase_Indent ("Check", Project.Name);
@@ -6387,6 +6387,7 @@ package body Prj.Nmsc is
if Current_Verbosity = High then
Debug_Indent;
+
if Source.Path /= No_Path_Information then
Write_Line ("Setting full path for "
& Get_Name_String (Source.File)