Skip to content

Commit

Permalink
Check for left recursion inside precedence!()
Browse files Browse the repository at this point in the history
Fixes #238
  • Loading branch information
kevinmehall committed Feb 21, 2021
1 parent a8d0473 commit a8510d9
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 1 deletion.
20 changes: 19 additions & 1 deletion peg-macros/analysis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,25 @@ impl<'a> RecursionVisitor<'a> {

MatchStrExpr(ref expr) | QuietExpr(ref expr) => self.walk_expr(expr),

PrecedenceExpr { .. } => RuleInfo { nullable: false },
PrecedenceExpr { ref levels } => {
let mut nullable = false;

for level in levels {
for operator in &level.operators {
let mut operator_nullable = true;
for element in &operator.elements {
let res = self.walk_expr(&element.expr);
if !res.nullable {
operator_nullable = false;
break;
}
}
nullable |= operator_nullable;
}
}

RuleInfo { nullable }
},

LiteralExpr(_) | PatternExpr(_) | MethodExpr(_, _) | FailExpr(_) | MarkerExpr(_) => {
RuleInfo { nullable: false }
Expand Down
4 changes: 4 additions & 0 deletions tests/compile-fail/left_recursion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ peg::parser!(grammar foo() for str {
rule bar()
= "bar" bar()
/ foo() //~ ERROR left recursive rules create an infinite loop: foo -> bar -> foo

rule prec() = precedence! {
prec() { () } //~ ERROR
}
});

fn main() {}
6 changes: 6 additions & 0 deletions tests/compile-fail/left_recursion.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@ error: left recursive rules create an infinite loop: bar -> foo -> bar
|
8 | / bar() //~ ERROR left recursive rules create an infinite loop: bar -> foo -> bar
| ^^^

error: left recursive rules create an infinite loop: prec -> prec
--> $DIR/left_recursion.rs:15:9
|
15 | prec() { () } //~ ERROR
| ^^^^

0 comments on commit a8510d9

Please sign in to comment.