AlexBethel/drim
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Clippy

Browse source
This commit is contained in:
Alex Bethel 2022-08-10 17:32:47 -05:00
parent 8b36fe67f1
commit ef0fb0efc2
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
axc/src/parser.rs
View file

@ -215,7 +215,7 @@ impl Default for ParserMeta {
/// The list of reserved words that cannot be used as identifiers in AlexScript. /// The list of reserved words that cannot be used as identifiers in AlexScript.
#[rustfmt::skip] // keep this on separate lines for sorting #[rustfmt::skip] // keep this on separate lines for sorting
pub const RESERVED: &'static [&'static str] = &[ pub const RESERVED: &[&str] = &[
"_", "_",
"class", "class",
"data", "data",
@ -377,7 +377,7 @@ fn parse_unary(
) -> impl Parser<char, Expr, Error = Simple<char>> + Clone { ) -> impl Parser<char, Expr, Error = Simple<char>> + Clone {
pad(just("-").to("-")) pad(just("-").to("-"))
.repeated() .repeated()
.then(base.clone()) .then(base)
.map(|(ops, exp)| { .map(|(ops, exp)| {
ops.into_iter().fold(exp, |exp, op| Expr::UnaryOp { ops.into_iter().fold(exp, |exp, op| Expr::UnaryOp {
kind: op.to_string(), kind: op.to_string(),
@ -410,7 +410,7 @@ fn parse_binary<'a>(
panic!("Precedence parsing error: conflicting associativities"); panic!("Precedence parsing error: conflicting associativities");
} }
let all_assoc = first_assoc.map(|o| **o).flatten(); let all_assoc = first_assoc.and_then(|o| **o);
if all_assoc == None && others.len() >= 2 { if all_assoc == None && others.len() >= 2 {
panic!("Precedence parsing error: non-associative operation applied associatively"); panic!("Precedence parsing error: non-associative operation applied associatively");
@ -475,7 +475,7 @@ fn parse_let_expr(
.then_ignore(pad(just('='))) .then_ignore(pad(just('=')))
.then(base.clone()) .then(base.clone())
.then_ignore(pad(keyword("in"))) .then_ignore(pad(keyword("in")))
.then(base.clone()) .then(base)
.map(|((left, right), into)| Expr::Let { .map(|((left, right), into)| Expr::Let {
left, left,
right: Box::new(right), right: Box::new(right),
@ -492,7 +492,7 @@ fn parse_match_expr(
.then( .then(
parse_pattern(m) parse_pattern(m)
.then_ignore(pad(just("=>"))) .then_ignore(pad(just("=>")))
.then(base.clone()) .then(base)
.separated_by(pad(just(","))) .separated_by(pad(just(",")))
.allow_trailing() .allow_trailing()
.delimited_by(pad(just('{')), pad(just('}'))), .delimited_by(pad(just('{')), pad(just('}'))),
@ -544,9 +544,9 @@ fn parse_subscript_expr(
.then( .then(
choice(( choice((
pad(just('.')) pad(just('.'))
.ignore_then(base.clone()) .ignore_then(base)
.map(|e| (SubscriptKind::Dot, e)), .map(|e| (SubscriptKind::Dot, e)),
rec.clone() rec
.delimited_by(pad(just('[')), pad(just(']'))) .delimited_by(pad(just('[')), pad(just(']')))
.map(|e| (SubscriptKind::Bracket, e)), .map(|e| (SubscriptKind::Bracket, e)),
)) ))