pyGHDL/dom: add some guards to avoid crash for optional fields

ghdl · Jun 18, 2021 · 2d84548 · 2d84548
1 parent 823ee7d
commit 2d84548
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/pyGHDL/dom/InterfaceItem.py b/pyGHDL/dom/InterfaceItem.py
@@ -57,7 +57,8 @@ def parse(cls, generic):
         name = NodeToName(generic)
         mode = GetModeOfNode(generic)
         subTypeIndication = GetSubtypeIndicationFromNode(generic, "generic", name)
-        value = GetExpressionFromNode(nodes.Get_Default_Value(generic))
+        default = nodes.Get_Default_Value(generic);
+        value = GetExpressionFromNode(default) if default else None
 
         generic = cls(name, mode, subTypeIndication, value)
 

diff --git a/pyGHDL/dom/Object.py b/pyGHDL/dom/Object.py
@@ -105,7 +105,8 @@ def __init__(
     def parse(cls, node):
         name = NodeToName(node)
         subTypeIndication = GetSubtypeIndicationFromNode(node, "signal", name)
-        defaultExpression = GetExpressionFromNode(nodes.Get_Default_Value(node))
+        default = nodes.Get_Default_Value(node);
+        defaultExpression = GetExpressionFromNode(default) if default else None
 
         signal = cls(name, subTypeIndication, defaultExpression)
 

diff --git a/pyGHDL/dom/_Translate.py b/pyGHDL/dom/_Translate.py
@@ -62,6 +62,8 @@
 @export
 def GetSubtypeIndicationFromNode(node, entity: str, name: str) -> SubTypeOrSymbol:
     subTypeIndication = nodes.Get_Subtype_Indication(node)
+    if subTypeIndication is nodes.Null_Iir:
+        return None
     subTypeKind = GetIirKindOfNode(subTypeIndication)
 
     if subTypeKind == nodes.Iir_Kind.Simple_Name: