Skip to content

parser: cleanup dupe b_expr funcs #750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 1 commit into from
Dec 20, 2025
Merged

parser: cleanup dupe b_expr funcs #750

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions crates/squawk_parser/src/grammar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,16 +300,6 @@ fn overlay_fn(p: &mut Parser<'_>) -> CompletedMarker {
// cause trouble in the places where b_expr is used.
fn position_fn(p: &mut Parser<'_>) -> CompletedMarker {
assert!(p.at(POSITION_KW));
fn b_expr(r: &mut Parser<'_>) -> Option<CompletedMarker> {
expr_bp(
r,
1,
&Restrictions {
in_disabled: true,
..Restrictions::default()
},
)
}
let m = p.start();
p.expect(POSITION_KW);
p.expect(L_PAREN);
Expand Down Expand Up @@ -1419,7 +1409,7 @@ fn lhs(p: &mut Parser<'_>, r: &Restrictions) -> Option<CompletedMarker> {
}
};
// parse the interior of the unary expression
let _ = expr_bp(p, prefix_bp, &Restrictions::default());
expr_bp(p, prefix_bp, &Restrictions::default());
let cm = m.complete(p, kind);
Some(cm)
}
Expand Down Expand Up @@ -2127,9 +2117,9 @@ fn between_expr(p: &mut Parser<'_>) -> CompletedMarker {
p.eat(NOT_KW);
p.expect(BETWEEN_KW);
p.eat(SYMMETRIC_KW);
bexpr(p);
b_expr(p);
p.expect(AND_KW);
bexpr(p);
b_expr(p);
m.complete(p, BETWEEN_EXPR)
}

Expand Down Expand Up @@ -2315,8 +2305,7 @@ fn opt_expr(p: &mut Parser<'_>) -> Option<CompletedMarker> {

// Based on the Postgres grammar b_expr, it's expr without `AND`, `NOT`, `IS`,
// and `IN`
#[must_use]
fn bexpr(p: &mut Parser<'_>) -> Option<CompletedMarker> {
fn b_expr(p: &mut Parser<'_>) -> Option<CompletedMarker> {
expr_bp(
p,
1,
Expand Down Expand Up @@ -2477,7 +2466,6 @@ struct Restrictions {
and_disabled: bool,
}

#[must_use]
fn expr_bp(p: &mut Parser<'_>, bp: u8, r: &Restrictions) -> Option<CompletedMarker> {
let m = p.start();
if !p.at_ts(EXPR_FIRST) {
Expand Down
Loading