Skip to content
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.

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

feat: implement Pratt parsing #614

Draft
wants to merge 26 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
fed8c90
feat: implement Pratt parser
39555 Nov 10, 2024
ee4459d
commit suggestion
39555 Nov 16, 2024
4b1499d
remove spaces from #[doc(alias = "...")]
39555 Nov 16, 2024
acf4577
remove `UnaryOp` and `BinaryOp` in favor of `Fn`
39555 Nov 16, 2024
a816a1c
remove redundant trait impl
39555 Nov 16, 2024
2a80e65
remove `allow_unused`, move `allow(non_snake_case)` to where it shoul…
39555 Nov 16, 2024
29fe18d
stop dumping pratt into `combinator` namespace
39555 Nov 16, 2024
5a4f4b4
move important things to go first
39555 Nov 16, 2024
919a1cb
strip fancy api for now
39555 Nov 16, 2024
0273a29
remove wrong and long doc for now
39555 Nov 16, 2024
f218911
fix: precedence for associativity, remove `trace()`
39555 Nov 16, 2024
3d7ef41
switch from `&dyn Fn(O) -> O` to `fn(O) -> O`
39555 Nov 17, 2024
a6cbc1a
feat: pass Input into operator closures
39555 Nov 17, 2024
29b64fa
add `trace` for `tests` parser
39555 Nov 17, 2024
b31a3a3
feat: operator closures must return PResult
39555 Nov 18, 2024
33c82f3
feat: allow the user to specify starting power
39555 Nov 18, 2024
040dd85
feat: enum `Assoc` for infix operators. Add `Neither` associativity
39555 Nov 19, 2024
6d88dff
fix: switch to i64, fix precedence checking
39555 Nov 19, 2024
161f9da
fix: remove 'static constraint from `Operand`
39555 Nov 19, 2024
d53a32e
refactor: rename to `expression.rs`
39555 Nov 20, 2024
4f690db
refactor: rename to `fn expression`
39555 Nov 20, 2024
44546f2
feat: new api
39555 Nov 21, 2024
a583d24
fix: MSRV
39555 Nov 22, 2024
431b6f6
fix: clippy
39555 Nov 22, 2024
482a162
style: no need to specify the input type in the `fold` closure
39555 Nov 22, 2024
81ba185
feat: fn current_precedence_level(self, level: i64)
39555 Nov 22, 2024
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
3 changes: 3 additions & 0 deletions src/combinator/mod.rs
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Streaming support

This looks to be agnostic of streaming support like separated is

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hide behind a feature flagunstable-pratt

If this is going to start off unstable, then its fine noting most of my feedback in the "tracking" issue and not resolving all of it here

Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ mod multi;
mod parser;
mod sequence;

pub mod precedence;

#[cfg(test)]
mod tests;

Expand All @@ -174,6 +176,7 @@ pub use self::core::*;
pub use self::debug::*;
pub use self::multi::*;
pub use self::parser::*;
pub use self::precedence::*;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are dumping a lot of stray types into combinator. The single-line summaries should make it very easy to tell they are related to precedence (maybe be the first word) and somehow help the user know what, if any, they should care about

pub use self::sequence::*;

#[allow(unused_imports)]
Expand Down
193 changes: 193 additions & 0 deletions src/combinator/precedence.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
use crate::{
combinator::{opt, trace},
error::{ErrMode, ParserError},
stream::{Stream, StreamIsPartial},
PResult, Parser,
};

/// Parses an expression based on operator precedence.
#[doc(alias = "pratt")]
#[doc(alias = "separated")]
#[doc(alias = "shunting_yard")]
#[doc(alias = "precedence_climbing")]
#[inline(always)]
pub fn precedence<I, ParseOperand, ParseInfix, ParsePrefix, ParsePostfix, Operand: 'static, E>(
mut operand: ParseOperand,
mut prefix: ParsePrefix,
mut postfix: ParsePostfix,
mut infix: ParseInfix,
) -> impl Parser<I, Operand, E>
where
I: Stream + StreamIsPartial,
ParseOperand: Parser<I, Operand, E>,
ParseInfix: Parser<
I,
(
usize,
usize,
fn(&mut I, Operand, Operand) -> PResult<Operand, E>,
),
E,
>,
ParsePrefix: Parser<I, (usize, fn(&mut I, Operand) -> PResult<Operand, E>), E>,
ParsePostfix: Parser<I, (usize, fn(&mut I, Operand) -> PResult<Operand, E>), E>,
E: ParserError<I>,
{
trace("precedence", move |i: &mut I| {
let result = precedence_impl(i, &mut operand, &mut prefix, &mut postfix, &mut infix, 0)?;
Ok(result)
})
}

// recursive function
fn precedence_impl<I, ParseOperand, ParseInfix, ParsePrefix, ParsePostfix, Operand: 'static, E>(
i: &mut I,
parse_operand: &mut ParseOperand,
prefix: &mut ParsePrefix,
postfix: &mut ParsePostfix,
infix: &mut ParseInfix,
min_power: usize,
) -> PResult<Operand, E>
where
I: Stream + StreamIsPartial,
ParseOperand: Parser<I, Operand, E>,
ParseInfix: Parser<
I,
(
usize,
usize,
fn(&mut I, Operand, Operand) -> PResult<Operand, E>,
),
E,
>,
ParsePrefix: Parser<I, (usize, fn(&mut I, Operand) -> PResult<Operand, E>), E>,
ParsePostfix: Parser<I, (usize, fn(&mut I, Operand) -> PResult<Operand, E>), E>,
E: ParserError<I>,
{
let operand = opt(parse_operand.by_ref()).parse_next(i)?;
let mut operand = if let Some(operand) = operand {
operand
} else {
// Prefix unary operators
let len = i.eof_offset();
let (power, fold_prefix) = prefix.parse_next(i)?;
// infinite loop check: the parser must always consume
if i.eof_offset() == len {
return Err(ErrMode::assert(i, "`prefix` parsers must always consume"));
}
let operand = precedence_impl(i, parse_operand, prefix, postfix, infix, power)?;
fold_prefix(i, operand)?
};

'parse: while i.eof_offset() > 0 {
// Postfix unary operators
let start = i.checkpoint();
if let Some((power, fold_postfix)) = opt(postfix.by_ref()).parse_next(i)? {
// control precedence over the prefix e.g.:
// `--(i++)` or `(--i)++`
if power < min_power {
i.reset(&start);
break;
}
operand = fold_postfix(i, operand)?;

continue 'parse;
}

// Infix binary operators
let start = i.checkpoint();
let parse_result = opt(infix.by_ref()).parse_next(i)?;
if let Some((lpower, rpower, fold_infix)) = parse_result {
if lpower < min_power {
i.reset(&start);
break;
}
let rhs = precedence_impl(i, parse_operand, prefix, postfix, infix, rpower)?;
operand = fold_infix(i, operand, rhs)?;

continue 'parse;
}

break 'parse;
}

Ok(operand)
}

#[cfg(test)]
mod tests {
use crate::ascii::{digit1, space0};
use crate::combinator::{delimited, empty, fail, peek};
use crate::dispatch;
use crate::error::ContextError;
use crate::token::any;

use super::*;

fn factorial(x: i32) -> i32 {
if x == 0 {
1
} else {
x * factorial(x - 1)
}
}
fn parser<'i>() -> impl Parser<&'i str, i32, ContextError> {
move |i: &mut &str| {
precedence(
trace(
"operand",
delimited(
space0,
dispatch! {peek(any);
'(' => delimited('(', parser(), ')'),
_ => digit1.parse_to::<i32>()
},
space0,
),
),
trace(
"prefix",
dispatch! {any;
'+' => empty.value((9, (|_: &mut _, a| Ok(a)) as _)),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forgot to ask, why is as _ needed everywhere?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The compiler don't want to cast {closure34234234} into function pointer fn(&mut I, O) -> O automatically:(

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need it to be a function pointer rather than a dyn or an impl?

I assume #618 (comment) is related.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah it is related. &dyn also requires casting but with an additional &. I've switched to function pointers recently because I had trouble convincing the compiler that the lifetime of &mut I in the parser definition Parser<I, (usize, &dyn Fn(&mut I, Operand) -> PResult<Operand, E>), E>, is not related to the lifetime of the &dyn Fn, but it seems not always the case. So function pointers are actually easier and more type inference friendly. I doubt that the closure's variable capture is worth having dynamically dispatched &dyn callbacks in this context.
It cannot be impl because the return types of the dispatch are different closures.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we provided an infix function, the compiler would do the coercion for us, right?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just checked. Yes this simple guidance works

fn infix<I, O>(
    a: Assoc,
    f: fn(&mut I, O, O) -> PResult<O>,
) -> (
    Assoc,
    fn(&mut I, O, O) -> PResult<O>,
) {
    (a, f)
}
...

"*".value(infix(Assoc::Right(28), |_: &mut _, a, b| Ok(Expr::Pow(Box::new(a), Box::new(b)))))

'-' => empty.value((9, (|_: &mut _, a: i32| Ok(-a)) as _)),
_ => fail
},
),
trace(
"postfix",
dispatch! {any;
'!' => empty.value((9, (|_: &mut _, a| {Ok(factorial(a))}) as _)),
_ => fail
},
),
trace(
"infix",
dispatch! {any;
'+' => empty.value((5, 6, (|_: &mut _, a, b| Ok(a + b)) as _ )),
'-' => empty.value((5, 6, (|_: &mut _, a, b| Ok(a - b)) as _)),
'*' => empty.value((7, 8, (|_: &mut _, a, b| Ok(a * b)) as _)),
'/' => empty.value((7, 8, (|_: &mut _, a, b| Ok(a / b)) as _)),
'%' => empty.value((7, 8, (|_: &mut _, a, b| Ok(a % b)) as _)),
'^' => empty.value((9, 10, (|_: &mut _, a, b| Ok(a ^ b)) as _)),
_ => fail
},
),
)
.parse_next(i)
}
}

#[test]
fn test_precedence() {
assert_eq!(parser().parse("-3!+-3 * 4"), Ok(-18));
assert_eq!(parser().parse("+2 + 3 * 4"), Ok(14));
assert_eq!(parser().parse("2 * 3+4"), Ok(10));
}
#[test]
fn test_unary() {
assert_eq!(parser().parse("-2"), Ok(-2));
assert_eq!(parser().parse("4!"), Ok(24));
assert_eq!(parser().parse("2 + 4!"), Ok(26));
assert_eq!(parser().parse("-2 + 2"), Ok(0));
}
}