Changeset 433 for trunk/src/lua

Timestamp:

07/21/15 19:40:00 (10 years ago)

Author:

epyon

Message:

• string.hh split into separate files
• string.hh - removed std::string conversions (header still stays though)

Location:

trunk/src/lua

Files:

• lua_function.cc (modified) (2 diffs)
• lua_map_tile.cc (modified) (1 diff)
• lua_state.cc (modified) (3 diffs)

trunk/src/lua/lua_function.cc

@@ -21 +21 @@
         {
                 lua_pop( L, 1 );
-                NV_LUA_ABORT( "function_base::function_base", "not a valid path - ", a_path.to_string() );
+                NV_LUA_ABORT( "function_base::function_base", "not a valid path - ", a_path.to_string().c_str() );
         }
 
@@ -27 +27 @@
         {
                 lua_pop( L, 1 );
-                NV_LUA_ABORT( "function_base::function_base", "not a valid function - ", a_path.to_string() );
+                NV_LUA_ABORT( "function_base::function_base", "not a valid function - ", a_path.to_string().c_str() );
         }
         m_ref = luaL_ref( L, LUA_REGISTRYINDEX );

trunk/src/lua/lua_map_tile.cc

@@ -55 +55 @@
         nv::map_area* map_area = nv::lua::detail::to_map_area( L, 3 );
         lua_settop( L, 2 );
-        std::string code = nv::trimmed( lua_tostring( L, 1 ) ).to_string();
+        nv::string_view lts = nv::trimmed( lua_tostring( L, 1 ) );
+        std::string code( lts.data(), lts.size() );
         std::string chars( " \r\t" );
         code.erase( nv::remove_if( code.begin(), code.end(),

trunk/src/lua/lua_state.cc

@@ -116 +116 @@
         if ( !p.resolve( m_state, global ) )
         {
-                NV_LOG_ERROR( "Lua error : not a valid path - ", p.to_string() );
+                NV_LOG_ERROR( "Lua error : not a valid path - ", p.to_string().c_str() );
                 return false;
         }
@@ -123 +123 @@
         {
                 lua_pop( m_state, 1 );
-                NV_LOG_ERROR( "Lua error : not a valid function - ", p.to_string() );
+                NV_LOG_ERROR( "Lua error : not a valid function - ", p.to_string().c_str() );
                 return false;
         }
@@ -442 +442 @@
         for ( int i = 0; i < top; ++i )
         {
-                NV_LOG_DEBUG( "#", i+1, " - ", lua_typename(m_state, lua_type(m_state, i+1) ), " = ", nlua_typecontent(m_state, i+1) );
+                NV_LOG_DEBUG( "#", i+1, " - ", lua_typename(m_state, lua_type(m_state, i+1) ), " = ", nlua_typecontent(m_state, i+1).c_str() );
         }
 }