aboutsummaryrefslogtreecommitdiff
path: root/lbaselib.c
diff options
context:
space:
mode:
Diffstat (limited to 'lbaselib.c')
-rw-r--r--lbaselib.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/lbaselib.c b/lbaselib.c
index b552fa4b..2e04a9a4 100644
--- a/lbaselib.c
+++ b/lbaselib.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lbaselib.c,v 1.134 2003/10/07 20:13:41 roberto Exp roberto $ 2** $Id: lbaselib.c,v 1.135 2003/10/10 12:57:55 roberto Exp roberto $
3** Basic library 3** Basic library
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -78,10 +78,8 @@ static int luaB_tonumber (lua_State *L) {
78 78
79static int luaB_error (lua_State *L) { 79static int luaB_error (lua_State *L) {
80 int level = luaL_optint(L, 2, 1); 80 int level = luaL_optint(L, 2, 1);
81 luaL_checkany(L, 1); 81 lua_settop(L, 1);
82 if (!lua_isstring(L, 1) || level == 0) 82 if (lua_isstring(L, 1) && level > 0) { /* add extra information? */
83 lua_pushvalue(L, 1); /* propagate error message without changes */
84 else { /* add extra information */
85 luaL_where(L, level); 83 luaL_where(L, level);
86 lua_pushvalue(L, 1); 84 lua_pushvalue(L, 1);
87 lua_concat(L, 2); 85 lua_concat(L, 2);