Rework initialization and finalization.

libghdl can now be re-initialized.

4 files changed, 16 insertions, 4 deletions

diff --git a/src/vhdl/libghdl/libghdl.ads b/src/vhdl/libghdl/libghdl.ads
index 5326666b8..de2556069 100644
--- a/src/vhdl/libghdl/libghdl.ads
+++ b/src/vhdl/libghdl/libghdl.ads
@@ -36,7 +36,8 @@ package Libghdl is
    --  To be called before Analyze_File to initialize analysis.
    function Analyze_Init_Status return Integer;
 
-   --  Deprecated.  Raise an exception in case of error.
+   --  Deprecated, use Analyze_Init_Status instead.
+   --  Raise an exception in case of error.
    procedure Analyze_Init;
 
    --  Analyze one file.
diff --git a/src/vhdl/vhdl-nodes.adb b/src/vhdl/vhdl-nodes.adb
index f02857bd4..b879ba275 100644
--- a/src/vhdl/vhdl-nodes.adb
+++ b/src/vhdl/vhdl-nodes.adb
@@ -741,10 +741,14 @@ package body Vhdl.Nodes is
 
    procedure Initialize is
    begin
-      Nodet.Free;
       Nodet.Init;
    end Initialize;
 
+   procedure Finalize is
+   begin
+      Nodet.Free;
+   end Finalize;
+
    function Is_Null (Node : Iir) return Boolean is
    begin
       return Node = Null_Iir;
diff --git a/src/vhdl/vhdl-nodes.adb.in b/src/vhdl/vhdl-nodes.adb.in
index e35ed1832..5f98405a3 100644
--- a/src/vhdl/vhdl-nodes.adb.in
+++ b/src/vhdl/vhdl-nodes.adb.in
@@ -741,10 +741,14 @@ package body Vhdl.Nodes is
 
    procedure Initialize is
    begin
-      Nodet.Free;
       Nodet.Init;
    end Initialize;
 
+   procedure Finalize is
+   begin
+      Nodet.Free;
+   end Finalize;
+
    function Is_Null (Node : Iir) return Boolean is
    begin
       return Node = Null_Iir;
diff --git a/src/vhdl/vhdl-nodes.ads b/src/vhdl/vhdl-nodes.ads
index fb92c5882..855dccebd 100644
--- a/src/vhdl/vhdl-nodes.ads
+++ b/src/vhdl/vhdl-nodes.ads
@@ -7338,9 +7338,12 @@ package Vhdl.Nodes is
    type Free_Iir_Hook is access procedure (N : Iir);
    procedure Register_Free_Hook (Hook : Free_Iir_Hook);
 
-   --  Free all and reinit.
+   --  Initialize.
    procedure Initialize;
 
+   --  Free all the memory.
+   procedure Finalize;
+
    --  Disp statistics about node usage.
    procedure Disp_Stats;