diff options
-rw-r--r-- | pyGHDL/libghdl/__init__.py | 2 | ||||
-rw-r--r-- | pyGHDL/libghdl/errorout_memory.py | 5 | ||||
-rw-r--r-- | pyGHDL/libghdl/files_map.py | 4 | ||||
-rw-r--r-- | pyGHDL/libghdl/files_map_editor.py | 4 | ||||
-rw-r--r-- | pyGHDL/libghdl/flags.py | 4 | ||||
-rw-r--r-- | pyGHDL/libghdl/libraries.py | 4 | ||||
-rw-r--r-- | pyGHDL/libghdl/name_table.py | 6 | ||||
-rw-r--r-- | pyGHDL/libghdl/utils/__init__.py | 2 | ||||
-rw-r--r-- | pyGHDL/libghdl/vhdl/canon.py | 3 | ||||
-rw-r--r-- | pyGHDL/libghdl/vhdl/flists.py | 3 | ||||
-rw-r--r-- | pyGHDL/libghdl/vhdl/formatters.py | 3 | ||||
-rw-r--r-- | pyGHDL/libghdl/vhdl/ieee.py | 3 | ||||
-rw-r--r-- | pyGHDL/libghdl/vhdl/lists.py | 5 | ||||
-rw-r--r-- | pyGHDL/libghdl/vhdl/parse.py | 3 | ||||
-rw-r--r-- | pyGHDL/libghdl/vhdl/scanner.py | 3 | ||||
-rw-r--r-- | pyGHDL/libghdl/vhdl/std_package.py | 3 |
16 files changed, 43 insertions, 14 deletions
diff --git a/pyGHDL/libghdl/__init__.py b/pyGHDL/libghdl/__init__.py index af3096601..a38c60e30 100644 --- a/pyGHDL/libghdl/__init__.py +++ b/pyGHDL/libghdl/__init__.py @@ -39,6 +39,8 @@ from pathlib import Path from shutil import which from typing import Tuple +from pydecor import export + from pyGHDL.libghdl.version import __version__ diff --git a/pyGHDL/libghdl/errorout_memory.py b/pyGHDL/libghdl/errorout_memory.py index 49ffd74be..5318a6c7f 100644 --- a/pyGHDL/libghdl/errorout_memory.py +++ b/pyGHDL/libghdl/errorout_memory.py @@ -32,9 +32,12 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ============================================================================ # -from pyGHDL.libghdl import libghdl from ctypes import c_int8, c_int32, c_char_p, Structure +from pydecor import export + +from pyGHDL.libghdl import libghdl + class Error_Message(Structure): _fields_ = [ diff --git a/pyGHDL/libghdl/files_map.py b/pyGHDL/libghdl/files_map.py index 7b33a1e8d..708b20181 100644 --- a/pyGHDL/libghdl/files_map.py +++ b/pyGHDL/libghdl/files_map.py @@ -32,9 +32,11 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ============================================================================ # -from pyGHDL.libghdl import libghdl from ctypes import c_void_p +from pyGHDL.libghdl import libghdl + + EOT = b"\x04" No_Source_File_Entry = 0 diff --git a/pyGHDL/libghdl/files_map_editor.py b/pyGHDL/libghdl/files_map_editor.py index d1e35f260..ebd6c6724 100644 --- a/pyGHDL/libghdl/files_map_editor.py +++ b/pyGHDL/libghdl/files_map_editor.py @@ -32,9 +32,11 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ============================================================================ # -from pyGHDL.libghdl import libghdl from ctypes import c_int32, c_char_p, c_bool +from pyGHDL.libghdl import libghdl + + Replace_Text = libghdl.files_map__editor__replace_text_ptr Replace_Text.argstype = [c_int32, c_int32, c_int32, c_int32, c_char_p, c_int32] Replace_Text.restype = c_bool diff --git a/pyGHDL/libghdl/flags.py b/pyGHDL/libghdl/flags.py index 82ecb088f..907b736a3 100644 --- a/pyGHDL/libghdl/flags.py +++ b/pyGHDL/libghdl/flags.py @@ -32,9 +32,11 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ============================================================================ # -from pyGHDL.libghdl import libghdl from ctypes import c_bool, sizeof +from pyGHDL.libghdl import libghdl + + assert sizeof(c_bool) == 1 Flag_Elocations = c_bool.in_dll(libghdl, "flags__flag_elocations") diff --git a/pyGHDL/libghdl/libraries.py b/pyGHDL/libghdl/libraries.py index 00841584b..4fc91f062 100644 --- a/pyGHDL/libghdl/libraries.py +++ b/pyGHDL/libghdl/libraries.py @@ -32,9 +32,11 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ============================================================================ # -from pyGHDL.libghdl import libghdl from ctypes import c_int32 +from pyGHDL.libghdl import libghdl + + Get_Libraries_Chain = libghdl.libraries__get_libraries_chain Add_Design_Unit_Into_Library = libghdl.libraries__add_design_unit_into_library diff --git a/pyGHDL/libghdl/name_table.py b/pyGHDL/libghdl/name_table.py index b62b583f6..e4f9d8ec0 100644 --- a/pyGHDL/libghdl/name_table.py +++ b/pyGHDL/libghdl/name_table.py @@ -32,9 +32,13 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ============================================================================ # -from pyGHDL.libghdl import libghdl from ctypes import c_char_p +from pydecor import export + +from pyGHDL.libghdl import libghdl + + Get_Name_Length = libghdl.name_table__get_name_length Get_Name_Ptr = libghdl.name_table__get_name_ptr diff --git a/pyGHDL/libghdl/utils/__init__.py b/pyGHDL/libghdl/utils/__init__.py index fce6bcba9..cb9075a3d 100644 --- a/pyGHDL/libghdl/utils/__init__.py +++ b/pyGHDL/libghdl/utils/__init__.py @@ -35,6 +35,8 @@ from ctypes import byref from typing import List, Any, Generator +from pydecor import export + import pyGHDL.libghdl.name_table as name_table import pyGHDL.libghdl.files_map as files_map import pyGHDL.libghdl.vhdl.nodes as nodes diff --git a/pyGHDL/libghdl/vhdl/canon.py b/pyGHDL/libghdl/vhdl/canon.py index 160cb55ea..e54bb06e1 100644 --- a/pyGHDL/libghdl/vhdl/canon.py +++ b/pyGHDL/libghdl/vhdl/canon.py @@ -32,9 +32,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ============================================================================ # -from pyGHDL.libghdl import libghdl from ctypes import c_bool +from pyGHDL.libghdl import libghdl + Flag_Concurrent_Stmts = c_bool.in_dll( libghdl, "vhdl__canon__canon_flag_concurrent_stmts" diff --git a/pyGHDL/libghdl/vhdl/flists.py b/pyGHDL/libghdl/vhdl/flists.py index dac9ffb83..df7f87cc5 100644 --- a/pyGHDL/libghdl/vhdl/flists.py +++ b/pyGHDL/libghdl/vhdl/flists.py @@ -32,9 +32,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ============================================================================ # -from pyGHDL.libghdl import libghdl from ctypes import c_int32 +from pyGHDL.libghdl import libghdl + Flist_Type = c_int32 diff --git a/pyGHDL/libghdl/vhdl/formatters.py b/pyGHDL/libghdl/vhdl/formatters.py index cb039f95c..3c15c724c 100644 --- a/pyGHDL/libghdl/vhdl/formatters.py +++ b/pyGHDL/libghdl/vhdl/formatters.py @@ -32,9 +32,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ============================================================================ # -from pyGHDL.libghdl import libghdl from ctypes import c_int32, c_char_p +from pyGHDL.libghdl import libghdl + Indent_String = libghdl.vhdl__formatters__indent_string diff --git a/pyGHDL/libghdl/vhdl/ieee.py b/pyGHDL/libghdl/vhdl/ieee.py index f75476f1c..2241188e7 100644 --- a/pyGHDL/libghdl/vhdl/ieee.py +++ b/pyGHDL/libghdl/vhdl/ieee.py @@ -32,9 +32,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ============================================================================ # -from pyGHDL.libghdl import libghdl from ctypes import c_int +from pyGHDL.libghdl import libghdl + Std_Logic_1164_Pkg = c_int.in_dll( libghdl, "vhdl__ieee__std_logic_1164__std_logic_1164_pkg" diff --git a/pyGHDL/libghdl/vhdl/lists.py b/pyGHDL/libghdl/vhdl/lists.py index da23cbfae..5b4a389e2 100644 --- a/pyGHDL/libghdl/vhdl/lists.py +++ b/pyGHDL/libghdl/vhdl/lists.py @@ -32,9 +32,12 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ============================================================================ # -from pyGHDL.libghdl import libghdl from ctypes import c_int32, c_bool, POINTER, Structure +from pydecor import export + +from pyGHDL.libghdl import libghdl + List_Type = c_int32 diff --git a/pyGHDL/libghdl/vhdl/parse.py b/pyGHDL/libghdl/vhdl/parse.py index 8b29f2ab7..ecb84736f 100644 --- a/pyGHDL/libghdl/vhdl/parse.py +++ b/pyGHDL/libghdl/vhdl/parse.py @@ -32,9 +32,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ============================================================================ # -from pyGHDL.libghdl import libghdl from ctypes import c_bool +from pyGHDL.libghdl import libghdl + Parse_Design_File = libghdl.vhdl__parse__parse_design_file diff --git a/pyGHDL/libghdl/vhdl/scanner.py b/pyGHDL/libghdl/vhdl/scanner.py index ef3fd3ed0..1debe9dde 100644 --- a/pyGHDL/libghdl/vhdl/scanner.py +++ b/pyGHDL/libghdl/vhdl/scanner.py @@ -32,9 +32,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ============================================================================ # -from pyGHDL.libghdl import libghdl from ctypes import c_int, c_bool +from pyGHDL.libghdl import libghdl + Set_File = libghdl.vhdl__scanner__set_file diff --git a/pyGHDL/libghdl/vhdl/std_package.py b/pyGHDL/libghdl/vhdl/std_package.py index 2019e7927..fa5d5e2b7 100644 --- a/pyGHDL/libghdl/vhdl/std_package.py +++ b/pyGHDL/libghdl/vhdl/std_package.py @@ -32,9 +32,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ============================================================================ # -from pyGHDL.libghdl import libghdl from ctypes import c_int32 +from pyGHDL.libghdl import libghdl + # Use .value Std_Location = c_int32.in_dll(libghdl, "vhdl__std_package__std_location") |