vhdl: move evaluation to vhdl child.

18 files changed, 28 insertions, 28 deletions

diff --git a/src/vhdl/simulate/simul-elaboration.adb b/src/vhdl/simulate/simul-elaboration.adb
index 3addbef91..a961aeeae 100644
--- a/src/vhdl/simulate/simul-elaboration.adb
+++ b/src/vhdl/simulate/simul-elaboration.adb
@@ -19,7 +19,7 @@
 with Ada.Text_IO;
 with Str_Table;
 with Errorout; use Errorout;
-with Evaluation;
+with Vhdl.Evaluation;
 with Simul.Execution; use Simul.Execution;
 with Iirs_Utils; use Iirs_Utils;
 with Libraries;
@@ -2861,7 +2861,7 @@ package body Simul.Elaboration is
 
    function Override_Generic (Formal : Iir; Str : String) return Iir
    is
-      use Evaluation;
+      use Vhdl.Evaluation;
       Formal_Type : constant Iir := Get_Type (Formal);
       Formal_Btype : constant Iir := Get_Base_Type (Formal_Type);
       Res : Iir;
diff --git a/src/vhdl/simulate/simul-execution.adb b/src/vhdl/simulate/simul-execution.adb
index 59d91c8ef..d40a093cb 100644
--- a/src/vhdl/simulate/simul-execution.adb
+++ b/src/vhdl/simulate/simul-execution.adb
@@ -23,7 +23,7 @@ with Grt.Types; use Grt.Types;
 with Flags; use Flags;
 with Errorout; use Errorout;
 with Vhdl.Std_Package;
-with Evaluation;
+with Vhdl.Evaluation;
 with Iirs_Utils; use Iirs_Utils;
 with Simul.Annotations; use Simul.Annotations;
 with Name_Table;
@@ -361,7 +361,7 @@ package body Simul.Execution is
    function Execute_Path_Instance_Name_Attribute
      (Block : Block_Instance_Acc; Attr : Iir) return Iir_Value_Literal_Acc
    is
-      use Evaluation;
+      use Vhdl.Evaluation;
       use Grt.Vstrings;
       use Name_Table;
 
@@ -1420,7 +1420,7 @@ package body Simul.Execution is
             begin
                Unit := Get_Unit_Chain (Vhdl.Std_Package.Time_Type_Definition);
                while Unit /= Null_Iir loop
-                  exit when Evaluation.Get_Physical_Value (Unit)
+                  exit when Vhdl.Evaluation.Get_Physical_Value (Unit)
                     = Iir_Int64 (Right.I64);
                   Unit := Get_Chain (Unit);
                end loop;
@@ -2279,7 +2279,7 @@ package body Simul.Execution is
    is
       Prefix : constant Iir := Strip_Denoting_Name (Get_Prefix (Attr));
       Dim : constant Natural :=
-        Evaluation.Eval_Attribute_Parameter_Or_1 (Attr);
+        Vhdl.Evaluation.Eval_Attribute_Parameter_Or_1 (Attr);
    begin
       case Get_Kind (Prefix) is
          when Iir_Kind_Type_Declaration
@@ -3076,7 +3076,7 @@ package body Simul.Execution is
            | Iir_Kind_Physical_Fp_Literal
            | Iir_Kind_Unit_Declaration =>
             return Create_I64_Value
-              (Ghdl_I64 (Evaluation.Get_Physical_Value (Expr)));
+              (Ghdl_I64 (Vhdl.Evaluation.Get_Physical_Value (Expr)));
 
          when Iir_Kind_String_Literal8 =>
             return Execute_String_Literal (Expr, Block);
@@ -4380,7 +4380,7 @@ package body Simul.Execution is
               Get_Type (Get_Choice_Expression (Assoc));
             Choice_Len : Iir_Int64;
          begin
-            Choice_Len := Evaluation.Eval_Discrete_Type_Length
+            Choice_Len := Vhdl.Evaluation.Eval_Discrete_Type_Length
               (Get_String_Type_Bound_Type (Choice_Type));
             if Choice_Len /= Iir_Int64 (Value.Bounds.D (1).Length) then
                Error_Msg_Constraint (Expr);
diff --git a/src/vhdl/translate/trans-chap14.adb b/src/vhdl/translate/trans-chap14.adb
index b8e8f71fe..df6b937e3 100644
--- a/src/vhdl/translate/trans-chap14.adb
+++ b/src/vhdl/translate/trans-chap14.adb
@@ -16,7 +16,7 @@
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
 
-with Evaluation; use Evaluation;
+with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Vhdl.Std_Package; use Vhdl.Std_Package;
 with Errorout; use Errorout;
 with Iirs_Utils; use Iirs_Utils;
diff --git a/src/vhdl/translate/trans-chap3.adb b/src/vhdl/translate/trans-chap3.adb
index 66e897660..f9685f284 100644
--- a/src/vhdl/translate/trans-chap3.adb
+++ b/src/vhdl/translate/trans-chap3.adb
@@ -19,7 +19,7 @@
 with Name_Table;
 with Errorout; use Errorout;
 with Iirs_Utils; use Iirs_Utils;
-with Evaluation; use Evaluation;
+with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Trans.Chap2;
 with Trans.Chap4;
 with Trans.Chap6;
diff --git a/src/vhdl/translate/trans-chap6.adb b/src/vhdl/translate/trans-chap6.adb
index a1c8fa658..383dd8ce8 100644
--- a/src/vhdl/translate/trans-chap6.adb
+++ b/src/vhdl/translate/trans-chap6.adb
@@ -19,7 +19,7 @@
 with Files_Map;
 with Errorout; use Errorout;
 with Iirs_Utils; use Iirs_Utils;
-with Evaluation; use Evaluation;
+with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Trans.Chap3;
 with Trans.Chap7;
 with Trans.Chap14;
diff --git a/src/vhdl/translate/trans-chap7.adb b/src/vhdl/translate/trans-chap7.adb
index a9838e769..ebde37648 100644
--- a/src/vhdl/translate/trans-chap7.adb
+++ b/src/vhdl/translate/trans-chap7.adb
@@ -25,7 +25,7 @@ with Vhdl.Std_Package; use Vhdl.Std_Package;
 with Errorout; use Errorout;
 with Flags; use Flags;
 with Vhdl.Canon;
-with Evaluation; use Evaluation;
+with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Trans.Chap3;
 with Trans.Chap4;
 with Trans.Chap6;
diff --git a/src/vhdl/translate/trans-chap8.adb b/src/vhdl/translate/trans-chap8.adb
index f78a3d45a..4819a0e16 100644
--- a/src/vhdl/translate/trans-chap8.adb
+++ b/src/vhdl/translate/trans-chap8.adb
@@ -21,7 +21,7 @@ with Std_Names;
 with Errorout; use Errorout;
 with Iir_Chains;
 with Vhdl.Canon;
-with Evaluation; use Evaluation;
+with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Vhdl.Std_Package; use Vhdl.Std_Package;
 with Iirs_Utils; use Iirs_Utils;
 with Trans.Chap2;
diff --git a/src/vhdl/evaluation.adb b/src/vhdl/vhdl-evaluation.adb
index a3355f7a6..11776b1b6 100644
--- a/src/vhdl/evaluation.adb
+++ b/src/vhdl/vhdl-evaluation.adb
@@ -28,7 +28,7 @@ with Std_Names;
 with Ada.Characters.Handling;
 with Grt.Fcvt;
 
-package body Evaluation is
+package body Vhdl.Evaluation is
    --  If FORCE is true, always return a literal.
    function Eval_Expr_Keep_Orig (Expr : Iir; Force : Boolean) return Iir;
 
@@ -3991,4 +3991,4 @@ package body Evaluation is
       end;
    end Get_Path_Instance_Name_Suffix;
 
-end Evaluation;
+end Vhdl.Evaluation;
diff --git a/src/vhdl/evaluation.ads b/src/vhdl/vhdl-evaluation.ads
index 09975cd6a..12b8c778e 100644
--- a/src/vhdl/evaluation.ads
+++ b/src/vhdl/vhdl-evaluation.ads
@@ -18,7 +18,7 @@
 with Types; use Types;
 with Iirs; use Iirs;
 
-package Evaluation is
+package Vhdl.Evaluation is
 
    --  Evaluation is about compile-time computation of expressions, such as
    --  2 + 1 --> 3.  This is (of course) possible only with locally (and some
@@ -215,4 +215,4 @@ package Evaluation is
 
    --  Create a copy of VAL.
    function Copy_Constant (Val : Iir) return Iir;
-end Evaluation;
+end Vhdl.Evaluation;
diff --git a/src/vhdl/vhdl-ieee-vital_timing.adb b/src/vhdl/vhdl-ieee-vital_timing.adb
index 3a343858f..0cd175a05 100644
--- a/src/vhdl/vhdl-ieee-vital_timing.adb
+++ b/src/vhdl/vhdl-ieee-vital_timing.adb
@@ -24,7 +24,7 @@ with Name_Table;
 with Vhdl.Ieee.Std_Logic_1164; use Vhdl.Ieee.Std_Logic_1164;
 with Vhdl.Sem_Scopes;
 with Vhdl.Sem_Specs;
-with Evaluation;
+with Vhdl.Evaluation;
 with Vhdl.Sem;
 with Iirs_Utils;
 
@@ -569,7 +569,7 @@ package body Vhdl.Ieee.Vital_Timing is
             if Get_Type_Staticness (Itype) /= Locally then
                return Port_Length_Unknown;
             end if;
-            return Evaluation.Eval_Discrete_Type_Length (Itype);
+            return Vhdl.Evaluation.Eval_Discrete_Type_Length (Itype);
          else
             return Port_Length_Error;
          end if;
@@ -639,7 +639,7 @@ package body Vhdl.Ieee.Vital_Timing is
          if Get_Type_Staticness (Itype) /= Locally then
             return Port_Length_Unknown;
          else
-            return Evaluation.Eval_Discrete_Type_Length (Itype);
+            return Vhdl.Evaluation.Eval_Discrete_Type_Length (Itype);
          end if;
       end Get_Timing_Generic_Type_Length;
 
diff --git a/src/vhdl/vhdl-sem_assocs.adb b/src/vhdl/vhdl-sem_assocs.adb
index 403f720ef..112ed5e2f 100644
--- a/src/vhdl/vhdl-sem_assocs.adb
+++ b/src/vhdl/vhdl-sem_assocs.adb
@@ -15,7 +15,7 @@
 --  along with GHDL; see the file COPYING.  If not, write to the Free
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
-with Evaluation; use Evaluation;
+with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Errorout; use Errorout;
 with Flags; use Flags;
 with Types; use Types;
diff --git a/src/vhdl/vhdl-sem_decls.adb b/src/vhdl/vhdl-sem_decls.adb
index f67fcd96c..21eefd8ae 100644
--- a/src/vhdl/vhdl-sem_decls.adb
+++ b/src/vhdl/vhdl-sem_decls.adb
@@ -21,7 +21,7 @@ with Std_Names;
 with Vhdl.Tokens;
 with Flags; use Flags;
 with Vhdl.Std_Package; use Vhdl.Std_Package;
-with Evaluation; use Evaluation;
+with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Iirs_Utils; use Iirs_Utils;
 with Vhdl.Sem; use Vhdl.Sem;
 with Vhdl.Sem_Utils; use Vhdl.Sem_Utils;
diff --git a/src/vhdl/vhdl-sem_expr.adb b/src/vhdl/vhdl-sem_expr.adb
index cd9f9a2d5..09316fa11 100644
--- a/src/vhdl/vhdl-sem_expr.adb
+++ b/src/vhdl/vhdl-sem_expr.adb
@@ -26,7 +26,7 @@ with Vhdl.Sem;
 with Name_Table;
 with Str_Table;
 with Iirs_Utils; use Iirs_Utils;
-with Evaluation; use Evaluation;
+with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Iir_Chains; use Iir_Chains;
 with Vhdl.Sem_Types;
 with Vhdl.Sem_Stmts; use Vhdl.Sem_Stmts;
diff --git a/src/vhdl/vhdl-sem_names.adb b/src/vhdl/vhdl-sem_names.adb
index 3f49ae99a..afb0b549b 100644
--- a/src/vhdl/vhdl-sem_names.adb
+++ b/src/vhdl/vhdl-sem_names.adb
@@ -15,7 +15,7 @@
 --  along with GHDL; see the file COPYING.  If not, write to the Free
 --  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 --  02111-1307, USA.
-with Evaluation; use Evaluation;
+with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Iirs_Utils; use Iirs_Utils;
 with Errorout; use Errorout;
 with Flags; use Flags;
diff --git a/src/vhdl/vhdl-sem_psl.adb b/src/vhdl/vhdl-sem_psl.adb
index fb812706a..a9ca225b2 100644
--- a/src/vhdl/vhdl-sem_psl.adb
+++ b/src/vhdl/vhdl-sem_psl.adb
@@ -27,7 +27,7 @@ with Vhdl.Sem_Scopes;
 with Vhdl.Sem_Names;
 with Std_Names;
 with Iirs_Utils; use Iirs_Utils;
-with Evaluation; use Evaluation;
+with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Vhdl.Std_Package;
 with Vhdl.Ieee.Std_Logic_1164;
 with Errorout; use Errorout;
diff --git a/src/vhdl/vhdl-sem_specs.adb b/src/vhdl/vhdl-sem_specs.adb
index 3ed4ec571..ed56ade37 100644
--- a/src/vhdl/vhdl-sem_specs.adb
+++ b/src/vhdl/vhdl-sem_specs.adb
@@ -18,7 +18,7 @@
 with Iirs_Utils; use Iirs_Utils;
 with Vhdl.Sem_Expr; use Vhdl.Sem_Expr;
 with Vhdl.Sem_Names; use Vhdl.Sem_Names;
-with Evaluation; use Evaluation;
+with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Vhdl.Std_Package; use Vhdl.Std_Package;
 with Errorout; use Errorout;
 with Vhdl.Sem; use Vhdl.Sem;
diff --git a/src/vhdl/vhdl-sem_stmts.adb b/src/vhdl/vhdl-sem_stmts.adb
index c79f69496..deca231a6 100644
--- a/src/vhdl/vhdl-sem_stmts.adb
+++ b/src/vhdl/vhdl-sem_stmts.adb
@@ -28,7 +28,7 @@ with Vhdl.Sem_Scopes; use Vhdl.Sem_Scopes;
 with Vhdl.Sem_Types;
 with Vhdl.Sem_Psl;
 with Std_Names;
-with Evaluation; use Evaluation;
+with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Iirs_Utils; use Iirs_Utils;
 with Xrefs; use Xrefs;
 
diff --git a/src/vhdl/vhdl-sem_types.adb b/src/vhdl/vhdl-sem_types.adb
index 7f2bcd6aa..3eb5e8fe1 100644
--- a/src/vhdl/vhdl-sem_types.adb
+++ b/src/vhdl/vhdl-sem_types.adb
@@ -19,7 +19,7 @@ with Libraries;
 with Flags; use Flags;
 with Types; use Types;
 with Errorout; use Errorout;
-with Evaluation; use Evaluation;
+with Vhdl.Evaluation; use Vhdl.Evaluation;
 with Vhdl.Sem_Utils;
 with Vhdl.Sem_Expr; use Vhdl.Sem_Expr;
 with Vhdl.Sem_Scopes; use Vhdl.Sem_Scopes;