Changeset 486 for trunk/src/lua

Timestamp:

02/24/16 18:47:54 (9 years ago)

Author:

epyon

Message:

• mass update once again...

File:

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

trunk/src/lua/lua_state.cc

@@ -194 +194 @@
                 str = lua_tolstring( m_state, -1, &l );
                 result = hash_string< uint64 >( str, l );
+                //NV_LOG_DEBUG( str );
         }
         lua_pop( m_state, 1 );
@@ -204 +205 @@
         size_t l = 0;
         const char* str = nullptr;
-        uint64 result = defval;
+        shash64 result = shash64( defval );
         if ( lua_type( m_state, -1 ) == LUA_TSTRING )
         {
                 str = lua_tolstring( m_state, -1, &l );
-                result = table.insert( string_view( str, l ) ).value();
-        }
-        lua_pop( m_state, 1 );
-        return shash64( result );
+                result = table.insert( string_view( str, l ) );
+        }
+        lua_pop( m_state, 1 );
+        return result;
+}
+
+nv::shash64 nv::lua::table_guard::get_string( string_view element, string_table* table, uint64 defval /*= 0 */ )
+{
+        lua_getfield( m_state, -1, element.data() );
+        size_t l = 0;
+        const char* str = nullptr;
+        shash64 result = shash64( defval );
+        if ( lua_type( m_state, -1 ) == LUA_TSTRING )
+        {
+                str = lua_tolstring( m_state, -1, &l );
+                string_view sv( str, l );
+                result = table ? table->insert( sv ) : shash64( sv );
+        }
+        lua_pop( m_state, 1 );
+        return result;
 }