Adds support for macro-aware transcoding from text. #1010
Merged
+322
−146
Conversation
This file contains 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
tgregg
commented
Dec 9, 2024
| @@ -237,7 +237,7 @@ protected void readValueAsExpression(boolean isImplicitRest, List<Expression.EEx | |||
| } | |||
| IonType type = reader.encodingType(); | |||
| List<SymbolToken> annotations = getAnnotations(); | |||
| if (isImplicitRest) { | |||
| if (isImplicitRest && !isContainerAnExpressionGroup()) { | |||
There was a problem hiding this comment.
This is a bug fix. Without this, an expression group as the final parameter to a rest-compatible argument would be parsed into a nested expression group, which is illegal.
There was a problem hiding this comment.
This is one of the bugs that I noticed yesterday. Thanks for catching and fixing this.
| * @return true if the reader is positioned on an Ion 1.0 symbol table; otherwise, false. Note: the caller must | ||
| * ensure this is called only at the top level. | ||
| */ | ||
| boolean isPositionedOnSymbolTable() { |
There was a problem hiding this comment.
The green from here through handlePossibleIonVersionMarker was moved from the user-level reader.
tgregg
force-pushed
the
ion-11-encoding-by-value-transcode-text
branch
from
0ac1d7e to
db7014a
Compare
popematt
approved these changes
Dec 12, 2024
jobarr-amzn
approved these changes
Dec 12, 2024
Base automatically changed from
ion-11-encoding-by-value-transcode
to
ion-11-encoding
December 12, 2024 18:53
tgregg
force-pushed
the
ion-11-encoding-by-value-transcode-text
branch
from
db7014a to
b9df158
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description of changes:
Builds on #1000 and #1005.
Supports macro-aware transcoding from text, preserving symbol tables, encoding directives, and e-expression invocations. This will be useful for:
This change required moving a few symbol table-related methods from the user reader to the system reader, as we had to do in binary. That's because Ion 1.1 e-expressions need to be interpreted at the system level (because they may expand to system values), and may therefore affect the encoding context (including the symbol table).
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.