diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2013-05-06 14:20:22 -0300 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2013-05-06 14:20:22 -0300 |
| commit | 39808bb97078aafbf1b614a6d224c4a71b9ab46b (patch) | |
| tree | 3268b949d226f01f2e3224028cfd5f4204e4c940 | |
| parent | dcd35b45955b3ffe8e1f9670d625a69c646ac748 (diff) | |
| download | lua-39808bb97078aafbf1b614a6d224c4a71b9ab46b.tar.gz lua-39808bb97078aafbf1b614a6d224c4a71b9ab46b.tar.bz2 lua-39808bb97078aafbf1b614a6d224c4a71b9ab46b.zip | |
bug: Wrong assert when reporting concatenation errors.
| -rw-r--r-- | ldebug.c | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: ldebug.c,v 2.90 2012/08/16 17:34:28 roberto Exp $ | 2 | ** $Id: ldebug.c,v 2.90.1.1 2013/04/12 18:48:47 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 | */ |
| @@ -518,7 +518,7 @@ l_noret luaG_typeerror (lua_State *L, const TValue *o, const char *op) { | |||
| 518 | 518 | ||
| 519 | l_noret luaG_concaterror (lua_State *L, StkId p1, StkId p2) { | 519 | l_noret luaG_concaterror (lua_State *L, StkId p1, StkId p2) { |
| 520 | if (ttisstring(p1) || ttisnumber(p1)) p1 = p2; | 520 | if (ttisstring(p1) || ttisnumber(p1)) p1 = p2; |
| 521 | lua_assert(!ttisstring(p1) && !ttisnumber(p2)); | 521 | lua_assert(!ttisstring(p1) && !ttisnumber(p1)); |
| 522 | luaG_typeerror(L, p1, "concatenate"); | 522 | luaG_typeerror(L, p1, "concatenate"); |
| 523 | } | 523 | } |
| 524 | 524 | ||