Make data.Const comparable with list and dict objects compatible with the layout
#1420
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, `KeyError` was raised, which should not be escaping the implementation (`Layout.const` is not a retrieval method).
Before this commit, `data.Const` was only comparable to `data.Const` or
`data.View`.
After this commit, in addition, it is also comparable to `dict` or
`list` provided that such a value is accepted by `layout.const()` where
`layout` is the layout of the `data.Const` object.
This change greatly reduces boilerplate in tests by enabling e.g.:
assert (await stream_get(ctx, stream)) == {"value": 1}
instead of:
assert (await stream_get(ctx, stream)) == Const({"value": 1}, stream.p.shape())
Note that, unlike `Layout.const`, which accepts arbitrary `Mapping` or
`Sequence` objects, only `dict` and `list` are accepted in comparisons.
Also, `data.View` continues to be comparable only to `data.View` and
`data.Const`. This is to minimize the scope of the change and reduce
likelihood of undesirable side effects when backported to the 0.5.x
branch.
Fixes amaranth-lang#1414.
whitequark
force-pushed
the
data-const-compare-dict-list
branch
from
6de51e0 to
0f9f398
Compare
wanda-phi
approved these changes
Jun 27, 2024
|
For additional context, the main reason end = Signal()
with m.If(stream.payload == {"data": 1, "end": end}):
...Whether it should be allowed or not is definitely RFC-worthy, and @wanda-phi actually had a planned RFC that would bring the underlying functionality for composing a View out of a concatenation of parts. For the time being, I think it's simplest and safest to not touch |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before this commit,
data.Constwas only comparable todata.Constordata.View.After this commit, in addition, it is also comparable to
dictorlistprovided that such a value is accepted bylayout.const()wherelayoutis the layout of thedata.Constobject.This change greatly reduces boilerplate in tests by enabling e.g.:
instead of:
Note that, unlike
Layout.const, which accepts arbitraryMappingorSequenceobjects, onlydictandlistare accepted in comparisons. Also,data.Viewcontinues to be comparable only todata.Viewanddata.Const. This is to minimize the scope of the change and reduce likelihood of undesirable side effects when backported to the 0.5.x branch.Fixes #1414.