Allows readers to interpret macro invocations as encoding directives. #976
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
Oct 17, 2024
| override fun iterateTypeAnnotations(): MutableIterator<String>? = currentValueExpression?.annotations?.mapTo(mutableListOf()) { it.assumeText() }?.iterator() | ||
| override fun iterateTypeAnnotations(): MutableIterator<String> { | ||
| return currentValueExpression?.annotations?.mapTo(mutableListOf()) { it.assumeText() }?.iterator() | ||
| ?: return Collections.emptyIterator() |
There was a problem hiding this comment.
IonReader.iterateTypeAnnotations() is documented to return non-null.
popematt
approved these changes
Oct 17, 2024
| @@ -22,8 +22,11 @@ internal class EncodingDirectiveReader(private val reader: IonReader, readerAdap | |||
| private var state: State = State.READING_VALUE | |||
|
|
|||
| var isSymbolTableAppend = false | |||
| var isMacroTableAppend = false | |||
There was a problem hiding this comment.
Just curious... can this non-append concatenations?
$ion_encoding::(
(symbol_table [a, b, c] $ion_encoding [g, h, i])
(macro_table (macro pi () 3.14159) $ion_encoding)
)
There was a problem hiding this comment.
No, not yet. I created #977
| return makeSymbolsMap(FIRST_LOCAL_SYMBOL_ID, symbols); | ||
| } | ||
|
|
||
| private static void writeSymbolTableAppendMacroInvocation(IonRawWriter_1_1 writer, Map<String, Integer> existingSymbols, String... newSymbols) { |
There was a problem hiding this comment.
The combination of "SymbolTableAppendMacro" got me confused. Maybe E-Expression would be a better choice here (and in the similar methods)?
Suggested change
| private static void writeSymbolTableAppendMacroInvocation(IonRawWriter_1_1 writer, Map<String, Integer> existingSymbols, String... newSymbols) { | |
| private static void writeSymbolTableAppendEExpression(IonRawWriter_1_1 writer, Map<String, Integer> existingSymbols, String... newSymbols) { |
tgregg
force-pushed
the
ion-11-encoding-read-encoding-directives-from-invocations
branch
from
bf2951e
to
64610d7
Compare
tgregg
deleted the
ion-11-encoding-read-encoding-directives-from-invocations
branch
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 #973 to allow the readers to correctly interpret the
set_macros,add_macros,set_symbols, andadd_symbolssystem macros as encoding directives.As noted in the JavaDoc atop the EncodingDirectiveReader class, this PR includes some duplication between the top-level
EncodingDirectiveReaderand the one built into the core binary reader. We have a path to unifying these implementations in the future, but that is out of scope for this PR.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.