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

Timestamp:

07/23/15 08:30:41 (10 years ago)

Author:

epyon

Message:

• local updates (string removal)

File:

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

trunk/src/lua/lua_state.cc

@@ -134 +134 @@
         if ( status != 0 )
         {
-                NV_LOG_ERROR( "Lua error : ", lua_tostring( m_state, -1 ) );
+                NV_LOG_ERROR( "Lua error : ", nlua_tostringview( m_state, -1 ) );
                 lua_pop( m_state, 1 );
         }
@@ -402 +402 @@
         if (result)
         {
-                NV_LOG_WARNING( "Failed to load string ", name, ": ", lua_tostring(m_state, -1));
+                NV_LOG_WARNING( "Failed to load string ", name, ": ", nlua_tostringview(m_state, -1));
                 return false;
         }
@@ -414 +414 @@
         if (result) 
         {
-                NV_LOG_WARNING( "Failed to open file ", filename, ": ", lua_tostring( m_state, -1 ) );
+                NV_LOG_WARNING( "Failed to open file ", filename, ": ", nlua_tostringview( m_state, -1 ) );
                 return false;
         }
@@ -425 +425 @@
         if (result) 
         {
-                NV_LOG_WARNING( "Failed to run script ", name, ": ", lua_tostring( m_state, -1 ) );
+                NV_LOG_WARNING( "Failed to run script ", name, ": ", nlua_tostringview( m_state, -1 ) );
                 lua_pop( m_state, 1 );
         }
@@ -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).c_str() );
+                NV_LOG_DEBUG( "#", i+1, " - ", lua_typename(m_state, lua_type(m_state, i+1) ), " = ", nlua_typecontent(m_state, i+1) );
         }
 }
@@ -546 +546 @@
         if ( !object_index.is_valid() ) return;
         lua_rawgeti( m_state, LUA_REGISTRYINDEX, object_index.get() );
-        lua_pushlstring( m_state, metaname.data(), metaname.size() );
+        nlua_pushstringview( m_state, metaname );
         lua_pushlightuserdata( m_state, pointer );
         lua_rawset( m_state, -3 );
@@ -572 +572 @@
         else
                 nlua_deepcopy( m_state, -2 );
-        lua_pushlstring( m_state, id.data(), id.size() );
+        nlua_pushstringview( m_state, id );
         lua_pushvalue( m_state, -2 );
         lua_rawset( m_state, -4 );
@@ -590 +590 @@
                 return;
         }
-        lua_pushlstring( m_state, id.data(), id.size() );
+        nlua_pushstringview( m_state, id );
         lua_pushnil( m_state );
         lua_rawset( m_state, -3 );