Changeset 78 for trunk/src

Timestamp:

06/01/13 23:50:55 (12 years ago)

Author:

epyon

Message:

• types.hh - basing totally on typeid now
• types.hh - removed hash_string and name registration defines (get_type_name template)
• types.hh - name is defined at registration via create_type
• types.hh - overall the code is much cleaner now

Location:

trunk/src

Files:

• io_event.cc (modified) (7 diffs)
• lua/lua_state.cc (modified) (1 diff)
• object.cc (modified) (1 diff)

trunk/src/io_event.cc

@@ -49 +49 @@
 #       undef NV_KEY
         };
-        db->create_type<key_code>().enums( key_enums );
+        db->create_type<key_code>("key_code").enums( key_enums );
 
         type_enum mouse_enums[] = {
@@ -56 +56 @@
 #       undef NV_MOUSE
         };
-        db->create_type<mouse_code>().enums( mouse_enums );
+        db->create_type<mouse_code>("mouse_code").enums( mouse_enums );
 
         type_enum io_event_enums[] = {
@@ -63 +63 @@
 #       undef NV_IO_EVENT
         };
-        db->create_type<io_event_code>().enums( io_event_enums );
+        db->create_type<io_event_code>("event_code").enums( io_event_enums );
 
         type_field key_fields[] = {
@@ -73 +73 @@
                 type_field( "pressed", &key_event::pressed ),
         };
-        db->create_type<key_event>().fields( key_fields );
+        db->create_type<key_event>("key_event").fields( key_fields );
 
         type_field mouse_button_fields[] = {
@@ -82 +82 @@
                 type_field( "code",    &mouse_button_event::code ),
         };
-        db->create_type<mouse_button_event>().fields( mouse_button_fields );
+        db->create_type<mouse_button_event>("mouse_button_event").fields( mouse_button_fields );
 
         type_field mouse_move_fields[] = {
@@ -92 +92 @@
                 type_field( "code",    &mouse_move_event::code ),
         };
-        db->create_type<mouse_move_event>().fields( mouse_move_fields );
+        db->create_type<mouse_move_event>("mouse_move_event").fields( mouse_move_fields );
 
         type_field system_fields[] = {
@@ -99 +99 @@
                 type_field( "param2",   &system_event::param2 ),
         };
-        db->create_type<system_event>().fields( system_fields );
+        db->create_type<system_event>("system_event").fields( system_fields );
 }

trunk/src/lua/lua_state.cc

@@ -296 +296 @@
         if (!t) return ref_none;
         stack_guard guard( this );
-        lua_getglobal( L, t->name.text );
+        lua_getglobal( L, t->name.c_str() );
         if ( lua_isnil( L, -1 ) )
         {
-                NV_THROW( runtime_error, std::string( t->name.text ) + " type not registered!" );
+                NV_THROW( runtime_error, std::string( t->name ) + " type not registered!" );
         }
         deep_pointer_copy( -1, o );

trunk/src/object.cc

@@ -192 +192 @@
                 type_field("children"   , &object::m_children).flag( TF_READONLY ),
         };
-        db->create_type<object>().fields(fields);
+        db->create_type<object>("object").fields(fields);
 }