Changeset 185 for trunk/src

Timestamp:

08/03/13 04:40:16 (12 years ago)

Author:

epyon

Message:

• lua/state - call any function with any param count and any return value
• lua/table_guard - call any table/subtable function with any param count and any return value
• lua/function fix

File:

• trunk/src/lua/lua_state.cc (modified) (2 diffs)

trunk/src/lua/lua_state.cc

@@ -264 +264 @@
 }
 
+void lua::table_guard::call_get()
+{
+        lua_gettable( L->L, -2 );
+}
+
+void lua::table_guard::call_get_raw()
+{
+        lua_rawget( L->L, -2 );
+}
+
+
 void lua::table_guard::get_raw_flags( const std::string& element, uint8* data, uint32 count )
 {
@@ -375 +386 @@
         }
 }
+
+int lua::state::call_function( int nargs, int nresults )
+{
+        int status = lua_pcall( L, nargs, nresults, 0 );
+        if ( status != 0 )
+        {
+                std::string error = lua_tostring( L, -1 );
+                lua_pop( L, 1 );
+                NV_LOG( LOG_ERROR, "Lua error : " << error )
+        }
+        return status;
+}
+
+bool lua::state::push_function( const path& p, bool global )
+{
+        if ( !p.resolve( L, global ) )
+        {
+                lua_pop( L, 1 );
+                NV_LOG( LOG_ERROR, "Lua error : not a valid path - " + p.to_string() );
+                return false;
+        }
+
+        if ( !lua_isfunction( L, -1 ) ) 
+        {
+                lua_pop( L, 1 );
+                NV_LOG( LOG_ERROR, "Lua error : not a valid function - " + p.to_string() );
+                return false;
+        }
+        return true;
+}