Changeset 265 for trunk/src

Timestamp:

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

Author:

epyon

Message:

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

Location:

trunk/src

Files:

• lua/lua_map_area.cc (modified) (1 diff)
• lua/lua_object.cc (deleted)
• lua/lua_state.cc (modified) (5 diffs)
• lua/lua_values.cc (modified) (2 diffs)
• object.cc (modified) (1 diff)
• root.cc (modified) (2 diffs)

trunk/src/lua/lua_map_area.cc

@@ -233 +233 @@
 }
 
-void nv::lua::register_map_area_instance( lua_State* L, int object_index, map_area* area )
-{
-        lua_rawgeti( L, LUA_REGISTRYINDEX, object_index );
+void nv::lua::register_map_area_instance( lua_State* L, ref object_index, map_area* area )
+{
+        lua_rawgeti( L, LUA_REGISTRYINDEX, object_index.get() );
         lua_pushstring( L, "__map_area_ptr" );
         lua_pushlightuserdata( L, (map_area*)area );

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 );

trunk/src/lua/lua_values.cc

@@ -40 +40 @@
 }
 
+void nv::lua::detail::push_nil( lua_State *L )
+{
+        lua_pushnil( L );
+}
+
 void nv::lua::detail::push_unsigned( lua_State *L, lunsigned v )
 {
@@ -74 +79 @@
         lua_pushlightuserdata( L, p );
 }
+
+void nv::lua::detail::push_ref_object ( lua_State *L, ref object )
+{
+        lua_rawgeti( L, LUA_REGISTRYINDEX, object.get() );
+}
+
 
 lunsigned   nv::lua::detail::to_unsigned( lua_State *L, int index )

trunk/src/object.cc

@@ -18 +18 @@
         , m_name()
         , m_uid(0)
-        , m_lua_index(lua::ref_none)
-        , m_lua_proto_index(lua::ref_none)
+        , m_lua_index(lua::ref::none)
+        , m_lua_proto_index(lua::ref::none)
         , m_parent( nullptr )
         , m_children()

trunk/src/root.cc

@@ -22 +22 @@
         destroy_children( o );
         o->detach();
-        if ( m_lua_state && o->m_lua_index != lua::ref_none )
+        if ( m_lua_state && o->m_lua_index != lua::ref::none )
         {
-                m_lua_state->unregister_object( o->m_lua_index );
+                m_lua_state->unregister_object( lua::ref( o->m_lua_index ) );
         }
         if ( m_uid_store && o->m_uid != 0 )
@@ -47 +47 @@
                 if ( lua_name != nullptr )
                 {
-                        o->m_lua_index       = m_lua_state->register_object( o, lua_name );
+                        o->m_lua_index       = m_lua_state->register_object( o, lua_name ).get();
                 }
                 if ( storage != nullptr )
                 {
-                        o->m_lua_proto_index = m_lua_state->register_proto( o->get_id().c_str(), storage );
+                        o->m_lua_proto_index = m_lua_state->register_proto( o->get_id().c_str(), storage ).get();
                 }
         }