feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Suppress conversion warnings in match_results.

Browse Source 
When passing std::size_t arguments to length(), str() and operator[] by making these templates enable_if'd on is_integral.
Fixes https://github.com/boostorg/regex/issues/197.
This commit is contained in:
jzmaddock
2024-03-25 17:31:32 +00:00
parent 260982ea9e
commit c82a797230
1 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/boost/regex/v5/match_results.hpp
View File

@ -97,15 +97,23 @@ public:
bool empty() const bool empty() const
{ return m_subs.size() < 2; } { return m_subs.size() < 2; }
// element access: // element access:
difference_type length(int sub = 0) const private:
difference_type do_get_length(int sub = 0) const
{ {
if(m_is_singular) if (m_is_singular)
raise_logic_error(); raise_logic_error();
sub += 2; sub += 2;
if((sub < (int)m_subs.size()) && (sub > 0)) if ((sub < (int)m_subs.size()) && (sub > 0))
return m_subs[sub].length(); return m_subs[sub].length();
return 0; return 0;
} }
public:
template <class Integer>
typename std::enable_if<std::is_integral<Integer>::value, difference_type>::type length(Integer sub) const
{
return do_get_length(static_cast<int>(sub));
}
difference_type length() const { return do_get_length(0); }
difference_type length(const char_type* sub) const difference_type length(const char_type* sub) const
{ {
if(m_is_singular) if(m_is_singular)
@ -161,7 +169,8 @@ public:
{ {
return position(sub.c_str()); return position(sub.c_str());
} }
string_type str(int sub = 0) const private:
string_type do_get_string(int sub = 0) const
{ {
if(m_is_singular) if(m_is_singular)
raise_logic_error(); raise_logic_error();
@ -177,6 +186,13 @@ public:
} }
return result; return result;
} }
public:
template <class Integer>
typename std::enable_if<std::is_integral<Integer>::value, string_type>::type str(Integer sub) const
{
return do_get_string(static_cast<int>(sub));
}
string_type str() const { return do_get_string(0); }
string_type str(const char_type* sub) const string_type str(const char_type* sub) const
{ {
return (*this)[sub].str(); return (*this)[sub].str();
@ -196,7 +212,8 @@ public:
{ {
return (*this)[sub].str(); return (*this)[sub].str();
} }
const_reference operator[](int sub) const private:
const_reference get_at(int sub) const
{ {
if(m_is_singular && m_subs.empty()) if(m_is_singular && m_subs.empty())
raise_logic_error(); raise_logic_error();
@ -207,6 +224,12 @@ public:
} }
return m_null; return m_null;
} }
public:
template <class Integer>
typename std::enable_if<std::is_integral<Integer>::value, const_reference>::type operator[](Integer sub) const
{
return get_at(static_cast<int>(sub));
}
// //
// Named sub-expressions: // Named sub-expressions:
// //