Changeset 333

Timestamp:

09/17/14 14:18:10 (11 years ago)

Author:

epyon

Message:

• extended handle_operator (unsafe ops)
• lua_handle library and support (multiple handle types supported)

Location:

trunk

Files:

• nv/core/handle.hh (modified) (3 diffs)
• nv/lua/lua_handle.hh (added)
• nv/lua/lua_state.hh (modified) (1 diff)
• src/lua/lua_handle.cc (added)
• src/lua/lua_state.cc (modified) (1 diff)

trunk/nv/core/handle.hh

@@ -29 +29 @@
         public:
                 typedef T value_type;
+                typedef TAG tag_type;
                 static const int INDEX_BITS   = IBITS;
                 static const int COUNTER_BITS = IBITS;
@@ -48 +49 @@
 
                 handle( T a_index, T a_counter ) : m_index( a_index ), m_counter( a_counter ) {}
-                template < typename H, typename I >
-                friend class index_store;
-        };
-
+                template < typename H >
+                friend class handle_operator;
+        };
+
+        template < typename HANDLE >
+        class handle_operator
+        {
+        public:
+                typedef typename HANDLE::value_type value_type;
+
+                static HANDLE create( value_type index, value_type counter )
+                {
+                        return HANDLE( index, counter );
+                }
+                static value_type get_counter( const HANDLE& h ) { return h.m_counter; }
+                static value_type get_index( const HANDLE& h ) { return h.m_index; }
+        };
 
 
@@ -66 +80 @@
                 handle create_handle( index_type index )
                 {
+                        typedef handle_operator<HANDLE> hop; 
                         value_type i       = get_free_entry();
                         m_entries[i].index = index;
                         m_entries[i].counter++;
-                        return handle( i, m_entries[i].counter );
+                        return hop::create( i, m_entries[i].counter );
                 }
 
                 void free_handle( handle h )
                 {
-                        m_entries[ h.m_index ].index     = -1;
-                        m_entries[ h.m_index ].next_free = -1;
+                        m_entries[ h.index() ].index     = -1;
+                        m_entries[ h.index() ].next_free = -1;
                         if ( m_last_free == -1 )
                         {
-                                m_first_free = m_last_free = h.m_index;
+                                m_first_free = m_last_free = h.index();
                                 return;
                         }
-                        m_entries[ (unsigned)m_last_free ].next_free = h.m_index;
-                        m_last_free = h.m_index;
+                        m_entries[ (unsigned)m_last_free ].next_free = h.index();
+                        m_last_free = h.index();
                 }
 
                 void swap_indices( handle h1, handle h2 )
                 {
-                        std::swap( m_entries[ h1.m_index ].index, m_entries[ h2.m_index ].index );
+                        std::swap( m_entries[ h1.index() ].index, m_entries[ h2.index() ].index );
                 }
 
                 sint32 get_index( handle h ) const
                 {
-                        return m_entries[ h.m_index ].counter == h.m_counter ? m_entries[ h.m_index ].index : -1;
+                        typedef handle_operator<HANDLE> hop; 
+                        return m_entries[ h.index() ].counter == hop::get_counter(h) ? m_entries[ h.index() ].index : -1;
                 }
         private:

trunk/nv/lua/lua_state.hh

@@ -14 +14 @@
 #include <nv/core/common.hh>
 #include <nv/core/flags.hh>
+#include <nv/core/handle.hh>
 #include <istream>
 #include <map>

trunk/src/lua/lua_state.cc

@@ -261 +261 @@
         lua_pushliteral(m_state, LUA_TABLIBNAME);
         lua_call(m_state, 1, 0);
+
+        {
+                // Preregister 8 references for Handle registry
+                lua_newtable(m_state);
+                NV_ASSERT( luaL_ref( m_state, LUA_REGISTRYINDEX ) == 1, "First reference not 1!" );
+                for ( uint32 i = 1; i < 8; ++i )
+                {
+                        lua_newtable(m_state);
+                        luaL_ref( m_state, LUA_REGISTRYINDEX );
+                }
+        }
 
         if ( load_libs )