kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Add comparison operators to ImmutableString.

Browse Source
This commit is contained in:
Stephen Chung
2020-07-30 13:28:25 +08:00
parent 691e04292f
commit e505a06839
4 changed files with 51 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/engine.rs
View File

@@ -1105,7 +1105,7 @@ impl Engine {
.downcast_ref::<ImmutableString>()
.ok_or_else(|| EvalAltResult::ErrorStringIndexExpr(idx_pos))?;
map.get_mut(index.as_str())
map.get_mut(index)
.map(Target::from)
.unwrap_or_else(|| Target::from(()))
})
@@ -1208,10 +1208,8 @@ impl Engine {
#[cfg(not(feature = "no_object"))]
Dynamic(Union::Map(rhs_value)) => match lhs_value {
// Only allows String or char
Dynamic(Union::Str(s)) => Ok(rhs_value.contains_key(s.as_str()).into()),
Dynamic(Union::Char(c)) => {
Ok(rhs_value.contains_key(c.to_string().as_str()).into())
}
Dynamic(Union::Str(s)) => Ok(rhs_value.contains_key(&s).into()),
Dynamic(Union::Char(c)) => Ok(rhs_value.contains_key(&c.to_string()).into()),
_ => Err(Box::new(EvalAltResult::ErrorInExpr(lhs.position()))),
},
Dynamic(Union::Str(rhs_value)) => match lhs_value {