Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Property now extends Data, remove BaseType #3514

Merged
merged 11 commits into from Aug 31, 2023
Merged

Conversation

jackkoenig
Copy link
Contributor

@jackkoenig jackkoenig commented Aug 30, 2023

Currently a draft PR because there is more to do:

  • Merge some of the code in Property back into Data
  • Rip out BaseType
  • Make Bundles and Vecs containing Properties work
  • Figure out what to do with connections containing Properties

Contributor Checklist

  • Did you add Scaladoc to every public function/method?
  • Did you add at least one test demonstrating the PR?
  • Did you delete any extraneous printlns/debugging code?
  • Did you specify the type of improvement?
  • Did you add appropriate documentation in docs/src?
  • Did you request a desired merge strategy?
  • Did you add text to be included in the Release Notes for this change?

Type of Improvement

  • API modification

A new entry in the Data subhierarchy is a pretty substantial change that will affect users.

Desired Merge Strategy

  • Squash

Release Notes

Properties can be fields of Bundles and used in wires.

Reviewer Checklist (only modified by reviewer)

  • Did you add the appropriate labels? (Select the most appropriate one based on the "Type of Improvement")
  • Did you mark the proper milestone (Bug fix: 3.5.x, 3.6.x, or 5.x depending on impact, API modification or big change: 6.0)?
  • Did you review?
  • Did you check whether all relevant Contributor checkboxes have been checked?
  • Did you do one of the following when ready to merge:
    • Squash: You/ the contributor Enable auto-merge (squash), clean up the commit message, and label with Please Merge.
    • Merge: Ensure that contributor has cleaned up their commit history, then merge with Create a merge commit.

We are ALL Data on this blessed day.
This is important so that you can connectable connect Seq[Property[A]]
to Property[Seq[Property[A]]]. This is needed to support Property
values/literals.
@jackkoenig jackkoenig marked this pull request as ready for review August 31, 2023 20:37
@jackkoenig jackkoenig changed the title MVP of Property extending Data Property now extends Data Aug 31, 2023
@jackkoenig
Copy link
Contributor Author

Note that I carefully reconstructed the order of fields in Data from before BaseType was added (and took some of the fields out in #3429), you can diff Data.scala with the prior commit (878733f) to see.

Copy link
Member

@seldridge seldridge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Do I read this correctly in that this is working for Wire, too?

core/src/main/scala/chisel3/IO.scala Outdated Show resolved Hide resolved
core/src/main/scala/chisel3/internal/BiConnect.scala Outdated Show resolved Hide resolved
src/test/scala/chiselTests/properties/PropertySpec.scala Outdated Show resolved Hide resolved
@jackkoenig
Copy link
Contributor Author

Do I read this correctly in that this is working for Wire, too?

You do indeed, I'll mention that in the release notes.

@jackkoenig jackkoenig changed the title Property now extends Data Property now extends Data, remove BaseType Aug 31, 2023
@jackkoenig jackkoenig enabled auto-merge (squash) August 31, 2023 21:16
@jackkoenig jackkoenig merged commit c9b5b83 into main Aug 31, 2023
14 checks passed
@jackkoenig jackkoenig deleted the properties-as-data branch August 31, 2023 21:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants