From 27a38f0c1b1cf8a2af13882861511018d9f4c5c9 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Mon, 27 Jan 2020 18:54:17 +0100
Subject: ghdlcomp: renaming; allow files in any order for --synth.

---
 src/ghdldrv/ghdlcomp.adb  | 10 +++++-----
 src/ghdldrv/ghdlcomp.ads  | 10 ++++++++--
 src/ghdldrv/ghdlsynth.adb |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'src/ghdldrv')

diff --git a/src/ghdldrv/ghdlcomp.adb b/src/ghdldrv/ghdlcomp.adb
index a20ff932a..941ee62e9 100644
--- a/src/ghdldrv/ghdlcomp.adb
+++ b/src/ghdldrv/ghdlcomp.adb
@@ -213,7 +213,7 @@ package body Ghdlcomp is
       end if;
    end Compile_Analyze_Init;
 
-   procedure Compile_Analyze_File (File : String)
+   procedure Compile_Load_File (File : String)
    is
       Res : Iir_Design_File;
       Design : Iir;
@@ -232,9 +232,9 @@ package body Ghdlcomp is
          Libraries.Add_Design_Unit_Into_Library (Design);
          Design := Next_Design;
       end loop;
-   end Compile_Analyze_File;
+   end Compile_Load_File;
 
-   function Compile_Analyze_File2 (File : String) return Iir
+   function Compile_Analyze_File (File : String) return Iir
    is
       Id : constant Name_Id := Name_Table.Get_Identifier (File);
       Design_File : Iir_Design_File;
@@ -280,7 +280,7 @@ package body Ghdlcomp is
       end loop;
 
       return New_Design_File;
-   end Compile_Analyze_File2;
+   end Compile_Analyze_File;
 
    procedure Compile_Elaborate (Unit_Name : String_Access)
    is
@@ -372,7 +372,7 @@ package body Ghdlcomp is
                      Elab_Arg := I + 1;
                      exit;
                   else
-                     Compile_Analyze_File (Arg);
+                     Compile_Load_File (Arg);
                   end if;
                end;
             end loop;
diff --git a/src/ghdldrv/ghdlcomp.ads b/src/ghdldrv/ghdlcomp.ads
index c87676d20..396f550e7 100644
--- a/src/ghdldrv/ghdlcomp.ads
+++ b/src/ghdldrv/ghdlcomp.ads
@@ -96,8 +96,14 @@ package Ghdlcomp is
    --  Functionnal interface.
    --  Must be first initialized by Compile_Init
    procedure Compile_Analyze_Init (Load_Work : Boolean := True);
-   procedure Compile_Analyze_File (File : String);
-   function Compile_Analyze_File2 (File : String) return Iir;
+
+   --  Load and parse FILE, put library units in the work library (without
+   --  analyzing them).
+   procedure Compile_Load_File (File : String);
+
+   --  Load, parse and analyze FILE.
+   function Compile_Analyze_File (File : String) return Iir;
+
    procedure Compile_Elaborate (Unit_Name : String_Access);
    procedure Compile_Run;
 end Ghdlcomp;
diff --git a/src/ghdldrv/ghdlsynth.adb b/src/ghdldrv/ghdlsynth.adb
index 243120b21..739bd778f 100644
--- a/src/ghdldrv/ghdlsynth.adb
+++ b/src/ghdldrv/ghdlsynth.adb
@@ -201,7 +201,7 @@ package body Ghdlsynth is
                   return Null_Iir;
                end if;
             else
-               Design_File := Ghdlcomp.Compile_Analyze_File2 (Arg);
+               Ghdlcomp.Compile_Load_File (Arg);
             end if;
          end;
       end loop;
-- 
cgit v1.2.3