Changeset 429

Timestamp:

07/20/15 14:14:22 (10 years ago)

Author:

epyon

Message:

• cstring_store removed - types uses string_table instead

Location:

trunk/nv

Files:

• core/types.hh (modified) (12 diffs)
• stl/cstring_store.hh (deleted)

trunk/nv/core/types.hh

@@ -13 +13 @@
 #include <nv/stl/vector.hh>
 #include <nv/stl/unordered_map.hh>
-#include <nv/stl/cstring_store.hh>
+#include <nv/stl/string_table.hh>
+#include <nv/stl/functional/hash.hh>
 #include <nv/stl/type_traits/properties.hh>
 
@@ -55 +56 @@
         struct type_field
         {
-                uint32      name;     //!< name of the field
+                uint64  name;     //!< name of the field
                 type_hash   hash; //!< typeinfo for later retrieval of type
                 type_entry* type;     //!< pointer to field type
@@ -64 +65 @@
         struct type_enum
         {
-                uint32 name;
+                uint64 name;
                 sint32 value;
         };
@@ -75 +76 @@
 
                 type_database*          type_db;     //!< Parent type database
-                uint32                  name;        //!< Scoped C++ name of the type
+                uint64                  name;        //!< Scoped C++ name of the type
                 constructor_func        constructor; //!< Pointers to the constructor 
                 destructor_func         destructor;  //!< Pointers to the destructor 
@@ -82 +83 @@
                 vector<type_field> field_list;  //!< Field list
                 vector<type_enum>  enum_list;   //!< Enum list
-                cstring_store names;
         };
 
@@ -109 +109 @@
         {
         public:
+                friend class type_creator;
+
                 template< typename TYPE >
                 type_creator create_type( const char* name )
                 {
                         NV_ASSERT( !m_names.exists( name ), "Type redefinition!" );
-                        uint32 name_idx = m_names.push( name );
+                        uint64 name_hash = m_names.insert( name );
                         type_entry* i_type = new type_entry;
                         i_type->type_db = this;
-                        i_type->name = name_idx;
+                        i_type->name = name_hash;
                         i_type->size = sizeof( TYPE );
 
                         i_type->constructor = raw_construct_object < TYPE >;
                         i_type->destructor  = raw_destroy_object < TYPE >;
-                        m_idx_types[typeid( TYPE )] = i_type;
+                        m_index_by_type[typeid( TYPE )] = i_type;
+                        m_index_by_name[name_hash] = i_type;
                         m_type_list.push_back( i_type );
                         return type_creator( this, i_type );
@@ -128 +131 @@
                 type_entry* get_type( const char* name )
                 {
-                        uint32 name_idx = m_names.resolve( name );
-                        if ( name_idx < m_type_list.size() )
-                        {
-                                return m_type_list[name_idx];
-                        }
-                        return nullptr;
+                        uint64 name_hash = hash_string<type_hash>( name );
+                        auto it = m_index_by_name.find( name_hash );
+                        return it != m_index_by_name.end() ? it->second : nullptr;
                 }
 
                 type_entry* get_type( type_hash hash )
                 {
-                        type_info_map::iterator it = m_idx_types.find( hash );
-                        if ( it != m_idx_types.end() )
+                        type_hash_map::iterator it = m_index_by_type.find( hash );
+                        if ( it != m_index_by_type.end() )
                         {
                                 return it->second;
@@ -146 +146 @@
                 }
 
-                const char* resolve_name( uint32 name_idx )
-                {
-                        return m_names.get( name_idx );
+                string_view resolve_name( uint64 name_hash )
+                {
+                        return m_names[name_hash];
                 }
 
@@ -157 +157 @@
         private:
                 typedef vector<type_entry*>                   type_list;
-                typedef unordered_map<type_hash, type_entry*> type_info_map;
-                cstring_store m_names;
+                typedef unordered_map<type_hash, type_entry*> type_hash_map;
+                string_table  m_names;
                 type_list     m_type_list;
-                type_info_map m_idx_types;
+                type_hash_map m_index_by_type;
+                type_hash_map m_index_by_name;
         };
         
@@ -176 +177 @@
                 NV_ASSERT( m_entry->enum_list.empty(), "Type cannot have both enums and fields!" );
                 type_field f;
-                f.name = m_entry->names.insert( name );
+                f.name = m_database->m_names.insert( name );
                 f.hash = rtti_type_hash< remove_pointer_t<field_type> >::hash();
                 f.type = type_db->get_type( f.hash );
@@ -192 +193 @@
                 NV_ASSERT( m_entry->enum_list.empty(), "Type cannot have both enums and fields!" );
                 type_field f;
-                f.name = m_entry->names.insert( name );
+                f.name = m_database->m_names.insert( name );
                 f.hash = rtti_type_hash< remove_pointer_t<TFIELD> >::hash();
                 f.type = type_db->get_type( f.hash );
@@ -207 +208 @@
                 NV_ASSERT( m_entry->field_list.empty(), "Type cannot have both enums and fields!" );
                 type_enum e;
-                e.name = m_entry->names.insert( name );
+                e.name = m_database->m_names.insert( name );
                 e.value = value;
                 m_entry->enum_list.push_back( e );