Changeset 533 for trunk/src/lua

Timestamp:

01/12/17 13:16:48 (8 years ago)

Author:

epyon

Message:

• getting rid of size_t
• datatypes now restricted to uint32 size
• 64-bit compatibility
• copyright updates where modified

Location:

trunk/src/lua

Files:

• lua_state.cc (modified) (11 diffs)
• lua_values.cc (modified) (1 diff)

trunk/src/lua/lua_state.cc

@@ -172 +172 @@
 }
 
-nv::size_t lua::table_guard::get_size()
+nv::uint32 lua::table_guard::get_size()
 {
         return nlua_rawlen( m_state, -1 );
@@ -194 +194 @@
         {
                 str = lua_tolstring( m_state, -1, &l );
-                result = hash_string< uint64 >( str, l );
+                result = hash_string< uint64 >( str, static_cast< uint32 >( l ) );
                 //NV_LOG_DEBUG( str );
         }
@@ -210 +210 @@
         {
                 str = lua_tolstring( m_state, -1, &l );
-                string_view sv( str, l );
+                string_view sv( str, static_cast< uint32 >( l ) );
                 result = table ? table->insert( sv ) : shash64( sv );
         }
@@ -226 +226 @@
         {
                 str = lua_tolstring( m_state, -1, &l );
-                result = hash_string< uint64 >( str, l );
+                result = hash_string< uint64 >( str, static_cast< uint32 >( l ) );
                 //NV_LOG_DEBUG( str );
         }
@@ -247 +247 @@
                 str = defval.data();
         }
-        string128 result( str, l );
+        string128 result( str, static_cast< uint32 >( l ) );
         lua_pop( m_state, 1 );
         return result;
@@ -266 +266 @@
                 str = defval.data();
         }
-        const_string result( str, l );
+        const_string result( str, static_cast< uint32 >( l ) );
         lua_pop( m_state, 1 );
         return result;
@@ -280 +280 @@
         {
                 str = lua_tolstring( m_state, -1, &l );
-                string_view sv( str, l );
+                string_view sv( str, static_cast< uint32 >( l ) );
                 result = table ? table->insert( sv ) : shash64( sv );
         }
@@ -301 +301 @@
                 str = defval.data();
         }
-        const_string result( str, l );
+        const_string result( str, static_cast< uint32 >( l ) );
         lua_pop( m_state, 1 );
         return result;
@@ -320 +320 @@
                 str = defval.data();
         }
-        string128 result( str, l );
+        string128 result( str, static_cast< uint32 >( l ) );
         lua_pop( m_state, 1 );
         return result;
@@ -339 +339 @@
                 str = defval.data();
         }
-        string64 result( str, l );
+        string64 result( str, static_cast< uint32 >( l ) );
         lua_pop( m_state, 1 );
         return result;
@@ -359 +359 @@
                 str = defval.data();
         }
-        string32 result( str, l );
+        string32 result( str, static_cast< uint32 >( l ) );
         lua_pop( m_state, 1 );
         return result;

trunk/src/lua/lua_values.cc

@@ -105 +105 @@
         size_t length = 0;
         const char* result = lua_tolstring( L, index, &length );
-        return string_view( result, length );
+        return string_view( result, static_cast< uint32 >( length ) );
 }