From 463d669ab50fe07c2f54ad70ec610a5c9fa073b3 Mon Sep 17 00:00:00 2001
From: Stephen Chung <Stephen.Chung@intexact.com>
Date: Sat, 25 Jul 2020 09:55:33 +0800
Subject: [PATCH] Avoid shadowing indexer errors.

---
 src/engine.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/engine.rs b/src/engine.rs
index f34cb7ca..dccc308f 100644
--- a/src/engine.rs
+++ b/src/engine.rs
@@ -1050,6 +1050,7 @@ impl Engine {
                 }
             }
 
+            #[cfg(not(feature = "no_object"))]
             #[cfg(not(feature = "no_index"))]
             _ => {
                 let type_name = self.map_type_name(val.type_name());
@@ -1058,11 +1059,11 @@ impl Engine {
                     state, lib, FN_IDX_GET, true, 0, args, is_ref, true, None, level,
                 )
                 .map(|(v, _)| v.into())
-                .map_err(|_| {
-                    Box::new(EvalAltResult::ErrorIndexingType(
-                        type_name.into(),
-                        Position::none(),
-                    ))
+                .map_err(|err| match *err {
+                    EvalAltResult::ErrorFunctionNotFound(_, _) => Box::new(
+                        EvalAltResult::ErrorIndexingType(type_name.into(), Position::none()),
+                    ),
+                    _ => err,
                 })
             }