Changeset 380 for trunk/src/lua/lua_path.cc

Timestamp:

05/29/15 17:28:16 (10 years ago)

Author:

epyon

Message:

• oops, missed src : got rid of to_string and other std::string utilities (except slurp) string no longer in nv namespace

File:

• trunk/src/lua/lua_path.cc (modified) (3 diffs)

trunk/src/lua/lua_path.cc

@@ -32 +32 @@
 }
 
-void lua::path::push( nv::size_t value )
+void lua::path::push( nv::uint32 value )
 {
         m_elements[ m_count ].value  = value;
@@ -50 +50 @@
         if (m_count == 0) return false;
         if (global) lua_pushglobaltable( L );
-        for (int i = 0; i < m_count; ++i )
+        for ( uint32 i = 0; i < m_count; ++i )
         {
                 if ( lua_istable( L, -1 ) )
@@ -76 +76 @@
 std::string nv::lua::path::to_string() const
 {
-        std::string result;
-        result.reserve( 64 );
+        char buffer[64];
+        char* start   = buffer;
+        char* current = buffer;
         bool dot = false;
+        bool oos = false;
         for ( const element& e : m_elements )
         {
-                if ( dot ) result.append(".");
+                if ( current - start > 48 ) { oos = true; break; }
+                if ( dot ) *current++ = '.';
                 if ( e.length == 0 )
                 {
-                        result.append("[" + nv::to_string( e.value ) + "]" );
+                        *current++ = '[';
+                        current += uint32_to_buffer( e.value, current );
+                        *current++ = ']';
                         dot = false;
                 }
                 else
                 {
-                        result.append( e.str, e.length );
+                        if ( size_t(current - start) + e.length > 60 ) { oos = true; break; }
+                        nvmemcpy( current, e.str, e.length );
+                        current += e.length;
                         dot = true;
                 }
         }
-        return result;
+        if (oos) 
+        { 
+                *current++ = '.';
+                *current++ = '.';
+                *current++ = '.';
+        }
+        *current++ = '\0';
+        return std::string( buffer, size_t(current - start - 1) );
 }