shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Take self by value in eval to avoid clone in common case

Browse Source
This commit is contained in:
ConnorSkees 2020-02-16 22:06:30 -05:00
parent 23b90aa97e
commit e5bbba3462
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/value/mod.rs
View File

@ -39,7 +39,7 @@ impl Display for Value {
.join(sep.as_str()) .join(sep.as_str())
), ),
Self::Color(c) => write!(f, "{}", c), Self::Color(c) => write!(f, "{}", c),
Self::BinaryOp(..) => write!(f, "{}", self.eval()), Self::BinaryOp(..) => write!(f, "{}", self.clone().eval()),
Self::Paren(val) => write!(f, "{}", val), Self::Paren(val) => write!(f, "{}", val),
Self::Ident(val, kind) => write!(f, "{}{}{}", kind.as_str(), val, kind.as_str()), Self::Ident(val, kind) => write!(f, "{}{}{}", kind.as_str(), val, kind.as_str()),
Self::True => write!(f, "true"), Self::True => write!(f, "true"),
@ -57,7 +57,7 @@ impl Value {
pub fn is_true(&self) -> bool { pub fn is_true(&self) -> bool {
match self { match self {
Value::Null | Value::False => false, Value::Null | Value::False => false,
Self::BinaryOp(..) => self.eval().is_true(), Self::BinaryOp(..) => self.clone().eval().is_true(),
_ => true, _ => true,
} }
} }
@ -78,7 +78,7 @@ impl Value {
// Value::Function(..) => "function", // Value::Function(..) => "function",
Value::True | Value::False => "bool", Value::True | Value::False => "bool",
Value::Null => "null", Value::Null => "null",
Value::BinaryOp(..) => self.eval().kind(), Value::BinaryOp(..) => self.clone().eval().kind(),
_ => "unknown", _ => "unknown",
} }
} }
@ -91,18 +91,18 @@ impl Value {
} }
} }
pub fn eval(&self) -> Self { pub fn eval(self) -> Self {
match self { match self {
Self::BinaryOp(lhs, op, rhs) => match op { Self::BinaryOp(lhs, op, rhs) => match op {
Op::Plus => *lhs.clone() + *rhs.clone(), Op::Plus => *lhs + *rhs,
Op::Minus => *lhs.clone() - *rhs.clone(), Op::Minus => *lhs - *rhs,
Op::Equal => Self::bool(*lhs == *rhs), Op::Equal => Self::bool(*lhs == *rhs),
Op::NotEqual => Self::bool(*lhs != *rhs), Op::NotEqual => Self::bool(*lhs != *rhs),
Op::Mul => *lhs.clone() * *rhs.clone(), Op::Mul => *lhs * *rhs,
Op::Div => *lhs.clone() / *rhs.clone(), Op::Div => *lhs / *rhs,
_ => Self::BinaryOp(lhs.clone(), *op, rhs.clone()), _ => Self::BinaryOp(lhs, op, rhs),
}, },
_ => self.clone(), _ => self,
} }
} }
} }