synth: rename synth-context to synth-vhdl_context

16 files changed, 25 insertions, 25 deletions

diff --git a/src/ghdldrv/ghdlsynth.adb b/src/ghdldrv/ghdlsynth.adb
index d95ea55e3..7a55cafee 100644
--- a/src/ghdldrv/ghdlsynth.adb
+++ b/src/ghdldrv/ghdlsynth.adb
@@ -48,7 +48,7 @@ with Netlists.Errors;
 
 with Synthesis;
 with Synth.Disp_Vhdl;
-with Synth.Context; use Synth.Context;
+with Synth.Vhdl_Context; use Synth.Vhdl_Context;
 with Synth.Flags; use Synth.Flags;
 
 package body Ghdlsynth is
@@ -492,7 +492,7 @@ package body Ghdlsynth is
       Set_Elab_Flag (Vhdl.Std_Package.Std_Standard_Unit, False);
 
       Vhdl.Annotations.Finalize_Annotate;
-      Synth.Context.Free_Base_Instance;
+      Synth.Vhdl_Context.Free_Base_Instance;
       return Res;
 
    exception
diff --git a/src/synth/synth-aggr.ads b/src/synth/synth-aggr.ads
index 41e99d932..d37cd8afe 100644
--- a/src/synth/synth-aggr.ads
+++ b/src/synth/synth-aggr.ads
@@ -20,7 +20,7 @@ with Vhdl.Nodes; use Vhdl.Nodes;
 
 with Synth.Objtypes; use Synth.Objtypes;
 with Synth.Values; use Synth.Values;
-with Synth.Context; use Synth.Context;
+with Synth.Vhdl_Context; use Synth.Vhdl_Context;
 
 package Synth.Aggr is
    --  Aggr_Type is the type from the context.
diff --git a/src/synth/synth-debugger.ads b/src/synth/synth-debugger.ads
index b330f4b78..329bab3e2 100644
--- a/src/synth/synth-debugger.ads
+++ b/src/synth/synth-debugger.ads
@@ -18,7 +18,7 @@
 
 with Vhdl.Nodes; use Vhdl.Nodes;
 
-with Synth.Context; use Synth.Context;
+with Synth.Vhdl_Context; use Synth.Vhdl_Context;
 
 package Synth.Debugger is
    --  If true, debugging is enabled:
diff --git a/src/synth/synth-decls.ads b/src/synth/synth-decls.ads
index c8a0bc0c7..d227bdbe1 100644
--- a/src/synth/synth-decls.ads
+++ b/src/synth/synth-decls.ads
@@ -19,7 +19,7 @@
 with Vhdl.Nodes; use Vhdl.Nodes;
 
 with Netlists; use Netlists;
-with Synth.Context; use Synth.Context;
+with Synth.Vhdl_Context; use Synth.Vhdl_Context;
 with Synth.Objtypes; use Synth.Objtypes;
 
 package Synth.Decls is
diff --git a/src/synth/synth-disp_vhdl.ads b/src/synth/synth-disp_vhdl.ads
index 8d1f98d48..39706a085 100644
--- a/src/synth/synth-disp_vhdl.ads
+++ b/src/synth/synth-disp_vhdl.ads
@@ -18,7 +18,7 @@
 
 with Netlists; use Netlists;
 with Vhdl.Nodes; use Vhdl.Nodes;
-with Synth.Context; use Synth.Context;
+with Synth.Vhdl_Context; use Synth.Vhdl_Context;
 
 package Synth.Disp_Vhdl is
    --  Disp ENT (like the original text) and its content as a wrapper.
diff --git a/src/synth/synth-environment.adb b/src/synth/synth-environment.adb
index 1091c1694..c791c5a2d 100644
--- a/src/synth/synth-environment.adb
+++ b/src/synth/synth-environment.adb
@@ -31,7 +31,7 @@ with Name_Table;
 with Synth.Flags;
 with Synth.Errors; use Synth.Errors;
 with Synth.Source; use Synth.Source;
-with Synth.Context;
+with Synth.Vhdl_Context;
 
 with Vhdl.Nodes;
 with Vhdl.Utils;
@@ -397,7 +397,7 @@ package body Synth.Environment is
             raise Internal_Error;
          when True =>
             --  Create a net.  No inference to do.
-            Res := Synth.Context.Get_Memtyp_Net (Ctxt, Asgn_Rec.Val.Val);
+            Res := Synth.Vhdl_Context.Get_Memtyp_Net (Ctxt, Asgn_Rec.Val.Val);
             if Wire_Rec.Kind = Wire_Enable then
                Connect (Get_Input (Get_Net_Parent (Outport), 0), Res);
             else
@@ -1154,7 +1154,7 @@ package body Synth.Environment is
       end case;
 
       if Asgn_Rec.Val.Is_Static = True then
-         return Synth.Context.Get_Memtyp_Net (Ctxt, Asgn_Rec.Val.Val);
+         return Synth.Vhdl_Context.Get_Memtyp_Net (Ctxt, Asgn_Rec.Val.Val);
       end if;
 
       --  Cannot be empty.
@@ -1217,7 +1217,7 @@ package body Synth.Environment is
 
       --  If the current value is static, just return it.
       if Get_Assign_Is_Static (First_Seq) then
-         return Context.Get_Partial_Memtyp_Net
+         return Vhdl_Context.Get_Partial_Memtyp_Net
            (Ctxt, Get_Assign_Static_Val (First_Seq), Off, Wd);
       end if;
 
@@ -1305,7 +1305,7 @@ package body Synth.Environment is
                      end if;
                      if Get_Assign_Is_Static (Seq) then
                         --  Extract from static value.
-                        Append (Vec, Context.Get_Partial_Memtyp_Net
+                        Append (Vec, Vhdl_Context.Get_Partial_Memtyp_Net
                                   (Ctxt, Get_Assign_Static_Val (Seq),
                                    Cur_Off, Cur_Wd));
                         exit;
@@ -1418,7 +1418,7 @@ package body Synth.Environment is
             when Unknown =>
                null;
             when True =>
-               N (I) := Context.Get_Partial_Memtyp_Net
+               N (I) := Vhdl_Context.Get_Partial_Memtyp_Net
                  (Ctxt, P (I).Val, Off, Wd);
             when False =>
                if Get_Partial_Offset (P (I).Asgns) <= Off then
@@ -1995,7 +1995,7 @@ package body Synth.Environment is
                N : Net;
                Pa : Partial_Assign;
             begin
-               N := Synth.Context.Get_Memtyp_Net (Ctxt, Asgn_Rec.Val.Val);
+               N := Synth.Vhdl_Context.Get_Memtyp_Net (Ctxt, Asgn_Rec.Val.Val);
                Pa := New_Partial_Assign (N, 0);
                Asgn_Rec.Val := (Is_Static => False, Asgns => Pa);
             end;
diff --git a/src/synth/synth-expr.ads b/src/synth/synth-expr.ads
index 2d977c70c..8dac335c4 100644
--- a/src/synth/synth-expr.ads
+++ b/src/synth/synth-expr.ads
@@ -29,7 +29,7 @@ with Netlists.Builders; use Netlists.Builders;
 with Synth.Source;
 with Synth.Objtypes; use Synth.Objtypes;
 with Synth.Values; use Synth.Values;
-with Synth.Context; use Synth.Context;
+with Synth.Vhdl_Context; use Synth.Vhdl_Context;
 
 package Synth.Expr is
    --  Perform a subtype conversion.  Check constraints.
diff --git a/src/synth/synth-files_operations.ads b/src/synth/synth-files_operations.ads
index 60d94ec4e..8d95a7cec 100644
--- a/src/synth/synth-files_operations.ads
+++ b/src/synth/synth-files_operations.ads
@@ -20,7 +20,7 @@ with Vhdl.Nodes; use Vhdl.Nodes;
 
 with Synth.Source; use Synth.Source;
 with Synth.Values; use Synth.Values;
-with Synth.Context; use Synth.Context;
+with Synth.Vhdl_Context; use Synth.Vhdl_Context;
 
 package Synth.Files_Operations is
    --  Raised in case of un-recoverable error.
diff --git a/src/synth/synth-insts.ads b/src/synth/synth-insts.ads
index 650c56248..f0ac690e6 100644
--- a/src/synth/synth-insts.ads
+++ b/src/synth/synth-insts.ads
@@ -18,7 +18,7 @@
 
 with Vhdl.Nodes; use Vhdl.Nodes;
 
-with Synth.Context; use Synth.Context;
+with Synth.Vhdl_Context; use Synth.Vhdl_Context;
 with Synth.Flags; use Synth.Flags;
 
 package Synth.Insts is
diff --git a/src/synth/synth-oper.ads b/src/synth/synth-oper.ads
index 68e5af975..c3d84dec6 100644
--- a/src/synth/synth-oper.ads
+++ b/src/synth/synth-oper.ads
@@ -20,7 +20,7 @@ with Vhdl.Nodes; use Vhdl.Nodes;
 
 with Synth.Objtypes; use Synth.Objtypes;
 with Synth.Values; use Synth.Values;
-with Synth.Context; use Synth.Context;
+with Synth.Vhdl_Context; use Synth.Vhdl_Context;
 
 package Synth.Oper is
    function Synth_Predefined_Function_Call
diff --git a/src/synth/synth-static_oper.ads b/src/synth/synth-static_oper.ads
index 93fcdd28b..3178c6448 100644
--- a/src/synth/synth-static_oper.ads
+++ b/src/synth/synth-static_oper.ads
@@ -17,7 +17,7 @@
 --  along with this program.  If not, see <gnu.org/licenses>.
 
 with Synth.Objtypes; use Synth.Objtypes;
-with Synth.Context; use Synth.Context;
+with Synth.Vhdl_Context; use Synth.Vhdl_Context;
 
 with Vhdl.Nodes; use Vhdl.Nodes;
 
diff --git a/src/synth/synth-static_proc.ads b/src/synth/synth-static_proc.ads
index 516e50135..810918f36 100644
--- a/src/synth/synth-static_proc.ads
+++ b/src/synth/synth-static_proc.ads
@@ -16,7 +16,7 @@
 --  You should have received a copy of the GNU General Public License
 --  along with this program.  If not, see <gnu.org/licenses>.
 
-with Synth.Context; use Synth.Context;
+with Synth.Vhdl_Context; use Synth.Vhdl_Context;
 with Vhdl.Nodes; use Vhdl.Nodes;
 
 package Synth.Static_Proc is
diff --git a/src/synth/synth-stmts.ads b/src/synth/synth-stmts.ads
index 91dc62256..f240ca33e 100644
--- a/src/synth/synth-stmts.ads
+++ b/src/synth/synth-stmts.ads
@@ -23,7 +23,7 @@ with Netlists; use Netlists;
 
 with Synth.Objtypes; use Synth.Objtypes;
 with Synth.Values; use Synth.Values;
-with Synth.Context; use Synth.Context;
+with Synth.Vhdl_Context; use Synth.Vhdl_Context;
 with Synth.Environment; use Synth.Environment;
 
 package Synth.Stmts is
diff --git a/src/synth/synth-context.adb b/src/synth/synth-vhdl_context.adb
index 4fa3e9ca6..2a497ae0f 100644
--- a/src/synth/synth-context.adb
+++ b/src/synth/synth-vhdl_context.adb
@@ -29,7 +29,7 @@ with Netlists.Folds; use Netlists.Folds;
 with Synth.Expr; use Synth.Expr;
 with Netlists.Locations;
 
-package body Synth.Context is
+package body Synth.Vhdl_Context is
    function Make_Base_Instance return Synth_Instance_Acc
    is
       Base : Base_Instance_Acc;
@@ -559,4 +559,4 @@ package body Synth.Context is
             raise Internal_Error;
       end case;
    end Get_Net;
-end Synth.Context;
+end Synth.Vhdl_Context;
diff --git a/src/synth/synth-context.ads b/src/synth/synth-vhdl_context.ads
index a2952eca0..35972409f 100644
--- a/src/synth/synth-context.ads
+++ b/src/synth/synth-vhdl_context.ads
@@ -28,7 +28,7 @@ with Synth.Environment; use Synth.Environment;
 with Synth.Objtypes; use Synth.Objtypes;
 with Synth.Values; use Synth.Values;
 
-package Synth.Context is
+package Synth.Vhdl_Context is
    --  Values are stored into Synth_Instance, which is parallel to simulation
    --  Block_Instance_Type.
 
@@ -202,4 +202,4 @@ private
       --  Instance for synthesis.
       Objects : Objects_Array (1 .. Max_Objs);
    end record;
-end Synth.Context;
+end Synth.Vhdl_Context;
diff --git a/src/synth/synthesis.ads b/src/synth/synthesis.ads
index 9fb0b175a..e515f8002 100644
--- a/src/synth/synthesis.ads
+++ b/src/synth/synthesis.ads
@@ -20,7 +20,7 @@ with Vhdl.Nodes; use Vhdl.Nodes;
 
 with Netlists; use Netlists;
 
-with Synth.Context; use Synth.Context;
+with Synth.Vhdl_Context; use Synth.Vhdl_Context;
 with Synth.Flags; use Synth.Flags;
 
 package Synthesis is