diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2010-01-13 14:18:25 -0200 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2010-01-13 14:18:25 -0200 |
| commit | 070d3743a7892ec6429000c8309b72bfb0600d19 (patch) | |
| tree | 6922c5b887e36400d6d1a9971d2b831799d9a2be /ldebug.c | |
| parent | 0c7de97d47074b82dd08e67443e78dcee1241277 (diff) | |
| download | lua-070d3743a7892ec6429000c8309b72bfb0600d19.tar.gz lua-070d3743a7892ec6429000c8309b72bfb0600d19.tar.bz2 lua-070d3743a7892ec6429000c8309b72bfb0600d19.zip | |
"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.c | 10 |
1 files changed, 5 insertions, 5 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: ldebug.c,v 2.61 2010/01/06 14:42:35 roberto Exp roberto $ | 2 | ** $Id: ldebug.c,v 2.62 2010/01/11 17:37:59 roberto Exp roberto $ |
| 3 | ** Debug Interface | 3 | ** Debug Interface |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -416,7 +416,7 @@ static int isinstack (CallInfo *ci, const TValue *o) { | |||
| 416 | void luaG_typeerror (lua_State *L, const TValue *o, const char *op) { | 416 | void luaG_typeerror (lua_State *L, const TValue *o, const char *op) { |
| 417 | CallInfo *ci = L->ci; | 417 | CallInfo *ci = L->ci; |
| 418 | const char *name = NULL; | 418 | const char *name = NULL; |
| 419 | const char *t = luaT_typenames[ttype(o)]; | 419 | const char *t = typename(ttype(o)); |
| 420 | const char *kind = (isLua(ci) && isinstack(ci, o)) ? | 420 | const char *kind = (isLua(ci) && isinstack(ci, o)) ? |
| 421 | getobjname(L, ci, cast_int(o - ci->u.l.base), &name) : | 421 | getobjname(L, ci, cast_int(o - ci->u.l.base), &name) : |
| 422 | NULL; | 422 | NULL; |
| @@ -444,9 +444,9 @@ void luaG_aritherror (lua_State *L, const TValue *p1, const TValue *p2) { | |||
| 444 | 444 | ||
| 445 | 445 | ||
| 446 | int luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) { | 446 | int luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) { |
| 447 | const char *t1 = luaT_typenames[ttype(p1)]; | 447 | const char *t1 = typename(ttype(p1)); |
| 448 | const char *t2 = luaT_typenames[ttype(p2)]; | 448 | const char *t2 = typename(ttype(p2)); |
| 449 | if (t1[2] == t2[2]) | 449 | if (t1 == t2) |
| 450 | luaG_runerror(L, "attempt to compare two %s values", t1); | 450 | luaG_runerror(L, "attempt to compare two %s values", t1); |
| 451 | else | 451 | else |
| 452 | luaG_runerror(L, "attempt to compare %s with %s", t1, t2); | 452 | luaG_runerror(L, "attempt to compare %s with %s", t1, t2); |