Changeset 335 for trunk/src/lua/lua_handle.cc

Timestamp:

09/17/14 14:58:46 (11 years ago)

Author:

epyon

Message:

• NV_LUA_STACKASSERT -> NV_LUA_STACK_ASSERT
• asserts for lua_handle
• bugfix in gl_context that prevented framebuffer release

File:

• trunk/src/lua/lua_handle.cc (modified) (3 diffs)

trunk/src/lua/lua_handle.cc

@@ -7 +7 @@
 #include "nv/lua/lua_handle.hh"
 
+#include "nv/lua/lua_state.hh"
 #include "nv/lua/lua_raw.hh"
 
@@ -12 +13 @@
 void nv::lua::detail::push_handle_impl( lua_State* L, int pseudoindex, uint32 index )
 {
-        int stack = lua_gettop(L);
+        NV_LUA_STACK_ASSERT( L, +1 );
         lua_rawgeti( L, LUA_REGISTRYINDEX, pseudoindex ); // table
         lua_rawgeti( L, -1, index );                      // table, entry
-        if ( lua_isnil( L, -1 ) )
+        if ( !lua_istable( L, -1 ) )
         {
                 NV_LOG( nv::LOG_ERROR, "NIL" );
+                lua_pop( L, 2 );
+                lua_pushnil( L );
+                return;
         }
-        lua_replace( L, stack + 1 );
-        lua_settop( L, stack + 1 );
+        lua_replace( L, -2 );
 }
 
 nv::lua::detail::handle_struct nv::lua::detail::to_handle_impl( lua_State* L, int i, uint32 dindex, uint32 dcounter )
 {
+        NV_LUA_STACK_ASSERT( L, 0 );
         handle_conversion hc;
         hc.h.index   = dindex;
@@ -59 +63 @@
 void nv::lua::detail::unregister_handle_impl( lua_State* L, int pseudoindex, uint32 index )
 {
-        int stack = lua_gettop(L);
+        NV_LUA_STACK_ASSERT( L, 0 );
         lua_rawgeti( L, LUA_REGISTRYINDEX, pseudoindex ); // table
         lua_pushinteger( L, 0 );
         lua_rawseti( L, -2, index );
-        lua_settop( L, stack );
+        lua_pop( L, 1 );
 }