vhdl: move canon to a vhdl child package.

5 files changed, 15 insertions, 13 deletions

diff --git a/src/vhdl/translate/trans-chap4.adb b/src/vhdl/translate/trans-chap4.adb
index cdd424cc9..0c44b8af6 100644
--- a/src/vhdl/translate/trans-chap4.adb
+++ b/src/vhdl/translate/trans-chap4.adb
@@ -20,7 +20,7 @@ with Errorout; use Errorout;
 with Files_Map;
 with Iirs_Utils; use Iirs_Utils;
 with Std_Package; use Std_Package;
-with Canon;
+with Vhdl.Canon;
 with Translation; use Translation;
 with Trans.Chap2;
 with Trans.Chap3;
@@ -2403,7 +2403,7 @@ package body Trans.Chap4 is
                   Call : constant Iir := Get_Procedure_Call (Stmt);
                   Imp : constant Iir := Get_Implementation (Call);
                begin
-                  Canon.Canon_Subprogram_Call (Call);
+                  Vhdl.Canon.Canon_Subprogram_Call (Call);
                   Update_Node_Infos;
 
                   if Get_Suspend_Flag (Imp) then
diff --git a/src/vhdl/translate/trans-chap7.adb b/src/vhdl/translate/trans-chap7.adb
index e34c6f378..29707e256 100644
--- a/src/vhdl/translate/trans-chap7.adb
+++ b/src/vhdl/translate/trans-chap7.adb
@@ -24,7 +24,7 @@ with Iir_Chains; use Iir_Chains;
 with Std_Package; use Std_Package;
 with Errorout; use Errorout;
 with Flags; use Flags;
-with Canon;
+with Vhdl.Canon;
 with Evaluation; use Evaluation;
 with Trans.Chap3;
 with Trans.Chap4;
@@ -4397,7 +4397,7 @@ package body Trans.Chap7 is
                        (Expr, Left, Right, Res_Type);
                   end;
                else
-                  Canon.Canon_Subprogram_Call (Expr);
+                  Vhdl.Canon.Canon_Subprogram_Call (Expr);
                   Trans.Update_Node_Infos;
                   Assoc_Chain := Get_Parameter_Association_Chain (Expr);
                   Res := Chap8.Translate_Subprogram_Call
diff --git a/src/vhdl/translate/trans-chap8.adb b/src/vhdl/translate/trans-chap8.adb
index 31c6803b5..815748f35 100644
--- a/src/vhdl/translate/trans-chap8.adb
+++ b/src/vhdl/translate/trans-chap8.adb
@@ -20,7 +20,7 @@ with Ada.Text_IO;
 with Std_Names;
 with Errorout; use Errorout;
 with Iir_Chains;
-with Canon;
+with Vhdl.Canon;
 with Evaluation; use Evaluation;
 with Std_Package; use Std_Package;
 with Iirs_Utils; use Iirs_Utils;
@@ -3556,7 +3556,7 @@ package body Trans.Chap8 is
       if Sensitivity = Null_Iir_List and Cond /= Null_Iir then
          --  Extract sensitivity from condition.
          Sensitivity := Create_Iir_List;
-         Canon.Canon_Extract_Sensitivity (Cond, Sensitivity);
+         Vhdl.Canon.Canon_Extract_Sensitivity (Cond, Sensitivity);
          Set_Sensitivity_List (Stmt, Sensitivity);
       end if;
 
@@ -4683,7 +4683,8 @@ package body Trans.Chap8 is
                C_Stmt : Iir;
             begin
                C_Stmt :=
-                 Canon.Canon_Conditional_Variable_Assignment_Statement (Stmt);
+                 Vhdl.Canon.Canon_Conditional_Variable_Assignment_Statement
+                 (Stmt);
                Trans.Update_Node_Infos;
                Translate_If_Statement (C_Stmt);
             end;
@@ -4692,7 +4693,8 @@ package body Trans.Chap8 is
                C_Stmt : Iir;
             begin
                C_Stmt :=
-                 Canon.Canon_Conditional_Signal_Assignment_Statement (Stmt);
+                 Vhdl.Canon.Canon_Conditional_Signal_Assignment_Statement
+                 (Stmt);
                Trans.Update_Node_Infos;
                Translate_If_Statement (C_Stmt);
             end;
@@ -4711,7 +4713,7 @@ package body Trans.Chap8 is
             begin
                if not Get_Suspend_Flag (Stmt) then
                   --  Suspendable calls were already canonicalized.
-                  Canon.Canon_Subprogram_Call (Call);
+                  Vhdl.Canon.Canon_Subprogram_Call (Call);
                   Trans.Update_Node_Infos;
                end if;
 
diff --git a/src/vhdl/translate/trans-chap9.adb b/src/vhdl/translate/trans-chap9.adb
index 1029275ce..c0b935fa3 100644
--- a/src/vhdl/translate/trans-chap9.adb
+++ b/src/vhdl/translate/trans-chap9.adb
@@ -21,7 +21,7 @@ with Errorout; use Errorout;
 with Std_Package; use Std_Package;
 with Flags;
 with Libraries;
-with Canon;
+with Vhdl.Canon;
 with Trans_Analyzes;
 with Nodes_Meta;
 with PSL.Nodes;
@@ -1758,7 +1758,7 @@ package body Trans.Chap9 is
       if Is_Sensitized then
          List_Orig := Get_Sensitivity_List (Proc);
          if List_Orig = Iir_List_All then
-            List := Canon.Canon_Extract_Process_Sensitivity (Proc);
+            List := Vhdl.Canon.Canon_Extract_Process_Sensitivity (Proc);
          else
             List := List_Orig;
          end if;
diff --git a/src/vhdl/translate/translation.adb b/src/vhdl/translate/translation.adb
index 9dab1243b..4f66723cf 100644
--- a/src/vhdl/translate/translation.adb
+++ b/src/vhdl/translate/translation.adb
@@ -29,7 +29,7 @@ with Std_Package; use Std_Package;
 with Sem_Specs;
 with Libraries;
 with Std_Names;
-with Canon;
+with Vhdl.Canon;
 with Trans;
 with Trans_Decls; use Trans_Decls;
 with Trans.Chap1;
@@ -375,7 +375,7 @@ package body Translation is
       Init_Node_Infos;
 
       --  Set flags for canon.
-      Canon.Canon_Flag_Add_Labels := True;
+      Vhdl.Canon.Canon_Flag_Add_Labels := True;
 
       --  Force to unnest subprograms is the code generator doesn't support
       --  nested subprograms.