Changeset 181

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

Files:

• nv/lua/lua_path.hh (added)
• nv/lua/lua_state.hh (modified) (2 diffs)
• nv/string.hh (modified) (2 diffs)
• src/lua/lua_path.cc (added)
• src/lua/lua_state.cc (modified) (1 diff)

trunk/nv/lua/lua_state.hh

@@ -12 +12 @@
 #include <nv/common.hh>
 #include <nv/flags.hh>
+#include <nv/lua/lua_path.hh>
 #include <string>
 
@@ -42 +43 @@
                 {
                 public:
-                        table_guard( state* lstate, const std::string& table, bool global = true );
-                        table_guard( state* lstate, const std::string& table, int index, bool global = true );
-                        table_guard( state* lstate, const std::string& table, const std::string& index, bool global = true );
-                        table_guard( const table_guard& parent, const std::string& index );
-                        table_guard( const table_guard& parent, int index );
+                        table_guard( state* lstate, const path& p, bool global = true );
+                        table_guard( const table_guard& parent, const path& p );
                         bool has_field( const std::string& element );
                         std::string get_string( const std::string& element, const std::string& defval = "" );

trunk/nv/string.hh

@@ -7 +7 @@
 
 #include <string>
+#include <cstring>
 #include <sstream>
 #include <fstream>
@@ -119 +120 @@
         }
 
+        template< typename T >
+        struct string_length
+        {
+                static const size_t get( T ) { return 0; }
+        };
+        template< size_t S >
+        struct string_length< const char[S] >
+        {
+                static const size_t get( const char* ) { return S-1; }
+        };
+        template<>
+        struct string_length< const char* >
+        {
+                static const size_t get( const char* s ) { return std::strlen( s ); }
+        };
+        template<>
+        struct string_length< std::string >
+        {
+                static const size_t get( const std::string& s ) { return s.length(); }
+        };
+
 
 }

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
+        }
 }