Changeset 212

Timestamp:

09/09/13 19:29:23 (12 years ago)

Author:

epyon

Message:

• lua/dispatch - powerful module for binding any function or method to lua
• lua/state - added initial method/function registration

Location:

trunk

Files:

• nv/lua/lua_dispatch.hh (added)
• nv/lua/lua_state.hh (modified) (4 diffs)
• src/lua/lua_state.cc (modified) (3 diffs)

trunk/nv/lua/lua_state.hh

@@ -12 +12 @@
 #include <nv/common.hh>
 #include <nv/flags.hh>
+
 #include <nv/lua/lua_path.hh>
 #include <nv/lua/lua_values.hh>
+#include <nv/lua/lua_dispatch.hh>
 #include <string>
-
-struct lua_State;
 
 namespace nv
@@ -26 +26 @@
                 const int ret_multi = -1;
 
-                class state;
+                int upvalue_index( int i );
+
                 typedef int reference;
 
@@ -131 +132 @@
 
                         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 >
+                        void register_function( const char* name )
+                        {
+                                register_native_function( detail::function_wrapper< F, f >, name );
+                        }
                 protected:
                         bool is_defined( const path& p, bool global );
@@ -178 +185 @@
                         void store_metadata( object* o, const std::string& metaname, void* pointer );
                         void unregister_object( object * o );
+                        void register_native_object_method( const char* lua_name, const char* name, lfunction f );
+                        template < typename F, F* f >
+                        void register_object_method( const char* lua_name, const char* name )
+                        {
+                                register_native_object_method( lua_name, name, detail::object_method_wrapper< typename memfn_class_type<F>, F, f > );
+                        }
                         void register_enum( type_database* db, const std::string& name, const std::string& prefix = std::string() );
                         operator lua_State*() { return m_state; }

trunk/src/lua/lua_state.cc

@@ -251 +251 @@
 }
 
+
+void lua::state_wrapper::register_native_function( lfunction f, const char* name )
+{
+        if ( m_global ) push_global_table();
+        lua_pushcfunction( m_state, f );
+        lua_setfield( m_state, -2, name );
+        if ( m_global ) pop_global_table();
+}
+
 void lua::state::log_stack()
 {
@@ -287 +296 @@
         if ( t == nullptr ) return ref_none;
         return register_object( o, t->name.c_str() );
+}
+
+void lua::state::register_native_object_method( const char* lua_name, const char* name, lfunction f )
+{
+        stack_guard guard( this );
+        lua_getglobal( m_state, lua_name );
+        if ( lua_isnil( m_state, -1 ) )
+        {
+                NV_THROW( runtime_error, std::string( lua_name ) + " type not registered!" );
+        }
+        lua_pushcfunction( m_state, f );
+        lua_setfield( m_state, -2, name );
 }
 
@@ -411 +432 @@
         lua_settop( m_state, m_level );
 }
+
+int nv::lua::upvalue_index( int i )
+{
+        return lua_upvalueindex(i);
+}