Skip to content

Commit 9ddc827

Browse files
authored
Symbols, Expressions, Range
2 parents b1990cb + 6d768a9 commit 9ddc827

File tree

10 files changed

+439
-153
lines changed

10 files changed

+439
-153
lines changed

.github/workflows/Pipeline.yml

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ on: [ push ]
44

55
jobs:
66
UnitTesting:
7-
name: Unit Tests using Python ${{ matrix.python }}
7+
name: ${{ matrix.icon }} Unit Tests using Python ${{ matrix.python }}
88
runs-on: ubuntu-latest
99

1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
python: [ 3.6, 3.7, 3.8, 3.9 ]
13+
include:
14+
- {python: 3.6, icon: 🔴}
15+
- {python: 3.7, icon: 🟠}
16+
- {python: 3.8, icon: 🟡}
17+
- {python: 3.9, icon: 🟢}
1418

1519
env:
1620
PYTHON: ${{ matrix.python }}
@@ -21,12 +25,12 @@ jobs:
2125
- name: Checkout repository
2226
uses: actions/checkout@v2
2327

24-
- name: Setup Python ${{ matrix.python }}
28+
- name: 🐍 Setup Python ${{ matrix.python }}
2529
uses: actions/setup-python@v2
2630
with:
2731
python-version: ${{ matrix.python }}
2832

29-
- name: Install dependencies
33+
- name: 🔧 Install dependencies
3034
run: |
3135
python -m pip install --upgrade pip
3236
pip install -r tests/requirements.txt
@@ -36,7 +40,7 @@ jobs:
3640
python -m pytest -rA tests/unit
3741
3842
Coverage:
39-
name: Collect Coverage Data using Python 3.9
43+
name: 📈 Collect Coverage Data using Python 3.9
4044
runs-on: ubuntu-latest
4145

4246
env:
@@ -45,15 +49,15 @@ jobs:
4549
python: ${{ env.PYTHON }}
4650

4751
steps:
48-
- name: Checkout repository
52+
- name: 🔋 Checkout repository
4953
uses: actions/checkout@v2
5054

51-
- name: Setup Python ${{ env.PYTHON }}
55+
- name: 🐍 Setup Python ${{ env.PYTHON }}
5256
uses: actions/setup-python@v2
5357
with:
5458
python-version: ${{ env.PYTHON }}
5559

56-
- name: Install dependencies
60+
- name: 🗂 Install dependencies
5761
run: |
5862
python -m pip install --upgrade pip
5963
pip install -r tests/requirements.txt
@@ -67,15 +71,15 @@ jobs:
6771
run: |
6872
coverage xml
6973
70-
- name: Publish coverage at CodeCov
74+
- name: 📊 Publish coverage at CodeCov
7175
continue-on-error: true
7276
uses: codecov/codecov-action@v1
7377
with:
7478
file: ./coverage.xml
7579
flags: unittests
7680
env_vars: PYTHON
7781

78-
- name: Publish coverage at Codacy
82+
- name: 📉 Publish coverage at Codacy
7983
continue-on-error: true
8084
uses: codacy/codacy-coverage-reporter-action@master
8185
with:
@@ -101,7 +105,7 @@ jobs:
101105
upload_url: ${{ steps.createReleasePage.outputs.upload_url }}
102106

103107
steps:
104-
- name: Extract Git tag from GITHUB_REF
108+
- name: 🔁 Extract Git tag from GITHUB_REF
105109
id: getVariables
106110
run: |
107111
GIT_TAG=${GITHUB_REF#refs/*/}
@@ -112,7 +116,7 @@ jobs:
112116
echo ::set-output name=version::${RELEASE_VERSION}
113117
echo ::set-output name=datetime::${RELEASE_DATETIME}
114118
115-
- name: Create Release Page
119+
- name: 📑 Create Release Page
116120
id: createReleasePage
117121
uses: actions/create-release@v1
118122
env:
@@ -135,7 +139,7 @@ jobs:
135139
prerelease: false
136140

137141
Package:
138-
name: Package in Wheel Format
142+
name: 📦 Package in Wheel Format
139143
runs-on: ubuntu-latest
140144

141145
if: startsWith(github.ref, 'refs/tags')
@@ -150,28 +154,28 @@ jobs:
150154
artifact: ${{ env.ARTIFACT }}
151155

152156
steps:
153-
- name: Checkout repository
157+
- name: 📥 Checkout repository
154158
uses: actions/checkout@v2
155159

156-
- name: Setup Python ${{ env.PYTHON }}
160+
- name: 🐍 Setup Python ${{ env.PYTHON }}
157161
uses: actions/setup-python@v2
158162
with:
159163
python-version: ${{ env.PYTHON }}
160164

161-
- name: Install dependencies for packaging and release
165+
- name: 🔧 Install dependencies for packaging and release
162166
run: |
163167
python -m pip install --upgrade pip
164168
pip install wheel
165169
166-
- name: Build Python package (source distribution)
170+
- name: 🔨 Build Python package (source distribution)
167171
run: |
168172
python setup.py sdist
169173
170-
- name: Build Python package (binary distribution - wheel)
174+
- name: 🔨 Build Python package (binary distribution - wheel)
171175
run: |
172176
python setup.py bdist_wheel
173177
174-
- name: Upload 'pyVHDLModel' artifact
178+
- name: 📤 Upload 'pyVHDLModel' artifact
175179
uses: actions/upload-artifact@v2
176180
with:
177181
name: ${{ env.ARTIFACT }}
@@ -201,39 +205,39 @@ jobs:
201205
name: ${{ env.ARTIFACT }}
202206
path: dist/
203207

204-
- name: Setup Python ${{ env.PYTHON }}
208+
- name: 🐍 Setup Python ${{ env.PYTHON }}
205209
uses: actions/setup-python@v2
206210
with:
207211
python-version: ${{ env.PYTHON }}
208212

209-
- name: Install dependencies for packaging and release
213+
- name: Install dependencies for packaging and release
210214
run: |
211215
python -m pip install --upgrade pip
212216
pip install wheel twine
213217
214-
- name: Release Python package to PyPI
218+
- name: Release Python package to PyPI
215219
env:
216220
TWINE_USERNAME: __token__
217221
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
218222
run: |
219223
twine upload dist/*
220224
221225
BuildTheDocs:
222-
name: Run BuildTheDocs and publish to GH-Pages
226+
name: 📓 Run BuildTheDocs and publish to GH-Pages
223227
runs-on: ubuntu-latest
224228
steps:
225229

226230
- name: Checkout repository
227231
uses: actions/checkout@v2
228232

229-
- name: Build documentation in 'pyVHDLModel/doc'
233+
- name: 🚢 Build documentation in 'pyVHDLModel/doc'
230234
run: |
231235
docker build -t vhdl/doc - <<-EOF
232236
FROM btdi/sphinx:featured
233237
RUN apk add -U --no-cache graphviz
234238
EOF
235239
236-
- name: Unknown
240+
- name: 🛳️ Unknown
237241
uses: buildthedocs/btd@v0
238242
with:
239243
token: ${{ github.token }}
@@ -245,7 +249,7 @@ jobs:
245249
path: doc/_build/html
246250

247251
ArtifactCleanUp:
248-
name: Artifact Cleanup
252+
name: 🗑️ Artifact Cleanup
249253
runs-on: ubuntu-latest
250254

251255
needs:
@@ -256,7 +260,7 @@ jobs:
256260
ARTIFACT: ${{ needs.Package.outputs.artifact }}
257261

258262
steps:
259-
- name: Delete all Artifacts
263+
- name: 🗑️ Delete all Artifacts
260264
uses: geekyeggo/delete-artifact@v1
261265
with:
262266
name: |

doc/LanguageModel/ConcurrentStatements.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ Assert Statement
5050
5151
# inherited from MixinReportStatement
5252
@property
53-
def Message(self) -> Expression:
53+
def Message(self) -> BaseExpression:
5454
5555
@property
56-
def Severity(self) -> Expression:
56+
def Severity(self) -> BaseExpression:
5757
5858
# inherited from MixinAssertStatement
5959
@property
60-
def Condition(self) -> Expression:
60+
def Condition(self) -> BaseExpression:
6161
6262
6363
@@ -89,7 +89,7 @@ Signal Assignment
8989
def Target(self) -> Object:
9090
9191
@property
92-
def Expression(self) -> Expression:
92+
def BaseExpression(self) -> BaseExpression:
9393
9494
9595
@@ -217,7 +217,7 @@ Case Generate
217217
218218
# from CaseGenerateStatement
219219
@property
220-
def SelectExpression(self) -> Expression:
220+
def SelectExpression(self) -> BaseExpression:
221221
222222
@property
223223
def Cases(self) -> List[ConcurrentCase]:

doc/LanguageModel/DesignUnits.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ types). An entity's list of statements is called body items.
8383
def LibraryReferences(self) -> List[Library]:
8484
8585
@property
86-
def PackageReferences(self) -> List[PackageReference]:
86+
def PackageReferences(self) -> List[UseStatement]:
8787
8888
@property
8989
def ContextReferences(self) -> List[Context]:
@@ -131,7 +131,7 @@ Package
131131
def LibraryReferences(self) -> List[Library]:
132132
133133
@property
134-
def PackageReferences(self) -> List[PackageReference]:
134+
def PackageReferences(self) -> List[UseStatement]:
135135
136136
@property
137137
def ContextReferences(self) -> List[Context]:
@@ -178,7 +178,7 @@ Architeture
178178
def LibraryReferences(self) -> List[Library]:
179179
180180
@property
181-
def PackageReferences(self) -> List[PackageReference]:
181+
def PackageReferences(self) -> List[UseStatement]:
182182
183183
@property
184184
def ContextReferences(self) -> List[Context]:
@@ -223,7 +223,7 @@ Package Body
223223
def LibraryReferences(self) -> List[Library]:
224224
225225
@property
226-
def PackageReferences(self) -> List[PackageReference]:
226+
def PackageReferences(self) -> List[UseStatement]:
227227
228228
@property
229229
def ContextReferences(self) -> List[Context]:

doc/LanguageModel/InterfaceItems.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ GenericConstantInterfaceItem
6666
6767
# inherited from WithDefaultExpression
6868
@property
69-
def DefaultExpression(self) -> Expression:
69+
def DefaultExpression(self) -> BaseExpression:
7070
7171
# inherited from InterfaceItem
7272
@property
@@ -178,7 +178,7 @@ PortSignalInterfaceItem
178178
179179
# inherited from WithDefaultExpression
180180
@property
181-
def DefaultExpression(self) -> Expression:
181+
def DefaultExpression(self) -> BaseExpression:
182182
183183
# inherited from InterfaceItem
184184
@property
@@ -220,7 +220,7 @@ ParameterConstantInterfaceItem
220220
221221
# inherited from WithDefaultExpression
222222
@property
223-
def DefaultExpression(self) -> Expression:
223+
def DefaultExpression(self) -> BaseExpression:
224224
225225
# inherited from InterfaceItem
226226
@property
@@ -257,7 +257,7 @@ ParameterVariableInterfaceItem
257257
258258
# inherited from WithDefaultExpression
259259
@property
260-
def DefaultExpression(self) -> Expression:
260+
def DefaultExpression(self) -> BaseExpression:
261261
262262
# inherited from InterfaceItem
263263
@property
@@ -294,7 +294,7 @@ ParameterSignalInterfaceItem
294294
295295
# inherited from WithDefaultExpression
296296
@property
297-
def DefaultExpression(self) -> Expression:
297+
def DefaultExpression(self) -> BaseExpression:
298298
299299
# inherited from InterfaceItem
300300
@property

doc/LanguageModel/ObjectDeclarations.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ a deferred constant. See :ref:`vhdlmodel-deferredconstant` in next section.
7474
def SubType(self) -> SubType:
7575
7676
@property
77-
def DefaultExpression(self) -> Expression:
77+
def DefaultExpression(self) -> BaseExpression:
7878
7979
8080
@@ -171,7 +171,7 @@ expression.
171171
172172
# inherited from WithDefaultExpression
173173
@property
174-
def DefaultExpression(self) -> Expression:
174+
def DefaultExpression(self) -> BaseExpression:
175175
176176
177177
@@ -233,7 +233,7 @@ assigned via a default expression.
233233
234234
# inherited from WithDefaultExpression
235235
@property
236-
def DefaultExpression(self) -> Expression:
236+
def DefaultExpression(self) -> BaseExpression:
237237
238238
239239

0 commit comments

Comments
 (0)