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

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

File:

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

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