first implementation of multiple states (reentrant code).

1 files changed, 145 insertions, 90 deletions

diff --git a/lua.h b/lua.h
index 12cbb626..aed37bad 100644
--- a/lua.h
+++ b/lua.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lua.h,v 1.36 1999/10/07 19:04:30 roberto Exp roberto $
+** $Id: lua.h,v 1.37 1999/11/11 17:02:40 roberto Exp roberto $
 ** Lua - An Extensible Extension Language
 ** TeCGraf: Grupo de Tecnologia em Computacao Grafica, PUC-Rio, Brazil
 ** e-mail: lua@tecgraf.puc-rio.br
@@ -21,144 +21,199 @@
 #define LUA_NOREF       (-2)
 #define LUA_REFNIL      (-1)
 
-#define LUA_ANYTAG    (-1)
+#define LUA_ANYTAG      (-1)
 
 typedef struct lua_State lua_State;
-extern lua_State *lua_state;
 
-typedef void (*lua_CFunction) (void);
+typedef void (*lua_CFunction) ();
 typedef unsigned int lua_Object;
 
-void           lua_open                 (void);
-void           lua_close                (void);
-lua_State      *lua_setstate            (lua_State *st);
+lua_State     *lua_newstate (void);
+void           lua_close (lua_State *L);
 
-lua_Object     lua_settagmethod (int tag, const char *event);
+lua_Object     lua_settagmethod (lua_State *L, int tag, const char *event);
                                                        /* In: new method */
-lua_Object     lua_gettagmethod (int tag, const char *event);
+lua_Object     lua_gettagmethod (lua_State *L, int tag, const char *event);
 
-int            lua_newtag               (void);
-int            lua_copytagmethods       (int tagto, int tagfrom);
-void           lua_settag               (int tag); /* In: object */
+int            lua_newtag (lua_State *L);
+int            lua_copytagmethods (lua_State *L, int tagto, int tagfrom);
+void           lua_settag (lua_State *L, int tag); /* In: object */
 
-void           lua_error                (const char *s);
-int            lua_dofile               (const char *filename);
+void           lua_error (lua_State *L, const char *s);
+int            lua_dofile (lua_State *L, const char *filename);
                                                         /* Out: returns */
-int            lua_dostring             (const char *string);
+int            lua_dostring (lua_State *L, const char *string);
                                                         /* Out: returns */
-int            lua_dobuffer             (const char *buff, int size,
+int            lua_dobuffer (lua_State *L, const char *buff, int size,
                                          const char *name); /* Out: returns */
-int            lua_callfunction         (lua_Object f);
+int            lua_callfunction (lua_State *L, lua_Object f);
                                           /* In: parameters; Out: returns */
 
-void           lua_beginblock           (void);
-void           lua_endblock             (void);
+void           lua_beginblock (lua_State *L);
+void           lua_endblock (lua_State *L);
 
-lua_Object     lua_lua2C                (int number);
-#define        lua_getparam(_)          lua_lua2C(_)
-#define        lua_getresult(_)         lua_lua2C(_)
+lua_Object     lua_lua2C (lua_State *L, int number);
+#define        lua_getparam             lua_lua2C
+#define        lua_getresult            lua_lua2C
 
-const char    *lua_type                 (lua_Object object);
+const char    *lua_type (lua_State *L, lua_Object object);
 
-int            lua_isnil                (lua_Object object);
-int            lua_istable              (lua_Object object);
-int            lua_isuserdata           (lua_Object object);
-int            lua_iscfunction          (lua_Object object);
-int            lua_isnumber             (lua_Object object);
-int            lua_isstring             (lua_Object object);
-int            lua_isfunction           (lua_Object object);
+int            lua_isnil (lua_State *L, lua_Object object);
+int            lua_istable (lua_State *L, lua_Object object);
+int            lua_isuserdata (lua_State *L, lua_Object object);
+int            lua_iscfunction (lua_State *L, lua_Object object);
+int            lua_isnumber (lua_State *L, lua_Object object);
+int            lua_isstring (lua_State *L, lua_Object object);
+int            lua_isfunction (lua_State *L, lua_Object object);
 
-int            lua_equalobj             (lua_Object o1, lua_Object o2);
+int            lua_equalobj (lua_State *L, lua_Object o1, lua_Object o2);
 
-double         lua_getnumber            (lua_Object object);
-const char    *lua_getstring            (lua_Object object);
-long           lua_strlen               (lua_Object object);
-lua_CFunction  lua_getcfunction         (lua_Object object);
-void          *lua_getuserdata          (lua_Object object);
+double         lua_getnumber (lua_State *L, lua_Object object);
+const char    *lua_getstring (lua_State *L, lua_Object object);
+long           lua_strlen (lua_State *L, lua_Object object);
+lua_CFunction  lua_getcfunction (lua_State *L, lua_Object object);
+void          *lua_getuserdata (lua_State *L, lua_Object object);
 
 
-void           lua_pushnil              (void);
-void           lua_pushnumber           (double n);
-void           lua_pushlstring          (const char *s, long len);
-void           lua_pushstring           (const char *s);
-void           lua_pushcclosure         (lua_CFunction fn, int n);
-void           lua_pushusertag          (void *u, int tag);
-void           lua_pushobject           (lua_Object object);
+void           lua_pushnil (lua_State *L);
+void           lua_pushnumber (lua_State *L, double n);
+void           lua_pushlstring (lua_State *L, const char *s, long len);
+void           lua_pushstring (lua_State *L, const char *s);
+void           lua_pushcclosure (lua_State *L, lua_CFunction fn, int n);
+void           lua_pushusertag (lua_State *L, void *u, int tag);
+void           lua_pushobject (lua_State *L, lua_Object object);
 
-lua_Object     lua_pop                  (void);
+lua_Object     lua_pop (lua_State *L);
 
-lua_Object     lua_getglobal            (const char *name);
-lua_Object     lua_rawgetglobal         (const char *name);
-void           lua_setglobal            (const char *name); /* In: value */
-void           lua_rawsetglobal         (const char *name); /* In: value */
+lua_Object     lua_getglobal (lua_State *L, const char *name);
+lua_Object     lua_rawgetglobal (lua_State *L, const char *name);
+void           lua_setglobal (lua_State *L, const char *name); /* In: value */
+void           lua_rawsetglobal (lua_State *L, const char *name);/* In: value */
 
-void           lua_settable     (void); /* In: table, index, value */
-void           lua_rawsettable  (void); /* In: table, index, value */
-lua_Object     lua_gettable             (void); /* In: table, index */
-lua_Object     lua_rawgettable          (void); /* In: table, index */
+void           lua_settable (lua_State *L); /* In: table, index, value */
+void           lua_rawsettable (lua_State *L); /* In: table, index, value */
+lua_Object     lua_gettable (lua_State *L); /* In: table, index */
+lua_Object     lua_rawgettable (lua_State *L); /* In: table, index */
 
-int            lua_tag                  (lua_Object object);
+int            lua_tag (lua_State *L, lua_Object object);
 
-const char    *lua_nextvar              (const char *varname);  /* Out: value */
-int            lua_next                 (lua_Object o, int i);
+const char    *lua_nextvar (lua_State *L, const char *varname); /* Out: value */
+int            lua_next (lua_State *L, lua_Object o, int i);
                                                 /* Out: ref, value */ 
 
-int            lua_ref                  (int lock); /* In: value */
-lua_Object     lua_getref               (int ref);
-void           lua_unref                (int ref);
+int            lua_ref (lua_State *L, int lock); /* In: value */
+lua_Object     lua_getref (lua_State *L, int ref);
+void           lua_unref (lua_State *L, int ref);
 
-lua_Object     lua_createtable          (void);
+lua_Object     lua_createtable (lua_State *L);
 
-long           lua_collectgarbage       (long limit);
+long           lua_collectgarbage (lua_State *L, long limit);
 
 
-/* =============================================================== */
-/* some useful macros/functions */
+lua_Object     lua_seterrormethod (lua_State *L);  /* In: new method */
 
-#define lua_call(name)          lua_callfunction(lua_getglobal(name))
+lua_State     *lua_setstate (lua_State *st);
 
-#define lua_pushref(ref)        lua_pushobject(lua_getref(ref))
 
-#define lua_refobject(o,l)      (lua_pushobject(o), lua_ref(l))
+/* 
+** ===============================================================
+** some useful macros
+** ===============================================================
+*/
 
-#define lua_register(n,f)       (lua_pushcfunction(f), lua_setglobal(n))
+#ifdef LUA_REENTRANT
 
-#define lua_pushuserdata(u)     lua_pushusertag(u, 0)
+#define lua_call(L,name)        lua_callfunction(L, lua_getglobal(L, name))
+#define lua_pushref(L,ref)      lua_pushobject(L, lua_getref(L, ref))
+#define lua_refobject(L,o,l)    (lua_pushobject(L, o), lua_ref(L, l))
+#define lua_register(L,n,f)     (lua_pushcfunction(L, f), lua_setglobal(L, n))
+#define lua_pushuserdata(L,u)   lua_pushusertag(L, u, 0)
+#define lua_pushcfunction(L,f)  lua_pushcclosure(L, f, 0)
+#define lua_clonetag(L,t)       lua_copytagmethods(L, lua_newtag(L), (t))
 
-#define lua_pushcfunction(f)    lua_pushcclosure(f, 0)
+#else
 
+#define lua_call(name)          lua_callfunction(lua_getglobal(name))
+#define lua_pushref(ref)        lua_pushobject(lua_getref(ref))
+#define lua_refobject(o,l)      (lua_pushobject(o), lua_ref(l))
+#define lua_register(n,f)       (lua_pushcfunction(f), lua_setglobal(n))
+#define lua_pushuserdata(u)     lua_pushusertag(u, 0)
+#define lua_pushcfunction(f)    lua_pushcclosure(f, 0)
 #define lua_clonetag(t)         lua_copytagmethods(lua_newtag(), (t))
 
-lua_Object     lua_seterrormethod (void);  /* In: new method */
-
-/* ==========================================================================
-** for compatibility with old versions. Avoid using these macros/functions
-** If your program does need any of these, define LUA_COMPAT2_5
-*/
-
-
-#ifdef LUA_COMPAT2_5
-
-
+#endif
 
-#define lua_storeglobal         lua_setglobal
 
-#define lua_lockobject(o)  lua_refobject(o,1)
-#define lua_lock() lua_ref(1)
-#define lua_getlocked lua_getref
-#define lua_pushlocked lua_pushref
-#define lua_unlock lua_unref
 
-#define lua_pushliteral(o)  lua_pushstring(o)
+#ifndef LUA_REENTRANT
+/* 
+** ===============================================================
+** Macros for single-state use
+** ===============================================================
+*/
 
-#define lua_getindexed(o,n) (lua_pushobject(o), lua_pushnumber(n), lua_gettable())
-#define lua_getfield(o,f)   (lua_pushobject(o), lua_pushstring(f), lua_gettable())
+extern lua_State *lua_state;
 
-#define lua_getsubscript  lua_gettable
-#define lua_storesubscript  lua_settable
+#define lua_open()              ((void)(lua_state?0:(lua_state=lua_newstate())))
+
+#define lua_close()             (lua_close)(lua_state)
+#define lua_setstate(st)        (lua_setstate)(lua_state, st)
+#define lua_settagmethod(tag,event)     (lua_settagmethod)(lua_state, tag,event)
+#define lua_gettagmethod(tag,event)     (lua_gettagmethod)(lua_state, tag,event)
+#define lua_newtag()            (lua_newtag)(lua_state)
+#define lua_copytagmethods(tagto,tagfrom)       \
+                (lua_copytagmethods)(lua_state, tagto,tagfrom)
+#define lua_settag(tag)         (lua_settag)(lua_state, tag)
+#define lua_error(s)            (lua_error)(lua_state, s)
+#define lua_dofile(filename)    (lua_dofile)(lua_state, filename)
+#define lua_dostring(string)    (lua_dostring)(lua_state, string)
+#define lua_callfunction(f)     (lua_callfunction)(lua_state, f)
+#define lua_beginblock()        (lua_beginblock)(lua_state)
+#define lua_endblock()          (lua_endblock)(lua_state)
+#define lua_lua2C(number)       (lua_lua2C)(lua_state, number)
+#define lua_type(object)        (lua_type)(lua_state, object)
+#define lua_isnil(object)       (lua_isnil)(lua_state, object)
+#define lua_istable(object)     (lua_istable)(lua_state, object)
+#define lua_isuserdata(object)  (lua_isuserdata)(lua_state, object)
+#define lua_iscfunction(object) (lua_iscfunction)(lua_state, object)
+#define lua_isnumber(object)    (lua_isnumber)(lua_state, object)
+#define lua_isstring(object)    (lua_isstring)(lua_state, object)
+#define lua_isfunction(object)  (lua_isfunction)(lua_state, object)
+#define lua_equalobj(o1,o2)     (lua_equalobj)(lua_state, o1,o2)
+#define lua_getnumber(object)   (lua_getnumber)(lua_state, object)
+#define lua_getstring(object)   (lua_getstring)(lua_state, object)
+#define lua_strlen(object)      (lua_strlen)(lua_state, object)
+#define lua_getcfunction(object)        (lua_getcfunction)(lua_state, object)
+#define lua_getuserdata(object) (lua_getuserdata)(lua_state, object)
+#define lua_pushnil()           (lua_pushnil)(lua_state)
+#define lua_pushnumber(n)       (lua_pushnumber)(lua_state, n)
+#define lua_pushlstring(s,len)  (lua_pushlstring)(lua_state, s,len)
+#define lua_pushstring(s)       (lua_pushstring)(lua_state, s)
+#define lua_pushcclosure(fn,n)  (lua_pushcclosure)(lua_state, fn,n)
+#define lua_pushusertag(u,tag)  (lua_pushusertag)(lua_state, u,tag)
+#define lua_pushobject(object)  (lua_pushobject)(lua_state, object)
+#define lua_pop()               (lua_pop)(lua_state)
+#define lua_getglobal(name)     (lua_getglobal)(lua_state, name)
+#define lua_rawgetglobal(name)  (lua_rawgetglobal)(lua_state, name)
+#define lua_setglobal(name)     (lua_setglobal)(lua_state, name)
+#define lua_rawsetglobal(name)  (lua_rawsetglobal)(lua_state, name)
+#define lua_settable()          (lua_settable)(lua_state)
+#define lua_rawsettable()       (lua_rawsettable)(lua_state)
+#define lua_gettable()          (lua_gettable)(lua_state)
+#define lua_rawgettable()       (lua_rawgettable)(lua_state)
+#define lua_tag(object)         (lua_tag)(lua_state, object)
+#define lua_nextvar(varname)    (lua_nextvar)(lua_state, varname)
+#define lua_next(o,i)           (lua_next)(lua_state, o,i)
+#define lua_ref(lock)           (lua_ref)(lua_state, lock)
+#define lua_getref(ref)         (lua_getref)(lua_state, ref)
+#define lua_unref(ref)          (lua_unref)(lua_state, ref)
+#define lua_createtable()       (lua_createtable)(lua_state)
+#define lua_collectgarbage(limit)       (lua_collectgarbage)(lua_state, limit)
+#define lua_seterrormethod()    (lua_seterrormethod)(lua_state)
 
 #endif
 
+
 #endif