Some function call fixes#684
Merged
Kijewski merged 1 commit intoaskama-rs:mainfrom Jan 28, 2026
Merged
Conversation
Kijewski
commented
Jan 28, 2026
Comment on lines
-31
to
37
| let mut i_before = *i; | ||
| let mut level_guard = i.state.level.guard(); | ||
| while let Some(((op, span), rhs)) = opt((ws(op.with_span()), inner)).parse_next(i)? { | ||
| let mut next = opt(|i: &mut _| { | ||
| // We need to make sure that we decrement the level before we enter the right-hand side. | ||
| let i_before = *i; | ||
| let op = ws(op.with_span()).parse_next(i)?; | ||
| level_guard.nest(&i_before)?; | ||
| Ok((op, inner(i)?)) | ||
| }); | ||
| while let Some(((op, span), rhs)) = next.parse_next(i)? { | ||
| expr = WithSpan::new(Box::new(Expr::BinOp(BinOp { op, lhs: expr, rhs })), span); | ||
| i_before = *i; | ||
| } |
Member
Author
There was a problem hiding this comment.
This function was a red herring. The change did not fix the problem with the function calls, but I still think the old implementation was not exactly correct.
Kijewski
commented
Jan 28, 2026
Comment on lines
+282
to
+292
| fn comma<'a: 'l, 'l>(i: &mut InputStream<'a, 'l>) -> ParseResult<'a, ()> { | ||
| (ws(','), no_comma).void().parse_next(i) | ||
| } | ||
|
|
||
| fn no_comma<'a: 'l, 'l>(i: &mut InputStream<'a, 'l>) -> ParseResult<'a, ()> { | ||
| if let Some(span) = opt(','.span()).parse_next(i)? { | ||
| cut_error!("stray comma `,` in argument list", span) | ||
| } else { | ||
| Ok(()) | ||
| } | ||
| } |
Member
Author
There was a problem hiding this comment.
The introduction of the repeated-comma check is not necessarily part of the PR, but I think it makes for better error messages, and I was reviewing the function anyway. :)
|
|
||
| fn no_comma<'a: 'l, 'l>(i: &mut InputStream<'a, 'l>) -> ParseResult<'a, ()> { | ||
| if let Some(span) = opt(','.span()).parse_next(i)? { | ||
| cut_error!("stray comma `,` in argument list", span) |
Collaborator
There was a problem hiding this comment.
This is a nit, not something that necessarily needs a fix but: I'd write expected an expression, found a comma in argument list.
Member
Author
There was a problem hiding this comment.
Yeah, makes sense to tell the user what we expected instead of the comma.
Collaborator
There was a problem hiding this comment.
Following compiler example. :)
GuillaumeGomez
previously approved these changes
Jan 28, 2026
Collaborator
|
Apart from the nit, looks all good to me, thanks! |
4f11aa2 to
e7fff80
Compare
| fn no_comma<'a: 'l, 'l>(i: &mut InputStream<'a, 'l>) -> ParseResult<'a, ()> { | ||
| if let Some(span) = opt(','.span()).parse_next(i)? { | ||
| cut_error!( | ||
| "expected an expression, but found a comma in argument list", |
Collaborator
There was a problem hiding this comment.
nitpicking++
Suggested change
| "expected an expression, but found a comma in argument list", | |
| "expected an expression, found a comma in argument list", |
* Parsing function calls is expensive. Make sure not to stack overflow. * We only need to to call `level.nest()` if we descent, but we need to call it before we descent.
GuillaumeGomez
approved these changes
Jan 28, 2026
Collaborator
|
Thanks! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
level.nest()if we descent, but we need to call it before we descent.I de-indented a good chunk of the code, so the diff might be more readable with hidden white-space changes.
Fixes #682.