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

Timestamp:

05/29/15 17:28:16 (10 years ago)

Author:

epyon

Message:

• oops, missed src : got rid of to_string and other std::string utilities (except slurp) string no longer in nv namespace

File:

• trunk/src/lua/lua_raw.cc (modified) (1 diff)

trunk/src/lua/lua_raw.cc

@@ -11 +11 @@
 std::string nlua_typecontent( lua_State* L, int idx )
 {
-        switch ( lua_type( L, idx ) )
+        int type = lua_type( L, idx );
+        switch ( type )
         {
         case LUA_TNONE          : return "NONE"; 
         case LUA_TNIL               : return "NIL"; 
         case LUA_TBOOLEAN               : return lua_toboolean( L, idx ) == 0 ? "false" : "true"; 
-        case LUA_TLIGHTUSERDATA : return nv::to_string( nv::uint64( lua_touserdata( L, idx ) ) ); 
-        case LUA_TNUMBER                : return nv::to_string( lua_tonumber( L, idx ) ); 
+        //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 ); 
         case LUA_TTABLE             : return "TABLE"; 
         case LUA_TFUNCTION              : return "FUNCTION"; 
-        case LUA_TUSERDATA              : return nv::to_string( nv::uint64( lua_touserdata( L, idx ) ) ); 
+//      case LUA_TUSERDATA              : return std::to_string( nv::uint64( lua_touserdata( L, idx ) ) ); 
         case LUA_TTHREAD                : return "THREAD"; 
-        default : return "UNKNOWN!"; 
-        }
+        default : break; 
+        }
+        char buffer[64];
+        if ( type == LUA_TLIGHTUSERDATA || type == LUA_TUSERDATA )
+        {
+                size_t l = nv::uint64_to_buffer( nv::uint64( lua_touserdata( L, idx ) ), buffer );
+                return std::string( buffer, l );
+        }
+        else if ( type == LUA_TNUMBER )
+        {
+                size_t l = nv::f64_to_buffer( lua_tonumber( L, idx ), buffer );
+                return std::string( buffer, l );
+        }
+        return "UNKNOWN!";
 }