Changeset 973 for cpp/frams/util/sstring-simple.h

Timestamp:

07/03/20 00:37:13 (5 years ago)

Author:

Maciej Komosinski

Message:

Increased SString and std::string compatibility: introduced length(), size(), and capacity(), and removed legacy methods that have std::string equivalents

File:

• cpp/frams/util/sstring-simple.h (modified) (4 diffs)

cpp/frams/util/sstring-simple.h

@@ -14 +14 @@
 private:
         char *txt;      ///< string buffer or NULL for empty string
-        int size;       ///< allocated memory (including \0)
+        int allocated;       ///< allocated memory (including \0)
         int used;       ///< string length
         int appending;  ///< append mode, changes can occur after character # 'appending'
@@ -20 +20 @@
         void initEmpty();
         void copyFrom(SString &from); ///< copy from SString
-        void resize(int newsize);
-        void ensureSize(int needed);
+        void reallocate(int newsize);
+        void ensureAllocated(int needed);
         const char* getPtr() const { return txt ? txt : ""; }
 
@@ -34 +34 @@
 
         void copyFrom(const char* ch, int chlen = -1); ///< copy string, length of -1 == unknown
-        
-        void* operator new(size_t s, void* mem){ return mem; }
+
+        void* operator new(size_t s, void* mem) { return mem; }
 #ifdef _MSC_VER
-                void operator delete(void* mem, void* t) {}
+        void operator delete(void* mem, void* t) {}
 #endif
-        void* operator new(size_t s){ return malloc(sizeof(SString)); }
+        void* operator new(size_t s) { return malloc(sizeof(SString)); }
         void operator delete(void* mem) { free(mem); }
 
-        int len() const { return used; } ///< get string length
+        int length() const { return used; } ///< get string length
+        int size() const { return length(); } ///< get string length
         void shrink(); ///< free unnecessary buffer
-        void reserve(int needed) { ensureSize(needed); } ///< like in std::string
+        void reserve(int cap) { ensureAllocated(cap + 1); } ///< like in std::string
 
         /// after this call, you can modify sstring directly.
@@ -87 +88 @@
         void endAppend(int appendlength = -1);
 
-        void memoryHint(int howbig) { ensureSize(howbig); }
-        int directMaxLen() { return size - 1; } ///< when called after directWrite: max number of characters allowed (can be more than requested)
+        int capacity() { return (allocated > 0) ? (allocated - 1) : allocated; } ///< std::string.capacity()
 
         /// find a character in SString.