summaryrefslogtreecommitdiff
path: root/ldebug.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2010-01-13 14:18:25 -0200
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2010-01-13 14:18:25 -0200
commit070d3743a7892ec6429000c8309b72bfb0600d19 (patch)
tree6922c5b887e36400d6d1a9971d2b831799d9a2be /ldebug.c
parent0c7de97d47074b82dd08e67443e78dcee1241277 (diff)
downloadlua-github-070d3743a7892ec6429000c8309b72bfb0600d19.tar.gz
"no value" added to array luaT_typenames + occurrences of "userdata"
in that array unified in a single address
Diffstat (limited to 'ldebug.c')
-rw-r--r--ldebug.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ldebug.c b/ldebug.c
index d5cdb868..6b15634e 100644
--- a/ldebug.c
+++ b/ldebug.c
@@ -1,5 +1,5 @@
/*
-** $Id: ldebug.c,v 2.61 2010/01/06 14:42:35 roberto Exp roberto $
+** $Id: ldebug.c,v 2.62 2010/01/11 17:37:59 roberto Exp roberto $
** Debug Interface
** See Copyright Notice in lua.h
*/
@@ -416,7 +416,7 @@ static int isinstack (CallInfo *ci, const TValue *o) {
void luaG_typeerror (lua_State *L, const TValue *o, const char *op) {
CallInfo *ci = L->ci;
const char *name = NULL;
- const char *t = luaT_typenames[ttype(o)];
+ const char *t = typename(ttype(o));
const char *kind = (isLua(ci) && isinstack(ci, o)) ?
getobjname(L, ci, cast_int(o - ci->u.l.base), &name) :
NULL;
@@ -444,9 +444,9 @@ void luaG_aritherror (lua_State *L, const TValue *p1, const TValue *p2) {
int luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) {
- const char *t1 = luaT_typenames[ttype(p1)];
- const char *t2 = luaT_typenames[ttype(p2)];
- if (t1[2] == t2[2])
+ const char *t1 = typename(ttype(p1));
+ const char *t2 = typename(ttype(p2));
+ if (t1 == t2)
luaG_runerror(L, "attempt to compare two %s values", t1);
else
luaG_runerror(L, "attempt to compare %s with %s", t1, t2);