reduce a conditional branch in wrapped __index function

vereena0x13 · Oct 18, 2019 · 63f83ea · 63f83ea
1 parent fd25b1a
commit 63f83ea
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/middleclass.lua b/middleclass.lua
@@ -31,14 +31,22 @@ local middleclass = {
 local function _createIndexWrapper(aClass, f)
   if f == nil then
     return aClass.__instanceDict
-  else
+  elseif type(f) == "function" then
     return function(self, name)
       local value = aClass.__instanceDict[name]
 
       if value ~= nil then
         return value
-      elseif type(f) == "function" then
+      else
         return (f(self, name))
+      end
+    end
+  else -- if  type(f) == "table" then
+    return function(self, name)
+      local value = aClass.__instanceDict[name]
+
+      if value ~= nil then
+        return value
       else
         return f[name]
       end