diff options
| author | Unai Martinez-Corral <38422348+umarcor@users.noreply.github.com> | 2021-06-22 12:05:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 12:05:45 +0100 |
| commit | bf45d9939dc26d0d584dd549923b9962f83360ec (patch) | |
| tree | 976beef99129705fa8d0e592dfba4fad61b80135 /testsuite/pyunit | |
| parent | 15f447b1270a815748fdbcce46d97abd9eecc21d (diff) | |
| parent | 0a69901be945dfb6c5372e657332d5e5ddfa10c7 (diff) | |
| download | ghdl-bf45d9939dc26d0d584dd549923b9962f83360ec.tar.gz ghdl-bf45d9939dc26d0d584dd549923b9962f83360ec.tar.bz2 ghdl-bf45d9939dc26d0d584dd549923b9962f83360ec.zip | |
More expression kinds and function calls (#1802)
Diffstat (limited to 'testsuite/pyunit')
| -rw-r--r-- | testsuite/pyunit/Current.vhdl | 4 | ||||
| -rw-r--r-- | testsuite/pyunit/dom/Expressions.py | 8 | ||||
| -rw-r--r-- | testsuite/pyunit/dom/Literals.py | 2 | ||||
| -rw-r--r-- | testsuite/pyunit/dom/SimpleEntity.py | 2 | ||||
| -rw-r--r-- | testsuite/pyunit/dom/SimplePackage.py | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/testsuite/pyunit/Current.vhdl b/testsuite/pyunit/Current.vhdl index 5a677546e..8653cb088 100644 --- a/testsuite/pyunit/Current.vhdl +++ b/testsuite/pyunit/Current.vhdl @@ -20,7 +20,7 @@ end entity entity_1; architecture behav of entity_1 is constant MAX : positive := -25; - signal rst : std_logic := 'U'; + signal rst : std_logic := foo'('U'); type newInt is range -4 to 3; subtype uint8 is integer range 0 to 255; @@ -45,7 +45,7 @@ begin end architecture behav; package package_1 is - constant ghdl : float := (3, 5, 0 => 5, 3 => 4, name => 10); -- 2.3; + constant ghdl : float := (3, 5, 0 to 2 => 5, 3 => 4, name => 10); -- 2.3; end package; package body package_1 is diff --git a/testsuite/pyunit/dom/Expressions.py b/testsuite/pyunit/dom/Expressions.py index 3a4f658af..a7afb30ba 100644 --- a/testsuite/pyunit/dom/Expressions.py +++ b/testsuite/pyunit/dom/Expressions.py @@ -5,8 +5,8 @@ from unittest import TestCase from pyGHDL.dom.DesignUnit import Package from pyGHDL.dom import Expression -from pyGHDL.dom.Misc import Design, Document -from pyGHDL.dom.Symbol import SimpleObjectSymbol +from pyGHDL.dom.NonStandard import Design, Document +from pyGHDL.dom.Symbol import SimpleObjectOrFunctionCallSymbol from pyGHDL.dom.Object import Constant from pyGHDL.dom.Expression import InverseExpression @@ -39,7 +39,7 @@ class Expressions(TestCase): item: Constant = package.DeclaredItems[0] default: Expression = item.DefaultExpression self.assertTrue(isinstance(default, InverseExpression)) - self.assertTrue(isinstance(default.Operand, SimpleObjectSymbol)) + self.assertTrue(isinstance(default.Operand, SimpleObjectOrFunctionCallSymbol)) self.assertTrue(default.Operand.SymbolName == "true") # def test_Aggregare(self): @@ -66,5 +66,5 @@ class Expressions(TestCase): # item: Constant = package.DeclaredItems[0] # default: Expression = item.DefaultExpression # self.assertTrue(isinstance(default, InverseExpression)) - # self.assertTrue(isinstance(default.Operand, SimpleObjectSymbol)) + # self.assertTrue(isinstance(default.Operand, SimpleObjectOrFunctionCallSymbol)) # self.assertTrue(default.Operand.SymbolName == "true") diff --git a/testsuite/pyunit/dom/Literals.py b/testsuite/pyunit/dom/Literals.py index 7eb80abaa..c542ebfe5 100644 --- a/testsuite/pyunit/dom/Literals.py +++ b/testsuite/pyunit/dom/Literals.py @@ -2,7 +2,7 @@ from pathlib import Path from textwrap import dedent from unittest import TestCase -from pyGHDL.dom.Misc import Design, Document +from pyGHDL.dom.NonStandard import Design, Document from pyGHDL.dom.Object import Constant from pyGHDL.dom.Literal import IntegerLiteral diff --git a/testsuite/pyunit/dom/SimpleEntity.py b/testsuite/pyunit/dom/SimpleEntity.py index 252032f9e..8199fe7cc 100644 --- a/testsuite/pyunit/dom/SimpleEntity.py +++ b/testsuite/pyunit/dom/SimpleEntity.py @@ -1,7 +1,7 @@ from pathlib import Path from unittest import TestCase -from pyGHDL.dom.Misc import Design, Library, Document +from pyGHDL.dom.NonStandard import Design, Document if __name__ == "__main__": diff --git a/testsuite/pyunit/dom/SimplePackage.py b/testsuite/pyunit/dom/SimplePackage.py index 212e0402d..5b16e74b8 100644 --- a/testsuite/pyunit/dom/SimplePackage.py +++ b/testsuite/pyunit/dom/SimplePackage.py @@ -1,7 +1,7 @@ from pathlib import Path from unittest import TestCase -from pyGHDL.dom.Misc import Design, Document +from pyGHDL.dom.NonStandard import Design, Document if __name__ == "__main__": |