Changeset 51

Timestamp:

05/29/13 07:26:37 (12 years ago)

Author:

epyon

Message:

• lua_raw module added

Location:

trunk

Files:

• nv/lua/lua_raw.hh (added)
• src/lua/lua_raw.cc (added)
• src/lua/lua_state.cc (modified) (2 diffs)

trunk/src/lua/lua_state.cc

@@ -7 +7 @@
 #include "nv/lua/lua_state.hh"
 
-#include "nv/lib/lua.hh"
+#include "nv/lua/lua_raw.hh"
 #include "nv/logging.hh"
 #include "nv/string.hh"
 
 using namespace nv;
-
-// The following should be moved to lua_raw
-
-std::string lua_typecontent( lua_State* L, int idx )
-{
-        switch ( lua_type( L, idx ) )
-        {
-        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( uint64( lua_touserdata( L, idx ) ) ); 
-        case LUA_TNUMBER                : return nv::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( uint64( lua_touserdata( L, idx ) ) ); 
-        case LUA_TTHREAD                : return "THREAD"; 
-        default : return "UNKNOWN!"; 
-        }
-}
-
-// -----
 
 lua::stack_guard::stack_guard( lua::state* L )
@@ -297 +275 @@
         for ( int i = 0; i < top; ++i )
         {
-                NV_LOG( LOG_DEBUG, "#" << i+1 << " - " << lua_typename(L, i+1) << " = " << lua_typecontent(L, i+1) );
+                NV_LOG( LOG_DEBUG, "#" << i+1 << " - " << lua_typename(L, i+1) << " = " << nlua_typecontent(L, i+1) );
         }
 }