* error for division by zero with = * cargo fmt * add helper zero_division_error * tests for zero division error * fix test names (zero div error)
84 lines
3.1 KiB
Rust
84 lines
3.1 KiB
Rust
use crate::data::value;
|
|
use nu_errors::ShellError;
|
|
use nu_protocol::hir::Operator;
|
|
use nu_protocol::{Primitive, ShellTypeName, UntaggedValue, Value};
|
|
use std::ops::Not;
|
|
|
|
pub fn apply_operator(
|
|
op: Operator,
|
|
left: &Value,
|
|
right: &Value,
|
|
) -> Result<UntaggedValue, (&'static str, &'static str)> {
|
|
match op {
|
|
Operator::Equal
|
|
| Operator::NotEqual
|
|
| Operator::LessThan
|
|
| Operator::GreaterThan
|
|
| Operator::LessThanOrEqual
|
|
| Operator::GreaterThanOrEqual => {
|
|
value::compare_values(op, left, right).map(UntaggedValue::boolean)
|
|
}
|
|
Operator::Contains => string_contains(left, right).map(UntaggedValue::boolean),
|
|
Operator::NotContains => string_contains(left, right)
|
|
.map(Not::not)
|
|
.map(UntaggedValue::boolean),
|
|
Operator::Plus => value::compute_values(op, left, right),
|
|
Operator::Minus => value::compute_values(op, left, right),
|
|
Operator::Multiply => value::compute_values(op, left, right),
|
|
Operator::Divide => value::compute_values(op, left, right).map(|res| match res {
|
|
UntaggedValue::Error(_) => UntaggedValue::Error(ShellError::labeled_error(
|
|
"Evaluation error",
|
|
"division by zero",
|
|
&right.tag.span,
|
|
)),
|
|
_ => res,
|
|
}),
|
|
Operator::In => table_contains(left, right).map(UntaggedValue::boolean),
|
|
Operator::NotIn => table_contains(left, right).map(|x| UntaggedValue::boolean(!x)),
|
|
Operator::And => match (left.as_bool(), right.as_bool()) {
|
|
(Ok(left), Ok(right)) => Ok(UntaggedValue::boolean(left && right)),
|
|
_ => Err((left.type_name(), right.type_name())),
|
|
},
|
|
Operator::Or => match (left.as_bool(), right.as_bool()) {
|
|
(Ok(left), Ok(right)) => Ok(UntaggedValue::boolean(left || right)),
|
|
_ => Err((left.type_name(), right.type_name())),
|
|
},
|
|
}
|
|
}
|
|
|
|
fn string_contains(
|
|
left: &UntaggedValue,
|
|
right: &UntaggedValue,
|
|
) -> Result<bool, (&'static str, &'static str)> {
|
|
match (left, right) {
|
|
(
|
|
UntaggedValue::Primitive(Primitive::String(l)),
|
|
UntaggedValue::Primitive(Primitive::String(r)),
|
|
) => Ok(l.contains(r)),
|
|
(
|
|
UntaggedValue::Primitive(Primitive::Line(l)),
|
|
UntaggedValue::Primitive(Primitive::String(r)),
|
|
) => Ok(l.contains(r)),
|
|
(
|
|
UntaggedValue::Primitive(Primitive::String(l)),
|
|
UntaggedValue::Primitive(Primitive::Line(r)),
|
|
) => Ok(l.contains(r)),
|
|
(
|
|
UntaggedValue::Primitive(Primitive::Line(l)),
|
|
UntaggedValue::Primitive(Primitive::Line(r)),
|
|
) => Ok(l.contains(r)),
|
|
_ => Err((left.type_name(), right.type_name())),
|
|
}
|
|
}
|
|
|
|
fn table_contains(
|
|
left: &UntaggedValue,
|
|
right: &UntaggedValue,
|
|
) -> Result<bool, (&'static str, &'static str)> {
|
|
let left = left.clone();
|
|
match right {
|
|
UntaggedValue::Table(values) => Ok(values.iter().any(|x| x.value == left)),
|
|
_ => Err((left.type_name(), right.type_name())),
|
|
}
|
|
}
|