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

	* 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

diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb
index e12fe08b167f7f94be927371ec68875936201ba7..56075cf292d8c5ed0bc5d3d44afe34283ee7c70e 100644 (file)
--- a/gcc/ada/prj-nmsc.adb
+++ b/gcc/ada/prj-nmsc.adb
@@ -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;
 

diff --git a/gcc/ada/prj.adb b/gcc/ada/prj.adb
index 55fd9f0bcb7cd317776642b5e72ab77263ad505a..ca6758e55abfe3f4096059192d1691e77f3b5d71 100644 (file)
--- a/gcc/ada/prj.adb
+++ b/gcc/ada/prj.adb
@@ -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 --
    -------------------

diff --git a/gcc/ada/prj.ads b/gcc/ada/prj.ads
index d4b47784445ee86594daf79d5be29daace4cabd7..eb02bf4804aaf3877c7f6de1505ea73ae5adeb2b 100644 (file)
--- a/gcc/ada/prj.ads
+++ b/gcc/ada/prj.ads
@@ -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;