remove warnings of intentionally unreachable code

[wxWidgets.git] / include / wx / stringimpl.h

diff --git a/include/wx/stringimpl.h b/include/wx/stringimpl.h
index 4173d2c69b5b778d72a78a796a802ae5d47fd51e..1b3f172c948bda220fa3bd0398a3f1196818a661 100644 (file)
--- a/include/wx/stringimpl.h
+++ b/include/wx/stringimpl.h
@@ -42,6 +42,10 @@
 
 // global pointer to empty string
 extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxEmptyString;
 
 // global pointer to empty string
 extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxEmptyString;

+#if wxUSE_UNICODE_UTF8
+// FIXME-UTF8: we should have only one wxEmptyString
+extern WXDLLIMPEXP_DATA_BASE(const wxStringCharType*) wxEmptyStringImpl;
+#endif

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -57,17 +61,20 @@ extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxEmptyString;
 #include <string>
 #include "wx/afterstd.h"
 
 #include <string>
 #include "wx/afterstd.h"
 

+#ifdef HAVE_STD_WSTRING
+    typedef std::wstring wxStdWideString;
+#else
+    typedef std::basic_string<wchar_t> wxStdWideString;
+#endif
+

 #if wxUSE_UNICODE_WCHAR
 #if wxUSE_UNICODE_WCHAR

-    #ifdef HAVE_STD_WSTRING
-        typedef std::wstring wxStdString;
-    #else
-        typedef std::basic_string<wxChar> wxStdString;
-    #endif
+    typedef wxStdWideString wxStdString;

 #else
     typedef std::string wxStdString;
 #endif
 
 #else
     typedef std::string wxStdString;
 #endif
 

-#endif // need <string>
+#endif // wxUSE_STL_BASED_WXSTRING || wxUSE_STD_STRING
+

 
 #if wxUSE_STL_BASED_WXSTRING
 
 
 #if wxUSE_STL_BASED_WXSTRING
 


@@ -97,8 +104,8 @@ struct WXDLLIMPEXP_BASE wxStringData
   size_t  nDataLength,  // actual string length
           nAllocLength; // allocated memory size
 
   size_t  nDataLength,  // actual string length
           nAllocLength; // allocated memory size
 

-  // mimics declaration 'wxChar data[nAllocLength]'
-  wxChar* data() const { return (wxChar*)(this + 1); }
+  // mimics declaration 'wxStringCharType data[nAllocLength]'
+  wxStringCharType* data() const { return (wxStringCharType*)(this + 1); }

 
   // empty string has a special ref count so it's never deleted
   bool  IsEmpty()   const { return (nRefs == -1); }
 
   // empty string has a special ref count so it's never deleted
   bool  IsEmpty()   const { return (nRefs == -1); }


@@ -143,7 +150,11 @@ protected:
   // string (re)initialization functions
     // initializes the string to the empty value (must be called only from
     // ctors, use Reinit() otherwise)
   // string (re)initialization functions
     // initializes the string to the empty value (must be called only from
     // ctors, use Reinit() otherwise)

+#if wxUSE_UNICODE_UTF8
+  void Init() { m_pchData = (wxStringCharType *)wxEmptyStringImpl; } // FIXME-UTF8
+#else

   void Init() { m_pchData = (wxStringCharType *)wxEmptyString; }
   void Init() { m_pchData = (wxStringCharType *)wxEmptyString; }

+#endif

     // initializes the string with (a part of) C-string
   void InitWith(const wxStringCharType *psz, size_t nPos = 0, size_t nLen = npos);
     // as Init, but also frees old data
     // initializes the string with (a part of) C-string
   void InitWith(const wxStringCharType *psz, size_t nPos = 0, size_t nLen = npos);
     // as Init, but also frees old data


@@ -177,8 +188,103 @@ public:
   typedef const value_type& const_reference;
   typedef value_type* pointer;
   typedef const value_type* const_pointer;
   typedef const value_type& const_reference;
   typedef value_type* pointer;
   typedef const value_type* const_pointer;

-  typedef value_type *iterator;
-  typedef const value_type *const_iterator;
+
+  // macro to define the bulk of iterator and const_iterator classes
+  #define WX_DEFINE_STRINGIMPL_ITERATOR(iterator_name, ref_type, ptr_type)    \
+    public:                                                                   \
+        typedef wxStringCharType value_type;                                  \
+        typedef ref_type reference;                                           \
+        typedef ptr_type pointer;                                             \
+        typedef int difference_type;                                          \
+                                                                              \
+        iterator_name(pointer ptr) : m_ptr(ptr) { }                           \
+                                                                              \
+        reference operator*() const { return *m_ptr; }                        \
+                                                                              \
+        iterator_name& operator++() { m_ptr++; return *this; }                \
+        iterator_name operator++(int)                                         \
+        {                                                                     \
+            const iterator_name tmp(*this);                                   \
+            m_ptr++;                                                          \
+            return tmp;                                                       \
+        }                                                                     \
+                                                                              \
+        iterator_name& operator--() { m_ptr--; return *this; }                \
+        iterator_name operator--(int)                                         \
+        {                                                                     \
+            const iterator_name tmp(*this);                                   \
+            m_ptr--;                                                          \
+            return tmp;                                                       \
+        }                                                                     \
+                                                                              \
+        iterator_name operator+(int n) const                                  \
+            { return iterator_name(m_ptr + n); }                              \
+        iterator_name operator+(size_t n) const                               \
+            { return iterator_name(m_ptr + n); }                              \
+        iterator_name operator-(int n) const                                  \
+            { return iterator_name(m_ptr - n); }                              \
+        iterator_name operator-(size_t n) const                               \
+            { return iterator_name(m_ptr - n); }                              \
+        iterator_name& operator+=(int n)                                      \
+            { m_ptr += n; return *this; }                                     \
+        iterator_name& operator+=(size_t n)                                   \
+            { m_ptr += n; return *this; }                                     \
+        iterator_name& operator-=(int n)                                      \
+            { m_ptr -= n; return *this; }                                     \
+        iterator_name& operator-=(size_t n)                                   \
+            { m_ptr -= n; return *this; }                                     \
+                                                                              \
+        difference_type operator-(const iterator_name& i) const               \
+            { return m_ptr - i.m_ptr; }                                       \
+                                                                              \
+        bool operator==(const iterator_name& i) const                         \
+          { return m_ptr == i.m_ptr; }                                        \
+        bool operator!=(const iterator_name& i) const                         \
+          { return m_ptr != i.m_ptr; }                                        \
+                                                                              \
+        bool operator<(const iterator_name& i) const                          \
+          { return m_ptr < i.m_ptr; }                                         \
+        bool operator>(const iterator_name& i) const                          \
+          { return m_ptr > i.m_ptr; }                                         \
+        bool operator<=(const iterator_name& i) const                         \
+          { return m_ptr <= i.m_ptr; }                                        \
+        bool operator>=(const iterator_name& i) const                         \
+          { return m_ptr >= i.m_ptr; }                                        \
+                                                                              \
+    private:                                                                  \
+        /* for wxStringImpl use only */                                       \
+        operator pointer() const { return m_ptr; }                            \
+                                                                              \
+        friend class WXDLLIMPEXP_BASE wxStringImpl;                           \
+                                                                              \
+        pointer m_ptr
+
+  // we need to declare const_iterator in wxStringImpl scope, the friend
+  // declaration inside iterator class itself is not enough, or at least not
+  // for g++ 3.4 (g++ 4 is ok)
+  class const_iterator;
+
+  class iterator
+  {
+    WX_DEFINE_STRINGIMPL_ITERATOR(iterator,
+                                  wxStringCharType&,
+                                  wxStringCharType*);
+
+    friend class const_iterator;
+  };
+
+  class const_iterator
+  {
+  public:
+      const_iterator(iterator i) : m_ptr(i.m_ptr) { }
+
+      WX_DEFINE_STRINGIMPL_ITERATOR(const_iterator,
+                                    const wxStringCharType&,
+                                    const wxStringCharType*);
+  };
+
+  #undef WX_DEFINE_STRINGIMPL_ITERATOR
+

 
   // constructors and destructor
     // ctor for an empty string
 
   // constructors and destructor
     // ctor for an empty string


@@ -215,8 +321,19 @@ public:
     size_t strLen = str.length() - nPos; nLen = strLen < nLen ? strLen : nLen;
     InitWith(str.c_str(), nPos, nLen);
   }
     size_t strLen = str.length() - nPos; nLen = strLen < nLen ? strLen : nLen;
     InitWith(str.c_str(), nPos, nLen);
   }

-    // take all characters from pStart to pEnd
-  wxStringImpl(const void *pStart, const void *pEnd);
+    // take everything between start and end
+  wxStringImpl(const_iterator start, const_iterator end);
+
+
+    // ctor from and conversion to std::string
+#if wxUSE_STD_STRING
+  wxStringImpl(const wxStdString& impl)
+      { InitWith(impl.c_str(), 0, impl.length()); }
+
+  operator wxStdString() const
+      { return wxStdString(c_str(), length()); }
+#endif
+

 
     // dtor is not virtual, this class must not be inherited from!
   ~wxStringImpl()
 
     // dtor is not virtual, this class must not be inherited from!
   ~wxStringImpl()


@@ -283,7 +400,7 @@ public:
     { ConcatSelf(str.length(), str.c_str()); return *this; }
     // append first n (or all if n == npos) characters of sz
   wxStringImpl& append(const wxStringCharType *sz)
     { ConcatSelf(str.length(), str.c_str()); return *this; }
     // append first n (or all if n == npos) characters of sz
   wxStringImpl& append(const wxStringCharType *sz)

-    { ConcatSelf(wxStrlen(sz), sz); return *this; }
+    { ConcatSelf(Strsize(sz), sz); return *this; }

   wxStringImpl& append(const wxStringCharType *sz, size_t n)
     { ConcatSelf(n, sz); return *this; }
     // append n copies of ch
   wxStringImpl& append(const wxStringCharType *sz, size_t n)
     { ConcatSelf(n, sz); return *this; }
     // append n copies of ch


@@ -300,7 +417,7 @@ public:
     { clear(); return append(str, pos, n); }
     // same as `= first n (or all if n == npos) characters of sz'
   wxStringImpl& assign(const wxStringCharType *sz)
     { clear(); return append(str, pos, n); }
     // same as `= first n (or all if n == npos) characters of sz'
   wxStringImpl& assign(const wxStringCharType *sz)

-    { clear(); return append(sz, wxStrlen(sz)); }
+    { clear(); return append(sz, Strsize(sz)); }

   wxStringImpl& assign(const wxStringCharType *sz, size_t n)
     { clear(); return append(sz, n); }
     // same as `= n copies of ch'
   wxStringImpl& assign(const wxStringCharType *sz, size_t n)
     { clear(); return append(sz, n); }
     // same as `= n copies of ch'


@@ -335,9 +452,9 @@ public:
     // insert first n (or all if n == npos) characters of sz
   wxStringImpl& insert(size_t nPos, const wxStringCharType *sz, size_t n = npos);
     // insert n copies of ch
     // insert first n (or all if n == npos) characters of sz
   wxStringImpl& insert(size_t nPos, const wxStringCharType *sz, size_t n = npos);
     // insert n copies of ch

-  wxStringImpl& insert(size_t nPos, size_t n, wxStringCharType ch)// FIXME-UTF8: tricky
+  wxStringImpl& insert(size_t nPos, size_t n, wxStringCharType ch)

     { return insert(nPos, wxStringImpl(n, ch)); }
     { return insert(nPos, wxStringImpl(n, ch)); }

-  iterator insert(iterator it, wxStringCharType ch) // FIXME-UTF8: tricky
+  iterator insert(iterator it, wxStringCharType ch)

     { size_t idx = it - begin(); insert(idx, 1, ch); return begin() + idx; }
   void insert(iterator it, const_iterator first, const_iterator last)
     { insert(it - begin(), first, last - first); }
     { size_t idx = it - begin(); insert(idx, 1, ch); return begin() + idx; }
   void insert(iterator it, const_iterator first, const_iterator last)
     { insert(it - begin(), first, last - first); }


@@ -397,7 +514,7 @@ public:
     // find first n characters of sz
   size_t find(const wxStringCharType* sz, size_t nStart = 0, size_t n = npos) const;
 
     // find first n characters of sz
   size_t find(const wxStringCharType* sz, size_t nStart = 0, size_t n = npos) const;
 

-    // find the first occurence of character ch after nStart
+    // find the first occurrence of character ch after nStart

   size_t find(wxStringCharType ch, size_t nStart = 0) const;
 
     // rfind() family is exactly like find() but works right to left
   size_t find(wxStringCharType ch, size_t nStart = 0) const;
 
     // rfind() family is exactly like find() but works right to left


@@ -430,6 +547,13 @@ public:
   void DoUngetWriteBuf(size_t nLen);
 #endif
 
   void DoUngetWriteBuf(size_t nLen);
 #endif
 

+private:
+#if wxUSE_UNICODE_UTF8
+  static size_t Strsize(const wxStringCharType *s) { return strlen(s); }
+#else
+  static size_t Strsize(const wxStringCharType *s) { return wxStrlen(s); }
+#endif
+

   friend class WXDLLIMPEXP_BASE wxString;
 };
 
   friend class WXDLLIMPEXP_BASE wxString;
 };