Changeset 209

Timestamp:

08/19/13 11:40:56 (12 years ago)

Author:

epyon

Message:

• lua_flags - dedicated flags module and lua type passing support
• minor cleanups

Location:

trunk

Files:

• nv/lua/lua_area.hh (modified) (1 diff)
• nv/lua/lua_flags.hh (added)
• nv/lua/lua_state.hh (modified) (1 diff)
• src/lua/lua_flags.cc (added)
• src/lua/lua_state.cc (modified) (1 diff)

trunk/nv/lua/lua_area.hh

@@ -38 +38 @@
                 {
                         static void push( lua_State *L, const rectangle& p ) { detail::push_area( L, p ); }
-                        static void pop( lua_State *L, rectangle& p ) { p = detail::to_area( L, -1 ); detail::pop_and_discard( L, 1 ); }
                         static rectangle to( lua_State *L, int index ) { return detail::to_area( L, index ); }
                 };

trunk/nv/lua/lua_state.hh

@@ -203 +203 @@
                         bool get_boolean( const std::string& element, bool defval = false );
 
-                        template< uint32 SIZE, typename T >
-                        flags< SIZE, T > get_flags( const std::string& element )
-                        {
-                                flags< SIZE, T > result;
-                                get_raw_flags( element, result.data(), result.size() );
-                                return result;
-                        }
-
-                        template< uint32 SIZE, typename T >
-                        void load_flags( const std::string& element, flags< SIZE, T >& flags )
-                        {
-                                get_raw_flags( element, flags.data(), flags.size() );
-                        }
-
-                private:
-                        void get_raw_flags( const std::string& element, uint8* data, uint32 count );
-
+                private:
                         int m_level;
                 };

trunk/src/lua/lua_state.cc

@@ -251 +251 @@
 }
 
-void lua::table_guard::get_raw_flags( const std::string& element, uint8* data, uint32 count )
-{
-        lua_getfield( m_state, -1, element.c_str() );
-        if ( lua_type( m_state, -1 ) != LUA_TTABLE )
-        {
-                lua_pop( m_state, 1 );
-                return;
-        }
-        nlua_toflags( m_state, -1, data, count );
-        lua_pop( m_state, 1 );
-}
-
-
 void lua::state::log_stack()
 {