holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert if expression to match (#1683)

Browse Source
This commit is contained in:
Mohammed Anas 2020-04-30 00:59:50 +00:00 committed by GitHub
parent db8219e798
commit 789b28ac8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
crates/nu-parser/src/parse.rs
View File

@ -221,43 +221,29 @@ fn parse_range(lite_arg: &Spanned<String>) -> (SpannedExpression, Option<ParseEr
/// Parse any allowed operator, including word-based operators /// Parse any allowed operator, including word-based operators
fn parse_operator(lite_arg: &Spanned<String>) -> (SpannedExpression, Option<ParseError>) { fn parse_operator(lite_arg: &Spanned<String>) -> (SpannedExpression, Option<ParseError>) {
let operator = if lite_arg.item == "==" { let operator = match &lite_arg.item[..] {
Operator::Equal "==" => Operator::Equal,
} else if lite_arg.item == "!=" { "!=" => Operator::NotEqual,
Operator::NotEqual "<" => Operator::LessThan,
} else if lite_arg.item == "<" { "<=" => Operator::LessThanOrEqual,
Operator::LessThan ">" => Operator::GreaterThan,
} else if lite_arg.item == "<=" { ">=" => Operator::GreaterThanOrEqual,
Operator::LessThanOrEqual "=~" => Operator::Contains,
} else if lite_arg.item == ">" { "!~" => Operator::NotContains,
Operator::GreaterThan "+" => Operator::Plus,
} else if lite_arg.item == ">=" { "-" => Operator::Minus,
Operator::GreaterThanOrEqual "*" => Operator::Multiply,
} else if lite_arg.item == "=~" { "/" => Operator::Divide,
Operator::Contains "in:" => Operator::In,
} else if lite_arg.item == "!~" { "not-in:" => Operator::NotIn,
Operator::NotContains "&&" => Operator::And,
} else if lite_arg.item == "+" { "||" => Operator::Or,
Operator::Plus _ => {
} else if lite_arg.item == "-" {
Operator::Minus
} else if lite_arg.item == "*" {
Operator::Multiply
} else if lite_arg.item == "/" {
Operator::Divide
} else if lite_arg.item == "in:" {
Operator::In
} else if lite_arg.item == "not-in:" {
Operator::NotIn
} else if lite_arg.item == "&&" {
Operator::And
} else if lite_arg.item == "||" {
Operator::Or
} else {
return ( return (
garbage(lite_arg.span), garbage(lite_arg.span),
Some(ParseError::mismatch("operator", lite_arg.clone())), Some(ParseError::mismatch("operator", lite_arg.clone())),
); );
}
}; };
( (