Changeset 187 for trunk

Timestamp:

08/03/13 12:07:12 (12 years ago)

Author:

epyon

Message:

• object - lua registration will now be manual, with an option to be separate from the type system
• lua/state - explicit object registration

Location:

trunk

Files:

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

trunk/nv/lua/lua_state.hh

@@ -175 +175 @@
                         lua_State* get_raw();
                         reference register_object( object * o );
+                        reference register_object( object * o, const char* lua_name );
                         void unregister_object( object * o );
                         void register_enum( type_database* db, const std::string& name, const std::string& prefix = std::string() );

trunk/nv/object.hh

@@ -178 +178 @@
 
         protected:
+                void register_with_lua( const char* lua_name = nullptr );
+
+        protected:
                 root*   m_root;        ///< pointer to root
                 string  m_id;          ///< id type of the object

trunk/src/lua/lua_state.cc

@@ -303 +303 @@
 }
 
+lua::reference lua::state::register_object( object * o, const char* lua_name )
+{
+        if ( o == nullptr ) return ref_none;
+        stack_guard guard( this );
+        lua_getglobal( L, lua_name );
+        if ( lua_isnil( L, -1 ) )
+        {
+                NV_THROW( runtime_error, std::string( lua_name ) + " type not registered!" );
+        }
+        deep_pointer_copy( -1, o );
+        return luaL_ref( L, LUA_REGISTRYINDEX );
+}
+
 lua::reference lua::state::register_object( object * o )
 {
-        if (!o) return ref_none;
+        if ( o == nullptr ) return ref_none;
         type_database *db = o->get_root()->get_type_database();
-        if (!db) return ref_none;
-        type_entry* t = db->get_type(typeid(o));
-        if (!t) return ref_none;
-        stack_guard guard( this );
-        lua_getglobal( L, t->name.c_str() );
-        if ( lua_isnil( L, -1 ) )
-        {
-                NV_THROW( runtime_error, std::string( t->name ) + " type not registered!" );
-        }
-        deep_pointer_copy( -1, o );
-    return luaL_ref( L, LUA_REGISTRYINDEX );
+        if ( db == nullptr ) return ref_none;
+        type_entry* t = db->get_type(typeid(*o));
+        if ( t == nullptr ) return ref_none;
+        return register_object( o, t->name.c_str() );
 }
 
@@ -403 +409 @@
         if ( !p.resolve( L, global ) )
         {
-                lua_pop( L, 1 );
                 NV_LOG( LOG_ERROR, "Lua error : not a valid path - " + p.to_string() );
                 return false;
@@ -416 +421 @@
         return true;
 }
+

trunk/src/object.cc

@@ -16 +16 @@
 
 object::object()
-        : m_root( nullptr ), m_id(), m_name(), m_uid(0), m_lua_index(-2), m_parent( nullptr ), m_children(), m_child_count(0)
+        : m_root( nullptr ), m_id(), m_name(), m_uid(0), m_lua_index(lua::ref_none), m_parent( nullptr ), m_children(), m_child_count(0)
 {
 }
 
 object::object( root* aroot, const string& aid )
-        : m_root( aroot ), m_id(aid), m_name(), m_uid( 0 ), m_lua_index(-2), m_parent( nullptr ), m_children(), m_child_count(0)
+        : m_root( aroot ), m_id(aid), m_name(), m_uid( 0 ), m_lua_index(lua::ref_none), m_parent( nullptr ), m_children(), m_child_count(0)
 {
         if ( m_root )
         {
                 uid_store*  store = get_root()->get_uid_store();
-                lua::state* state = get_root()->get_lua_state();
                 if (store)
                 {
                         m_uid = store->insert( this );
-                }
-                if (state)
-                {
-                        m_lua_index = state->register_object( this );
                 }
         }
@@ -195 +190 @@
         db->create_type<object>("object").fields(fields);
 }
+
+void nv::object::register_with_lua( const char* lua_name /*= nullptr*/ )
+{
+        lua::state* state = get_root()->get_lua_state();
+        if (state)
+        {
+                if ( lua_name != nullptr )
+                {
+                        m_lua_index = state->register_object( this, lua_name );
+                }
+                else
+                {
+                        m_lua_index = state->register_object( this );
+                }
+        }
+}