make.adb (Check_Mains, [...]): Adapt to name changes in package Prj (Current_Spec_Suffix => Ada_Spec_Suffix...

	* make.adb (Check_Mains, Switches_Of): Adapt to name changes in
	package Prj (Current_Spec_Suffix => Ada_Spec_Suffix,
	Current_Body_Suffix => Ada_Body_Suffix).
	Take into account Externally_Built attribute.

	* clean.adb (In_Extension_Chain): Always return False when one of the
	parameter is No_Project.
	(Clean_Project): Adapt to changes in package Prj (Lang_Ada =>
	Ada_Language_Index).
	(Gnatclean): Adapt to change in package Prj.Pars (no parameter
	Process_Languages for procedure Parse).

	* gnatcmd.adb (Carg_Switches): New table.
	(GNATCmd): Put all switches following -cargs in the Carg_Switches table.
	Adapt to name changes in package Prj (Current_Spec_Suffix =>
	Ada_Spec_Suffix, Current_Body_Suffix => Ada_Body_Suffix).

	* mlib-prj.adb: Adapt to changes in packages Prj and Prj.Com: type
	Header_Num and function Hash are now declared in package Prj,
	not Prj.Com.

	* prj.adb (Suffix_Of): New function.
	(Set (Suffix)): New procedure.
	(Hash): One function moved from Prj.Com
	(Is_Present, Language_Processing_Data_Of): New functions
	(Set): Two new procedures
	(Add_Language_Name, Display_Language_Name): New procedures

	* prj.ads: (Suffix_Of): New function
	(Set (Suffix)): New procedure
	Add several types and tables for multi-language support.
	(Header_Num): Type moved from Prj.Com
	(Hash): Two functions moved from Prj.Com
	(Is_Present, Language_Processing_Data_Of): New functions
	(Set): Two new procedures
	(Add_Language_Name, Display_Language_Name): New procedures
	(Naming): Component name changes:
	Current_Spec_Suffix => Ada_Spec_Suffix,
	Current_Body_Suffix => Ada_Body_Suffix. Add new components:
	Impl_Suffixes, Supp_Suffixes.
	(Project_Data): New components: Externally_Built, Supp_Languages,
	First_Language_Processing, Supp_Language_Processing, Default_Linker,
	Default_Linker_Path.

	* prj-attr.adb: Add new attributes Ada_Roots and Externally_Built and
	new package Language_Processing with its attributes (Compiler_Driver,
	Compiler_Kind, Dependency_Option, Compute_Dependency, Include_Option,
	Binder_Driver, Default_Linker).

	* prj-com.ads, prj-com.adb (Hash): Function moved to package Prj.
	(Header_Num): Type moved to package Prj

	* prj-env.adb: Adapt to name changes in package Prj
	(Current_Spec_Suffix => Ada_Spec_Suffix,
	Current_Body_Suffix => Ada_Body_Suffix).

	* prj-ext.adb: Add the default project dir (<prefix>/log/gnat) by
	default to the project path, except the "-" is one of the directories
	in env var ADA_PROJECT_PATH.
	(Current_Project_Path): Global variable, replacing Project_Path
	that was in the body of Prj.Part.
	(Project_Path): New function
	(Set_Project_Path): New procedure
	Initialize Current_Project_Path during elaboration of the package
	Remove dependency on Prj.Com, no longer needed

	* prj-ext.ads (Project_Path): New function
	(Set_Project_Path): New procedure

	* prj-nmsc.adb (Body_Suffix_Of): New function. Returns .<lang> when no
	suffix is defined for language <lang>.
	(Find_Sources, Record_Other_Sources): Use Body_Suffix_Of, instead of
	accessing directly the components of Naming.
	(Look_For_Sources): Use Set (Suffix) to set the suffix of a language.
	Reorganise of this package.
	Break procedure Check in several procedures.

	* prj-nmsc.ads: Replace all procedures (Ada_Check,
	Other_Languages_Check and Language_Independent_Check) with a single
	procedure Check.

	* prj-pars.ads, prj-pars.adb (Parse): Remove parameter
	Process_Languages, no longer needed.

	* prj-part.adb (Project_Path): Move to the body of Prj.Ext as
	Current_Project_Path.
	Remove elaboration code, moved to the body of Prj.Ext
	Use new function Prj.Ext.Project_Path instead of old variable
	Project_Path.
	(Post_Parse_Context_Clause): Get Resolved_Path as a case-sensitive path.
	When comparing with project paths on the stack, first put the resolved
	path in canonical case.
	(Parse_Single_Project): Set the path name of the project file in the
	tree to the normalized path.

	* prj-proc.ads, prj-proc.adb (Check, Recursive_Check, Process): Remove
	parameter Process_Languages, no longer needed.
	(Recursive_Check): Call Prj.Nmsc.Check, instead of Ada_Check and
	Other_Languages_Check.

	* prj-tree.ads (Project_Name_And_Node): New component Canonical_Path
	to store the resolved canonical path of the project file.
	Remove dependency to Prj.Com, no longer needed

	* prj-util.adb: Adapt to name changes in package Prj
	(Current_Spec_Suffix => Ada_Spec_Suffix, Current_Body_Suffix =>
	Ada_Body_Suffix).

	* snames.ads, snames.adb: New standard names: Ada_Roots, Binder_Driver,
	Compiler_Driver, Compiler_Kind, Compute_Dependency, Default_Linker,
	Externally_Built, Include_Option, Language_Processing.

	* makegpr.adb: Numerous changes due to changes in packages
	Prj and Prj.Nmsc.

	* gnatls.adb: Add the default project dir (<prefix>/log/gnat) by
	default to the project path, except whe "-" is one of the directories
	in env var ADA_PROJECT_PATH.
	(Gnatls): In verbose mode, add the new section "Project Search Path:"

From-SVN: r91877

1 files changed, 62 insertions, 51 deletions

diff --git a/gcc/ada/snames.ads b/gcc/ada/snames.ads
index 10eb49b..4fb6c25 100644
--- a/gcc/ada/snames.ads
+++ b/gcc/ada/snames.ads
@@ -921,64 +921,75 @@ package Snames is
 
    Name_Raise_Exception                : constant Name_Id := N + 568;
 
-   --  Additional reserved words in GNAT Project Files
+   --  Additional reserved words and identifiers used in GNAT Project Files
    --  Note that Name_External is already previously declared
 
-   Name_Binder                         : constant Name_Id := N + 569;
-   Name_Body_Suffix                    : constant Name_Id := N + 570;
-   Name_Builder                        : constant Name_Id := N + 571;
-   Name_Compiler                       : constant Name_Id := N + 572;
-   Name_Cross_Reference                : constant Name_Id := N + 573;
-   Name_Default_Switches               : constant Name_Id := N + 574;
-   Name_Exec_Dir                       : constant Name_Id := N + 575;
-   Name_Executable                     : constant Name_Id := N + 576;
-   Name_Executable_Suffix              : constant Name_Id := N + 577;
-   Name_Extends                        : constant Name_Id := N + 578;
-   Name_Finder                         : constant Name_Id := N + 579;
-   Name_Global_Configuration_Pragmas   : constant Name_Id := N + 580;
-   Name_Gnatls                         : constant Name_Id := N + 581;
-   Name_Gnatstub                       : constant Name_Id := N + 582;
-   Name_Implementation                 : constant Name_Id := N + 583;
-   Name_Implementation_Exceptions      : constant Name_Id := N + 584;
-   Name_Implementation_Suffix          : constant Name_Id := N + 585;
-   Name_Languages                      : constant Name_Id := N + 586;
-   Name_Library_Dir                    : constant Name_Id := N + 587;
-   Name_Library_Auto_Init              : constant Name_Id := N + 588;
-   Name_Library_GCC                    : constant Name_Id := N + 589;
-   Name_Library_Interface              : constant Name_Id := N + 590;
-   Name_Library_Kind                   : constant Name_Id := N + 591;
-   Name_Library_Name                   : constant Name_Id := N + 592;
-   Name_Library_Options                : constant Name_Id := N + 593;
-   Name_Library_Reference_Symbol_File  : constant Name_Id := N + 594;
-   Name_Library_Src_Dir                : constant Name_Id := N + 595;
-   Name_Library_Symbol_File            : constant Name_Id := N + 596;
-   Name_Library_Symbol_Policy          : constant Name_Id := N + 597;
-   Name_Library_Version                : constant Name_Id := N + 598;
-   Name_Linker                         : constant Name_Id := N + 599;
-   Name_Local_Configuration_Pragmas    : constant Name_Id := N + 600;
-   Name_Locally_Removed_Files          : constant Name_Id := N + 601;
-   Name_Metrics                        : constant Name_Id := N + 602;
-   Name_Naming                         : constant Name_Id := N + 603;
-   Name_Object_Dir                     : constant Name_Id := N + 604;
-   Name_Pretty_Printer                 : constant Name_Id := N + 605;
-   Name_Project                        : constant Name_Id := N + 606;
-   Name_Separate_Suffix                : constant Name_Id := N + 607;
-   Name_Source_Dirs                    : constant Name_Id := N + 608;
-   Name_Source_Files                   : constant Name_Id := N + 609;
-   Name_Source_List_File               : constant Name_Id := N + 610;
-   Name_Spec                           : constant Name_Id := N + 611;
-   Name_Spec_Suffix                    : constant Name_Id := N + 612;
-   Name_Specification                  : constant Name_Id := N + 613;
-   Name_Specification_Exceptions       : constant Name_Id := N + 614;
-   Name_Specification_Suffix           : constant Name_Id := N + 615;
-   Name_Switches                       : constant Name_Id := N + 616;
+   Name_Ada_Roots                      : constant Name_Id := N + 569;
+   Name_Binder                         : constant Name_Id := N + 570;
+   Name_Binder_Driver                  : constant Name_Id := N + 571;
+   Name_Body_Suffix                    : constant Name_Id := N + 572;
+   Name_Builder                        : constant Name_Id := N + 573;
+   Name_Compiler                       : constant Name_Id := N + 574;
+   Name_Compiler_Driver                : constant Name_Id := N + 575;
+   Name_Compiler_Kind                  : constant Name_Id := N + 576;
+   Name_Compute_Dependency             : constant Name_Id := N + 577;
+   Name_Cross_Reference                : constant Name_Id := N + 578;
+   Name_Default_Linker                 : constant Name_Id := N + 579;
+   Name_Default_Switches               : constant Name_Id := N + 580;
+   Name_Dependency_Option              : constant Name_Id := N + 581;
+   Name_Exec_Dir                       : constant Name_Id := N + 582;
+   Name_Executable                     : constant Name_Id := N + 583;
+   Name_Executable_Suffix              : constant Name_Id := N + 584;
+   Name_Extends                        : constant Name_Id := N + 585;
+   Name_Externally_Built               : constant Name_Id := N + 586;
+   Name_Finder                         : constant Name_Id := N + 587;
+   Name_Global_Configuration_Pragmas   : constant Name_Id := N + 588;
+   Name_Gnatls                         : constant Name_Id := N + 589;
+   Name_Gnatstub                       : constant Name_Id := N + 590;
+   Name_Implementation                 : constant Name_Id := N + 591;
+   Name_Implementation_Exceptions      : constant Name_Id := N + 592;
+   Name_Implementation_Suffix          : constant Name_Id := N + 593;
+   Name_Include_Option                 : constant Name_Id := N + 594;
+   Name_Language_Processing            : constant Name_Id := N + 595;
+   Name_Languages                      : constant Name_Id := N + 596;
+   Name_Library_Dir                    : constant Name_Id := N + 597;
+   Name_Library_Auto_Init              : constant Name_Id := N + 598;
+   Name_Library_GCC                    : constant Name_Id := N + 599;
+   Name_Library_Interface              : constant Name_Id := N + 600;
+   Name_Library_Kind                   : constant Name_Id := N + 601;
+   Name_Library_Name                   : constant Name_Id := N + 602;
+   Name_Library_Options                : constant Name_Id := N + 603;
+   Name_Library_Reference_Symbol_File  : constant Name_Id := N + 604;
+   Name_Library_Src_Dir                : constant Name_Id := N + 605;
+   Name_Library_Symbol_File            : constant Name_Id := N + 606;
+   Name_Library_Symbol_Policy          : constant Name_Id := N + 607;
+   Name_Library_Version                : constant Name_Id := N + 608;
+   Name_Linker                         : constant Name_Id := N + 609;
+   Name_Local_Configuration_Pragmas    : constant Name_Id := N + 610;
+   Name_Locally_Removed_Files          : constant Name_Id := N + 611;
+   Name_Metrics                        : constant Name_Id := N + 612;
+   Name_Naming                         : constant Name_Id := N + 613;
+   Name_Object_Dir                     : constant Name_Id := N + 614;
+   Name_Pretty_Printer                 : constant Name_Id := N + 615;
+   Name_Project                        : constant Name_Id := N + 616;
+   Name_Separate_Suffix                : constant Name_Id := N + 617;
+   Name_Source_Dirs                    : constant Name_Id := N + 618;
+   Name_Source_Files                   : constant Name_Id := N + 619;
+   Name_Source_List_File               : constant Name_Id := N + 620;
+   Name_Spec                           : constant Name_Id := N + 621;
+   Name_Spec_Suffix                    : constant Name_Id := N + 622;
+   Name_Specification                  : constant Name_Id := N + 623;
+   Name_Specification_Exceptions       : constant Name_Id := N + 624;
+   Name_Specification_Suffix           : constant Name_Id := N + 625;
+   Name_Switches                       : constant Name_Id := N + 626;
+
    --  Other miscellaneous names used in front end
 
-   Name_Unaligned_Valid                : constant Name_Id := N + 617;
+   Name_Unaligned_Valid                : constant Name_Id := N + 627;
 
    --  Mark last defined name for consistency check in Snames body
 
-   Last_Predefined_Name                : constant Name_Id := N + 617;
+   Last_Predefined_Name                : constant Name_Id := N + 627;
 
    subtype Any_Operator_Name is Name_Id range
      First_Operator_Name .. Last_Operator_Name;