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

Timestamp:

07/23/15 21:16:01 (10 years ago)

Author:

epyon

Message:

• massive std::string removal
• no header depends on std::string anymore (or any other STL header)
• still some code files do (WIP)
• massive refactoring where std::string was used
• lua still messy (grep for string128 - used everywhere)
• string_twine added

File:

• trunk/src/lua/lua_path.cc (modified) (1 diff)

trunk/src/lua/lua_path.cc

@@ -74 +74 @@
 }
 
-std::string nv::lua::path::to_string() const
+string128 nv::lua::path::to_string() const
 {
-        char buffer[64];
-        char* start   = buffer;
-        char* current = buffer;
+        string128 buffer;
         bool dot = false;
-        bool oos = false;
         for ( const element& e : m_elements )
         {
-                if ( current - start > 48 ) { oos = true; break; }
-                if ( dot ) *current++ = '.';
+                if ( dot ) buffer.append( "." );
                 if ( e.length == 0 )
                 {
-                        *current++ = '[';
-                        current += uint32_to_buffer( array_ref< char >( current, current - start ), e.value );
-                        *current++ = ']';
+                        buffer.append( "["_ls + e.value + "]"_ls );
                         dot = false;
                 }
                 else
                 {
-                        if ( size_t(current - start) + e.length > 60 ) { oos = true; break; }
-                        nvmemcpy( current, e.str, e.length );
-                        current += e.length;
+                        buffer.append( e.str, e.length );
                         dot = true;
                 }
         }
-        if (oos) 
-        { 
-                *current++ = '.';
-                *current++ = '.';
-                *current++ = '.';
-        }
-        *current++ = '\0';
-        return std::string( buffer, size_t(current - start - 1) );
+        return buffer;
 }