Changeset 253 for trunk

Timestamp:

06/12/14 15:38:09 (11 years ago)

Author:

epyon

Message:

• managed finally to force the compile-time, hand-written performance, Lua function binding to work
• FUCK YEAH!

Location:

trunk/nv

Files:

• lua/lua_dispatch.hh (modified) (2 diffs)
• lua/lua_function.hh (modified) (1 diff)
• lua/lua_state.hh (modified) (3 diffs)
• type_traits.hh (modified) (1 diff)

trunk/nv/lua/lua_dispatch.hh

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

trunk/nv/lua/lua_function.hh

@@ -12 +12 @@
 #include <nv/lua/lua_values.hh>
 #include <nv/lua/lua_path.hh>
-
-struct lua_State;
 
 namespace nv

trunk/nv/lua/lua_state.hh

@@ -136 +136 @@
                         bool is_defined( const path& p ) { return is_defined( p, m_global ); }
                         void register_native_function( lfunction f, const char* name );
-                        template < typename F, F* f >
+
+                        template < typename F, F f >
                         void register_function( const char* name )
                         {
@@ -142 +143 @@
                         }
 
-                        template < typename C, typename F, F* f > 
+                        template < typename C, typename F, F f >
                         void register_function( const char* name )
                         {
@@ -212 +213 @@
                         void unregister_object( object * o );
                         void register_native_object_method( const char* lua_name, const char* name, lfunction f );
-                        template < typename F, F* f >
+                        template < typename F, F f >
                         void register_object_method( const char* lua_name, const char* name )
                         {

trunk/nv/type_traits.hh

@@ -163 +163 @@
 
         template < typename F >
-        struct function_traits : public detail::function_traits_impl< typename std::add_pointer< F >::type >
-        {
-
-        };
-
+        struct function_traits : public detail::function_traits_impl< F >
+        {
+
+        };
 
         template < typename T >