diff options
Diffstat (limited to 'ldebug.c')
| -rw-r--r-- | ldebug.c | 11 |
1 files changed, 5 insertions, 6 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: ldebug.c,v 2.85 2011/09/13 17:40:20 roberto Exp roberto $ | 2 | ** $Id: ldebug.c,v 2.86 2011/09/13 18:05: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 | */ |
| @@ -520,7 +520,7 @@ void luaG_concaterror (lua_State *L, StkId p1, StkId p2) { | |||
| 520 | } | 520 | } |
| 521 | 521 | ||
| 522 | 522 | ||
| 523 | void luaG_aritherror (lua_State *L, const TValue *p1, const TValue *p2) { | 523 | l_noret luaG_aritherror (lua_State *L, const TValue *p1, const TValue *p2) { |
| 524 | TValue temp; | 524 | TValue temp; |
| 525 | if (luaV_tonumber(p1, &temp) == NULL) | 525 | if (luaV_tonumber(p1, &temp) == NULL) |
| 526 | p2 = p1; /* first operand is wrong */ | 526 | p2 = p1; /* first operand is wrong */ |
| @@ -528,14 +528,13 @@ void luaG_aritherror (lua_State *L, const TValue *p1, const TValue *p2) { | |||
| 528 | } | 528 | } |
| 529 | 529 | ||
| 530 | 530 | ||
| 531 | int luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) { | 531 | l_noret luaG_ordererror (lua_State *L, const TValue *p1, const TValue *p2) { |
| 532 | const char *t1 = objtypename(p1); | 532 | const char *t1 = objtypename(p1); |
| 533 | const char *t2 = objtypename(p2); | 533 | const char *t2 = objtypename(p2); |
| 534 | if (t1 == t2) | 534 | if (t1 == t2) |
| 535 | luaG_runerror(L, "attempt to compare two %s values", t1); | 535 | luaG_runerror(L, "attempt to compare two %s values", t1); |
| 536 | else | 536 | else |
| 537 | luaG_runerror(L, "attempt to compare %s with %s", t1, t2); | 537 | luaG_runerror(L, "attempt to compare %s with %s", t1, t2); |
| 538 | return 0; | ||
| 539 | } | 538 | } |
| 540 | 539 | ||
| 541 | 540 | ||
| @@ -555,7 +554,7 @@ static void addinfo (lua_State *L, const char *msg) { | |||
| 555 | } | 554 | } |
| 556 | 555 | ||
| 557 | 556 | ||
| 558 | void luaG_errormsg (lua_State *L) { | 557 | l_noret luaG_errormsg (lua_State *L) { |
| 559 | if (L->errfunc != 0) { /* is there an error handling function? */ | 558 | if (L->errfunc != 0) { /* is there an error handling function? */ |
| 560 | StkId errfunc = restorestack(L, L->errfunc); | 559 | StkId errfunc = restorestack(L, L->errfunc); |
| 561 | if (!ttisfunction(errfunc)) luaD_throw(L, LUA_ERRERR); | 560 | if (!ttisfunction(errfunc)) luaD_throw(L, LUA_ERRERR); |
| @@ -568,7 +567,7 @@ void luaG_errormsg (lua_State *L) { | |||
| 568 | } | 567 | } |
| 569 | 568 | ||
| 570 | 569 | ||
| 571 | void luaG_runerror (lua_State *L, const char *fmt, ...) { | 570 | l_noret luaG_runerror (lua_State *L, const char *fmt, ...) { |
| 572 | va_list argp; | 571 | va_list argp; |
| 573 | va_start(argp, fmt); | 572 | va_start(argp, fmt); |
| 574 | addinfo(L, luaO_pushvfstring(L, fmt, argp)); | 573 | addinfo(L, luaO_pushvfstring(L, fmt, argp)); |
