From c34213d2665fe83e654c3b71708c0c1fa6a9ec26 Mon Sep 17 00:00:00 2001
From: kikito <kikito@gmail.com>
Date: Sat, 14 Sep 2013 16:45:31 +0200
Subject: [PATCH] refactor type sorting

---
 inspect.lua | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/inspect.lua b/inspect.lua
index fe728d4..7cad289 100644
--- a/inspect.lua
+++ b/inspect.lua
@@ -61,21 +61,26 @@ local function isDictionaryKey(k, length)
   return not isArrayKey(k, length)
 end
 
-local sortOrdersByType = setmetatable({
+local defaultTypeOrders = {
   ['number']   = 1, ['boolean']  = 2, ['string'] = 3, ['table'] = 4,
   ['function'] = 5, ['userdata'] = 6, ['thread'] = 7
-},
-{ __index = function (t, k)
-  if not rawget(t, k) then
-    return math.huge
-  end
-end })
+}
 
 local function sortKeys(a, b)
   local ta, tb = type(a), type(b)
-  if ta ~= tb then return sortOrdersByType[ta] < sortOrdersByType[tb] end
-  if ta == 'string' or ta == 'number' then return a < b end
-  return false
+
+  -- strings and numbers are sorted numerically/alphabetically
+  if ta == tb and (ta == 'string' or ta == 'number') then return a < b end
+
+  local dta, dtb = defaultTypeOrders[ta], defaultTypeOrders[tb]
+  -- Two default types are compared according to the defaultTypeOrders table
+  if dta and dtb then return defaultTypeOrders[ta] < defaultTypeOrders[tb]
+  elseif dta     then return true  -- default types before custom ones
+  elseif dtb     then return false -- custom types after default ones
+  end
+
+  -- custom types are sorted out alphabetically
+  return ta < tb
 end
 
 local function getDictionaryKeys(t)