From 77dfc80fe99b83888b2721dbcbf35b2934cc7528 Mon Sep 17 00:00:00 2001
From: Stephen Chung <schungx@live.com>
Date: Mon, 1 Nov 2021 09:31:48 +0800
Subject: [PATCH] Use iter().rev().enumerate().

---
 src/fn_call.rs |  2 +-
 src/scope.rs   | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/fn_call.rs b/src/fn_call.rs
index 61911f74..2c317c14 100644
--- a/src/fn_call.rs
+++ b/src/fn_call.rs
@@ -727,7 +727,7 @@ impl Engine {
                 return Ok((Dynamic::UNIT, false));
             }
 
-            let scope: &mut Scope = &mut Default::default();
+            let scope = &mut Scope::new();
 
             // Move captured variables into scope
             #[cfg(not(feature = "no_closure"))]
diff --git a/src/scope.rs b/src/scope.rs
index 028287a5..330a6ab3 100644
--- a/src/scope.rs
+++ b/src/scope.rs
@@ -307,10 +307,11 @@ impl<'a> Scope<'a> {
     pub(crate) fn get_index(&self, name: &str) -> Option<(usize, AccessMode)> {
         self.names
             .iter()
-            .enumerate()
             .rev() // Always search a Scope in reverse order
+            .enumerate()
             .find_map(|(index, (key, _))| {
                 if name == key.as_ref() {
+                    let index = self.len() - 1 - index;
                     Some((index, self.values[index].access_mode()))
                 } else {
                     None
@@ -334,10 +335,14 @@ impl<'a> Scope<'a> {
     pub fn get_value<T: Variant + Clone>(&self, name: &str) -> Option<T> {
         self.names
             .iter()
-            .enumerate()
             .rev()
+            .enumerate()
             .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.
     ///
@@ -516,12 +521,14 @@ impl<'a> Scope<'a> {
 
         self.names
             .iter()
-            .enumerate()
             .rev()
-            .for_each(|(i, (name, alias))| {
+            .enumerate()
+            .for_each(|(index, (name, alias))| {
                 if !entries.names.iter().any(|(key, _)| key == name) {
                     entries.names.push((name.clone(), alias.clone()));
-                    entries.values.push(self.values[i].clone());
+                    entries
+                        .values
+                        .push(self.values[self.len() - 1 - index].clone());
                 }
             });