Changeset 265 for trunk/src/lua/lua_state.cc

Timestamp:

06/19/14 02:22:56 (11 years ago)

Author:

epyon

Message:

• lua::ref lightweight wrapper class
• allows distinction from int for templates

File:

• trunk/src/lua/lua_state.cc (modified) (5 diffs)

trunk/src/lua/lua_state.cc

@@ -328 +328 @@
 }
 
-lua::reference lua::state::register_object( void* o, const char* lua_name )
-{
-        if ( o == nullptr ) return ref_none;
+lua::ref lua::state::register_object( void* o, const char* lua_name )
+{
+        if ( o == nullptr ) return lua::ref( lua::ref::none );
         stack_guard guard( this );
         lua_getglobal( m_state, lua_name );
@@ -338 +338 @@
         }
         deep_pointer_copy( -1, o );
-        return luaL_ref( m_state, LUA_REGISTRYINDEX );
-}
-
-lua::reference lua::state::register_proto( const char* id, const char* storage )
+        return lua::ref( luaL_ref( m_state, LUA_REGISTRYINDEX ) );
+}
+
+lua::ref lua::state::register_proto( const char* id, const char* storage )
 {
         stack_guard guard( this );
@@ -354 +354 @@
                 NV_THROW( runtime_error, std::string( id ) + " not found in " + std::string( storage ) + " storage!" );
         }
-        return luaL_ref( m_state, LUA_REGISTRYINDEX );
+        return lua::ref( luaL_ref( m_state, LUA_REGISTRYINDEX ) );
 }
 
@@ -369 +369 @@
 }
 
-void lua::state::unregister_object( reference object_index )
-{
-        if ( object_index == ref_nil ) return;
+void lua::state::unregister_object( ref object_index )
+{
+        if ( !object_index.is_valid() ) return;
         stack_guard guard( this );
-        lua_rawgeti( m_state, LUA_REGISTRYINDEX, object_index );
+        lua_rawgeti( m_state, LUA_REGISTRYINDEX, object_index.get() );
         lua_pushstring( m_state, "__ptr" );
         lua_pushboolean( m_state, false );
         lua_rawset( m_state, -3 );
         lua_pop( m_state, 1 );
-        luaL_unref( m_state, LUA_REGISTRYINDEX, object_index );
+        luaL_unref( m_state, LUA_REGISTRYINDEX, object_index.get() );
 }
 
@@ -419 +419 @@
 }
 
-void nv::lua::state::store_metadata( reference object_index, const std::string& metaname, void* pointer )
-{
-        if ( object_index == ref_nil ) return;
-        lua_rawgeti( m_state, LUA_REGISTRYINDEX, object_index );
+void nv::lua::state::store_metadata( ref object_index, const std::string& metaname, void* pointer )
+{
+        if ( !object_index.is_valid() ) return;
+        lua_rawgeti( m_state, LUA_REGISTRYINDEX, object_index.get() );
         lua_pushstring( m_state, metaname.c_str() );
         lua_pushlightuserdata( m_state, pointer );