aboutsummaryrefslogtreecommitdiff
path: root/ldebug.c
diff options
context:
space:
mode:
Diffstat (limited to 'ldebug.c')
-rw-r--r--ldebug.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ldebug.c b/ldebug.c
index f7b2866e..e31c0607 100644
--- a/ldebug.c
+++ b/ldebug.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: ldebug.c,v 2.98 2014/07/15 21:26:50 roberto Exp roberto $ 2** $Id: ldebug.c,v 2.99 2014/07/17 12:30:53 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*/
@@ -526,8 +526,7 @@ l_noret luaG_typeerror (lua_State *L, const TValue *o, const char *op) {
526 526
527 527
528l_noret luaG_concaterror (lua_State *L, const TValue *p1, const TValue *p2) { 528l_noret luaG_concaterror (lua_State *L, const TValue *p1, const TValue *p2) {
529 if (ttisstring(p1) || ttisnumber(p1)) p1 = p2; 529 if (ttisstring(p1) || cvt2str(p1)) p1 = p2;
530 lua_assert(!ttisstring(p1) && !ttisnumber(p1));
531 luaG_typeerror(L, p1, "concatenate"); 530 luaG_typeerror(L, p1, "concatenate");
532} 531}
533 532