Changeset 262 for trunk/src/lua/lua_values.cc

Timestamp:

06/19/14 00:02:55 (11 years ago)

Author:

epyon

Message:

• major decoupling lua system independent of nv::object nv::object support for lua opt-in lua system independent of types.hh

File:

• trunk/src/lua/lua_values.cc (modified) (7 diffs)

trunk/src/lua/lua_values.cc

@@ -8 +8 @@
 
 #include "nv/lua/lua_raw.hh"
-#include "nv/object.hh"
 
 using nv::lua::linteger;
@@ -71 +70 @@
 }
 
-void nv::lua::detail::push_object  ( lua_State *L, object* o )
-{
-        if ( o == nullptr )
-        {
-                lua_pushnil( L );
-        }
-        else
-        {
-                lua_rawgeti( L, LUA_REGISTRYINDEX, o->get_lua_index() );
-        }
-}
-
 void nv::lua::detail::push_pointer ( lua_State *L, void* p )
 {
@@ -118 +105 @@
 }
 
-nv::object* nv::lua::detail::to_object  ( lua_State *L, int index )
+void*       nv::lua::detail::to_pointer ( lua_State *L, int index )
 {
-        object* o = nullptr;
+        return lua_touserdata( L, index );
+}
+
+void* nv::lua::detail::to_ref_object  ( lua_State *L, int index )
+{
+        void* o = nullptr;
         if ( lua_istable( L , index ) )
         {
@@ -127 +119 @@
                 if ( lua_isuserdata( L, -1 ) )
                 {
-                        o = static_cast<object*>( lua_touserdata( L, -1 ) );
+                        o = lua_touserdata( L, -1 );
                 } 
                 lua_pop( L, 1 );
         }
         return o;
-}
-
-void*       nv::lua::detail::to_pointer ( lua_State *L, int index )
-{
-        return lua_touserdata( L, index );
 }
 
@@ -169 +156 @@
 }
 
-nv::object* nv::lua::detail::to_object  ( lua_State *L, int index, nv::object* def )
+void*       nv::lua::detail::to_pointer ( lua_State *L, int index, void* def )
 {
-        object* o = def;
+        return ( lua_type( L, index ) == LUA_TUSERDATA ? lua_touserdata( L, index ) : def );
+}
+
+void* nv::lua::detail::to_ref_object( lua_State *L, int index, void* def )
+{
+        void* o = def;
         if ( lua_istable( L , index ) )
         {
@@ -178 +170 @@
                 if ( lua_isuserdata( L, -1 ) )
                 {
-                        o = static_cast<object*>( lua_touserdata( L, -1 ) );
+                        o = lua_touserdata( L, -1 );
                 }
                 lua_pop( L, 1 );
@@ -184 +176 @@
         return o;
 }
-
-void*       nv::lua::detail::to_pointer ( lua_State *L, int index, void* def )
-{
-        return ( lua_type( L, index ) == LUA_TUSERDATA ? lua_touserdata( L, index ) : def );
-}