Upgrading to Lua-5.1.2

1 files changed, 22 insertions, 22 deletions

diff --git a/include/BLua.h b/include/BLua.h
index 4fec1b6..c57a633 100644
--- a/include/BLua.h
+++ b/include/BLua.h
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: BLua.h,v 1.40 2007-06-19 21:31:19 pixel Exp $ */
+/* $Id: BLua.h,v 1.41 2007-07-27 10:05:52 pixel Exp $ */
 
 #ifndef __BLUA_H__
 #define __BLUA_H__
@@ -107,15 +107,15 @@ class Lua : public Base {
     String escape_string(const String &);
     void load(Handle *, bool docall = true) throw (GeneralException);
     void load(const String &, bool docall = true) throw (GeneralException);
-    void dump(Handle *, bool strip = true);
+    void dump(Handle *, bool strip = true, int listing = 0);
     void dumpvars(Handle *, const String &, int = -1);
     Lua * thread(bool saveit = true);
     Lua * thread(const String &, int nargs = 0, bool saveit = true);
     Lua * thread(Handle *, int nargs = 0, bool saveit = true);
     int yield(int nresults = 0);
-    void resume(int nargs = 0) throw (GeneralException);
-    void resume(const String &, int nargs = 0);
-    void resume(Handle *, int nargs = 0);
+    bool resume(int nargs = 0) throw (GeneralException);
+    bool resume(const String &, int nargs = 0);
+    bool resume(Handle *, int nargs = 0);
     static Lua * find(lua_State *) throw (GeneralException);
     void showstack(int level = M_INFO);
     void showerror();
@@ -178,15 +178,15 @@ class LuaException : public GeneralException {
 };
 
 enum Lua_types_t {
-    LUA_OBJECT      = 0x01,
-    LUA_TABLE       = 0x02,
-    LUA_BOOLEAN     = 0x04,
-    LUA_NUMBER      = 0x08,
-    LUA_STRING      = 0x10,
-    LUA_FUNCTION    = 0x20,
-    LUA_NIL         = 0x40,
-    LUA_USERDATA    = 0x80,
-    LUA_ANY         = 0xff,
+    BLUA_OBJECT      = 0x01,
+    BLUA_TABLE       = 0x02,
+    BLUA_BOOLEAN     = 0x04,
+    BLUA_NUMBER      = 0x08,
+    BLUA_STRING      = 0x10,
+    BLUA_FUNCTION    = 0x20,
+    BLUA_NIL         = 0x40,
+    BLUA_USERDATA    = 0x80,
+    BLUA_ANY         = 0xff,
 };
 
 #define MAX_TYPE 8
@@ -282,7 +282,7 @@ class LuaHelpers : public Base {
                         mask = 1 << j;
                         if (tab[caller].argtypes[i] & mask) {
                             switch(mask) {
-                                case LUA_OBJECT:
+                                case BLUA_OBJECT:
                                     if (L->istable(i + 1 + add)) {
                                         L->push("__obj");
                                         L->gettable(i + 1 + add);
@@ -292,25 +292,25 @@ class LuaHelpers : public Base {
                                         arg_valid = L->isnil(i + 1 + add);
                                     }
                                     break;
-                                case LUA_TABLE:
+                                case BLUA_TABLE:
                                     arg_valid = L->istable(i + 1 + add);
                                     break;
-                                case LUA_BOOLEAN:
+                                case BLUA_BOOLEAN:
                                     arg_valid = L->isboolean(i + 1 + add);
                                     break;
-                                case LUA_NUMBER:
+                                case BLUA_NUMBER:
                                     arg_valid = L->isnumber(i + 1 + add);
                                     break;
-                                case LUA_STRING:
+                                case BLUA_STRING:
                                     arg_valid = L->isstring(i + 1 + add);
                                     break;
-                                case LUA_FUNCTION:
+                                case BLUA_FUNCTION:
                                     arg_valid = L->isfunction(i + 1 + add);
                                     break;
-                                case LUA_NIL:
+                                case BLUA_NIL:
                                     arg_valid = L->isnil(i + 1 + add);
                                     break;
-                                case LUA_USERDATA:
+                                case BLUA_USERDATA:
                                     arg_valid = L->isuserdata(i + 1 + add) || L->islightuserdata(i + 1 + add);
                                     break;
                             }