FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

prj-nmsc.adb: (Ada_Check): Migrate drom Ada_Default_...

Browse source 
* prj-nmsc.adb: (Ada_Check): Migrate drom Ada_Default_... to
	Default_Ada_...

	* prj.adb: (Ada_Default_Spec_Suffix, Ada_Default_Impl_Suffix):
	Remove functions.
	(Default_Ada_Spec_Suffix, Default_Ada_Impl_Suffix): Move to spec.

	* prj.ads: (Ada_Default_Spec_Suffix, Ada_Default_Impl_Suffix):
	Remove functions.
	(Default_Ada_Spec_Suffix, Default_Ada_Impl_Suffix): Move from body.

From-SVN: r48123
This commit is contained in:
Geert Bosch 2001-12-17 21:50:03 +01:00
parent d6c1ace7a3
commit b1085d2daa
3 changed files with 13 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gcc/ada/prj-nmsc.adb
View file

@ -638,7 +638,7 @@ package body Prj.Nmsc is
Data.Naming.Current_Spec_Suffix := Ada_Spec_Suffix;
else
Data.Naming.Current_Spec_Suffix := Ada_Default_Spec_Suffix;
Data.Naming.Current_Spec_Suffix := Default_Ada_Spec_Suffix;
end if;
end;
@ -662,7 +662,7 @@ package body Prj.Nmsc is
Data.Naming.Current_Impl_Suffix := Ada_Impl_Suffix;
else
Data.Naming.Current_Impl_Suffix := Ada_Default_Impl_Suffix;
Data.Naming.Current_Impl_Suffix := Default_Ada_Impl_Suffix;
end if;
end;
@ -713,9 +713,9 @@ package body Prj.Nmsc is
Check_Ada_Naming_Scheme (Data.Naming);
else
Data.Naming.Current_Spec_Suffix := Ada_Default_Spec_Suffix;
Data.Naming.Current_Impl_Suffix := Ada_Default_Impl_Suffix;
Data.Naming.Separate_Suffix := Ada_Default_Impl_Suffix;
Data.Naming.Current_Spec_Suffix := Default_Ada_Spec_Suffix;
Data.Naming.Current_Impl_Suffix := Default_Ada_Impl_Suffix;
Data.Naming.Separate_Suffix := Default_Ada_Impl_Suffix;
end if;
end;

21
gcc/ada/prj.adb
View file

@ -43,9 +43,6 @@ package body Prj is
The_Empty_String : String_Id;
Default_Ada_Spec_Suffix : Name_Id := No_Name;
Default_Ada_Impl_Suffix : Name_Id := No_Name;
subtype Known_Casing is Casing_Type range All_Upper_Case .. Mixed_Case;
The_Casing_Images : array (Known_Casing) of String_Access :=
@ -108,24 +105,6 @@ package body Prj is
Flag1 => False,
Flag2 => False);
-----------------------------
-- Ada_Default_Spec_Suffix --
-----------------------------
function Ada_Default_Spec_Suffix return Name_Id is
begin
return Default_Ada_Spec_Suffix;
end Ada_Default_Spec_Suffix;
-----------------------------
-- Ada_Default_Impl_Suffix --
-----------------------------
function Ada_Default_Impl_Suffix return Name_Id is
begin
return Default_Ada_Impl_Suffix;
end Ada_Default_Impl_Suffix;
-------------------
-- Empty_Project --
-------------------

16
gcc/ada/prj.ads
View file

@ -40,6 +40,14 @@ with Types; use Types;
package Prj is
Default_Ada_Spec_Suffix : Name_Id := No_Name;
-- The Name_Id for the standard GNAT suffix for Ada spec source file
-- name ".ads". Initialized by Prj.Initialize.
Default_Ada_Impl_Suffix : Name_Id := No_Name;
-- The Name_Id for the standard GNAT suffix for Ada body source file
-- name ".adb". Initialized by Prj.Initialize.
type Put_Line_Access is access procedure (Line : String);
-- Use to customize error reporting in Prj.Proc and Prj.Nmsc.
@ -466,14 +474,6 @@ package Prj is
-- it is called for B. With_State may be used by Action to choose a
-- behavior or to report some global result.
function Ada_Default_Spec_Suffix return Name_Id;
-- Return the Name_Id for the standard GNAT suffix for Ada spec source
-- file name ".ads".
function Ada_Default_Impl_Suffix return Name_Id;
-- Return the Name_Id for the standard GNAT suffix for Ada body source
-- file name ".adb".
private
procedure Scan;