Changeset 440 for trunk/src/lua/lua_state.cc

Timestamp:

07/23/15 21:16:01 (10 years ago)

Author:

epyon

Message:

• massive std::string removal
• no header depends on std::string anymore (or any other STL header)
• still some code files do (WIP)
• massive refactoring where std::string was used
• lua still messy (grep for string128 - used everywhere)
• string_twine added

File:

• trunk/src/lua/lua_state.cc (modified) (4 diffs)

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().c_str() );
+                NV_LOG_ERROR( "Lua error : not a valid path - ", p.to_string() );
                 return false;
         }
@@ -123 +123 @@
         {
                 lua_pop( m_state, 1 );
-                NV_LOG_ERROR( "Lua error : not a valid function - ", p.to_string().c_str() );
+                NV_LOG_ERROR( "Lua error : not a valid function - ", p.to_string() );
                 return false;
         }
@@ -212 +212 @@
         lua_pop( m_state, 1 );
         return shash64( result );
-}
-
-std::string lua::table_guard::get_std_string( string_view element, string_view defval /*= string_view() */ )
-{
-        lua_getfield( m_state, -1, element.data() );
-        size_t l = 0;
-        const char* str = nullptr;
-        if ( lua_type( m_state, -1 ) == LUA_TSTRING )
-        {
-                str = lua_tolstring( m_state, -1, &l );
-        }
-        else
-        {
-                l = defval.size();
-                str = defval.data();
-        }
-        std::string result( str, l );
-        lua_pop( m_state, 1 );
-        return result;
 }
 
@@ -250 +231 @@
         lua_pop( m_state, 1 );
         return result;
+}
+
+string128 lua::table_guard::get_string128( string_view element, string_view defval )
+{
+        lua_getfield( m_state, -1, element.data() );
+        size_t l = 0;
+        const char* str = nullptr;
+        if ( lua_type( m_state, -1 ) == LUA_TSTRING )
+        {
+                str = lua_tolstring( m_state, -1, &l );
+        }
+        else
+        {
+                l = defval.size();
+                str = defval.data();
+        }
+        string128 result( str, l );
+        lua_pop( m_state, 1 );
+        return result;
 }