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

Use iter().rev().enumerate().

Browse Source
This commit is contained in:
Stephen Chung 2021-11-01 09:31:48 +08:00
parent dac99a9907
commit 77dfc80fe9
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fn_call.rs
View File

@ -727,7 +727,7 @@ impl Engine {
return Ok((Dynamic::UNIT, false)); return Ok((Dynamic::UNIT, false));
} }
let scope: &mut Scope = &mut Default::default(); let scope = &mut Scope::new();
// Move captured variables into scope // Move captured variables into scope
#[cfg(not(feature = "no_closure"))] #[cfg(not(feature = "no_closure"))]

19
src/scope.rs
View File

@ -307,10 +307,11 @@ impl<'a> Scope<'a> {
pub(crate) fn get_index(&self, name: &str) -> Option<(usize, AccessMode)> { pub(crate) fn get_index(&self, name: &str) -> Option<(usize, AccessMode)> {
self.names self.names
.iter() .iter()
.enumerate()
.rev() // Always search a Scope in reverse order .rev() // Always search a Scope in reverse order
.enumerate()
.find_map(|(index, (key, _))| { .find_map(|(index, (key, _))| {
if name == key.as_ref() { if name == key.as_ref() {
let index = self.len() - 1 - index;
Some((index, self.values[index].access_mode())) Some((index, self.values[index].access_mode()))
} else { } else {
None None
@ -334,10 +335,14 @@ impl<'a> Scope<'a> {
pub fn get_value<T: Variant + Clone>(&self, name: &str) -> Option<T> { pub fn get_value<T: Variant + Clone>(&self, name: &str) -> Option<T> {
self.names self.names
.iter() .iter()
.enumerate()
.rev() .rev()
.enumerate()
.find(|(_, (key, _))| name == key.as_ref()) .find(|(_, (key, _))| name == key.as_ref())
.and_then(|(index, _)| self.values[index].flatten_clone().try_cast()) .and_then(|(index, _)| {
self.values[self.len() - 1 - index]
.flatten_clone()
.try_cast()
})
} }
/// Check if the named entry in the [`Scope`] is constant. /// Check if the named entry in the [`Scope`] is constant.
/// ///
@ -516,12 +521,14 @@ impl<'a> Scope<'a> {
self.names self.names
.iter() .iter()
.enumerate()
.rev() .rev()
.for_each(|(i, (name, alias))| { .enumerate()
.for_each(|(index, (name, alias))| {
if !entries.names.iter().any(|(key, _)| key == name) { if !entries.names.iter().any(|(key, _)| key == name) {
entries.names.push((name.clone(), alias.clone())); entries.names.push((name.clone(), alias.clone()));
entries.values.push(self.values[i].clone()); entries
.values
.push(self.values[self.len() - 1 - index].clone());
} }
}); });