Changeset 399 for trunk/src

Timestamp:

06/13/15 11:47:09 (10 years ago)

Author:

epyon

Message:

• naming cleanup
• string_ref -> string_view (compatible with C++17 standard!)
• *_ref and const_*_ref, renamed to _ref and _view for consistency

Location:

trunk/src

Files:

• core/library.cc (modified) (6 diffs)
• core/logger.cc (modified) (5 diffs)
• core/profiler.cc (modified) (5 diffs)
• engine/program_manager.cc (modified) (1 diff)
• engine/resource_system.cc (modified) (1 diff)
• fmod/fmod_audio.cc (modified) (1 diff)
• formats/assimp_loader.cc (modified) (1 diff)
• formats/md3_loader.cc (modified) (3 diffs)
• formats/md5_loader.cc (modified) (1 diff)
• formats/nmd_loader.cc (modified) (1 diff)
• gfx/texture_font.cc (modified) (1 diff)
• gl/gl_device.cc (modified) (4 diffs)
• lua/lua_nova.cc (modified) (1 diff)
• lua/lua_path.cc (modified) (2 diffs)
• lua/lua_state.cc (modified) (27 diffs)
• lua/lua_values.cc (modified) (2 diffs)
• sdl/sdl_audio.cc (modified) (1 diff)

trunk/src/core/library.cc

@@ -41 +41 @@
 }
 
-void library::open( string_ref name )
+void library::open( string_view name )
 {
         m_name.assign( name.data(), name.size() );
@@ -51 +51 @@
 }
 
-bool nv::library::try_open( string_ref name )
+bool nv::library::try_open( string_view name )
 {
         m_name.assign( name.data(), name.size() );
@@ -62 +62 @@
 }
 
-string_ref library::get_name() const
+string_view library::get_name() const
 {
-    return string_ref( m_name );
+    return string_view( m_name );
 }
 
@@ -76 +76 @@
 
         std::string name = m_name;
-        string_ref ext( NV_LIB_EXT );
+        string_view ext( NV_LIB_EXT );
 
         if ( name.length() < ext.length() || name.substr( name.length() - ext.length(), ext.length() ) != ext )
@@ -94 +94 @@
 }
 
-void* library::get( string_ref symbol )
+void* library::get( string_view symbol )
 {
         void* result = (void*) NV_LIB_GET( (NV_LIB_HANDLE) m_handle, symbol.data() );
@@ -104 +104 @@
 }
 
-void* nv::library::try_get( string_ref symbol )
+void* nv::library::try_get( string_view symbol )
 {
         return (void*) NV_LIB_GET( (NV_LIB_HANDLE) m_handle, symbol.data() );

trunk/src/core/logger.cc

@@ -85 +85 @@
 
 // log function
-void logger::log( log_level level, const string_ref& message )
+void logger::log( log_level level, const string_view& message )
 {
         for ( auto& sink_info : m_log_sinks )
@@ -141 +141 @@
 
 // console logging
-void log_console_sink::log( log_level level, const string_ref& message )
+void log_console_sink::log( log_level level, const string_view& message )
 {
         char stamp[16];
@@ -177 +177 @@
 
 // handle logging
-void log_handle_sink::log( log_level level, const string_ref& message )
+void log_handle_sink::log( log_level level, const string_view& message )
 {
         char stamp[16];
@@ -204 +204 @@
 }
 
-nv::log_file_sink::log_file_sink( const string_ref& file_name, bool flush_always /*= true */ )
+nv::log_file_sink::log_file_sink( const string_view& file_name, bool flush_always /*= true */ )
         : log_handle_sink( nullptr, flush_always )
 {
@@ -257 +257 @@
 }
 
-string_ref nv::log_sink::level_name( log_level level ) const
+string_view nv::log_sink::level_name( log_level level ) const
 {
         return NV_LOG_LEVEL_NAME( level );
 }
 
-string_ref nv::log_sink::padded_level_name( log_level level ) const
-{
-        return string_ref( NV_LOG_LEVEL_NAME_PAD( level ), 8 );
-}
-
+string_view nv::log_sink::padded_level_name( log_level level ) const
+{
+        return string_view( NV_LOG_LEVEL_NAME_PAD( level ), 8 );
+}
+

trunk/src/core/profiler.cc

@@ -30 +30 @@
 }
 
-void profiler::start_profile( const string_ref& tag )
+void profiler::start_profile( const string_view& tag )
 {
         if ( tag != m_current->m_tag )
@@ -47 +47 @@
 }
 
-profiler::node::node( const string_ref& tag, node* parent )
+profiler::node::node( const string_view& tag, node* parent )
         : m_tag( tag.to_string() )
         , m_parent( parent )
@@ -58 +58 @@
 }
 
-profiler::node* profiler::node::request_child( const string_ref& tag )
+profiler::node* profiler::node::request_child( const string_view& tag )
 {
         std::string stag( tag.to_string() );
@@ -110 +110 @@
         char buffer[128];
         snprintf( buffer, 128, "%-23s %6s %6s %9s %6s", "TAG", "%PARNT", "CALLS", "TOTAL(ms)", "AVG(ms)" );
-        NV_LOG_INFO( string_ref( buffer, nvstrlen( buffer ) ) );
+        NV_LOG_INFO( string_view( buffer, nvstrlen( buffer ) ) );
         log_node_children( 0, m_root );
         NV_LOG_INFO( "-- PROFILER REPORT END ---------------------------------" );
@@ -131 +131 @@
                         snprintf( buffer + indent, 128 - indent, "%*.*s %6.2f %6d %9.2f %6.2f", indent - 23, 23 - indent,
                                 c->m_tag.c_str(), pparent, calls, total_ms, avg_ms );
-                        NV_LOG_INFO( string_ref( buffer, nvstrlen( buffer ) ) );
+                        NV_LOG_INFO( string_view( buffer, nvstrlen( buffer ) ) );
                         if ( c->m_children.size() > 0 )
                         {

trunk/src/engine/program_manager.cc

@@ -37 +37 @@
         }
 
-        nv::program program = m_context->get_device()->create_program( string_ref( vsource ), string_ref( fsource ) );
+        nv::program program = m_context->get_device()->create_program( string_view( vsource ), string_view( fsource ) );
         return add( program );
 }

trunk/src/engine/resource_system.cc

@@ -12 +12 @@
 {
         m_lua = a_lua_state;
-        lua::register_storage( m_lua, get_storage_name(), string_ref( "register_" + get_resource_name().to_string() ) );
+        lua::register_storage( m_lua, get_storage_name(), string_view( "register_" + get_resource_name().to_string() ) );
 }
 

trunk/src/fmod/fmod_audio.cc

@@ -88 +88 @@
 
 
-nv::sound fmod::audio::load_sound( const string_ref& a_path )
+nv::sound fmod::audio::load_sound( const string_view& a_path )
 {
         FMOD_SYSTEM* system = (FMOD_SYSTEM*)m_system;

trunk/src/formats/assimp_loader.cc

@@ -237 +237 @@
                         aiMesh* mesh = scene->mMeshes[mc];
 
-                        NV_LOG_NOTICE( "Mesh #", mc, "   - ", string_ref( (char*)mesh->mName.data ) );
+                        NV_LOG_NOTICE( "Mesh #", mc, "   - ", string_view( (char*)mesh->mName.data ) );
                         NV_LOG_NOTICE( "  bones   - ", mesh->mNumBones );
                         NV_LOG_NOTICE( "  uvs     - ", mesh->mNumUVComponents[0] );

trunk/src/formats/md3_loader.cc

@@ -284 +284 @@
 }
 
-nv::key_raw_channel* nv::md3_loader::load_tags( const string_ref& tag )
+nv::key_raw_channel* nv::md3_loader::load_tags( const string_view& tag )
 {
         md3_t* md3 = (md3_t*)m_md3;
@@ -294 +294 @@
                 {
                         const md3_tag_t& rtag = md3->tags[i + md3->header.num_tags * f];
-                        string_ref rname((char*)(rtag.name));
+                        string_view rname((char*)(rtag.name));
                         if (rname == tag)
                         {
@@ -425 +425 @@
         {
                 const md3_tag_t& rtag = md3->tags[i];
-                string_ref name( (char*)(rtag.name) );
+                string_view name( (char*)(rtag.name) );
 
                 nodes[i].transform = mat4();

trunk/src/formats/md5_loader.cc

@@ -457 +457 @@
 }
 
-void md5_loader::build_frame_skeleton( mesh_node_data* nodes, uint32 index, const const_array_ref<md5_joint_info>& joint_infos, const const_array_ref<transform>& base_frames, const const_array_ref<float>& frame_data )
+void md5_loader::build_frame_skeleton( mesh_node_data* nodes, uint32 index, const array_view<md5_joint_info>& joint_infos, const array_view<transform>& base_frames, const array_view<float>& frame_data )
 {
         assert( m_type == ANIMATION );

trunk/src/formats/nmd_loader.cc

@@ -162 +162 @@
 static void nmd_dump_mesh( const mesh_data* mesh, stream& stream_out )
 {
-        const_array_ref< mesh_raw_channel* > data  = mesh->get_raw_channels();
+        array_view< mesh_raw_channel* > data  = mesh->get_raw_channels();
 
         uint32 size = sizeof( nmd_element_header );

trunk/src/gfx/texture_font.cc

@@ -92 +92 @@
 }
 
-bool texture_font::load_glyphs( string_ref codes )
+bool texture_font::load_glyphs( string_view codes )
 {
         FT_Face face = (FT_Face)(m_rface);

trunk/src/gl/gl_device.cc

@@ -24 +24 @@
 }
 
-program gl_device::create_program( string_ref vs_source, string_ref fs_source )
+program gl_device::create_program( string_view vs_source, string_view fs_source )
 {
         program result = m_programs.create();
@@ -41 +41 @@
 // this is a temporary function that will be removed once we find a way to 
 // pass binary file data around
-image_data* gl_device::create_image_data( string_ref filename )
+image_data* gl_device::create_image_data( string_view filename )
 {
         load_sdl_image_library();
@@ -264 +264 @@
 }
 
-bool nv::gl_device::compile( gl_program_info* p, string_ref vertex_program, string_ref fragment_program )
+bool nv::gl_device::compile( gl_program_info* p, string_view vertex_program, string_view fragment_program )
 {
         if (!compile( GL_VERTEX_SHADER,   vertex_program, p->glidv ))   { return false; }
@@ -407 +407 @@
 }
 
-bool nv::gl_device::compile( uint32 sh_type, string_ref shader_code, unsigned& glid )
+bool nv::gl_device::compile( uint32 sh_type, string_view shader_code, unsigned& glid )
 {
         glid = glCreateShader( sh_type );

trunk/src/lua/lua_nova.cc

@@ -810 +810 @@
 }
 
-void nv::lua::register_storage( state* a_state, string_ref name, string_ref constructor_name )
+void nv::lua::register_storage( state* a_state, string_view name, string_view constructor_name )
 {
         // TODO: error checking

trunk/src/lua/lua_path.cc

@@ -14 +14 @@
 {
         if ( m_elements[0].length == 0 || m_elements[0].str == nullptr ) return;
-        string_ref spath( m_elements[0].str, m_elements[0].length );
+        string_view spath( m_elements[0].str, m_elements[0].length );
         m_count = 0;
         size_t point = spath.find( '.' );
 
-        while ( point != string_ref::npos )
+        while ( point != string_view::npos )
         {
                 m_elements[m_count].str    = spath.data();
@@ -39 +39 @@
 }
 
-void nv::lua::path::push( string_ref p )
+void nv::lua::path::push( string_view p )
 {
         m_elements[ m_count ].str    = p.data();

trunk/src/lua/lua_state.cc

@@ -80 +80 @@
 }
 
-void lua::state_wrapper::register_native_function( lfunction f, string_ref name )
+void lua::state_wrapper::register_native_function( lfunction f, string_view name )
 {
         if ( m_global ) push_global_table();
@@ -171 +171 @@
 }
 
-bool lua::table_guard::has_field( string_ref element )
+bool lua::table_guard::has_field( string_view element )
 {
         lua_getfield( m_state, -1, element.data() );
@@ -179 +179 @@
 }
 
-std::string lua::table_guard::get_std_string( string_ref element, string_ref defval /*= string_ref() */ )
+std::string lua::table_guard::get_std_string( string_view element, string_view defval /*= string_view() */ )
 {
         lua_getfield( m_state, -1, element.data() );
@@ -198 +198 @@
 }
 
-const_string lua::table_guard::get_string( string_ref element, string_ref defval /*= string_ref() */ )
+const_string lua::table_guard::get_string( string_view element, string_view defval /*= string_view() */ )
 {
         lua_getfield( m_state, -1, element.data() );
@@ -217 +217 @@
 }
 
-char lua::table_guard::get_char( string_ref element, char defval /*= "" */ )
+char lua::table_guard::get_char( string_view element, char defval /*= "" */ )
 {
         lua_getfield( m_state, -1, element.data() );
@@ -225 +225 @@
 }
 
-int lua::table_guard::get_integer( string_ref element, int defval /*= "" */ )
+int lua::table_guard::get_integer( string_view element, int defval /*= "" */ )
 {
         lua_getfield( m_state, -1, element.data() );
@@ -233 +233 @@
 }
 
-unsigned lua::table_guard::get_unsigned( string_ref element, unsigned defval /*= "" */ )
+unsigned lua::table_guard::get_unsigned( string_view element, unsigned defval /*= "" */ )
 {
         lua_getfield( m_state, -1, element.data() );
@@ -241 +241 @@
 }
 
-double lua::table_guard::get_double( string_ref element, double defval /*= "" */ )
+double lua::table_guard::get_double( string_view element, double defval /*= "" */ )
 {
         lua_getfield( m_state, -1, element.data() );
@@ -250 +250 @@
 
 
-float nv::lua::table_guard::get_float( string_ref element, float defval /*= 0.0 */ )
+float nv::lua::table_guard::get_float( string_view element, float defval /*= 0.0 */ )
 {
         lua_getfield( m_state, -1, element.data() );
@@ -258 +258 @@
 }
 
-bool lua::table_guard::get_boolean( string_ref element, bool defval /*= "" */ )
+bool lua::table_guard::get_boolean( string_view element, bool defval /*= "" */ )
 {
         lua_getfield( m_state, -1, element.data() );
@@ -266 +266 @@
 }
 
-bool nv::lua::table_guard::is_table( string_ref element )
+bool nv::lua::table_guard::is_table( string_view element )
 {
         lua_getfield( m_state, -1, element.data() );
@@ -274 +274 @@
 }
 
-bool nv::lua::table_guard::is_number( string_ref element )
+bool nv::lua::table_guard::is_number( string_view element )
 {
         lua_getfield( m_state, -1, element.data() );
@@ -282 +282 @@
 }
 
-bool nv::lua::table_guard::is_boolean( string_ref element )
+bool nv::lua::table_guard::is_boolean( string_view element )
 {
         lua_getfield( m_state, -1, element.data() );
@@ -290 +290 @@
 }
 
-bool nv::lua::table_guard::is_string( string_ref element )
+bool nv::lua::table_guard::is_string( string_view element )
 {
         lua_getfield( m_state, -1, element.data() );
@@ -350 +350 @@
 }
 
-int lua::state::load_string( string_ref code, string_ref name )
+int lua::state::load_string( string_view code, string_view name )
 {
         NV_LOG_TRACE( "Loading Lua string '", name, "'");
@@ -356 +356 @@
 }
 
-int lua::state::load_file( string_ref filename )
+int lua::state::load_file( string_view filename )
 {
         NV_LOG_NOTICE( "Loading Lua file '", filename, "'");
@@ -362 +362 @@
 }
 
-bool lua::state::do_string( string_ref code, string_ref name, int rvalues )
+bool lua::state::do_string( string_view code, string_view name, int rvalues )
 {
         lua::stack_guard( this );
@@ -374 +374 @@
 }
 
-bool lua::state::do_file( string_ref filename )
+bool lua::state::do_file( string_view filename )
 {
         lua::stack_guard( this );
@@ -386 +386 @@
 }
 
-int lua::state::do_current( string_ref name, int rvalues )
+int lua::state::do_current( string_view name, int rvalues )
 {
         int result = lua_pcall(m_state, 0, rvalues, 0);
@@ -417 +417 @@
 }
 
-lua::ref lua::state::register_object( void* o, string_ref lua_name )
+lua::ref lua::state::register_object( void* o, string_view lua_name )
 {
         if ( o == nullptr ) return lua::ref( lua::ref::none );
@@ -430 +430 @@
 }
 
-lua::ref lua::state::register_proto( string_ref id, string_ref storage )
+lua::ref lua::state::register_proto( string_view id, string_view storage )
 {
         stack_guard guard( this );
@@ -446 +446 @@
 }
 
-void lua::state::register_native_object_method( string_ref lua_name, string_ref name, lfunction f )
+void lua::state::register_native_object_method( string_view lua_name, string_view name, lfunction f )
 {
         stack_guard guard( this );
@@ -508 +508 @@
 }
 
-void nv::lua::state::store_metadata( ref object_index, string_ref metaname, void* pointer )
+void nv::lua::state::store_metadata( ref object_index, string_view metaname, void* pointer )
 {
         if ( !object_index.is_valid() ) return;
@@ -518 +518 @@
 }
 
-void nv::lua::state::register_enum( string_ref name, int value )
+void nv::lua::state::register_enum( string_view name, int value )
 {
         lua_pushinteger( m_state, value );
@@ -524 +524 @@
 }
 
-nv::lua::ref nv::lua::state::register_handle_component_impl( string_ref id, bool empty )
+nv::lua::ref nv::lua::state::register_handle_component_impl( string_view id, bool empty )
 {
         int args = empty ? 1 : 2;
@@ -547 +547 @@
 }
 
-void nv::lua::state::unregister_handle_component_impl( string_ref id )
+void nv::lua::state::unregister_handle_component_impl( string_view id )
 {
         NV_LUA_STACK_ASSERT( m_state, -1 );
@@ -562 +562 @@
 }
 
-void nv::lua::state::register_singleton( string_ref name, void* o )
+void nv::lua::state::register_singleton( string_view name, void* o )
 {
         if ( o == nullptr ) return;

trunk/src/lua/lua_values.cc

@@ -75 +75 @@
 }
 
-void nv::lua::detail::push_string_ref( lua_State *L, string_ref s )
+void nv::lua::detail::push_string_view( lua_State *L, string_view s )
 {
         lua_pushlstring( L, s.data(), s.size() );
@@ -123 +123 @@
 }
 
-nv::string_ref nv::lua::detail::to_string_ref( lua_State *L, int index )
+nv::string_view nv::lua::detail::to_string_view( lua_State *L, int index )
 {
         size_t length = 0;
         const char* result = lua_tolstring( L, index, &length );
-        return string_ref( result, length );
+        return string_view( result, length );
 }
 

trunk/src/sdl/sdl_audio.cc

@@ -85 +85 @@
 }
 
-nv::sound nv::sdl::audio::load_sound( const string_ref& a_path )
+nv::sound nv::sdl::audio::load_sound( const string_view& a_path )
 {
         // TODO: this is a really weird error - if we remove this check, all hell gets loose