Changeset 437 for trunk/src/lua

Timestamp:

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

Author:

epyon

Message:

• local updates (string removal)

Location:

trunk/src/lua

Files:

• lua_map_area.cc (modified) (1 diff)
• lua_nova.cc (modified) (1 diff)
• lua_raw.cc (modified) (3 diffs)
• lua_state.cc (modified) (8 diffs)

trunk/src/lua/lua_map_area.cc

@@ -137 +137 @@
 {
         nv::map_area* ma = to_map_area( L, 1 );
-        nv::string_view result( ma->id_to_string( ma->get_cell( to_coord( L, 2 ) ) ) );
-        lua_pushlstring( L, result.data(), result.size() );
+        nlua_pushstringview( L, ma->id_to_string( ma->get_cell( to_coord( L, 2 ) ) ) );
         return 1;
 }

trunk/src/lua/lua_nova.cc

@@ -817 +817 @@
         // TODO: check if nova is loaded
         lua_pushcfunction( L, nova_register_storage );
-        lua_pushlstring( L, name.data(), name.size() );
+        nlua_pushstringview( L, name );
         lua_call( L, 1, 1 );
         lua_setglobal( L, constructor_name.data() );

trunk/src/lua/lua_raw.cc

@@ -7 +7 @@
 #include "nv/lua/lua_raw.hh"
 
-#include "nv/stl/string.hh"
-
-std::string nlua_typecontent( lua_State* L, int idx )
+nv::string_view nlua_typecontent( lua_State* L, int idx )
 {
         int type = lua_type( L, idx );
@@ -19 +17 @@
         //case LUA_TLIGHTUSERDATA       : return std::to_string( nv::uint64( lua_touserdata( L, idx ) ) ); 
         //case LUA_TNUMBER              : return std::to_string( lua_tonumber( L, idx ) ); 
-        case LUA_TSTRING                : return lua_tostring( L, idx ); 
+        // TODO: copy to buffer?
+        case LUA_TSTRING                : return nlua_tostringview( L, idx ); 
         case LUA_TTABLE             : return "TABLE"; 
         case LUA_TFUNCTION              : return "FUNCTION"; 
@@ -26 +25 @@
         default : break; 
         }
-        char buffer_data[64];
+        static char buffer_data[64];
         nv::array_ref< char > buffer( buffer_data, 64 );
         if ( type == LUA_TLIGHTUSERDATA || type == LUA_TUSERDATA )
         {
                 size_t l = nv::uint64_to_buffer( buffer, nv::uint64( lua_touserdata( L, idx ) ) );
-                return std::string( buffer_data, l );
+                return nv::string_view( buffer.data(), buffer.size() );
         }
         else if ( type == LUA_TNUMBER )
         {
                 size_t l = nv::f64_to_buffer( buffer, lua_tonumber( L, idx ) );
-                return std::string( buffer_data, l );
+                return nv::string_view( buffer.data(), buffer.size() );
         }
         return "UNKNOWN!";

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