Changeset 3138 for code/branches/pch/src/tolua/tolua_is.c

Timestamp:

Jun 10, 2009, 4:01:42 PM (15 years ago)

Author:

rgrieder

Message:

Tolua update to v1.0.93 is not working properly and I would not know how to fix it. I have created a patch however, just in case we need it after all.

File:

• code/branches/pch/src/tolua/tolua_is.c (modified) (4 diffs)

code/branches/pch/src/tolua/tolua_is.c

@@ -86 +86 @@
 }
 
-TOLUA_API void tolua_error (lua_State* L, const char* msg, tolua_Error* err)
+TOLUA_API void tolua_error (lua_State* L, char* msg, tolua_Error* err)
 {
         if (msg[0] == '#')
@@ -117 +117 @@
 
 /* the equivalent of lua_is* for usertable */
-static  int lua_isusertable (lua_State* L, int lo, const const char* type)
+static  int lua_isusertable (lua_State* L, int lo, const char* type)
 {
         int r = 0;
@@ -213 +213 @@
  return 0;
 }
+TOLUA_API int tolua_isvalue (lua_State* L, int lo, int def, tolua_Error* err)
+{
+        if (def || abs(lo)<=lua_gettop(L))  /* any valid index */
+                return 1;
+        err->index = lo;
+        err->array = 0;
+        err->type = "value";
+        return 0;
+}
 
 TOLUA_API int tolua_isboolean (lua_State* L, int lo, int def, tolua_Error* err)
@@ -284 +293 @@
         err->array = 0;
         err->type = "userdata";
-        return 0;
-}
-
-TOLUA_API int tolua_isvaluenil (lua_State* L, int lo, tolua_Error* err) {
-
-        if (lua_gettop(L)<abs(lo))
-                return 0; /* somebody else should chack this */
-        if (!lua_isnil(L, lo))
-                return 0;
-        
-        err->index = lo;
-        err->array = 0;
-        err->type = "value";
-        return 1;
-};
-
-TOLUA_API int tolua_isvalue (lua_State* L, int lo, int def, tolua_Error* err)
-{
-        if (def || abs(lo)<=lua_gettop(L))  /* any valid index */
-                return 1;
-        err->index = lo;
-        err->array = 0;
-        err->type = "value";
         return 0;
 }