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

Restack 1.1 macros and symbols to meet spec changes #1013

Merged
merged 3 commits into from
Dec 12, 2024

Conversation

jobarr-amzn
Copy link
Contributor

See also: amazon-ion/ion-rust#879

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@jobarr-amzn jobarr-amzn requested a review from zslayton December 12, 2024 00:04
Copy link
Contributor

@tgregg tgregg left a comment

Choose a reason for hiding this comment

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

Confirmed this is consistent with ion-rust as of amazon-ion/ion-rust#879

src/test/java/com/amazon/ion/impl/bin/WriteBufferTest.java Outdated Show resolved Hide resolved
Copy link
Contributor

@popematt popematt left a comment

Choose a reason for hiding this comment

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

I'm not sure quite what's going on with the ion-tests submodule update that's included in this PR. Naturally, some conformance tests will likely fail if the symbols have been restacked in ion-java without being also updated in ion-tests.

Can you

  • make sure that the ion-tests commit you are using in this PR is one that is already present in main (of ion-tests)?
  • add the failing tests to the skip-list in ConformanceTestRunner, along with a note what change caused the tests to start failing?

Comment on lines +61 to +62
MakeList(14, MAKE_LIST, listOf(zeroToManyTagged("sequences")), null), // TODO: make_list
MakeSExp(15, MAKE_SEXP, listOf(zeroToManyTagged("sequences")), null), // TODO: make_sexp
Copy link
Contributor

@popematt popematt Dec 12, 2024

Choose a reason for hiding this comment

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

Non-blocking—the nulls are unnecessary.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll fix that, thanks.

@jobarr-amzn
Copy link
Contributor Author

I know what's going wrong with ion-tests- I ended up pulling in an older version somehow. I'm working through that and I will first publish an update to ion-tests and then a new revision to this PR.

@jobarr-amzn jobarr-amzn merged commit 4f594cf into ion-11-encoding Dec 12, 2024
17 checks passed
@jobarr-amzn jobarr-amzn deleted the restack-macros-symbols branch December 12, 2024 20:06
tgregg added a commit that referenced this pull request Dec 13, 2024
* Restack macros and symbols to meet spec changes

* Update ion-tests for symbol and macro restack

* Fix comment in src/test/java/com/amazon/ion/impl/bin/WriteBufferTest.java

Co-authored-by: Tyler Gregg <[email protected]>

---------

Co-authored-by: Tyler Gregg <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants