Changeset 378 for trunk/src

Timestamp:

05/29/15 12:12:47 (10 years ago)

Author:

epyon

Message:

• important fix in reverse_iterator operators
• std::string functions removed or converted to string_ref in string.hh
• capi.hh - more function forwards and usage of them instead of libc
• more std removal
• assert fix

Location:

trunk/src

Files:

• gui/gui_gfx_renderer.cc (modified) (1 diff)
• lua/lua_area.cc (modified) (2 diffs)
• lua/lua_glm.cc (modified) (2 diffs)
• lua/lua_map_tile.cc (modified) (1 diff)
• stl/assert.cc (modified) (1 diff)
• stl/string.cc (modified) (2 diffs)

trunk/src/gui/gui_gfx_renderer.cc

@@ -190 +190 @@
 {
         std::string id_name( filename );
-        id_name.append( to_string( size ) );
+        id_name.append( std::to_string( size ) );
         auto i = m_font_names.find( id_name );
         if ( i != m_font_names.end() )

trunk/src/lua/lua_area.cc

@@ -8 +8 @@
 
 #include "nv/lua/lua_raw.hh"
-#include "nv/stl/string.hh"
 #include "nv/core/random.hh"
 
@@ -325 +324 @@
 {
         nv::rectangle a = to_area( L, 1 );
-        std::string s = "(";
-        s += nv::to_string(a.ul.x);
-        s += ",";
-        s += nv::to_string(a.ul.y);
-        s += "x";
-        s += nv::to_string(a.lr.x);
-        s += ",";
-        s += nv::to_string(a.lr.y);
-        s += ")";
-        lua_pushstring( L, s.c_str() );
+        lua_pushfstring( L, "(%d,%dx%d,%d)", a.ul.x, a.ul.y, a.lr.x, a.lr.y );
         return 1;
 }

trunk/src/lua/lua_glm.cc

@@ -8 +8 @@
 
 #include "nv/lua/lua_raw.hh"
-#include "nv/stl/string.hh"
 #include "nv/core/random.hh"
+#include "nv/stl/traits/common.hh"
 
 static size_t nlua_swizzel_lookup[256];
@@ -292 +292 @@
 {
         T v = to_vec<T>( L, 1 );
-        std::string s = "(";
-        for ( size_t i = 0; i < v.length(); ++i )
-        {
-                if (i > 0) s += ",";
-                s += nv::to_string(v[i]);
-        }
-        s+=")";
-        lua_pushstring( L, s.c_str() );
+        bool fl = nv::is_floating_point<typename T::value_type>::value;
+        switch ( v.length() )
+        {
+        case 1: lua_pushfstring( L, ( fl ? "(%f)"          : "(%d)" ),          v[0] );
+        case 2: lua_pushfstring( L, ( fl ? "(%f,%f)"       : "(%d,%d)" ),       v[0], v[1] );
+        case 3: lua_pushfstring( L, ( fl ? "(%f,%f,%f)"    : "(%d,%d,%d)" ),    v[0], v[1], v[2] );
+        case 4: lua_pushfstring( L, ( fl ? "(%f,%f,%f,%f)" : "(%d,%d,%d,%d)" ), v[0], v[1], v[2], v[3] );
+        default:
+                lua_pushliteral( L, "(vector?)" ); break;
+        }
         return 1;
 }

trunk/src/lua/lua_map_tile.cc

@@ -55 +55 @@
         nv::map_area* map_area = nv::lua::detail::to_map_area( L, 3 );
         lua_settop( L, 2 );
-        std::string code = nv::trimmed( lua_tostring( L, 1 ) );
-        nv::remove_chars( code, " \r\t" );
+        std::string code = nv::trimmed( lua_tostring( L, 1 ) ).to_string();
+        std::string chars( " \r\t" );
+        code.erase( nv::remove_if( code.begin(), code.end(),
+                [&chars] ( const char& c )
+        {
+                return chars.find( c ) != std::string::npos;
+        } ), code.end() );
 
         map_tile tile;

trunk/src/stl/assert.cc

@@ -34 +34 @@
 }
 #       else
-#include <assert.h>
+extern "C" {
+        extern void __assert_fail(const char *, const char *, unsigned int, const char *)
+                throw() __attribute__ ((__noreturn__));
+}
 #       endif
 void nv_internal_assert( const char * assertion, const char * file, unsigned int line, const char * function )

trunk/src/stl/string.cc

@@ -11 +11 @@
 #include <cstdio>
 #include <cstdlib>
+#include <fstream> // for slurp only
 
 using namespace nv;
@@ -16 +17 @@
 static const double s_power_10[] = { 1, 10, 100, 1000, 10000, 100000, 1000000,
 10000000, 100000000, 1000000000 };
+
+std::string nv::slurp( const std::string& filename )
+{
+        std::ifstream input( filename );
+        //              if ( !input.is_open() ) NV_THROW( std::runtime_error, "File "+filename+" not found!");
+        std::stringstream sstr;
+        while ( input >> sstr.rdbuf() );
+        return sstr.str();
+}
 
 static inline void string_reverse( char* begin, char* end )