Trigger errors without macros, remove unwrap_or_else! and go_match!
#600
Conversation
This file contains hidden or 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
Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
simonwuelker
commented
Apr 13, 2025
Comment on lines
+376
to
+377
| #[cfg(feature = "trace_tokenizer")] | ||
| trace!(" error"); |
There was a problem hiding this comment.
I think the usefulness of the trace_tokenizer feature is a bit questionable, but I didn't want to touch it for now. This matches what the sh_trace! macro would log before.
jdm
approved these changes
Apr 14, 2025
| @@ -1565,7 +1578,10 @@ impl<Sink: TokenSink> Tokenizer<Sink> { | |||
|
|
|||
| states::MarkupDeclarationOpen => go!(self: error; to BogusComment), | |||
|
|
|||
| states::CdataSection => go!(self: emit_temp; error_eof; to Data), | |||
| states::CdataSection => { | |||
| self.bad_eof_error(); | |||
There was a problem hiding this comment.
This reorders the eof and emit_tmp. Is that a problem?
There was a problem hiding this comment.
Any user that relies on this ordering is doing silly things, but it is observable I think. Nice catch!
Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
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.
This change is the first step in gradually removing the
go!macro that is currently used to implement the tokenizer-DSL.When this macro was first introduced it might have made sense to have it - some quality-of-life rust syntax did not exist back then.
But I think it's not necessary anymore and I'm certain that it's possible to remove the DSL without compromising on performance or readability (like this).