summaryrefslogtreecommitdiff
path: root/src/lvm.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lvm.h')
-rw-r--r--src/lvm.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/lvm.h b/src/lvm.h
index 36e78e68..0f4667af 100644
--- a/src/lvm.h
+++ b/src/lvm.h
@@ -1,5 +1,5 @@
/*
-** $Id: lvm.h,v 2.31 2014/05/26 17:10:22 roberto Exp $
+** $Id: lvm.h,v 2.33 2014/07/30 14:42:44 roberto Exp $
** Lua virtual machine
** See Copyright Notice in lua.h
*/
@@ -13,6 +13,20 @@
#include "ltm.h"
+#if !defined(LUA_NOCVTN2S)
+#define cvt2str(o) ttisnumber(o)
+#else
+#define cvt2str(o) 0 /* no convertion from numbers to strings */
+#endif
+
+
+#if !defined(LUA_NOCVTS2N)
+#define cvt2num(o) ttisstring(o)
+#else
+#define cvt2num(o) 0 /* no convertion from strings to numbers */
+#endif
+
+
#define tonumber(o,n) \
(ttisfloat(o) ? (*(n) = fltvalue(o), 1) : luaV_tonumber_(o,n))
@@ -29,7 +43,6 @@ LUAI_FUNC int luaV_lessthan (lua_State *L, const TValue *l, const TValue *r);
LUAI_FUNC int luaV_lessequal (lua_State *L, const TValue *l, const TValue *r);
LUAI_FUNC int luaV_tonumber_ (const TValue *obj, lua_Number *n);
LUAI_FUNC int luaV_tointeger_ (const TValue *obj, lua_Integer *p);
-LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj);
LUAI_FUNC void luaV_gettable (lua_State *L, const TValue *t, TValue *key,
StkId val);
LUAI_FUNC void luaV_settable (lua_State *L, const TValue *t, TValue *key,