diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2007-05-29 15:59:59 -0300 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2007-05-29 15:59:59 -0300 |
| commit | fc8d077612a235b42d5defd48d6ba923ed85a17f (patch) | |
| tree | 178e4b1b4f4df8aa547fed533403b934ae6b3807 /ldebug.c | |
| parent | e64fcb9d9454d7640a0a171c9e625139c0c436c0 (diff) | |
| download | lua-fc8d077612a235b42d5defd48d6ba923ed85a17f.tar.gz lua-fc8d077612a235b42d5defd48d6ba923ed85a17f.tar.bz2 lua-fc8d077612a235b42d5defd48d6ba923ed85a17f.zip | |
bug: wrong error message in some concatenations
Diffstat (limited to 'ldebug.c')
| -rw-r--r-- | ldebug.c | 6 |
1 files changed, 3 insertions, 3 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: ldebug.c,v 2.35 2007/03/26 18:35:34 roberto Exp roberto $ | 2 | ** $Id: ldebug.c,v 2.36 2007/05/09 15:49:36 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 | */ |
| @@ -591,8 +591,8 @@ void luaG_typeerror (lua_State *L, const TValue *o, const char *op) { | |||
| 591 | 591 | ||
| 592 | 592 | ||
| 593 | void luaG_concaterror (lua_State *L, StkId p1, StkId p2) { | 593 | void luaG_concaterror (lua_State *L, StkId p1, StkId p2) { |
| 594 | if (ttisstring(p1)) p1 = p2; | 594 | if (ttisstring(p1) || ttisnumber(p1)) p1 = p2; |
| 595 | lua_assert(!ttisstring(p1)); | 595 | lua_assert(!ttisstring(p1) && !ttisnumber(p2)); |
| 596 | luaG_typeerror(L, p1, "concatenate"); | 596 | luaG_typeerror(L, p1, "concatenate"); |
| 597 | } | 597 | } |
| 598 | 598 | ||