Changeset 399 for trunk/src/lua

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/lua

Files:

• lua_nova.cc (modified) (1 diff)
• lua_path.cc (modified) (2 diffs)
• lua_state.cc (modified) (27 diffs)
• lua_values.cc (modified) (2 diffs)

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