Changeset 217

Timestamp:

09/10/13 18:11:39 (12 years ago)

Author:

epyon

Message:

• lua/nova - almost complete reimplementation of "core" from FPC Valkyrie
• lua/state - nova loaded by default
• object - prototype reference caching

Location:

trunk

Files:

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

trunk/nv/lua/lua_state.hh

@@ -168 +168 @@
                 };
 
-
-
                 class table_guard;
                 class state : public state_wrapper
@@ -175 +173 @@
                         friend class stack_guard;
                         friend class table_guard;
+
                 public:
                         explicit state( bool load_libs = false );
@@ -187 +186 @@
                         reference register_object( object * o );
                         reference register_object( object * o, const char* lua_name );
+                        reference register_proto( object * o, const char* storage );
 
                         template< typename TYPE >

trunk/nv/object.hh

@@ -178 +178 @@
 
         protected:
-                void register_with_lua( const char* lua_name = nullptr );
+                void register_with_lua( const char* lua_name, const char* storage );
 
         protected:
-                root*   m_root;        ///< pointer to root
-                string  m_id;          ///< id type of the object
-                string  m_name;        ///< name of the object
-                uid     m_uid;         ///< uid of the object
-                int     m_lua_index;   ///< lua reference
-                object* m_parent;      ///< pointer to parent
-                list    m_children;    ///< children objects
-                size_t  m_child_count; ///< number of children
+                root*   m_root;            ///< pointer to root
+                string  m_id;              ///< id type of the object
+                string  m_name;            ///< name of the object
+                uid     m_uid;             ///< uid of the object
+                int     m_lua_index;       ///< lua reference
+                int     m_lua_proto_index; ///< lua reference
+                object* m_parent;          ///< pointer to parent
+                list    m_children;        ///< children objects
+                size_t  m_child_count;     ///< number of children
         };
 

trunk/src/lua/lua_state.cc

@@ -8 +8 @@
 
 #include "nv/lua/lua_raw.hh"
+#include "nv/lua/lua_nova.hh"
 #include "nv/logging.hh"
 #include "nv/string.hh"
@@ -235 +236 @@
                         lib->func( m_state );
                 }
+                register_nova( this );
         }
 
@@ -337 +339 @@
         }
         deep_pointer_copy( -1, o );
+        return luaL_ref( m_state, LUA_REGISTRYINDEX );
+}
+
+lua::reference lua::state::register_proto( object * o, const char* storage )
+{
+        stack_guard guard( this );
+        lua_getglobal( m_state, storage );
+        if ( lua_isnil( m_state, -1 ) )
+        {
+                NV_THROW( runtime_error, std::string( storage ) + " storage not registered!" );
+        }
+        lua_getfield( m_state, -1, o->get_id().c_str() );
+        if ( lua_isnil( m_state, -1 ) )
+        {
+                NV_THROW( runtime_error, std::string( o->get_id() ) + " not found in " + std::string( storage ) + " storage!" );
+        }
         return luaL_ref( m_state, LUA_REGISTRYINDEX );
 }

trunk/src/object.cc

@@ -16 +16 @@
 
 object::object()
-        : 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)
+        : m_root( nullptr )
+        , m_id()
+        , m_name()
+        , m_uid(0)
+        , m_lua_index(lua::ref_none)
+        , m_lua_proto_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(lua::ref_none), 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_lua_proto_index(lua::ref_none)
+        , m_parent( nullptr )
+        , m_children()
+        , m_child_count(0)
 {
         if ( m_root )
@@ -191 +207 @@
 }
 
-void nv::object::register_with_lua( const char* lua_name /*= nullptr*/ )
+void nv::object::register_with_lua( const char* lua_name, const char* storage )
 {
         lua::state* state = get_root()->get_lua_state();
@@ -198 +214 @@
                 if ( lua_name != nullptr )
                 {
-                        m_lua_index = state->register_object( this, lua_name );
-                }
-                else
-                {
-                        m_lua_index = state->register_object( this );
-                }
-        }
-}
+                        m_lua_index       = state->register_object( this, lua_name );
+                }
+                if ( storage != nullptr )
+                {
+                        m_lua_proto_index = state->register_proto( this, storage );
+                }
+        }
+}