vhdl: refactoring: remove configure function with string access.

4 files changed, 14 insertions, 29 deletions

diff --git a/src/vhdl/translate/ortho_front.adb b/src/vhdl/translate/ortho_front.adb
index 935d5c9d0..77d5c73a3 100644
--- a/src/vhdl/translate/ortho_front.adb
+++ b/src/vhdl/translate/ortho_front.adb
@@ -61,9 +61,9 @@ package body Ortho_Front is
    Action : Action_Type := Action_Compile;
 
    --  Name of the entity to elaborate.
-   Elab_Entity : String_Acc;
+   Elab_Entity : Name_Id;
    --  Name of the architecture to elaborate.
-   Elab_Architecture : String_Acc;
+   Elab_Architecture : Name_Id;
    --  Filename for the list of files to link.
    Elab_Filelist : String_Acc;
 
@@ -89,15 +89,15 @@ package body Ortho_Front is
       Options.Initialize;
 
       Elab_Filelist := null;
-      Elab_Entity := null;
-      Elab_Architecture := null;
+      Elab_Entity := Null_Identifier;
+      Elab_Architecture := Null_Identifier;
       Flag_Expect_Failure := False;
    end Init;
 
    function Decode_Elab_Option (Arg : String_Acc; Cmd : String)
                                return Natural is
    begin
-      Elab_Architecture := null;
+      Elab_Architecture := Null_Identifier;
       --  Entity (+ architecture) to elaborate
       if Arg = null then
          Error_Msg_Option
@@ -146,12 +146,14 @@ package body Ortho_Front is
                   P := P - 1;
                end if;
             end loop;
-            Elab_Architecture := new String'(Arg (P + 1 .. Arg'Last - 1));
-            Elab_Entity := new String'(Arg (Arg'First .. P - 1));
+            Elab_Architecture :=
+              Name_Table.Get_Identifier (Arg (P + 1 .. Arg'Last - 1));
+            Elab_Entity :=
+              Name_Table.Get_Identifier (Arg (Arg'First .. P - 1));
          end;
       else
-         Elab_Entity := new String'(Arg.all);
-         Elab_Architecture := new String'("");
+         Elab_Entity := Name_Table.Get_Identifier (Arg.all);
+         Elab_Architecture := Null_Identifier;
       end if;
       return 2;
    end Decode_Elab_Option;
@@ -552,7 +554,7 @@ package body Ortho_Front is
             Shlib_Interning.Init;
 
             Config := Vhdl.Configuration.Configure
-              (Elab_Entity.all, Elab_Architecture.all);
+              (Elab_Entity, Elab_Architecture);
             if Errorout.Nbr_Errors > 0 then
                --  This may happen (bad entity for example).
                raise Compilation_Error;
@@ -606,7 +608,7 @@ package body Ortho_Front is
             Flags.Flag_Elaborate := True;
             Flags.Flag_Only_Elab_Warnings := False;
             Config := Vhdl.Configuration.Configure
-              (Elab_Entity.all, Elab_Architecture.all);
+              (Elab_Entity, Elab_Architecture);
             Translation.Elaborate (Config, True);
 
             if Errorout.Nbr_Errors > 0 then
diff --git a/src/vhdl/vhdl-configuration.adb b/src/vhdl/vhdl-configuration.adb
index c3d2db613..573a0b435 100644
--- a/src/vhdl/vhdl-configuration.adb
+++ b/src/vhdl/vhdl-configuration.adb
@@ -685,20 +685,6 @@ package body Vhdl.Configuration is
       return Top;
    end Configure;
 
-   function Configure (Primary : String; Secondary : String) return Iir
-   is
-      Primary_Id : Name_Id;
-      Secondary_Id : Name_Id;
-   begin
-      Primary_Id := Get_Identifier (Primary);
-      if Secondary /= "" then
-         Secondary_Id := Get_Identifier (Secondary);
-      else
-         Secondary_Id := Null_Identifier;
-      end if;
-      return Configure (Primary_Id, Secondary_Id);
-   end Configure;
-
    procedure Check_Entity_Declaration_Top (Entity : Iir_Entity_Declaration)
    is
       Has_Error : Boolean := False;
diff --git a/src/vhdl/vhdl-configuration.ads b/src/vhdl/vhdl-configuration.ads
index d38b90366..c6a5105cd 100644
--- a/src/vhdl/vhdl-configuration.ads
+++ b/src/vhdl/vhdl-configuration.ads
@@ -38,9 +38,6 @@ package Vhdl.Configuration is
    function Configure (Primary_Id : Name_Id; Secondary_Id : Name_Id)
      return Iir;
 
-   --  Likewise but directly from strings.
-   function Configure (Primary : String; Secondary : String) return Iir;
-
    --  Add design unit UNIT (with its dependences) in the design_units table.
    procedure Add_Design_Unit (Unit : Iir_Design_Unit; From : Iir);
 
diff --git a/src/vhdl/vhdl-scanner.ads b/src/vhdl/vhdl-scanner.ads
index e6eedb0b8..1e18cc62f 100644
--- a/src/vhdl/vhdl-scanner.ads
+++ b/src/vhdl/vhdl-scanner.ads
@@ -132,7 +132,7 @@ package Vhdl.Scanner is
    --  location of a missing token.
    function Get_Prev_Location return Location_Type;
 
-   --  Convert (canonicalize) an identifier stored in name_buffer/name_length.
+   --  Convert (canonicalize) identifier STR.
    --  Upper case letters are converted into lower case.
    --  Lexical checks are performed.
    --  This procedure is not used by Scan, but should be used for identifiers