Changeset 213 for trunk

Timestamp:

09/09/13 20:04:42 (12 years ago)

Author:

epyon

Message:

• lua/state - upvalue_index moved to lua/values

Location:

trunk

Files:

• nv/lua/lua_dispatch.hh (modified) (1 diff)
• nv/lua/lua_state.hh (modified) (2 diffs)
• nv/lua/lua_values.hh (modified) (1 diff)
• src/lua/lua_state.cc (modified) (1 diff)
• src/lua/lua_values.cc (modified) (1 diff)
• tests/lualib_test/lualib_test.cc (modified) (3 diffs)

trunk/nv/lua/lua_dispatch.hh

@@ -154 +154 @@
                         int fixed_method_wrapper( lua_State* L ) 
                         {
-                                C* c = (C*)to_pointer( L, nv::lua::upvalue_index(1) );
+                                C* c = (C*)to_pointer( L, nv::lua::detail::upvalue_index(1) );
                                 return dispatcher<typename return_type<F>::type>::call( L, c, 1, f );
                         }

trunk/nv/lua/lua_state.hh

@@ -4 +4 @@
 // This file is part of NV Libraries.
 // For conditions of distribution and use, see copyright notice in nv.hh
+//
+// TODO: decouple from the type database
+// TODO: paths for function registration?
+
 
 #ifndef NV_LUA_HH
@@ -25 +29 @@
                 const int ref_nil   = -1;
                 const int ret_multi = -1;
-
-                int upvalue_index( int i );
 
                 typedef int reference;

trunk/nv/lua/lua_values.hh

@@ -52 +52 @@
                 namespace detail
                 {
-                        struct void_type {};
+                        int upvalue_index( int i );
 
                         void push_unsigned( lua_State *L, lunsigned v );

trunk/src/lua/lua_state.cc

@@ -433 +433 @@
 }
 
-int nv::lua::upvalue_index( int i )
-{
-        return lua_upvalueindex(i);
-}

trunk/src/lua/lua_values.cc

@@ -13 +13 @@
 using nv::lua::lnumber;
 using nv::lua::lunsigned;
+
+int nv::lua::detail::upvalue_index( int i )
+{
+        return lua_upvalueindex(i);
+}
 
 bool nv::lua::detail::is_userdata( lua_State *L, int index, const char* metatable )

trunk/tests/lualib_test/lualib_test.cc

@@ -1 +1 @@
 #include <nv/lib/lua.hh>
 #include <nv/lua/lua_state.hh>
+#include <nv/lua/lua_dispatch.hh>
 #include <nv/lua/lua_raw.hh>
 #include <nv/lua/lua_glm.hh>
@@ -10 +11 @@
 #include <functional>
 #include <nv/gui/gui_element.hh>
+
+void hello( const std::string& h )
+{
+        std::cout << h << " world from C++!" << std::endl;
+}
+
 
 int main(int, char* [])
@@ -22 +29 @@
         {
                 nv::lua::state state( true );
-                nlua_register_glm( state );
+                nv::lua::register_glm( state );
                 // run the Lua script
+                state.register_function<decltype(hello),&hello>( "hello" );
                 state.do_file( "init.lua" );
+                //std::cout << nv::function_traits<decltype(hello)>::arg_count << std::endl;
 
                 log.set_level( nv::LOG_INFO );