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

Timestamp:

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

Author:

epyon

Message:

• local updates (string removal)

File:

• trunk/src/lua/lua_raw.cc (modified) (3 diffs)

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!";