Update to use new UserEnum creation method

SystemRDL · Sep 9, 2022 · d0d3632 · d0d3632
1 parent 01b5a9c
commit d0d3632
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/setup.py b/setup.py
@@ -27,7 +27,7 @@
     include_package_data=True,
     python_requires='>=3.5.2',
     install_requires=[
-        "systemrdl-compiler>=1.16.0",
+        "systemrdl-compiler>=1.24.0",
     ],
     entry_points = {
         "peakrdl.exporters": [

diff --git a/src/peakrdl_ipxact/__about__.py b/src/peakrdl_ipxact/__about__.py
@@ -1 +1 @@
-__version__ = "3.2.0"
+__version__ = "3.2.1"
diff --git a/src/peakrdl_ipxact/importer.py b/src/peakrdl_ipxact/importer.py
@@ -1,7 +1,6 @@
 from typing import Optional, List, Iterable, Dict, Any, Type, Union, Set
 import re
 
-from collections import OrderedDict
 from xml.dom import minidom
 
 from systemrdl import RDLCompiler, RDLImporter
@@ -838,7 +837,7 @@ def parse_enumeratedValues(self, enumeratedValues: minidom.Element, type_name: s
         """
         Parses an enumeration listing and returns the user-defined enum type
         """
-        entries = OrderedDict()
+        members = []
         for enumeratedValue in self.iterelements(enumeratedValues):
             if enumeratedValue.localName != "enumeratedValue":
                 continue
@@ -868,9 +867,12 @@ def parse_enumeratedValues(self, enumeratedValues: minidom.Element, type_name: s
             displayname = d.get('displayName', None)
             desc = d.get('description', None)
 
-            entries[entry_name] = (entry_value, displayname, desc)
+            member = rdltypes.UserEnumMemberContainer(
+                entry_name, entry_value, displayname, desc
+            )
+            members.append(member)
 
-        enum_type = rdltypes.UserEnum(type_name, entries) #pylint: disable=no-value-for-parameter
+        enum_type = rdltypes.UserEnum.define_new(type_name, members)
 
         return enum_type