Changeset 19:49b39ac77cad in rrlib_uri

Timestamp:

06.01.2022 00:58:10 (2 years ago)

Author:

Max Reichardt <max.reichardt@…>

Branch:

17.03

Phase:

public

Tags:

tip

Message:

Adds a std::ostream stream operator for tStringRange as well as typedefs and minor tweaks to tPath::tConstIterator (so that std::iterator_traits return a valid result). This e.g. enables using the latter with rrlib::util::Join.

Files:

• tPath.h (modified) (3 diffs)
• tStringRange.h (modified) (1 diff)

tPath.h

@@ -304 +304 @@
   public:
 
-    tConstIterator(const tPath& path, size_t element_index) :
+    typedef long int difference_type;
+    typedef const tElement value_type;
+    typedef const tElement* pointer;
+    typedef const tElement& reference;
+    typedef std::bidirectional_iterator_tag iterator_category;
+
+    tConstIterator(const tPath& path, long int element_index) :
       path(&path),
       element_index(element_index),
@@ -340 +346 @@
       return temp;
     }
-    friend size_t operator+(const tConstIterator& lhs, const tConstIterator& rhs)
+    inline tConstIterator& operator--()
+    {
+      element_index--;
+      UpdateElement();
+      return *this;
+    }
+    inline tConstIterator operator -- (int)
+    {
+      tConstIterator temp(*this);
+      operator--();
+      return temp;
+    }
+    friend long int operator+(const tConstIterator& lhs, const tConstIterator& rhs)
     {
       return lhs.element_index + rhs.element_index;
     }
-    friend size_t operator-(const tConstIterator& lhs, const tConstIterator& rhs)
+    friend long int operator-(const tConstIterator& lhs, const tConstIterator& rhs)
     {
       return lhs.element_index - rhs.element_index;
     }
-    friend tConstIterator operator+(const tConstIterator& lhs, size_t rhs)
+    friend tConstIterator operator+(const tConstIterator& lhs, long int rhs)
     {
       return tConstIterator(*lhs.path, lhs.element_index + rhs);
     }
-    friend tConstIterator operator-(const tConstIterator& lhs, size_t rhs)
+    friend tConstIterator operator-(const tConstIterator& lhs, long int rhs)
     {
       return tConstIterator(*lhs.path, lhs.element_index - rhs);
@@ -360 +378 @@
 
     const tPath* path;
-    size_t element_index;
+    long int element_index;
     tElement element;
 
     void UpdateElement()
     {
-      element = element_index >= path->element_count ? tStringRange() : (*path)[element_index];
+      element = static_cast<unsigned long int>(element_index) >= path->element_count ? tStringRange() : (*path)[element_index];
     }
   };

tStringRange.h

@@ -129 +129 @@
 }
 
+inline std::ostream& operator << (std::ostream& stream, const tStringRange& string_range)
+{
+  stream.write(string_range.CharPointer(), string_range.Length());
+  return stream;
+}
+
 //----------------------------------------------------------------------
 // End of namespace declaration