From b5884712a4ce8980831d4b231d123688063ccbf2 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 21 Jun 2022 23:10:26 +0200 Subject: Enable and disable AMS support based on VHDLVersion. (cherry picked from commit 04d141309147a5731ea3461d59cfc8e17ad57c82) --- pyGHDL/dom/NonStandard.py | 14 +++++++++++++- pyGHDL/libghdl/flags.py | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'pyGHDL') diff --git a/pyGHDL/dom/NonStandard.py b/pyGHDL/dom/NonStandard.py index db160faaf..13ddec68f 100644 --- a/pyGHDL/dom/NonStandard.py +++ b/pyGHDL/dom/NonStandard.py @@ -42,6 +42,8 @@ from typing import Any from pyTooling.Decorators import export +from pyGHDL.dom.Names import SimpleName +from pyVHDLModel import VHDLVersion from pyVHDLModel.SyntaxModel import ( Design as VHDLModel_Design, Library as VHDLModel_Library, @@ -50,6 +52,7 @@ from pyVHDLModel.SyntaxModel import ( ) from pyGHDL.libghdl import ( + ENCODING, initialize as libghdl_initialize, finalize as libghdl_finalize, set_option as libghdl_set_option, @@ -58,6 +61,7 @@ from pyGHDL.libghdl import ( files_map, errorout_memory, LibGHDLException, + flags, utils, files_map_editor, ENCODING, @@ -102,7 +106,6 @@ class Design(VHDLModel_Design): errorout_memory.Install_Handler() libghdl_set_option("--std=08") - libghdl_set_option("--ams") Flag_Gather_Comments.value = True Flag_Parse_Parenthesis.value = True @@ -131,6 +134,7 @@ class Document(VHDLModel_Document): self, path: Path, sourceCode: str = None, + vhdlVersion: VHDLVersion = VHDLVersion.VHDL2008, dontParse: bool = False, dontTranslate: bool = False, ): @@ -146,8 +150,16 @@ class Document(VHDLModel_Document): if not dontParse: # Parse input file t1 = time.perf_counter() + + if vhdlVersion.IsAMS(): + flags.AMS_Vhdl.value = True + self.__ghdlFile = sem_lib.Load_File(self.__ghdlSourceFileEntry) CheckForErrors() + + if vhdlVersion.IsAMS(): + flags.AMS_Vhdl.value = False + self.__ghdlProcessingTime = time.perf_counter() - t1 if not dontTranslate: diff --git a/pyGHDL/libghdl/flags.py b/pyGHDL/libghdl/flags.py index fadd3bb52..523b6c9cf 100644 --- a/pyGHDL/libghdl/flags.py +++ b/pyGHDL/libghdl/flags.py @@ -41,6 +41,7 @@ __all__ = [ "Verbose", "Flag_Elaborate_With_Outdated", "Flag_Force_Analysis", + "AMS_Vhdl", "Flag_Gather_Comments", ] @@ -54,4 +55,6 @@ Flag_Elaborate_With_Outdated = c_bool.in_dll(libghdl, "flags__flag_elaborate_wit Flag_Force_Analysis = c_bool.in_dll(libghdl, "flags__flag_force_analysis") +AMS_Vhdl = c_bool.in_dll(libghdl, "flags__ams_vhdl") + Flag_Gather_Comments = c_bool.in_dll(libghdl, "flags__flag_gather_comments") -- cgit v1.2.3 From 53fbe284740a23af5457fe12abd4715eb2309abd Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Wed, 22 Jun 2022 09:03:55 +0200 Subject: Exposed new flags from libghdl: mb_comment, fexplicit, frelaxed. (cherry picked from commit 2a78cc687299c5bc0f4f65127957dbe4d7176027) --- pyGHDL/libghdl/flags.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pyGHDL') diff --git a/pyGHDL/libghdl/flags.py b/pyGHDL/libghdl/flags.py index 523b6c9cf..1eca1544f 100644 --- a/pyGHDL/libghdl/flags.py +++ b/pyGHDL/libghdl/flags.py @@ -49,7 +49,10 @@ assert sizeof(c_bool) == 1 Flag_Elocations = c_bool.in_dll(libghdl, "flags__flag_elocations") -Verbose = c_bool.in_dll(libghdl, "flags__verbose") +Verbose = c_bool.in_dll(libghdl, "flags__verbose") #: Internal boolean flag representing :option:`-v`. +MB_Comment = c_bool.in_dll(libghdl, "flags__mb_comment") #: Internal boolean flag representing :option:`--mb-comments`. +Explicit = c_bool.in_dll(libghdl, "flags__flag_explicit") #: Internal boolean flag representing :option:`-fexplicit`. +Relaxed = c_bool.in_dll(libghdl, "flags__flag_relaxed_rules") #: Internal boolean flag representing :option:`-frelaxed`. Flag_Elaborate_With_Outdated = c_bool.in_dll(libghdl, "flags__flag_elaborate_with_outdated") -- cgit v1.2.3 From 960e44185ac356cca07d9d2eb6386e0286e31270 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Wed, 22 Jun 2022 20:19:57 +0200 Subject: Added new flag variables to __all__. (cherry picked from commit a51422a1fd1c11a7add7b3ee799b93b98d5f20f0) --- pyGHDL/libghdl/flags.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pyGHDL') diff --git a/pyGHDL/libghdl/flags.py b/pyGHDL/libghdl/flags.py index 1eca1544f..4bf30ef50 100644 --- a/pyGHDL/libghdl/flags.py +++ b/pyGHDL/libghdl/flags.py @@ -39,6 +39,9 @@ from pyGHDL.libghdl import libghdl __all__ = [ "Flag_Elocations", "Verbose", + "MB_Comment", + "Explicit", + "Relaxed", "Flag_Elaborate_With_Outdated", "Flag_Force_Analysis", "AMS_Vhdl", @@ -49,10 +52,10 @@ assert sizeof(c_bool) == 1 Flag_Elocations = c_bool.in_dll(libghdl, "flags__flag_elocations") -Verbose = c_bool.in_dll(libghdl, "flags__verbose") #: Internal boolean flag representing :option:`-v`. -MB_Comment = c_bool.in_dll(libghdl, "flags__mb_comment") #: Internal boolean flag representing :option:`--mb-comments`. -Explicit = c_bool.in_dll(libghdl, "flags__flag_explicit") #: Internal boolean flag representing :option:`-fexplicit`. -Relaxed = c_bool.in_dll(libghdl, "flags__flag_relaxed_rules") #: Internal boolean flag representing :option:`-frelaxed`. +Verbose = c_bool.in_dll(libghdl, "flags__verbose") #: Internal boolean flag representing :option:`-v`. +MB_Comment = c_bool.in_dll(libghdl, "flags__mb_comment") #: Internal boolean flag representing :option:`--mb-comment`. +Explicit = c_bool.in_dll(libghdl, "flags__flag_explicit") #: Internal boolean flag representing :option:`-fexplicit`. +Relaxed = c_bool.in_dll(libghdl, "flags__flag_relaxed_rules") #: Internal boolean flag representing :option:`-frelaxed`. Flag_Elaborate_With_Outdated = c_bool.in_dll(libghdl, "flags__flag_elaborate_with_outdated") -- cgit v1.2.3 From 829587b67d5be107bd44cfcb0c24e3bdddf0fc21 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Fri, 24 Jun 2022 23:19:00 +0200 Subject: Tiny fixes. (cherry picked from commit 2cb36a37f5efa1185ba4c61ea65b49aa6e9345a0) --- pyGHDL/dom/_Utils.py | 4 ++-- pyGHDL/libghdl/libraries.py | 13 ++++++++----- pyGHDL/libghdl/vhdl/std_package.py | 18 +++++++++++++++--- 3 files changed, 25 insertions(+), 10 deletions(-) (limited to 'pyGHDL') diff --git a/pyGHDL/dom/_Utils.py b/pyGHDL/dom/_Utils.py index 3b647013b..d8cd9a15c 100644 --- a/pyGHDL/dom/_Utils.py +++ b/pyGHDL/dom/_Utils.py @@ -109,5 +109,5 @@ def GetModeOfNode(node: Iir) -> Mode: try: return __MODE_TRANSLATION[nodes.Get_Mode(node)] - except KeyError: - raise LibGHDLException("Unknown mode.") + except KeyError as ex: + raise DOMException(f"Unknown mode '{ex.args[0]}'.") from ex diff --git a/pyGHDL/libghdl/libraries.py b/pyGHDL/libghdl/libraries.py index fe09fa920..f31d3ec5f 100644 --- a/pyGHDL/libghdl/libraries.py +++ b/pyGHDL/libghdl/libraries.py @@ -50,15 +50,18 @@ __all__ = ["Library_Location", "Work_Library"] Library_Location: LocationType = c_int32.in_dll(libghdl, "libraries__library_location") """ -A location for library declarations (such as library WORK). Use ``.value`` to -access this variable inside libghdl. +A location for library declarations (such as library WORK). + +Use the property ``.value`` to access the variable's value. """ Work_Library: Iir_Library_Declaration = c_int32.in_dll(libghdl, "libraries__work_library") """ -Library declaration for the work library. Note: the identifier of the work_library -is ``work_library_name``, which may be different from 'WORK'. Use ``.value`` to -access this variable inside libghdl. +Library declaration for the work library. + +.. note:: The identifier of the work_library is ``work_library_name``, which may be different from 'WORK'. + +Use the property ``.value`` to access the variable's value. """ diff --git a/pyGHDL/libghdl/vhdl/std_package.py b/pyGHDL/libghdl/vhdl/std_package.py index f2c46385a..d9035779c 100644 --- a/pyGHDL/libghdl/vhdl/std_package.py +++ b/pyGHDL/libghdl/vhdl/std_package.py @@ -46,12 +46,24 @@ __all__ = ["Std_Location", "Standard_Package", "Character_Type_Definition"] Std_Location: LocationType = c_int32.in_dll(libghdl, "vhdl__std_package__std_location") -"""Virtual location for the ``std.standard`` package. Use ``.value`` to access this variable inside libghdl.""" +""" +Virtual location for the ``std.standard`` package. + +Use the property ``.value`` to access the variable's value. +""" Standard_Package: Iir_Package_Declaration = c_int32.in_dll(libghdl, "vhdl__std_package__standard_package") -"""Virtual package ``std.package``. Use ``.value`` to access this variable inside libghdl.""" +""" +Virtual package ``std.package``. + +Use the property ``.value`` to access the variable's value. +""" Character_Type_Definition: Iir_Enumeration_Type_Definition = c_int32.in_dll( libghdl, "vhdl__std_package__character_type_definition" ) -"""Predefined character. Use ``.value`` to access this variable inside libghdl.""" +""" +Predefined character. + +Use the property ``.value`` to access the variable's value. +""" -- cgit v1.2.3 From f0f7b022b35aac03d586fd23b1ee6700cca60bcf Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Fri, 24 Jun 2022 23:20:48 +0200 Subject: Improved doc-strings. (cherry picked from commit 54ce76e3938413f9ee7d823cf63611c4ff5d8faf) --- pyGHDL/dom/_Utils.py | 42 +++++++++++++++++++++++++++++++++--------- pyGHDL/libghdl/flags.py | 14 ++++++++++++++ pyGHDL/libghdl/vhdl/nodes.py | 3 +++ 3 files changed, 50 insertions(+), 9 deletions(-) (limited to 'pyGHDL') diff --git a/pyGHDL/dom/_Utils.py b/pyGHDL/dom/_Utils.py index d8cd9a15c..22468d988 100644 --- a/pyGHDL/dom/_Utils.py +++ b/pyGHDL/dom/_Utils.py @@ -49,17 +49,30 @@ __MODE_TRANSLATION = { nodes.Iir_Mode.Buffer_Mode: Mode.Buffer, nodes.Iir_Mode.Linkage_Mode: Mode.Linkage, } - +""" +Translation table if IIR modes to pyVHDLModel mode enumeration values. +""" @export def CheckForErrors() -> None: + """ + Check if an error occurred in libghdl and raise an exception if so. + + **Behavior:** + + 1. read the error buffer and clear it afterwards + 2. convert it into a list of internal messages for a :exc:`LibGHDLException` + 3. raise a :exc:`DOMException` with a nested :exc:`LibGHDLException` as a ``__cause__``. + + :raises DOMException: If an error occurred in libghdl. + """ errorCount = errorout_memory.Get_Nbr_Messages() - errors = [] if errorCount != 0: + errors = [] for i in range(errorCount): rec = errorout_memory.Get_Error_Record(i + 1) # FIXME: needs help from @tgingold - fileName = "" # name_table.Get_Name_Ptr(files_map.Get_File_Name(rec.file)) + fileName = "????" # name_table.Get_Name_Ptr(files_map.Get_File_Name(rec.file)) message = errorout_memory.Get_Error_Message(i + 1) errors.append(f"{fileName}:{rec.line}:{rec.offset}: {message}") @@ -71,9 +84,13 @@ def CheckForErrors() -> None: @export def GetIirKindOfNode(node: Iir) -> nodes.Iir_Kind: - """Return the kind of a node in the IIR tree.""" + """Return the kind of a node in the IIR tree. + + :returns: The IIR kind of a node. + :raises ValueError: If parameter ``node`` is :py:data:`~pyGHDL.libghdl.vhdl.nodes.Null_Iir`. + """ if node == Null_Iir: - raise ValueError("GetIirKindOfNode: Parameter 'node' must not be 'Null_iir'.") + raise ValueError("GetIirKindOfNode: Parameter 'node' must not be 'Null_Iir'.") kind: int = nodes.Get_Kind(node) return nodes.Iir_Kind(kind) @@ -81,9 +98,12 @@ def GetIirKindOfNode(node: Iir) -> nodes.Iir_Kind: @export def GetNameOfNode(node: Iir) -> str: - """Return the python string from node :obj:`node` identifier.""" + """Return the Python string from node ``node`` identifier. + + :raises ValueError: If parameter ``node`` is :py:data:`~pyGHDL.libghdl.vhdl.nodes.Null_Iir`. + """ if node == Null_Iir: - raise ValueError("GetNameOfNode: Parameter 'node' must not be 'Null_iir'.") + raise ValueError("GetNameOfNode: Parameter 'node' must not be 'Null_Iir'.") identifier = utils.Get_Source_Identifier(node) return name_table.Get_Name_Ptr(identifier) @@ -103,9 +123,13 @@ def GetDocumentationOfNode(node: Iir) -> str: @export def GetModeOfNode(node: Iir) -> Mode: - """Return the mode of a :obj:`node`.""" + """Return the mode of a ``node``. + + :raises ValueError: If parameter ``node`` is :py:data:`~pyGHDL.libghdl.vhdl.nodes.Null_Iir`. + :raises DOMException: If mode returned by libghdl is not known by :py:data:`__MODE_TRANSLATION`. + """ if node == Null_Iir: - raise ValueError("GetModeOfNode: Parameter 'node' must not be 'Null_iir'.") + raise ValueError("GetModeOfNode: Parameter 'node' must not be 'Null_Iir'.") try: return __MODE_TRANSLATION[nodes.Get_Mode(node)] diff --git a/pyGHDL/libghdl/flags.py b/pyGHDL/libghdl/flags.py index 4bf30ef50..4e5f73d00 100644 --- a/pyGHDL/libghdl/flags.py +++ b/pyGHDL/libghdl/flags.py @@ -50,6 +50,20 @@ __all__ = [ assert sizeof(c_bool) == 1 + +@export +@unique +class VhdlStandard(IntEnum): + """An enumeration representing libghdl's internal ``Vhdl_Std_Type`` enumeration type.""" + + Vhdl_87 = 0 #: VHDL'87 + Vhdl_93 = 1 #: VHDL'93 + Vhdl_00 = 2 #: VHDL'2000 + Vhdl_02 = 3 #: VHDL'2002 + Vhdl_08 = 4 #: VHDL'2008 + Vhdl_19 = 5 #: VHDL'2019 + + Flag_Elocations = c_bool.in_dll(libghdl, "flags__flag_elocations") Verbose = c_bool.in_dll(libghdl, "flags__verbose") #: Internal boolean flag representing :option:`-v`. diff --git a/pyGHDL/libghdl/vhdl/nodes.py b/pyGHDL/libghdl/vhdl/nodes.py index f662ad6a7..85c064c37 100644 --- a/pyGHDL/libghdl/vhdl/nodes.py +++ b/pyGHDL/libghdl/vhdl/nodes.py @@ -30,6 +30,9 @@ from pyGHDL.libghdl._types import ( from pyGHDL.libghdl.vhdl.tokens import Tok Null_Iir = 0 +""" +Null element for an IIR node reference. +""" Null_Iir_List = 0 Iir_List_All = 1 -- cgit v1.2.3 From f4f081a771b2b389706a10a31068df6828002ab3 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Fri, 24 Jun 2022 23:58:52 +0200 Subject: Improved docs-strings. (cherry picked from commit 6979b2846e07791629f7f6011145f5886abfee33) --- pyGHDL/__init__.py | 8 ++++---- pyGHDL/dom/__init__.py | 5 +++-- pyGHDL/libghdl/__init__.py | 27 +++++++++++++++++++-------- 3 files changed, 26 insertions(+), 14 deletions(-) (limited to 'pyGHDL') diff --git a/pyGHDL/__init__.py b/pyGHDL/__init__.py index 64a3c3d87..4e8bc2ca8 100644 --- a/pyGHDL/__init__.py +++ b/pyGHDL/__init__.py @@ -38,13 +38,13 @@ GHDL offers two Python interfaces and a language server protocol service. All this is provided from a ``pyGHDL`` packages with four sub-packages: -* ``pyGHDL.cli`` - Command line interface (CLI) applications. -* ``pyGHDL.dom`` - A high-level API offering a document object model (DOM). +* :mod:`pyGHDL.cli` - Command line interface (CLI) applications. +* :mod:`pyGHDL.dom` - A high-level API offering a document object model (DOM). The underlying abstract VHDL language model is provided by :doc:`pyVHDLModel `. The DOM is using ``libghdl`` for file analysis and parsing. -* ``pyGHDL.libghdl`` - A low-level API directly interacting with the shared library ``libghdl....so``/``libghdl....dll``. +* :mod:`pyGHDL.libghdl` - A low-level API directly interacting with the shared library ``libghdl....so``/``libghdl....dll``. This is a procedural and C-like interface. It comes with some Python generators for easier iterating linked lists. -* ``pyGHDL.lsp`` - A :wikipedia:`language server protocol ` (LSP) +* :mod:`pyGHDL.lsp` - A :wikipedia:`language server protocol ` (LSP) written in Python. The implementation offers an HTTPS service that can be used e.g. by editors and IDEs supporting LSP. """ __author__ = "Tristan Gingold and contributors" diff --git a/pyGHDL/dom/__init__.py b/pyGHDL/dom/__init__.py index 12caccc1b..e60a4e211 100644 --- a/pyGHDL/dom/__init__.py +++ b/pyGHDL/dom/__init__.py @@ -9,8 +9,6 @@ # Authors: # Patrick Lehmann # -# Package package: Document object model (DOM) for pyGHDL.libghdl. -# # License: # ============================================================================ # Copyright (C) 2019-2021 Tristan Gingold @@ -30,6 +28,9 @@ # # SPDX-License-Identifier: GPL-2.0-or-later # ============================================================================ +""" +Document object model (DOM) for :mod:`pyGHDL.libghdl` based on :doc:`pyVHDLModel `. +""" from pathlib import Path from pyTooling.Decorators import export diff --git a/pyGHDL/libghdl/__init__.py b/pyGHDL/libghdl/__init__.py index 2cf9cff70..2be39d1d6 100644 --- a/pyGHDL/libghdl/__init__.py +++ b/pyGHDL/libghdl/__init__.py @@ -10,11 +10,9 @@ # Tristan Gingold # Patrick Lehmann # -# Package package: Python binding and low-level API for shared library 'libghdl'. -# # License: # ============================================================================ -# Copyright (C) 2019-2021 Tristan Gingold +# Copyright (C) 2019-2022 Tristan Gingold # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,6 +29,11 @@ # # SPDX-License-Identifier: GPL-2.0-or-later # ============================================================================ +""" +Python binding and low-level API for shared library ``libghdl``. + +In case of an error, a :exc:`LibGHDLException` is raised. +""" from ctypes import c_char_p, CDLL from sys import platform as sys_platform, version_info as sys_version_info from os import environ as os_environ @@ -48,9 +51,12 @@ from pyGHDL import __version__ as ghdlVersion Nullable = Optional +__all__ = ["ENCODING"] + ENCODING = "latin-1" +@export class LibGHDLException(GHDLBaseException): _internalErrors: Nullable[List[str]] @@ -63,6 +69,7 @@ class LibGHDLException(GHDLBaseException): return self._internalErrors +@export def _get_libghdl_name() -> Path: """Get the name of the libghdl library (with version and extension).""" version = ghdlVersion.replace("-", "_").replace(".", "_") @@ -70,6 +77,7 @@ def _get_libghdl_name() -> Path: return Path(f"libghdl-{version}.{ext}") +@export def _check_libghdl_libdir(libdir: Path, basename: Path) -> Path: """Returns libghdl path in :obj:`libdir`, if found.""" if libdir is None: @@ -82,6 +90,7 @@ def _check_libghdl_libdir(libdir: Path, basename: Path) -> Path: raise FileNotFoundError(str(res)) +@export def _check_libghdl_bindir(bindir: Path, basename: Path) -> Path: if bindir is None: raise ValueError("Parameter 'bindir' is None.") @@ -89,11 +98,12 @@ def _check_libghdl_bindir(bindir: Path, basename: Path) -> Path: return _check_libghdl_libdir((bindir / "../lib").resolve(), basename) +@export def _get_libghdl_path(): """\ Locate the directory where the shared library is installed. - Search order: + **Search order:** 1. `GHDL_PREFIX` - directory (prefix) of the vhdl libraries. 2. `VUNIT_GHDL_PATH` - path of the `ghdl` binary when using VUnit. @@ -145,6 +155,7 @@ def _get_libghdl_path(): raise Exception(f"Cannot find libghdl {basename}") +@export def _initialize(): # Load the shared library _libghdl_path = _get_libghdl_path() @@ -192,15 +203,15 @@ def initialize() -> None: @export # @BindToLibGHDL("libghdl__set_option") -def set_option(Opt: str) -> bool: +def set_option(opt: str) -> bool: """\ Set option :obj:`opt`. - :param Opt: Option to set. + :param opt: Option to set. :return: Return ``True``, if the option is known and handled. """ - Opt = Opt.encode(ENCODING) - return libghdl.libghdl__set_option(c_char_p(Opt), len(Opt)) == 0 + opt = opt.encode(ENCODING) + return libghdl.libghdl__set_option(c_char_p(opt), len(opt)) == 0 @export -- cgit v1.2.3 From e2f88a56ffc73b8df5eb501ad59a8112d23ea35c Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Sat, 25 Jun 2022 10:44:29 +0200 Subject: Formatting by black. (cherry picked from commit 68f9ef6f18ac454dd25a180c6bf1046c8172174d) --- pyGHDL/dom/NonStandard.py | 4 ++-- pyGHDL/dom/_Utils.py | 1 + pyGHDL/libghdl/flags.py | 18 ++++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) (limited to 'pyGHDL') diff --git a/pyGHDL/dom/NonStandard.py b/pyGHDL/dom/NonStandard.py index 13ddec68f..2066c190f 100644 --- a/pyGHDL/dom/NonStandard.py +++ b/pyGHDL/dom/NonStandard.py @@ -66,8 +66,8 @@ from pyGHDL.libghdl import ( files_map_editor, ENCODING, ) -from pyGHDL.libghdl.flags import Flag_Gather_Comments -from pyGHDL.libghdl.vhdl import nodes, sem_lib +from pyGHDL.libghdl.flags import Flag_Gather_Comments, Flags, VhdlStandard +from pyGHDL.libghdl.vhdl import nodes, sem_lib, parse from pyGHDL.libghdl.vhdl.parse import Flag_Parse_Parenthesis from pyGHDL.dom import DOMException, Position from pyGHDL.dom._Utils import GetIirKindOfNode, CheckForErrors, GetNameOfNode, GetDocumentationOfNode diff --git a/pyGHDL/dom/_Utils.py b/pyGHDL/dom/_Utils.py index 22468d988..83f10eae8 100644 --- a/pyGHDL/dom/_Utils.py +++ b/pyGHDL/dom/_Utils.py @@ -53,6 +53,7 @@ __MODE_TRANSLATION = { Translation table if IIR modes to pyVHDLModel mode enumeration values. """ + @export def CheckForErrors() -> None: """ diff --git a/pyGHDL/libghdl/flags.py b/pyGHDL/libghdl/flags.py index 4e5f73d00..26d548cd5 100644 --- a/pyGHDL/libghdl/flags.py +++ b/pyGHDL/libghdl/flags.py @@ -56,20 +56,22 @@ assert sizeof(c_bool) == 1 class VhdlStandard(IntEnum): """An enumeration representing libghdl's internal ``Vhdl_Std_Type`` enumeration type.""" - Vhdl_87 = 0 #: VHDL'87 - Vhdl_93 = 1 #: VHDL'93 - Vhdl_00 = 2 #: VHDL'2000 - Vhdl_02 = 3 #: VHDL'2002 - Vhdl_08 = 4 #: VHDL'2008 - Vhdl_19 = 5 #: VHDL'2019 + Vhdl_87 = 0 #: VHDL'87 + Vhdl_93 = 1 #: VHDL'93 + Vhdl_00 = 2 #: VHDL'2000 + Vhdl_02 = 3 #: VHDL'2002 + Vhdl_08 = 4 #: VHDL'2008 + Vhdl_19 = 5 #: VHDL'2019 + - Flag_Elocations = c_bool.in_dll(libghdl, "flags__flag_elocations") Verbose = c_bool.in_dll(libghdl, "flags__verbose") #: Internal boolean flag representing :option:`-v`. MB_Comment = c_bool.in_dll(libghdl, "flags__mb_comment") #: Internal boolean flag representing :option:`--mb-comment`. Explicit = c_bool.in_dll(libghdl, "flags__flag_explicit") #: Internal boolean flag representing :option:`-fexplicit`. -Relaxed = c_bool.in_dll(libghdl, "flags__flag_relaxed_rules") #: Internal boolean flag representing :option:`-frelaxed`. +Relaxed = c_bool.in_dll( + libghdl, "flags__flag_relaxed_rules" +) #: Internal boolean flag representing :option:`-frelaxed`. Flag_Elaborate_With_Outdated = c_bool.in_dll(libghdl, "flags__flag_elaborate_with_outdated") -- cgit v1.2.3 From 8b71d31b27837409affbd69842d03f1ae0ea6e29 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Sat, 24 Dec 2022 10:00:25 +0100 Subject: Change needs to be done in pynodes. --- pyGHDL/libghdl/vhdl/nodes.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pyGHDL') diff --git a/pyGHDL/libghdl/vhdl/nodes.py b/pyGHDL/libghdl/vhdl/nodes.py index 85c064c37..d5a8d8e80 100644 --- a/pyGHDL/libghdl/vhdl/nodes.py +++ b/pyGHDL/libghdl/vhdl/nodes.py @@ -29,6 +29,15 @@ from pyGHDL.libghdl._types import ( ) from pyGHDL.libghdl.vhdl.tokens import Tok +__all__ = [ + "Null_Iir", + "Null_Iir_List", + "Iir_List_All", + "Null_Iir_Flist", + "Iir_Flist_Others", + "Iir_Flist_All", +] + Null_Iir = 0 """ Null element for an IIR node reference. -- cgit v1.2.3 From 627d081090583be67093bd717cb54d1dde44b58c Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Sat, 24 Dec 2022 10:14:04 +0100 Subject: Added missing imports. --- pyGHDL/dom/NonStandard.py | 8 ++++---- pyGHDL/libghdl/flags.py | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'pyGHDL') diff --git a/pyGHDL/dom/NonStandard.py b/pyGHDL/dom/NonStandard.py index 2066c190f..0a2ead728 100644 --- a/pyGHDL/dom/NonStandard.py +++ b/pyGHDL/dom/NonStandard.py @@ -66,8 +66,8 @@ from pyGHDL.libghdl import ( files_map_editor, ENCODING, ) -from pyGHDL.libghdl.flags import Flag_Gather_Comments, Flags, VhdlStandard -from pyGHDL.libghdl.vhdl import nodes, sem_lib, parse +from pyGHDL.libghdl.flags import Flag_Gather_Comments +from pyGHDL.libghdl.vhdl import nodes, sem_lib from pyGHDL.libghdl.vhdl.parse import Flag_Parse_Parenthesis from pyGHDL.dom import DOMException, Position from pyGHDL.dom._Utils import GetIirKindOfNode, CheckForErrors, GetNameOfNode, GetDocumentationOfNode @@ -151,13 +151,13 @@ class Document(VHDLModel_Document): # Parse input file t1 = time.perf_counter() - if vhdlVersion.IsAMS(): + if vhdlVersion.IsAMS: flags.AMS_Vhdl.value = True self.__ghdlFile = sem_lib.Load_File(self.__ghdlSourceFileEntry) CheckForErrors() - if vhdlVersion.IsAMS(): + if vhdlVersion.IsAMS: flags.AMS_Vhdl.value = False self.__ghdlProcessingTime = time.perf_counter() - t1 diff --git a/pyGHDL/libghdl/flags.py b/pyGHDL/libghdl/flags.py index 26d548cd5..580828d0a 100644 --- a/pyGHDL/libghdl/flags.py +++ b/pyGHDL/libghdl/flags.py @@ -33,6 +33,9 @@ # ============================================================================ from ctypes import c_bool, sizeof +from enum import unique, IntEnum + +from pyTooling.Decorators import export from pyGHDL.libghdl import libghdl -- cgit v1.2.3 From 1e5aad63f64ff9b91b1a10c16f82fa29de42dbb4 Mon Sep 17 00:00:00 2001 From: tgingold Date: Sat, 24 Dec 2022 12:03:44 +0100 Subject: Update pyGHDL/libghdl/flags.py Co-authored-by: Patrick Lehmann --- pyGHDL/libghdl/flags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pyGHDL') diff --git a/pyGHDL/libghdl/flags.py b/pyGHDL/libghdl/flags.py index 580828d0a..dc5da6d60 100644 --- a/pyGHDL/libghdl/flags.py +++ b/pyGHDL/libghdl/flags.py @@ -80,6 +80,6 @@ Flag_Elaborate_With_Outdated = c_bool.in_dll(libghdl, "flags__flag_elaborate_wit Flag_Force_Analysis = c_bool.in_dll(libghdl, "flags__flag_force_analysis") -AMS_Vhdl = c_bool.in_dll(libghdl, "flags__ams_vhdl") +AMS_Vhdl = c_bool.in_dll(libghdl, "flags__ams_vhdl") #: Internal boolean flag representing :option:`-ams`. Flag_Gather_Comments = c_bool.in_dll(libghdl, "flags__flag_gather_comments") -- cgit v1.2.3