diff options
Diffstat (limited to 'src/ghdldrv')
-rw-r--r-- | src/ghdldrv/ghdlprint.adb | 10 | ||||
-rw-r--r-- | src/ghdldrv/ghdlrun.adb | 12 | ||||
-rw-r--r-- | src/ghdldrv/ghdlsimul.adb | 10 | ||||
-rw-r--r-- | src/ghdldrv/ghdlsynth.adb | 6 |
4 files changed, 19 insertions, 19 deletions
diff --git a/src/ghdldrv/ghdlprint.adb b/src/ghdldrv/ghdlprint.adb index 231f156ac..4738c6f7e 100644 --- a/src/ghdldrv/ghdlprint.adb +++ b/src/ghdldrv/ghdlprint.adb @@ -30,7 +30,7 @@ with Iirs_Utils; use Iirs_Utils; with Vhdl.Tokens; with Vhdl.Scanner; with Vhdl.Parse; -with Canon; +with Vhdl.Canon; with Version; with Xrefs; with Sem_Lib; use Sem_Lib; @@ -986,10 +986,10 @@ package body Ghdlprint is -- Keep parenthesis during parse. Vhdl.Parse.Flag_Parse_Parenthesis := True; - Canon.Canon_Flag_Concurrent_Stmts := False; - Canon.Canon_Flag_Configurations := False; - Canon.Canon_Flag_Specification_Lists := False; - Canon.Canon_Flag_Associations := False; + Vhdl.Canon.Canon_Flag_Concurrent_Stmts := False; + Vhdl.Canon.Canon_Flag_Configurations := False; + Vhdl.Canon.Canon_Flag_Specification_Lists := False; + Vhdl.Canon.Canon_Flag_Associations := False; -- Parse all files. for I in Args'Range loop diff --git a/src/ghdldrv/ghdlrun.adb b/src/ghdldrv/ghdlrun.adb index fbe10c5d3..b37d5a464 100644 --- a/src/ghdldrv/ghdlrun.adb +++ b/src/ghdldrv/ghdlrun.adb @@ -36,7 +36,7 @@ with Std_Package; with Flags; with Errorout; use Errorout; with Libraries; -with Canon; +with Vhdl.Canon; with Configuration; with Trans_Be; with Translation; @@ -146,12 +146,12 @@ package body Ghdlrun is case Elab_Mode is when Elab_Static => - Canon.Canon_Flag_Add_Labels := True; - Canon.Canon_Flag_Sequentials_Stmts := True; - Canon.Canon_Flag_Expressions := True; - Canon.Canon_Flag_All_Sensitivity := True; + Vhdl.Canon.Canon_Flag_Add_Labels := True; + Vhdl.Canon.Canon_Flag_Sequentials_Stmts := True; + Vhdl.Canon.Canon_Flag_Expressions := True; + Vhdl.Canon.Canon_Flag_All_Sensitivity := True; when Elab_Dynamic => - Canon.Canon_Flag_Add_Labels := True; + Vhdl.Canon.Canon_Flag_Add_Labels := True; end case; end Compile_Init; diff --git a/src/ghdldrv/ghdlsimul.adb b/src/ghdldrv/ghdlsimul.adb index 2e304d7ce..cb534e19b 100644 --- a/src/ghdldrv/ghdlsimul.adb +++ b/src/ghdldrv/ghdlsimul.adb @@ -28,7 +28,7 @@ with Name_Table; with Errorout; use Errorout; with Std_Package; with Libraries; -with Canon; +with Vhdl.Canon; with Configuration; with Iirs_Utils; with Simul.Annotations; @@ -70,10 +70,10 @@ package body Ghdlsimul is Simul.Annotations.Annotate (Std_Package.Std_Standard_Unit); - Canon.Canon_Flag_Add_Labels := True; - Canon.Canon_Flag_Sequentials_Stmts := True; - Canon.Canon_Flag_Expressions := True; - Canon.Canon_Flag_All_Sensitivity := True; + Vhdl.Canon.Canon_Flag_Add_Labels := True; + Vhdl.Canon.Canon_Flag_Sequentials_Stmts := True; + Vhdl.Canon.Canon_Flag_Expressions := True; + Vhdl.Canon.Canon_Flag_All_Sensitivity := True; end Compile_Init; procedure Compile_Elab diff --git a/src/ghdldrv/ghdlsynth.adb b/src/ghdldrv/ghdlsynth.adb index 55df0639e..48a10e753 100644 --- a/src/ghdldrv/ghdlsynth.adb +++ b/src/ghdldrv/ghdlsynth.adb @@ -23,7 +23,7 @@ with Ghdlsimul; with Libraries; with Flags; -with Canon; +with Vhdl.Canon; with Simul.Elaboration; @@ -94,9 +94,9 @@ package body Ghdlsynth is Libraries.Load_Work_Library (E_Opt >= Args'First); -- Do not canon concurrent statements. - Canon.Canon_Flag_Concurrent_Stmts := False; + Vhdl.Canon.Canon_Flag_Concurrent_Stmts := False; - Canon.Canon_Flag_Add_Labels := True; + Vhdl.Canon.Canon_Flag_Add_Labels := True; -- Analyze files (if any) for I in Args'First .. E_Opt - 1 loop |