Changeset 181 for trunk/src/lua

Timestamp:

07/30/13 04:44:15 (12 years ago)

Author:

epyon

Message:

• string - string_length template
• lua/path - power tool, universal lua path
• lua_state - now uses lua/path for table_guard constructors

Location:

trunk/src/lua

Files:

• lua_path.cc (added)
• lua_state.cc (modified) (1 diff)

trunk/src/lua/lua_state.cc

@@ -198 +198 @@
 }
 
-lua::table_guard::table_guard( lua::state* lstate, const std::string& table, bool global )
+lua::table_guard::table_guard( lua::state* lstate, const path& p, bool global )
         : L(lstate), m_guard(lstate)
 {
-        L->push( table, global );
-}
-
-lua::table_guard::table_guard( lua::state* lstate, const std::string& table, int index, bool global )
-        : L(lstate), m_guard(lstate)
-{
-        L->push( table, global );
-        lua_rawgeti( L->L, -1, index );
-}
-
-lua::table_guard::table_guard( lua::state* lstate, const std::string& table, const std::string& index, bool global /*= true */ )
-        : L(lstate), m_guard(lstate)
-{
-        L->push( table, global );
-        lua_pushstring( L->L, index.c_str() );
-        lua_rawget( L->L, -2 );
-}
-
-lua::table_guard::table_guard( const table_guard& parent, const std::string& index )
+        if ( !p.resolve( L->get_raw(), global ) )
+        {
+                // TODO : error handling
+        }
+}
+
+lua::table_guard::table_guard( const table_guard& parent, const path& p )
         : L( parent.L ), m_guard( parent.L )
 {
-        lua_getfield( L->L, -1, index.c_str() );
-}
-
-lua::table_guard::table_guard( const table_guard& parent, int index )
-        : L( parent.L ), m_guard( parent.L )
-{
-        lua_rawgeti( L->L, -1, index );
+        if ( !p.resolve( L->get_raw(), false ) )
+        {
+                // TODO : error handling
+        }
 }