Skip to content

Commit ce05433

Browse files
authored
Merge pull request #159 from krcb197/144-optimise-the-traversal-iterators
144 optimise the traversal iterators
2 parents 0ca0818 + 5519e6d commit ce05433

File tree

11 files changed

+1226
-1200
lines changed

11 files changed

+1226
-1200
lines changed

src/peakrdl_python/__about__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
1818
Variables that describes the peakrdl-python Package
1919
"""
20-
__version__ = "0.9.2"
20+
__version__ = "0.9.3"

src/peakrdl_python/lib/__init__.py

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -37,52 +37,52 @@
3737
from .base import AsyncAddressMapArray
3838
from .base import AsyncRegFileArray
3939

40-
from .register import Reg
41-
from .register import RegArray
42-
from .register import RegisterWriteVerifyError
40+
from .register_and_field import Reg
41+
from .register_and_field import RegArray
42+
from .register_and_field import RegisterWriteVerifyError
4343

44-
from .register import RegReadOnly
45-
from .register import RegWriteOnly
46-
from .register import RegReadWrite
47-
from .register import WritableRegister
48-
from .register import ReadableRegister
44+
from .register_and_field import RegReadOnly
45+
from .register_and_field import RegWriteOnly
46+
from .register_and_field import RegReadWrite
47+
from .register_and_field import WritableRegister
48+
from .register_and_field import ReadableRegister
4949

50-
from .register import RegReadOnlyArray
51-
from .register import RegWriteOnlyArray
52-
from .register import RegReadWriteArray
53-
from .register import ReadableRegisterArray
54-
from .register import WriteableRegisterArray
50+
from .register_and_field import RegReadOnlyArray
51+
from .register_and_field import RegWriteOnlyArray
52+
from .register_and_field import RegReadWriteArray
53+
from .register_and_field import ReadableRegisterArray
54+
from .register_and_field import WriteableRegisterArray
5555

56-
from .async_register import AsyncReg
57-
from .async_register import AsyncRegArray
58-
from .async_register import RegAsyncReadOnly
59-
from .async_register import RegAsyncWriteOnly
60-
from .async_register import RegAsyncReadWrite
61-
from .async_register import ReadableAsyncRegister
62-
from .async_register import WritableAsyncRegister
63-
from .async_register import RegAsyncReadOnlyArray
64-
from .async_register import RegAsyncWriteOnlyArray
65-
from .async_register import RegAsyncReadWriteArray
66-
from .async_register import ReadableAsyncRegisterArray
67-
from .async_register import WriteableAsyncRegisterArray
56+
from .async_register_and_field import AsyncReg
57+
from .async_register_and_field import AsyncRegArray
58+
from .async_register_and_field import RegAsyncReadOnly
59+
from .async_register_and_field import RegAsyncWriteOnly
60+
from .async_register_and_field import RegAsyncReadWrite
61+
from .async_register_and_field import ReadableAsyncRegister
62+
from .async_register_and_field import WritableAsyncRegister
63+
from .async_register_and_field import RegAsyncReadOnlyArray
64+
from .async_register_and_field import RegAsyncWriteOnlyArray
65+
from .async_register_and_field import RegAsyncReadWriteArray
66+
from .async_register_and_field import ReadableAsyncRegisterArray
67+
from .async_register_and_field import WriteableAsyncRegisterArray
6868

69-
from .fields import FieldSizeProps
70-
from .fields import FieldMiscProps
71-
from .fields import FieldReadOnly
72-
from .fields import FieldWriteOnly
73-
from .fields import FieldReadWrite
74-
from .fields import Field
75-
from .fields import FieldEnumReadOnly
76-
from .fields import FieldEnumWriteOnly
77-
from .fields import FieldEnumReadWrite
78-
from .fields import FieldEnum
69+
from .base_field import FieldSizeProps
70+
from .base_field import FieldMiscProps
71+
from .register_and_field import FieldReadOnly
72+
from .register_and_field import FieldWriteOnly
73+
from .register_and_field import FieldReadWrite
74+
from .base_field import Field
75+
from .register_and_field import FieldEnumReadOnly
76+
from .register_and_field import FieldEnumWriteOnly
77+
from .register_and_field import FieldEnumReadWrite
78+
from .base_field import FieldEnum
7979

80-
from .fields import FieldAsyncReadOnly
81-
from .fields import FieldAsyncWriteOnly
82-
from .fields import FieldAsyncReadWrite
83-
from .fields import FieldEnumAsyncReadOnly
84-
from .fields import FieldEnumAsyncWriteOnly
85-
from .fields import FieldEnumAsyncReadWrite
80+
from .async_register_and_field import FieldAsyncReadOnly
81+
from .async_register_and_field import FieldAsyncWriteOnly
82+
from .async_register_and_field import FieldAsyncReadWrite
83+
from .async_register_and_field import FieldEnumAsyncReadOnly
84+
from .async_register_and_field import FieldEnumAsyncWriteOnly
85+
from .async_register_and_field import FieldEnumAsyncReadWrite
8686

8787
from .memory import MemoryReadOnly, MemoryReadOnlyLegacy
8888
from .memory import MemoryWriteOnly, MemoryWriteOnlyLegacy

src/peakrdl_python/lib/async_memory.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@
4040

4141

4242
if TYPE_CHECKING:
43-
from .async_register import AsyncReg, AsyncRegArray
44-
from .async_register import ReadableAsyncRegister, WritableAsyncRegister
45-
from .async_register import ReadableAsyncRegisterArray, WriteableAsyncRegisterArray
46-
43+
from .async_register_and_field import AsyncReg, AsyncRegArray
44+
from .async_register_and_field import ReadableAsyncRegister, WritableAsyncRegister
45+
from .async_register_and_field import ReadableAsyncRegisterArray, WriteableAsyncRegisterArray
4746
# pylint: disable=duplicate-code
4847

4948

0 commit comments

Comments
 (0)