Skip to content

Commit 11134c7

Browse files
PaebbelsPaebbels
committed
Set parent reference or None.
1 parent 8e29087 commit 11134c7

File tree

6 files changed

+112
-115
lines changed

6 files changed

+112
-115
lines changed

‎pyVHDLModel/IEEE.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,20 +150,20 @@ def __init__(self) -> None:
150150
EnumerationLiteral("L"),
151151
EnumerationLiteral("H"),
152152
EnumerationLiteral("-"),
153-
))
153+
), None)
154154
self._types[stdULogic._normalizedIdentifier] = stdULogic
155155
self._declaredItems.append(stdULogic)
156156

157-
stdULogicVector = ArrayType("std_ulogic_vector", (SimpleSubtypeSymbol(SimpleName("natural")),), SimpleSubtypeSymbol(SimpleName("std_ulogic")))
157+
stdULogicVector = ArrayType("std_ulogic_vector", (SimpleSubtypeSymbol(SimpleName("natural")),), SimpleSubtypeSymbol(SimpleName("std_ulogic")), None)
158158
self._types[stdULogicVector._normalizedIdentifier] = stdULogicVector
159159
self._declaredItems.append(stdULogicVector)
160160

161-
stdLogic = Subtype("std_logic", SimpleSubtypeSymbol(SimpleName("std_ulogic")))
161+
stdLogic = Subtype("std_logic", SimpleSubtypeSymbol(SimpleName("std_ulogic")), None)
162162
stdLogic._baseType = stdULogic
163163
self._subtypes[stdLogic._normalizedIdentifier] = stdLogic
164164
self._declaredItems.append(stdLogic)
165165

166-
stdLogicVector = Subtype("std_logic_vector", SimpleSubtypeSymbol(SimpleName("std_ulogic_vector")))
166+
stdLogicVector = Subtype("std_logic_vector", SimpleSubtypeSymbol(SimpleName("std_ulogic_vector")), None)
167167
stdLogicVector._baseType = stdULogicVector
168168
self._subtypes[stdLogicVector._normalizedIdentifier] = stdLogicVector
169169
self._declaredItems.append(stdLogicVector)
@@ -267,20 +267,20 @@ def __init__(self) -> None:
267267
self._AddLibraryClause(("IEEE", ))
268268
self._AddPackageClause(("IEEE.std_logic_1164.all", ))
269269

270-
unresolvedUnsigned = ArrayType("unresolved_unsigned", (SimpleSubtypeSymbol(SimpleName("natural")),), SimpleSubtypeSymbol(SimpleName("std_ulogic")))
270+
unresolvedUnsigned = ArrayType("unresolved_unsigned", (SimpleSubtypeSymbol(SimpleName("natural")),), SimpleSubtypeSymbol(SimpleName("std_ulogic")), None)
271271
self._types[unresolvedUnsigned._normalizedIdentifier] = unresolvedUnsigned
272272
self._declaredItems.append(unresolvedUnsigned)
273273

274-
unsigned = Subtype("unsigned", SimpleSubtypeSymbol(SimpleName("unresolved_unsigned")))
274+
unsigned = Subtype("unsigned", SimpleSubtypeSymbol(SimpleName("unresolved_unsigned")), None)
275275
unsigned._baseType = unresolvedUnsigned
276276
self._subtypes[unsigned._normalizedIdentifier] = unsigned
277277
self._declaredItems.append(unsigned)
278278

279-
unresolvedSigned = ArrayType("unresolved_signed", (SimpleSubtypeSymbol(SimpleName("natural")),), SimpleSubtypeSymbol(SimpleName("std_ulogic")))
279+
unresolvedSigned = ArrayType("unresolved_signed", (SimpleSubtypeSymbol(SimpleName("natural")),), SimpleSubtypeSymbol(SimpleName("std_ulogic")), None)
280280
self._types[unresolvedSigned._normalizedIdentifier] = unresolvedSigned
281281
self._declaredItems.append(unresolvedSigned)
282282

283-
signed = Subtype("signed", SimpleSubtypeSymbol(SimpleName("unresolved_signed")))
283+
signed = Subtype("signed", SimpleSubtypeSymbol(SimpleName("unresolved_signed")), None)
284284
signed._baseType = unresolvedSigned
285285
self._subtypes[signed._normalizedIdentifier] = signed
286286
self._declaredItems.append(signed)

‎pyVHDLModel/PSLModel.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,19 @@ class PSLPrimaryUnit(PrimaryUnit):
5151
@export
5252
class VerificationUnit(PSLPrimaryUnit):
5353
def __init__(self, identifier: str) -> None:
54-
super().__init__(identifier)
54+
super().__init__(identifier, parent=None)
5555

5656

5757
@export
5858
class VerificationProperty(PSLPrimaryUnit):
5959
def __init__(self, identifier: str) -> None:
60-
super().__init__(identifier)
60+
super().__init__(identifier, parent=None)
6161

6262

6363
@export
6464
class VerificationMode(PSLPrimaryUnit):
6565
def __init__(self, identifier: str) -> None:
66-
super().__init__(identifier)
66+
super().__init__(identifier, parent=None)
6767

6868

6969
@export

‎pyVHDLModel/Predefined.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ class PredefinedLibrary(Library):
5252
* :class:`~pyVHDLModel.IEEE.Ieee`
5353
"""
5454

55-
def __init__(self, packages):
56-
super().__init__(self.__class__.__name__)
55+
def __init__(self, packages) -> None:
56+
super().__init__(self.__class__.__name__, None)
5757

5858
self.AddPackages(packages)
5959

@@ -105,7 +105,7 @@ class PredefinedPackage(Package, PredefinedPackageMixin):
105105
"""
106106

107107
def __init__(self) -> None:
108-
super().__init__(self.__class__.__name__)
108+
super().__init__(self.__class__.__name__, parent=None)
109109

110110

111111
@export
@@ -116,4 +116,4 @@ class PredefinedPackageBody(PackageBody, PredefinedPackageMixin):
116116

117117
def __init__(self) -> None:
118118
packageSymbol = PackageSymbol(SimpleName(self.__class__.__name__[:-5]))
119-
super().__init__(packageSymbol)
119+
super().__init__(packageSymbol, parent=None)

‎pyVHDLModel/STD.py‎

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ class Standard(PredefinedPackage):
8686
def __init__(self) -> None:
8787
super().__init__()
8888

89-
boolean = EnumeratedType("boolean", (EnumerationLiteral("false"), EnumerationLiteral("true")))
89+
boolean = EnumeratedType("boolean", (EnumerationLiteral("false"), EnumerationLiteral("true")), None)
9090
self._types[boolean._normalizedIdentifier] = boolean
9191
self._declaredItems.append(boolean)
9292

93-
bit = EnumeratedType("bit", (EnumerationLiteral("'0'"), EnumerationLiteral("'1'")))
93+
bit = EnumeratedType("bit", (EnumerationLiteral("'0'"), EnumerationLiteral("'1'")), None)
9494
self._types[bit._normalizedIdentifier] = bit
9595
self._declaredItems.append(bit)
9696

@@ -108,83 +108,78 @@ def __init__(self) -> None:
108108
"'È'", "'É'", "'Ê'", "'Ë'", "'Ì'", "'Í'", "'Î'", "'Ï'", "'Ð'", "'Ñ'", "'Ò'", "'Ó'", "'Ô'", "'Õ'", "'Ö'", "'×'", "'Ø'", "'Ù'", "'Ú'", "'Û'",\
109109
"'Ü'", "'Ý'", "'Þ'", "'ß'", "'à'", "'á'", "'â'", "'ã'", "'ä'", "'å'", "'æ'", "'ç'", "'è'", "'é'", "'ê'", "'ë'", "'ì'", "'í'", "'î'", "'ï'",\
110110
"'ð'", "'ñ'", "'ò'", "'ó'", "'ô'", "'õ'", "'ö'", "'÷'", "'ø'", "'ù'", "'ú'", "'û'", "'ü'", "'ý'", "'þ'", "'ÿ'"
111-
character = EnumeratedType("character", [EnumerationLiteral(char) for char in chars])
111+
character = EnumeratedType("character", [EnumerationLiteral(char) for char in chars], None)
112112
self._types[character._normalizedIdentifier] = character
113113
self._declaredItems.append(character)
114114

115115
levels = "note", "warning", "error", "failure"
116-
severityLevel = EnumeratedType("severityLevel", [EnumerationLiteral(level) for level in levels])
116+
severityLevel = EnumeratedType("severityLevel", [EnumerationLiteral(level) for level in levels], None)
117117
self._types[severityLevel._normalizedIdentifier] = severityLevel
118118
self._declaredItems.append(severityLevel)
119119

120-
integer = IntegerType("integer", Range(IntegerLiteral(-2**31), IntegerLiteral(2**31-1), Direction.To))
120+
integer = IntegerType("integer", Range(IntegerLiteral(-2**31), IntegerLiteral(2**31 - 1), Direction.To), None)
121121
self._types[integer._normalizedIdentifier] = integer
122122
self._declaredItems.append(integer)
123123

124124
# real
125125

126-
time = PhysicalType(
127-
"time",
128-
Range(IntegerLiteral(-2**63), IntegerLiteral(2**63-1), Direction.To),
129-
primaryUnit="fs",
130-
units=(
131-
("ps", PhysicalIntegerLiteral(1000, "fs")),
132-
("ns", PhysicalIntegerLiteral(1000, "ps")),
133-
("us", PhysicalIntegerLiteral(1000, "ns")),
134-
("ms", PhysicalIntegerLiteral(1000, "us")),
135-
("sec", PhysicalIntegerLiteral(1000, "ms")),
136-
("min", PhysicalIntegerLiteral(60, "sec")),
137-
("hr", PhysicalIntegerLiteral(60, "min")),
138-
)
139-
)
126+
time = PhysicalType("time", Range(IntegerLiteral(-2**63), IntegerLiteral(2**63 - 1), Direction.To), primaryUnit="fs", units=(
127+
("ps", PhysicalIntegerLiteral(1000, "fs")),
128+
("ns", PhysicalIntegerLiteral(1000, "ps")),
129+
("us", PhysicalIntegerLiteral(1000, "ns")),
130+
("ms", PhysicalIntegerLiteral(1000, "us")),
131+
("sec", PhysicalIntegerLiteral(1000, "ms")),
132+
("min", PhysicalIntegerLiteral(60, "sec")),
133+
("hr", PhysicalIntegerLiteral(60, "min")),
134+
), parent=None)
140135
self._types[time._normalizedIdentifier] = time
141136
self._declaredItems.append(time)
142137

143138
# delay_length
144139

145140
# now
146141

147-
natural = Subtype("natural", SimpleSubtypeSymbol(SimpleName("integer")))
142+
natural = Subtype("natural", SimpleSubtypeSymbol(SimpleName("integer")), None)
148143
natural._baseType = integer
149-
natural._range = Range(IntegerLiteral(0), IntegerLiteral(2**31-1), Direction.To)
144+
natural._range = Range(IntegerLiteral(0), IntegerLiteral(2**31 - 1), Direction.To)
150145
self._subtypes[natural._normalizedIdentifier] = natural
151146
self._declaredItems.append(natural)
152147

153-
positive = Subtype("positive", SimpleSubtypeSymbol(SimpleName("integer")))
148+
positive = Subtype("positive", SimpleSubtypeSymbol(SimpleName("integer")), None)
154149
positive._baseType = integer
155-
positive._range = Range(IntegerLiteral(1), IntegerLiteral(2**31-1), Direction.To)
150+
positive._range = Range(IntegerLiteral(1), IntegerLiteral(2**31 - 1), Direction.To)
156151
self._subtypes[positive._normalizedIdentifier] = positive
157152
self._declaredItems.append(positive)
158153

159-
string = ArrayType("string", (SimpleSubtypeSymbol(SimpleName("positive")), ), SimpleSubtypeSymbol(SimpleName("character")))
154+
string = ArrayType("string", (SimpleSubtypeSymbol(SimpleName("positive")),), SimpleSubtypeSymbol(SimpleName("character")), None)
160155
self._types[string._normalizedIdentifier] = string
161156
self._declaredItems.append(string)
162157

163-
booleanVector = ArrayType("boolean_vector", (SimpleSubtypeSymbol(SimpleName("natural")), ), SimpleSubtypeSymbol(SimpleName("boolean")))
158+
booleanVector = ArrayType("boolean_vector", (SimpleSubtypeSymbol(SimpleName("natural")),), SimpleSubtypeSymbol(SimpleName("boolean")), None)
164159
self._types[booleanVector._normalizedIdentifier] = booleanVector
165160
self._declaredItems.append(booleanVector)
166161

167-
bitVector = ArrayType("bit_vector", (SimpleSubtypeSymbol(SimpleName("natural")), ), SimpleSubtypeSymbol(SimpleName("bit")))
162+
bitVector = ArrayType("bit_vector", (SimpleSubtypeSymbol(SimpleName("natural")),), SimpleSubtypeSymbol(SimpleName("bit")), None)
168163
self._types[bitVector._normalizedIdentifier] = bitVector
169164
self._declaredItems.append(bitVector)
170165

171-
integerVector = ArrayType("integer_vector", (SimpleSubtypeSymbol(SimpleName("natural")), ), SimpleSubtypeSymbol(SimpleName("integer")))
166+
integerVector = ArrayType("integer_vector", (SimpleSubtypeSymbol(SimpleName("natural")),), SimpleSubtypeSymbol(SimpleName("integer")), None)
172167
self._types[integerVector._normalizedIdentifier] = integerVector
173168
self._declaredItems.append(integerVector)
174169

175170
# real_vector
176171

177-
timeVector = ArrayType("time_vector", (SimpleSubtypeSymbol(SimpleName("natural")), ), SimpleSubtypeSymbol(SimpleName("time")))
172+
timeVector = ArrayType("time_vector", (SimpleSubtypeSymbol(SimpleName("natural")),), SimpleSubtypeSymbol(SimpleName("time")), None)
178173
self._types[timeVector._normalizedIdentifier] = timeVector
179174
self._declaredItems.append(timeVector)
180175

181176
fileOpenKinds = "read_mode", "write_mode", "append_mode"
182-
openFileKind = EnumeratedType("open_file_kind", [EnumerationLiteral(kind) for kind in fileOpenKinds])
177+
openFileKind = EnumeratedType("open_file_kind", [EnumerationLiteral(kind) for kind in fileOpenKinds], None)
183178
self._types[openFileKind._normalizedIdentifier] = openFileKind
184179
self._declaredItems.append(openFileKind)
185180

186181
fileOpenStati = "open_ok", "status_error", "name_error", "mode_error"
187-
fileOpenStatus = EnumeratedType("open_file_status", [EnumerationLiteral(status) for status in fileOpenStati])
182+
fileOpenStatus = EnumeratedType("open_file_status", [EnumerationLiteral(status) for status in fileOpenStati], None)
188183
self._types[fileOpenStatus._normalizedIdentifier] = fileOpenStatus
189184
self._declaredItems.append(fileOpenStatus)
190185

‎tests/unit/Analyze.py‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def CreateDesign(self) -> Design:
5454
library = design.GetLibrary("lib_1")
5555

5656
path = Path("tests.vhdl")
57-
document = Document(path, documentation="Testing 'Library' class.")
57+
document = Document(path, documentation="Testing 'Library' class.", parent=None)
5858

5959
contextReferences = [
6060
LibraryClause([
@@ -64,7 +64,7 @@ def CreateDesign(self) -> Design:
6464
AllPackageMembersReferenceSymbol(AllName(SelectedName("std_logic_1164", SimpleName("ieee")))),
6565
])
6666
]
67-
context = Context("ctx_1", contextReferences, documentation="My first context.")
67+
context = Context("ctx_1", contextReferences, documentation="My first context.", parent=None)
6868
document._AddDesignUnit(context)
6969

7070
entityAReferences = [
@@ -81,44 +81,46 @@ def CreateDesign(self) -> Design:
8181
AllPackageMembersReferenceSymbol(AllName(SelectedName("pack_1", SimpleName("work")))),
8282
])
8383
]
84-
entityA = Entity("entity_A", entityAReferences, documentation="My first entity.")
84+
entityA = Entity("entity_A", entityAReferences, documentation="My first entity.", parent=None)
8585
document._AddDesignUnit(entityA)
8686

8787
architectureAReferences = [
8888
UseClause([
8989
AllPackageMembersReferenceSymbol(AllName(SelectedName("textio", SimpleName("std")))),
9090
]),
9191
]
92-
architectureA = Architecture("arch_A", EntitySymbol(SimpleName("entity_A")), architectureAReferences, documentation="My first entity implementation.")
92+
architectureA = Architecture("arch_A", EntitySymbol(SimpleName("entity_A")), architectureAReferences, documentation="My first entity implementation.",
93+
parent=None)
9394
document._AddDesignUnit(architectureA)
9495

9596
entityBReferences = [
9697
ContextReference([
9798
ContextReferenceSymbol(SelectedName("ctx_1", SimpleName("work"))),
9899
]),
99100
]
100-
entityB = Entity("entity_B", entityBReferences, documentation="My second entity.")
101+
entityB = Entity("entity_B", entityBReferences, documentation="My second entity.", parent=None)
101102
document._AddDesignUnit(entityB)
102103

103104
architectureBStatements = [
104105
EntityInstantiation("instWork", EntityInstantiationSymbol(SelectedName("entity_A", SimpleName("work")))),
105106
EntityInstantiation("instLib", EntityInstantiationSymbol(SelectedName("entity_A", SimpleName("lib_1")))),
106107
]
107-
architectureB = Architecture("arch_B", EntitySymbol(SimpleName("entity_B")), None, None, architectureBStatements, documentation="My second entity implementation.")
108+
architectureB = Architecture("arch_B", EntitySymbol(SimpleName("entity_B")), None, None, architectureBStatements,
109+
documentation="My second entity implementation.", parent=None)
108110
document._AddDesignUnit(architectureB)
109111

110112
packageReferences = [
111113
ContextReference([
112114
ContextReferenceSymbol(SelectedName("ctx_1", SimpleName("work"))),
113115
]),
114116
]
115-
package = Package("pack_1", packageReferences, documentation="My first utility package.")
117+
package = Package("pack_1", packageReferences, documentation="My first utility package.", parent=None)
116118
document._AddDesignUnit(package)
117119

118-
packageBody = PackageBody(PackageSymbol(SimpleName("pack_1")))
120+
packageBody = PackageBody(PackageSymbol(SimpleName("pack_1")), parent=None)
119121
document._AddDesignUnit(packageBody)
120122

121-
configuration = Configuration("cfg_1")
123+
configuration = Configuration("cfg_1", parent=None)
122124
document._AddDesignUnit(configuration)
123125

124126
design.AddDocument(document, library)

0 commit comments

Comments
 (0)