fbc6f01cfb
`left =~ right` return true if left contains right, using Rust's `String::contains`. `!~` is the negated version. A new `apply_operator` function is added which decouples evaluation from `Value::compare`. This returns a `Value` and opens the door to implementing `+` for example, though it wouldn't be useful immediately. The `operator!` macro had to be changed slightly as it would choke on `~` in arguments.
68 lines
1.7 KiB
Rust
68 lines
1.7 KiB
Rust
use crate::prelude::*;
|
|
use serde::{Deserialize, Serialize};
|
|
use std::fmt;
|
|
use std::str::FromStr;
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Deserialize, Serialize)]
|
|
pub enum Operator {
|
|
Equal,
|
|
NotEqual,
|
|
LessThan,
|
|
GreaterThan,
|
|
LessThanOrEqual,
|
|
GreaterThanOrEqual,
|
|
Dot,
|
|
Contains,
|
|
NotContains,
|
|
}
|
|
|
|
impl FormatDebug for Operator {
|
|
fn fmt_debug(&self, f: &mut DebugFormatter, _source: &str) -> fmt::Result {
|
|
write!(f, "{}", self.as_str())
|
|
}
|
|
}
|
|
|
|
impl Operator {
|
|
pub fn print(&self) -> String {
|
|
self.as_str().to_string()
|
|
}
|
|
|
|
pub fn as_str(&self) -> &str {
|
|
match *self {
|
|
Operator::Equal => "==",
|
|
Operator::NotEqual => "!=",
|
|
Operator::LessThan => "<",
|
|
Operator::GreaterThan => ">",
|
|
Operator::LessThanOrEqual => "<=",
|
|
Operator::GreaterThanOrEqual => ">=",
|
|
Operator::Dot => ".",
|
|
Operator::Contains => "=~",
|
|
Operator::NotContains => "!~",
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<&str> for Operator {
|
|
fn from(input: &str) -> Operator {
|
|
Operator::from_str(input).unwrap()
|
|
}
|
|
}
|
|
|
|
impl FromStr for Operator {
|
|
type Err = ();
|
|
fn from_str(input: &str) -> Result<Self, <Self as std::str::FromStr>::Err> {
|
|
match input {
|
|
"==" => Ok(Operator::Equal),
|
|
"!=" => Ok(Operator::NotEqual),
|
|
"<" => Ok(Operator::LessThan),
|
|
">" => Ok(Operator::GreaterThan),
|
|
"<=" => Ok(Operator::LessThanOrEqual),
|
|
">=" => Ok(Operator::GreaterThanOrEqual),
|
|
"." => Ok(Operator::Dot),
|
|
"=~" => Ok(Operator::Contains),
|
|
"!~" => Ok(Operator::NotContains),
|
|
_ => Err(()),
|
|
}
|
|
}
|
|
}
|