Changeset 406 for trunk/src/lua

Timestamp:

06/20/15 00:05:17 (10 years ago)

Author:

epyon

Message:

• code compiles cleanly on maximum warning level

Location:

trunk/src/lua

Files:

• lua_function.cc (modified) (4 diffs)
• lua_glm.cc (modified) (10 diffs)
• lua_handle.cc (modified) (3 diffs)
• lua_map_area.cc (modified) (3 diffs)
• lua_map_tile.cc (modified) (11 diffs)
• lua_raw.cc (modified) (1 diff)
• lua_state.cc (modified) (1 diff)

trunk/src/lua/lua_function.cc

@@ -5 +5 @@
 // For conditions of distribution and use, see copying.txt file in root folder.
 
-#include <nv/lua/lua_function.hh>
+#include "nv/lua/lua_function.hh"
 
-#include <nv/lua/lua_raw.hh>
+#include "nv/core/logging.hh"
+#include "nv/lua/lua_raw.hh"
 
 using namespace nv;
+
+#define NV_LUA_ABORT( func, ... ) \
+        NV_LOG_CRITICAL( "lua::" func " : ", __VA_ARGS__ ) \
+        NV_ABORT( "lua::" func " : critical error!" )
 
 lua::function_base::function_base( lua_State* a_L, const path& a_path, bool a_global /*= true*/ ) : L(a_L)
@@ -16 +21 @@
         {
                 lua_pop( L, 1 );
-                throw std::runtime_error("not a valid path - " + a_path.to_string() );
+                NV_LUA_ABORT( "function_base::function_base", "not a valid path - ", a_path.to_string() );
         }
 
@@ -22 +27 @@
         {
                 lua_pop( L, 1 );
-                throw std::runtime_error("not a valid function - " + a_path.to_string() );
+                NV_LUA_ABORT( "function_base::function_base", "not a valid function - ", a_path.to_string() );
         }
         m_ref = luaL_ref( L, LUA_REGISTRYINDEX );
@@ -61 +66 @@
                 std::string error = lua_tostring( L, -1 );
                 lua_pop( L, 1 );
-                throw std::runtime_error(error.c_str());
+                NV_LUA_ABORT( "function_base::call", "call failed - ", error.c_str() );
         }
 }

trunk/src/lua/lua_glm.cc

@@ -11 +11 @@
 #include "nv/stl/type_traits/common.hh"
 
-static size_t nlua_swizzel_lookup[256];
+static int nlua_swizzel_lookup[256];
 
 using nv::lua::detail::is_vec;
@@ -18 +18 @@
 using nv::lua::detail::push_vec;
 
-inline bool nlua_is_swizzel( const unsigned char* str, size_t max )
+inline bool nlua_is_swizzel( const unsigned char* str, int max )
 {
         while (*str)
@@ -155 +155 @@
 {
         if ( lua_type( L, 1 ) == LUA_TNUMBER )
-                push_vec<T>( L, (typename T::value_type)(lua_tonumber( L, 1 )) + to_vec<T>( L, 2 ) );
+                push_vec<T>( L, static_cast<typename T::value_type>(lua_tonumber( L, 1 )) + to_vec<T>( L, 2 ) );
         else
                 if ( lua_type( L, 2 ) == LUA_TNUMBER )
-                        push_vec<T>( L, to_vec<T>( L, 1 ) + (typename T::value_type)(lua_tonumber( L, 2 )) );
+                        push_vec<T>( L, to_vec<T>( L, 1 ) + static_cast<typename T::value_type>(lua_tonumber( L, 2 )) );
                 else
                         push_vec<T>( L, to_vec<T>( L, 1 ) + to_vec<T>( L, 2 ) );
@@ -168 +168 @@
 {
         if ( lua_type( L, 1 ) == LUA_TNUMBER )
-                push_vec<T>( L, (typename T::value_type)(lua_tonumber( L, 1 )) - to_vec<T>( L, 2 ) );
+                push_vec<T>( L, static_cast<typename T::value_type>(lua_tonumber( L, 1 )) - to_vec<T>( L, 2 ) );
         else
                 if ( lua_type( L, 2 ) == LUA_TNUMBER )
-                        push_vec<T>( L, to_vec<T>( L, 1 ) - (typename T::value_type)(lua_tonumber( L, 2 )) );
+                        push_vec<T>( L, to_vec<T>( L, 1 ) - static_cast<typename T::value_type>(lua_tonumber( L, 2 )) );
                 else
                         push_vec<T>( L, to_vec<T>( L, 1 ) - to_vec<T>( L, 2 ) );
@@ -181 +181 @@
 {
         if ( lua_type( L, 1 ) == LUA_TNUMBER )
-                push_vec<T>( L, (typename T::value_type)(lua_tonumber( L, 1 )) * to_vec<T>( L, 2 ) );
+                push_vec<T>( L, static_cast<typename T::value_type>(lua_tonumber( L, 1 )) * to_vec<T>( L, 2 ) );
         else
                 if ( lua_type( L, 2 ) == LUA_TNUMBER )
-                        push_vec<T>( L, to_vec<T>( L, 1 ) * (typename T::value_type)(lua_tonumber( L, 2 )) );
+                        push_vec<T>( L, to_vec<T>( L, 1 ) * static_cast<typename T::value_type>(lua_tonumber( L, 2 )) );
                 else
                         push_vec<T>( L, to_vec<T>( L, 1 ) * to_vec<T>( L, 2 ) );
@@ -194 +194 @@
 {
         if ( lua_type( L, 1 ) == LUA_TNUMBER )
-                push_vec<T>( L, (typename T::value_type)(lua_tonumber( L, 1 )) / to_vec<T>( L, 2 ) );
+                push_vec<T>( L, static_cast<typename T::value_type>(lua_tonumber( L, 1 )) / to_vec<T>( L, 2 ) );
         else
                 if ( lua_type( L, 2 ) == LUA_TNUMBER )
-                        push_vec<T>( L, to_vec<T>( L, 1 ) / (typename T::value_type)(lua_tonumber( L, 2 )) );
+                        push_vec<T>( L, to_vec<T>( L, 1 ) / static_cast<typename T::value_type>(lua_tonumber( L, 2 )) );
                 else
                         push_vec<T>( L, to_vec<T>( L, 1 ) / to_vec<T>( L, 2 ) );
@@ -226 +226 @@
         T* v = to_pvec<T>( L, 1 );
         size_t len  = 0;
-        size_t vlen = v->length();
-        const unsigned char * key = (const unsigned char *)( lua_tolstring( L, 2, &len ) );
-        size_t idx = 255;
+        int vlen = v->length();
+        const unsigned char * key = reinterpret_cast<const unsigned char *>( lua_tolstring( L, 2, &len ) );
+        int idx = 255;
 
         if ( len == 1 )
@@ -264 +264 @@
         T* v = to_pvec<T>( L, 1 );
         size_t len  = 0;
-        size_t vlen = v->length();
-        const unsigned char * key = (const unsigned char *)( lua_tolstring( L, 2, &len ) );
-        size_t idx = 255;
+        int vlen = v->length();
+        const unsigned char * key = reinterpret_cast<const unsigned char *>( lua_tolstring( L, 2, &len ) );
+        int idx = 255;
         if( len == 1 )
         {
@@ -272 +272 @@
                 if ( idx < vlen )
                 {
-                        (*v)[idx] = (typename T::value_type)luaL_checknumber( L, 3 );
+                        (*v)[idx] = static_cast<typename T::value_type>( luaL_checknumber( L, 3 ) );
                         return 0;
                 }
@@ -279 +279 @@
         {
                 switch (len) {
-                case 2 : { vec2 v2 = to_vec<vec2>(L,3); for (size_t i = 0; i<len; ++i) (*v)[nlua_swizzel_lookup[key[i]]] = v2[i]; } return 0;
-                case 3 : { vec3 v3 = to_vec<vec3>(L,3); for (size_t i = 0; i<len; ++i) (*v)[nlua_swizzel_lookup[key[i]]] = v3[i]; } return 0;
-                case 4 : { vec4 v4 = to_vec<vec4>(L,3); for (size_t i = 0; i<len; ++i) (*v)[nlua_swizzel_lookup[key[i]]] = v4[i]; } return 0;
+                case 2 : { vec2 v2 = to_vec<vec2>(L,3); for ( int i = 0; i<int( len ); ++i) (*v)[nlua_swizzel_lookup[key[i]]] = v2[i]; } return 0;
+                case 3 : { vec3 v3 = to_vec<vec3>(L,3); for ( int i = 0; i<int( len ); ++i) (*v)[nlua_swizzel_lookup[key[i]]] = v3[i]; } return 0;
+                case 4 : { vec4 v4 = to_vec<vec4>(L,3); for ( int i = 0; i<int( len ); ++i) (*v)[nlua_swizzel_lookup[key[i]]] = v4[i]; } return 0;
                 default: break;
                 }

trunk/src/lua/lua_handle.cc

@@ -16 +16 @@
         NV_LUA_STACK_ASSERT( L, +1 );
         lua_rawgeti( L, LUA_REGISTRYINDEX, pseudoindex ); // table
-        lua_rawgeti( L, -1, (int)index );                 // table, entry
+        lua_rawgeti( L, -1, int( index ) );                 // table, entry
         if ( !lua_istable( L, -1 ) )
         {
@@ -58 +58 @@
         lua_rawgeti( L, LUA_REGISTRYINDEX, pseudoindex );
         lua_insert( L, -2 );
-        lua_rawseti( L, -2, (int)index );
+        lua_rawseti( L, -2, int( index ) );
         lua_pop( L, 1 );
 }
@@ -67 +67 @@
         lua_rawgeti( L, LUA_REGISTRYINDEX, pseudoindex ); // table
         lua_pushinteger( L, 0 );
-        lua_rawseti( L, -2, (int)index );
+        lua_rawseti( L, -2, int( index ) );
         lua_pop( L, 1 );
 }

trunk/src/lua/lua_map_area.cc

@@ -67 +67 @@
         else
         {
-                return *(nv::map_area**)luaL_checkudata( L, index, NLUA_MAP_AREA_METATABLE );
+                return *reinterpret_cast<nv::map_area**>( luaL_checkudata( L, index, NLUA_MAP_AREA_METATABLE ) );
         }
         return o;
@@ -88 +88 @@
 void nv::lua::detail::push_map_area( lua_State* L, nv::map_area* c )
 {
-        nv::map_area** pm = (nv::map_area**) (lua_newuserdata(L, sizeof(nv::map_area*)));
+        nv::map_area** pm = reinterpret_cast<nv::map_area**>( lua_newuserdata(L, sizeof(nv::map_area*) ) );
         *pm = c;
         luaL_getmetatable( L, NLUA_MAP_AREA_METATABLE );
@@ -237 +237 @@
         lua_rawgeti( L, LUA_REGISTRYINDEX, object_index.get() );
         lua_pushliteral( L, "__map_area_ptr" );
-        lua_pushlightuserdata( L, (map_area*)area );
+        lua_pushlightuserdata( L, area );
         lua_rawset( L, -3 );
         lua_pop( L, 1 );

trunk/src/lua/lua_map_tile.cc

@@ -40 +40 @@
 static map_tile* nlua_to_pmap_tile( lua_State* L, int index )
 {
-        return (map_tile*)luaL_checkudata( L, index, NLUA_MAP_TILE_METATABLE );
+        return reinterpret_cast<map_tile*>( luaL_checkudata( L, index, NLUA_MAP_TILE_METATABLE ) );
 }
 
 static void nlua_push_map_tile( lua_State* L, const map_tile& tile )
 {
-        map_tile* result = (map_tile*)lua_newuserdata( L, sizeof(map_tile) );
+        map_tile* result = reinterpret_cast<map_tile*>( lua_newuserdata( L, sizeof(map_tile) ) );
         *result = tile;
         luaL_setmetatable( L, NLUA_MAP_TILE_METATABLE );
@@ -65 +65 @@
         map_tile tile;
 
-        tile.size_y = (nv::uint16)( nv::count( code.begin(), code.end(), '\n' ) + 1 );
-        tile.size_x = (nv::uint16)( code.find( '\n' ) );
+        tile.size_y = nv::uint16( nv::count( code.begin(), code.end(), '\n' ) + 1 );
+        tile.size_x = nv::uint16( code.find( '\n' ) );
         if ( tile.size_x == 0 )
         {
-                tile.size_x = (nv::uint16)code.length();
+                tile.size_x = nv::uint16( code.length() );
         }
         tile.data  = new nv::uint8[ tile.size_x * tile.size_y ];
@@ -85 +85 @@
                         if ( lua_isstring( L, -2 ) && lua_objlen( L, -2 ) == 1 )
                         {
-                                translation[ (nv::uint8)( lua_tostring( L, -2 )[0] ) ] = nv::uint8( map_area->string_to_id( lua_tostring( L, -1 ) ) );
+                                translation[ nv::uint8( lua_tostring( L, -2 )[0] ) ] = nv::uint8( map_area->string_to_id( lua_tostring( L, -1 ) ) );
                         }
                         // removes 'value'; keeps 'key' for next iteration */
@@ -95 +95 @@
                 for ( nv::uint16 row = 0; row < tile.size_y; row++ )
                 {
-                        nv::uchar8 gylph = (nv::uchar8)code[ row * ( tile.size_x + 1 ) + line ];
+                        nv::uchar8 gylph = nv::uchar8( code[ row * ( tile.size_x + 1 ) + line ] );
                         // TODO: check for errors
                         tile.data[ row * tile.size_x + line ] = translation[ gylph ];
@@ -108 +108 @@
 {
         map_tile* old_tile = nlua_to_pmap_tile( L, 1 );
-        map_tile* new_tile = (map_tile*) lua_newuserdata( L, sizeof( map_tile ) );
+        map_tile* new_tile = reinterpret_cast<map_tile*>( lua_newuserdata( L, sizeof( map_tile ) ) );
         new_tile->size_x = old_tile->size_x;
         new_tile->size_y = old_tile->size_y;
@@ -246 +246 @@
         nv::uint16 org_x = tile->size_x;
         nv::uint16 org_y = tile->size_y;
-        nv::uint16 new_x = ( nv::uint16 )nv::accumulate( sizes_x.begin(), sizes_x.end(), 0 );
-        nv::uint16 new_y = ( nv::uint16 )nv::accumulate( sizes_y.begin(), sizes_y.end(), 0 );
+        nv::uint16 new_x = nv::uint16( nv::accumulate( sizes_x.begin(), sizes_x.end(), 0 ) );
+        nv::uint16 new_y = nv::uint16( nv::accumulate( sizes_y.begin(), sizes_y.end(), 0 ) );
 
         nv::uint8* data = new nv::uint8[ new_x * new_y ];
@@ -274 +274 @@
 static int nlua_map_tile_raw_get( lua_State* L )
 {
-        map_tile* tile = (map_tile*)lua_touserdata( L, 1 );
+        map_tile* tile = reinterpret_cast<map_tile*>( lua_touserdata( L, 1 ) );
         if ( lua_type( L, 2 ) == LUA_TNUMBER )
         {
@@ -289 +289 @@
 static int nlua_map_tile_raw_set( lua_State* L )
 {
-        map_tile* tile = (map_tile*)lua_touserdata( L, 1 );
+        map_tile* tile = reinterpret_cast<map_tile*>( lua_touserdata( L, 1 ) );
         if ( lua_type( L, 2 ) == LUA_TNUMBER )
         {
-                tile->data[ ( lua_tointeger( L, 2 ) - 1 ) + ( lua_tointeger( L, 3 ) - 1 ) * tile->size_x ] = (nv::uint8)lua_tointeger( L, 3 );
+                tile->data[ ( lua_tointeger( L, 2 ) - 1 ) + ( lua_tointeger( L, 3 ) - 1 ) * tile->size_x ] = nv::uint8( lua_tointeger( L, 3 ) );
         }
         else
         {
                 nv::ivec2 coord = nv::lua::detail::to_coord( L, 2 );
-                tile->data[ ( coord.x - 1 ) + ( coord.y - 1 ) * tile->size_x ] = (nv::uint8)lua_tointeger( L, 3 );
+                tile->data[ ( coord.x - 1 ) + ( coord.y - 1 ) * tile->size_x ] = nv::uint8( lua_tointeger( L, 3 ) );
         }
         return 0;
@@ -304 +304 @@
 static int nlua_map_tile_ascii_get( lua_State* L )
 {
-        map_tile* tile = (map_tile*)lua_touserdata( L, 1 );
+        map_tile* tile = reinterpret_cast<map_tile*>( lua_touserdata( L, 1 ) );
         if ( lua_type( L, 2 ) == LUA_TNUMBER )
         {
@@ -319 +319 @@
 static int nlua_map_tile_ascii_set( lua_State* L )
 {
-        map_tile* tile = (map_tile*)lua_touserdata( L, 1 );
+        map_tile* tile = reinterpret_cast<map_tile*>( lua_touserdata( L, 1 ) );
         if ( lua_type( L, 2 ) == LUA_TNUMBER )
         {
-                tile->ascii[ ( lua_tointeger( L, 2 ) - 1 ) + ( lua_tointeger( L, 3 ) - 1 ) * tile->size_x ] = (nv::uint8)lua_tointeger( L, 3 );
+                tile->ascii[ ( lua_tointeger( L, 2 ) - 1 ) + ( lua_tointeger( L, 3 ) - 1 ) * tile->size_x ] = nv::uint8( lua_tointeger( L, 3 ) );
         }
         else
         {
                 nv::ivec2 coord = nv::lua::detail::to_coord( L, 2 );
-                tile->ascii[ ( coord.x - 1 ) + ( coord.y - 1 ) * tile->size_x ] = (nv::uint8)lua_tointeger( L, 3 );
+                tile->ascii[ ( coord.x - 1 ) + ( coord.y - 1 ) * tile->size_x ] = nv::uint8( lua_tointeger( L, 3 ) );
         }
         return 0;
@@ -334 +334 @@
 static int nlua_map_tile_gc( lua_State* L )
 {
-        map_tile* tile = (map_tile*)lua_touserdata( L, 1 );
+        map_tile* tile = reinterpret_cast<map_tile*>( lua_touserdata( L, 1 ) );
         if ( tile != nullptr )
         {

trunk/src/lua/lua_raw.cc

@@ -271 +271 @@
                 while ( lua_next( L, index ) != 0 )
                 {
-                        result.push_back( (nv::uint8) lua_tointeger( L, -1 ) );
+                        result.push_back( static_cast<nv::uint8>( lua_tointeger( L, -1 ) ) );
                         lua_pop( L, 1 );
                 }

trunk/src/lua/lua_state.cc

@@ -258 +258 @@
 {
         lua_getfield( m_state, -1, element.data() );
-        float result = lua_type( m_state, -1 ) == LUA_TNUMBER ? (float)lua_tonumber( m_state, -1 ) : defval;
+        float result = lua_type( m_state, -1 ) == LUA_TNUMBER ? static_cast<float>( lua_tonumber( m_state, -1 ) ) : defval;
         lua_pop( m_state, 1 );
         return result;