generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-23 16:48:06 +02:00
Code Issues Projects Releases Wiki Activity

Add missing relational operators to VarIterator (#4714)

Browse Source 
* Add missing relational operators to VarIterator

* Add tests for relational operators of VarIterator
This commit is contained in:
vfjpl
2024-10-03 10:52:45 +02:00
committed by GitHub
parent f3975eba96
commit 64c751f3a3
3 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Foundation/include/Poco/Dynamic/VarIterator.h
View File

@@ -69,6 +69,18 @@ public:
bool operator != (const VarIterator& other) const; bool operator != (const VarIterator& other) const;
/// Inequality operator. /// Inequality operator.
bool operator < (const VarIterator& other) const;
/// Less than operator.
bool operator > (const VarIterator& other) const;
/// Greater than operator.
bool operator <= (const VarIterator& other) const;
/// Less than or equal to operator.
bool operator >= (const VarIterator& other) const;
/// Greater than or equal to operator.
Var& operator * () const; Var& operator * () const;
/// Returns value at the current position. /// Returns value at the current position.
@@ -138,6 +150,30 @@ inline bool VarIterator::operator != (const VarIterator& other) const
} }
inline bool VarIterator::operator < (const VarIterator& other) const
{
return _position < other._position;
}
inline bool VarIterator::operator > (const VarIterator& other) const
{
return _position > other._position;
}
inline bool VarIterator::operator <= (const VarIterator& other) const
{
return _position <= other._position;
}
inline bool VarIterator::operator >= (const VarIterator& other) const
{
return _position >= other._position;
}
} } // namespace Poco::Dynamic } } // namespace Poco::Dynamic

3
Foundation/src/VarIterator.cpp
View File

@@ -83,8 +83,7 @@ void VarIterator::increment() const
{ {
if (POSITION_END == _position) if (POSITION_END == _position)
throw RangeException("End of iterator reached."); throw RangeException("End of iterator reached.");
else if (_position < _pVar->size() - 1)
if (_position < _pVar->size() - 1)
++_position; ++_position;
else else
_position = POSITION_END; _position = POSITION_END;

6
Foundation/testsuite/src/VarTest.cpp
View File

@@ -3161,6 +3161,8 @@ void VarTest::testIterator()
da = Poco::Dynamic::Array(); da = Poco::Dynamic::Array();
assertTrue(da.begin() == da.end()); assertTrue(da.begin() == da.end());
assertTrue(da.begin() <= da.end());
assertTrue(da.begin() >= da.end());
da = 1; da = 1;
assertTrue (!da.isEmpty()); assertTrue (!da.isEmpty());
@@ -3172,6 +3174,10 @@ void VarTest::testIterator()
} }
catch (RangeException&) {} catch (RangeException&) {}
assertTrue (da.begin() != da.end()); assertTrue (da.begin() != da.end());
assertTrue (da.begin() <= da.end());
assertTrue (da.begin() < da.end());
assertTrue (da.end() >= da.begin());
assertTrue (da.end() > da.begin());
Var::Iterator it = da.begin(); Var::Iterator it = da.begin();
Var::Iterator end = da.end(); Var::Iterator end = da.end();