Changeset 334

Timestamp:

09/17/14 14:40:19 (11 years ago)

Author:

epyon

Message:

• added lua::stack_assert - will come in use later

Location:

trunk

Files:

• nv/lua/lua_state.hh (modified) (2 diffs)
• src/lua/lua_area.cc (modified) (1 diff)
• src/lua/lua_state.cc (modified) (1 diff)

trunk/nv/lua/lua_state.hh

@@ -23 +23 @@
 #include <string>
 
+#ifdef NV_DEBUG
+#define NV_LUA_STACKASSERT( state, value ) nv::lua::stack_assert __lua_stack_assert( state, value );
+#else
+#define NV_LUA_STACKASSERT( state, value )
+#endif
+
 namespace nv
 {
@@ -207 +213 @@
                         int m_level;
                 };
+
+                class stack_assert
+                {
+                public:
+                        stack_assert( state* aL, int expected );
+                        stack_assert( state& aL, int expected );
+                        stack_assert( lua_State* sL, int expected );
+                        ~stack_assert();
+                private:
+                        lua_State* L;
+                        int m_expected;
+                };
+
 
                 class table_guard;

trunk/src/lua/lua_area.cc

@@ -403 +403 @@
 static int luaopen_area( lua_State * L )
 {
+        NV_LUA_STACKASSERT( L, 0 );
         static const struct luaL_Reg nlua_area_sf [] = {
                 { "new",            nlua_area_new },

trunk/src/lua/lua_state.cc

@@ -32 +32 @@
         lua_settop( L->m_state, m_level );
 }
+
+// stack_assert
+nv::lua::stack_assert::stack_assert( lua::state* aL, int expected )
+        : L(aL->get_raw()), m_expected( lua_gettop(aL->get_raw() ) + expected )
+{
+
+}
+
+nv::lua::stack_assert::stack_assert( lua::state& aL, int expected )
+        : L(aL.get_raw()), m_expected( lua_gettop(aL.get_raw() ) + expected )
+{
+
+}
+
+nv::lua::stack_assert::stack_assert( lua_State* aL, int expected )
+        : L(aL), m_expected( lua_gettop(aL) + expected )
+{
+
+}
+
+lua::stack_assert::~stack_assert()
+{
+        NV_ASSERT( lua_gettop(L) == m_expected, "Lua stack corruption detected!" );
+}
+
 
 // state_wrapper