Changeset 955 for cpp/frams/util

Timestamp:

06/25/20 00:34:29 (5 years ago)

Author:

Maciej Komosinski

Message:

Genetic format ID becomes a string (no longer limited to a single character)

Location:

cpp/frams/util

Files:

• sstring-simple.cpp (modified) (3 diffs)
• sstring-simple.h (modified) (2 diffs)
• sstring.cpp (modified) (2 diffs)
• sstring.h (modified) (2 diffs)

cpp/frams/util/sstring-simple.cpp

@@ -22 +22 @@
 }
 
-SString::SString(int x)
-{
-        initEmpty();
-        if (x)
-                ensureSize(x + 1);
-}
-
 SString::SString(const char *t, int t_len)
 {
@@ -46 +39 @@
         txt = from.txt; size = from.size; used = from.used;
         from.txt = NULL; from.size = 0; from.used = 0;
+}
+
+SString::SString(char in)
+{
+        initEmpty();
+        append(&in, 1);
 }
 
@@ -117 +116 @@
 SString SString::operator+(const SString& s) const
 {
-        SString ret(len() + s.len());
+        SString ret;
+        ret.reserve(len() + s.len());
         ret = *this;
         ret += s;

cpp/frams/util/sstring-simple.h

@@ -27 +27 @@
         SString(); ///< make an empty string
         SString(const char*t, int t_len = -1); ///< make a string from char*
-        SString(int x); ///< string with initial buffer allocated for x characters
+        SString(int x) = delete; ///< disallow the former 'int' constructor (so the new 'char' version is not used through implicit conversion)
         SString(const SString& from); ///< duplicate string
         SString(SString&& from);///< move
+        SString(char in);
         ~SString();
 
         void copyFrom(const char* ch, int chlen = -1); ///< copy string, length of -1 == unknown
-
+        
         void* operator new(size_t s, void* mem){ return mem; }
 #ifdef _MSC_VER
@@ -43 +44 @@
         int len() const { return used; } ///< get string length
         void shrink(); ///< free unnecessary buffer
+        void reserve(int needed) { ensureSize(needed); } ///< like in std::string
 
         /// after this call, you can modify sstring directly.

cpp/frams/util/sstring.cpp

@@ -127 +127 @@
 }
 
-SString::SString(int x)
-{
-        buf = new SBuf(x);
-}
-
 SString::SString(const char *t, int t_len)
 {
@@ -157 +152 @@
                 REF_UNLOCK;
         }
+}
+
+SString::SString(char in)
+{
+        initEmpty();
+        copyFrom(&in, 1);
 }
 

cpp/frams/util/sstring.h

@@ -70 +70 @@
         SString(); ///< make an empty string
         SString(const char*t, int t_len = -1); ///< make a string from char*
-        SString(int x); ///< string with initial buffer size
+        SString(int x) = delete; ///< disallow the former 'int' constructor (so the new 'char' version is not used through implicit conversion)
         SString(const SString& from); ///< duplicate string
         SString(SString&& from); ///< move
+        SString(char in);
         ~SString();
 
@@ -86 +87 @@
         int len() const { return buf->used; } ///< get string length
         void shrink(); ///< free unnecessary buffer
+        void reserve(int needed) { ensureSize(needed); } ///< like in std::string
 
         /// after this call, you can modify sstring directly.