language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-09-30 21:01:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix precedence of stream operator

Browse source
This commit is contained in:
Yuna Tomida 2022-11-16 13:01:55 +09:00
parent 5974ee942c
commit eb54cdd18b
No known key found for this signature in database
GPG key ID: 3446B3EBE0190A4E
1 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

43
compiler/erg_parser/parse.rs
View file

@ -948,11 +948,7 @@ impl Parser {
// "a": 1 (key-value pair) // "a": 1 (key-value pair)
if in_brace { if in_brace {
while stack.len() >= 3 { while stack.len() >= 3 {
let rhs = enum_unwrap!(stack.pop(), Some:(ExprOrOp::Expr:(_))); collect_last_binop_on_stack(&mut stack);
let op = enum_unwrap!(stack.pop(), Some:(ExprOrOp::Op:(_)));
let lhs = enum_unwrap!(stack.pop(), Some:(ExprOrOp::Expr:(_)));
let bin = BinOp::new(op, lhs, rhs);
stack.push(ExprOrOp::Expr(Expr::BinOp(bin)));
} }
break; break;
} }
@ -972,11 +968,7 @@ impl Parser {
if prev_op.category_is(TC::BinOp) if prev_op.category_is(TC::BinOp)
&& prev_op.kind.precedence() >= op_prec && prev_op.kind.precedence() >= op_prec
{ {
let rhs = enum_unwrap!(stack.pop(), Some:(ExprOrOp::Expr:(_))); collect_last_binop_on_stack(&mut stack);
let prev_op = enum_unwrap!(stack.pop(), Some:(ExprOrOp::Op:(_)));
let lhs = enum_unwrap!(stack.pop(), Some:(ExprOrOp::Expr:(_)));
let bin = BinOp::new(prev_op, lhs, rhs);
stack.push(ExprOrOp::Expr(Expr::BinOp(bin)));
} else { } else {
break; break;
} }
@ -1148,11 +1140,7 @@ impl Parser {
// else if stack.len() == 2 { switch_unreachable!() } // else if stack.len() == 2 { switch_unreachable!() }
else { else {
while stack.len() >= 3 { while stack.len() >= 3 {
let rhs = enum_unwrap!(stack.pop(), Some:(ExprOrOp::Expr:(_))); collect_last_binop_on_stack(&mut stack);
let op = enum_unwrap!(stack.pop(), Some:(ExprOrOp::Op:(_)));
let lhs = enum_unwrap!(stack.pop(), Some:(ExprOrOp::Expr:(_)));
let bin = BinOp::new(op, lhs, rhs);
stack.push(ExprOrOp::Expr(Expr::BinOp(bin)));
} }
} }
} }
@ -1324,11 +1312,7 @@ impl Parser {
// else if stack.len() == 2 { switch_unreachable!() } // else if stack.len() == 2 { switch_unreachable!() }
else { else {
while stack.len() >= 3 { while stack.len() >= 3 {
let rhs = enum_unwrap!(stack.pop(), Some:(ExprOrOp::Expr:(_))); collect_last_binop_on_stack(&mut stack);
let op = enum_unwrap!(stack.pop(), Some:(ExprOrOp::Op:(_)));
let lhs = enum_unwrap!(stack.pop(), Some:(ExprOrOp::Expr:(_)));
let bin = BinOp::new(op, lhs, rhs);
stack.push(ExprOrOp::Expr(Expr::BinOp(bin)));
} }
} }
} }
@ -2170,7 +2154,16 @@ impl Parser {
/// x |> f() => f(x) /// x |> f() => f(x)
fn try_reduce_stream_operator(&mut self, stack: &mut Vec<ExprOrOp>) -> ParseResult<()> { fn try_reduce_stream_operator(&mut self, stack: &mut Vec<ExprOrOp>) -> ParseResult<()> {
debug_call_info!(self); debug_call_info!(self);
self.skip(); // |> let op = self.lpop();
while stack.len() >= 3 {
collect_last_binop_on_stack(stack);
}
if stack.len() == 2 {
self.errs
.push(ParseError::compiler_bug(0, op.loc(), fn_name!(), line!()));
self.stack_dec();
return Err(());
}
fn get_stream_op_syntax_error(loc: Location) -> ParseError { fn get_stream_op_syntax_error(loc: Location) -> ParseError {
ParseError::syntax_error( ParseError::syntax_error(
@ -3237,3 +3230,11 @@ impl Parser {
} }
} }
} }
fn collect_last_binop_on_stack(stack: &mut Vec<ExprOrOp>) {
let rhs = enum_unwrap!(stack.pop(), Some:(ExprOrOp::Expr:(_)));
let op = enum_unwrap!(stack.pop(), Some:(ExprOrOp::Op:(_)));
let lhs = enum_unwrap!(stack.pop(), Some:(ExprOrOp::Expr:(_)));
let bin = BinOp::new(op, lhs, rhs);
stack.push(ExprOrOp::Expr(Expr::BinOp(bin)));
}