Merge branch 'master' of github.com:luvit/luvit

luvit · Aug 29, 2012 · c810e71 · c810e71
2 parents cc715a4 + 97e52a0
commit c810e71
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/luvit/utils.lua b/lib/luvit/utils.lua
@@ -53,7 +53,7 @@ function utils.color(color_name)
 end
 
 function utils.colorize(color_name, string, reset_name)
-  return utils.color(color_name) .. string .. utils.color(reset_name)
+  return utils.color(color_name) .. tostring(string) .. utils.color(reset_name)
 end
 
 local backslash, null, newline, carriage, tab, quote, quote2, obracket, cbracket

diff --git a/tests/test-utils.lua b/tests/test-utils.lua
@@ -91,3 +91,7 @@ bound('!', function(arg1, arg2, arg3)
   assert(arg2 == 'world')
   assert(arg3 == '!')
 end)
+
+local Error = require('core').Error
+local MyError = Error:extend()
+assert(pcall(utils.dump, MyError))