caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 04:56:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove booleans from args parser

Browse Source
This commit is contained in:
Laurenz 2022-06-15 13:26:53 +02:00
parent cbfac6cd45
commit a904976db5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/parse/mod.rs
View File

@ -375,7 +375,7 @@ fn expr_prec(p: &mut Parser, atomic: bool, min_prec: usize) -> ParseResult {
loop { loop {
// Parenthesis or bracket means this is a function call. // Parenthesis or bracket means this is a function call.
if let Some(NodeKind::LeftParen | NodeKind::LeftBracket) = p.peek_direct() { if let Some(NodeKind::LeftParen | NodeKind::LeftBracket) = p.peek_direct() {
marker.perform(p, NodeKind::FuncCall, |p| args(p, true, true))?; marker.perform(p, NodeKind::FuncCall, |p| args(p))?;
continue; continue;
} }
@ -387,7 +387,7 @@ fn expr_prec(p: &mut Parser, atomic: bool, min_prec: usize) -> ParseResult {
if p.eat_if(NodeKind::Dot) { if p.eat_if(NodeKind::Dot) {
ident(p)?; ident(p)?;
if let Some(NodeKind::LeftParen | NodeKind::LeftBracket) = p.peek_direct() { if let Some(NodeKind::LeftParen | NodeKind::LeftBracket) = p.peek_direct() {
marker.perform(p, NodeKind::MethodCall, |p| args(p, true, true))?; marker.perform(p, NodeKind::MethodCall, |p| args(p))?;
} else { } else {
marker.end(p, NodeKind::FieldAccess); marker.end(p, NodeKind::FieldAccess);
} }
@ -745,10 +745,10 @@ fn content_block(p: &mut Parser) {
} }
/// Parse the arguments to a function call. /// Parse the arguments to a function call.
fn args(p: &mut Parser, direct: bool, brackets: bool) -> ParseResult { fn args(p: &mut Parser) -> ParseResult {
match if direct { p.peek_direct() } else { p.peek() } { match p.peek_direct() {
Some(NodeKind::LeftParen) => {} Some(NodeKind::LeftParen) => {}
Some(NodeKind::LeftBracket) if brackets => {} Some(NodeKind::LeftBracket) => {}
_ => { _ => {
p.expected_found("argument list"); p.expected_found("argument list");
return Err(ParseError); return Err(ParseError);
@ -778,7 +778,7 @@ fn args(p: &mut Parser, direct: bool, brackets: bool) -> ParseResult {
}); });
} }
while brackets && p.peek_direct() == Some(&NodeKind::LeftBracket) { while p.peek_direct() == Some(&NodeKind::LeftBracket) {
content_block(p); content_block(p);
} }
}); });
@ -825,7 +825,7 @@ fn set_expr(p: &mut Parser) -> ParseResult {
p.perform(NodeKind::SetExpr, |p| { p.perform(NodeKind::SetExpr, |p| {
p.assert(NodeKind::Set); p.assert(NodeKind::Set);
ident(p)?; ident(p)?;
args(p, true, false) args(p)
}) })
} }