Adds binary eexp subfield span accessors #850
Merged
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
zslayton
commented
Nov 7, 2024
| @@ -18,32 +18,6 @@ use crate::lazy::text::raw::v1_1::arg_group::{EExpArg, EExpArgExpr}; | |||
| use crate::lazy::text::raw::v1_1::reader::MacroIdRef; | |||
| use crate::{try_or_some_err, v1_1, Environment, HasRange, HasSpan, IonResult, Span}; | |||
|
|
|||
| #[derive(Copy, Clone)] | |||
| pub struct BinaryEExpHeader { | |||
There was a problem hiding this comment.
🗺️ This type was created to offer methods like those added in this PR, but it was never completed or used.
| // will be the beginning of the encoded arguments. | ||
| // This index is the first position after the opcode and address. | ||
| // If the e-expression has a length prefix, it will begin at this position in `input`. | ||
| length_offset: u8, |
There was a problem hiding this comment.
🗺️ This type had 6 bytes of padding, so adding another u8 field did not increase its size.
Comment on lines
+966
to
+968
| // There is no length prefix, so we re-use the bitmap_offset as the first position | ||
| // beyond the opcode and address subfields. | ||
| bitmap_offset as u8, |
There was a problem hiding this comment.
🗺️ This is in the parser for e-expressions with combined opcode+address bytes. There is never a length prefix.
| @@ -996,6 +999,7 @@ impl<'a> BinaryBuffer<'a> { | |||
| })? | |||
| .reference(); | |||
| // Offset from `self`, not offset from the beginning of the stream. | |||
| let length_offset = (input_after_address.offset() - self.offset()) as u8; | |||
There was a problem hiding this comment.
🗺️ This is in the parser for 0xF5, e-expression w/length prefix.
tgregg
reviewed
Nov 7, 2024
Comment on lines
92
to
93
| // If these offsets are equal, there are no bytes representing the length. | ||
| self.length_offset == self.bitmap_offset |
There was a problem hiding this comment.
Suggested change
| // If these offsets are equal, there are no bytes representing the length. | |
| self.length_offset == self.bitmap_offset | |
| // If these offsets are equal, there are no bytes representing the length. | |
| self.length_offset != self.bitmap_offset |
If I'm reading this correctly. Though this function does appear unused.
jobarr-amzn
approved these changes
Nov 7, 2024
tgregg
approved these changes
Nov 7, 2024
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.
For use in tooling, particularly
ion inspect. These methods allow an application to access the encoded subfields of a binary 1.1 e-expression.Related to amazon-ion/ion-cli#181.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.