This is an archive of the discontinued LLVM Phabricator instance.

Differential D49808

[libc++] Factor duplicate code into function templates
ClosedPublic

Authored by ldionne on Jul 25 2018, 11:16 AM.

Details

Reviewers
mclow.lists
EricWF
dexonsmith
Commits
rG8b6a5bf91686: [libc++] Factor duplicate code into function templates
rL337955: [libc++] Factor duplicate code into function templates
rCXX337955: [libc++] Factor duplicate code into function templates
Summary

The exact same code was replicated 11 times for implementing the basic_istream
input operators (those that don't use numeric_limits). The same code was also
duplicated twice for implementing the basic_istream input operators that take
numeric_limits into account.

This commit factors the common code into function templates to avoid
the duplication.

Diff Detail

Event Timeline

ldionne created this revision.Jul 25 2018, 11:16 AM
Herald added a reviewer: EricWF. · View Herald TranscriptJul 25 2018, 11:16 AM
Herald added subscribers: cfe-commits, dexonsmith, christof. · View Herald Transcript
Harbormaster completed remote builds in B20703: Diff 157316.Jul 25 2018, 11:16 AM
dexonsmith accepted this revision.Jul 25 2018, 11:46 AM

Nice cleanup! LGTM.

This revision is now accepted and ready to land.Jul 25 2018, 11:46 AM
Closed by commit rCXX337955: [libc++] Factor duplicate code into function templates (authored by ldionne). · Explain WhyJul 25 2018, 12:40 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
libcxx/
include/
319 lines

Diff 157316

libcxx/include/istream

Show First 20 Lines • Show All 352 Lines • ▼ Show 20 Lines
#endif // _LIBCPP_CXX03_LANG #endif // _LIBCPP_CXX03_LANG
template <class _CharT, class _Traits> template <class _CharT, class _Traits>
basic_istream<_CharT, _Traits>::~basic_istream() basic_istream<_CharT, _Traits>::~basic_istream()
{ {
} }
template <class _CharT, class _Traits> template <class _Tp, class _CharT, class _Traits>
_LIBCPP_INLINE_VISIBILITY
basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>&
basic_istream<_CharT, _Traits>::operator>>(unsigned short& __n) __input_arithmetic(basic_istream<_CharT, _Traits>& __is, _Tp& __n) {
{
#ifndef _LIBCPP_NO_EXCEPTIONS #ifndef _LIBCPP_NO_EXCEPTIONS
try try
{ {
#endif // _LIBCPP_NO_EXCEPTIONS #endif // _LIBCPP_NO_EXCEPTIONS
sentry __s(*this); typename basic_istream<_CharT, _Traits>::sentry __s(__is);
if (__s) if (__s)
{ {
typedef istreambuf_iterator<char_type, traits_type> _Ip; typedef istreambuf_iterator<_CharT, _Traits> _Ip;
typedef num_get<char_type, _Ip> _Fp; typedef num_get<_CharT, _Ip> _Fp;
ios_base::iostate __err = ios_base::goodbit; ios_base::iostate __err = ios_base::goodbit;
use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n); use_facet<_Fp>(__is.getloc()).get(_Ip(__is), _Ip(), __is, __err, __n);
this->setstate(__err); __is.setstate(__err);
} }
#ifndef _LIBCPP_NO_EXCEPTIONS #ifndef _LIBCPP_NO_EXCEPTIONS
} }
catch (...) catch (...)
{ {
this->__set_badbit_and_consider_rethrow(); __is.__set_badbit_and_consider_rethrow();
} }
#endif // _LIBCPP_NO_EXCEPTIONS #endif // _LIBCPP_NO_EXCEPTIONS
return *this; return __is;
} }
template <class _CharT, class _Traits> template <class _CharT, class _Traits>
basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>&
basic_istream<_CharT, _Traits>::operator>>(unsigned int& __n) basic_istream<_CharT, _Traits>::operator>>(unsigned short& __n)
{
#ifndef _LIBCPP_NO_EXCEPTIONS
try
{
#endif // _LIBCPP_NO_EXCEPTIONS
sentry __s(*this);
if (__s)
{ {
typedef istreambuf_iterator<char_type, traits_type> _Ip; return _VSTD::__input_arithmetic<unsigned short>(*this, __n);
typedef num_get<char_type, _Ip> _Fp;
ios_base::iostate __err = ios_base::goodbit;
use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
this->setstate(__err);
}
#ifndef _LIBCPP_NO_EXCEPTIONS
} }
catch (...)
template <class _CharT, class _Traits>
basic_istream<_CharT, _Traits>&
basic_istream<_CharT, _Traits>::operator>>(unsigned int& __n)
{ {
this->__set_badbit_and_consider_rethrow(); return _VSTD::__input_arithmetic<unsigned int>(*this, __n);
}
#endif // _LIBCPP_NO_EXCEPTIONS
return *this;
} }
template <class _CharT, class _Traits> template <class _CharT, class _Traits>
basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>&
basic_istream<_CharT, _Traits>::operator>>(long& __n) basic_istream<_CharT, _Traits>::operator>>(long& __n)
{ {
#ifndef _LIBCPP_NO_EXCEPTIONS return _VSTD::__input_arithmetic<long>(*this, __n);
try
{
#endif // _LIBCPP_NO_EXCEPTIONS
sentry __s(*this);
if (__s)
{
typedef istreambuf_iterator<char_type, traits_type> _Ip;
typedef num_get<char_type, _Ip> _Fp;
ios_base::iostate __err = ios_base::goodbit;
use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
this->setstate(__err);
}
#ifndef _LIBCPP_NO_EXCEPTIONS
}
catch (...)
{
this->__set_badbit_and_consider_rethrow();
}
#endif // _LIBCPP_NO_EXCEPTIONS
return *this;
} }
template <class _CharT, class _Traits> template <class _CharT, class _Traits>
basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>&
basic_istream<_CharT, _Traits>::operator>>(unsigned long& __n) basic_istream<_CharT, _Traits>::operator>>(unsigned long& __n)
{ {
#ifndef _LIBCPP_NO_EXCEPTIONS return _VSTD::__input_arithmetic<unsigned long>(*this, __n);
try
{
#endif // _LIBCPP_NO_EXCEPTIONS
sentry __s(*this);
if (__s)
{
typedef istreambuf_iterator<char_type, traits_type> _Ip;
typedef num_get<char_type, _Ip> _Fp;
ios_base::iostate __err = ios_base::goodbit;
use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
this->setstate(__err);
}
#ifndef _LIBCPP_NO_EXCEPTIONS
}
catch (...)
{
this->__set_badbit_and_consider_rethrow();
}
#endif // _LIBCPP_NO_EXCEPTIONS
return *this;
} }
template <class _CharT, class _Traits> template <class _CharT, class _Traits>
basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>&
basic_istream<_CharT, _Traits>::operator>>(long long& __n) basic_istream<_CharT, _Traits>::operator>>(long long& __n)
{ {
#ifndef _LIBCPP_NO_EXCEPTIONS return _VSTD::__input_arithmetic<long long>(*this, __n);
try
{
#endif // _LIBCPP_NO_EXCEPTIONS
sentry __s(*this);
if (__s)
{
typedef istreambuf_iterator<char_type, traits_type> _Ip;
typedef num_get<char_type, _Ip> _Fp;
ios_base::iostate __err = ios_base::goodbit;
use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
this->setstate(__err);
}
#ifndef _LIBCPP_NO_EXCEPTIONS
}
catch (...)
{
this->__set_badbit_and_consider_rethrow();
}
#endif // _LIBCPP_NO_EXCEPTIONS
return *this;
} }
template <class _CharT, class _Traits> template <class _CharT, class _Traits>
basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>&
basic_istream<_CharT, _Traits>::operator>>(unsigned long long& __n) basic_istream<_CharT, _Traits>::operator>>(unsigned long long& __n)
{ {
#ifndef _LIBCPP_NO_EXCEPTIONS return _VSTD::__input_arithmetic<unsigned long long>(*this, __n);
try
{
#endif // _LIBCPP_NO_EXCEPTIONS
sentry __s(*this);
if (__s)
{
typedef istreambuf_iterator<char_type, traits_type> _Ip;
typedef num_get<char_type, _Ip> _Fp;
ios_base::iostate __err = ios_base::goodbit;
use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
this->setstate(__err);
}
#ifndef _LIBCPP_NO_EXCEPTIONS
}
catch (...)
{
this->__set_badbit_and_consider_rethrow();
}
#endif // _LIBCPP_NO_EXCEPTIONS
return *this;
} }
template <class _CharT, class _Traits> template <class _CharT, class _Traits>
basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>&
basic_istream<_CharT, _Traits>::operator>>(float& __n) basic_istream<_CharT, _Traits>::operator>>(float& __n)
{ {
#ifndef _LIBCPP_NO_EXCEPTIONS return _VSTD::__input_arithmetic<float>(*this, __n);
try
{
#endif // _LIBCPP_NO_EXCEPTIONS
sentry __s(*this);
if (__s)
{
typedef istreambuf_iterator<char_type, traits_type> _Ip;
typedef num_get<char_type, _Ip> _Fp;
ios_base::iostate __err = ios_base::goodbit;
use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
this->setstate(__err);
}
#ifndef _LIBCPP_NO_EXCEPTIONS
}
catch (...)
{
this->__set_badbit_and_consider_rethrow();
}
#endif // _LIBCPP_NO_EXCEPTIONS
return *this;
} }
template <class _CharT, class _Traits> template <class _CharT, class _Traits>
basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>&
basic_istream<_CharT, _Traits>::operator>>(double& __n) basic_istream<_CharT, _Traits>::operator>>(double& __n)
{ {
#ifndef _LIBCPP_NO_EXCEPTIONS return _VSTD::__input_arithmetic<double>(*this, __n);
try
{
#endif // _LIBCPP_NO_EXCEPTIONS
sentry __s(*this);
if (__s)
{
typedef istreambuf_iterator<char_type, traits_type> _Ip;
typedef num_get<char_type, _Ip> _Fp;
ios_base::iostate __err = ios_base::goodbit;
use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
this->setstate(__err);
}
#ifndef _LIBCPP_NO_EXCEPTIONS
}
catch (...)
{
this->__set_badbit_and_consider_rethrow();
}
#endif // _LIBCPP_NO_EXCEPTIONS
return *this;
} }
template <class _CharT, class _Traits> template <class _CharT, class _Traits>
basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>&
basic_istream<_CharT, _Traits>::operator>>(long double& __n) basic_istream<_CharT, _Traits>::operator>>(long double& __n)
{ {
#ifndef _LIBCPP_NO_EXCEPTIONS return _VSTD::__input_arithmetic<long double>(*this, __n);
try
{
#endif // _LIBCPP_NO_EXCEPTIONS
sentry __s(*this);
if (__s)
{
typedef istreambuf_iterator<char_type, traits_type> _Ip;
typedef num_get<char_type, _Ip> _Fp;
ios_base::iostate __err = ios_base::goodbit;
use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
this->setstate(__err);
}
#ifndef _LIBCPP_NO_EXCEPTIONS
}
catch (...)
{
this->__set_badbit_and_consider_rethrow();
}
#endif // _LIBCPP_NO_EXCEPTIONS
return *this;
} }
template <class _CharT, class _Traits> template <class _CharT, class _Traits>
basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>&
basic_istream<_CharT, _Traits>::operator>>(bool& __n) basic_istream<_CharT, _Traits>::operator>>(bool& __n)
{ {
#ifndef _LIBCPP_NO_EXCEPTIONS return _VSTD::__input_arithmetic<bool>(*this, __n);
try
{
#endif // _LIBCPP_NO_EXCEPTIONS
sentry __s(*this);
if (__s)
{
typedef istreambuf_iterator<char_type, traits_type> _Ip;
typedef num_get<char_type, _Ip> _Fp;
ios_base::iostate __err = ios_base::goodbit;
use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
this->setstate(__err);
}
#ifndef _LIBCPP_NO_EXCEPTIONS
}
catch (...)
{
this->__set_badbit_and_consider_rethrow();
}
#endif // _LIBCPP_NO_EXCEPTIONS
return *this;
} }
template <class _CharT, class _Traits> template <class _CharT, class _Traits>
basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>&
basic_istream<_CharT, _Traits>::operator>>(void*& __n) basic_istream<_CharT, _Traits>::operator>>(void*& __n)
{ {
#ifndef _LIBCPP_NO_EXCEPTIONS return _VSTD::__input_arithmetic<void*>(*this, __n);
try
{
#endif // _LIBCPP_NO_EXCEPTIONS
sentry __s(*this);
if (__s)
{
typedef istreambuf_iterator<char_type, traits_type> _Ip;
typedef num_get<char_type, _Ip> _Fp;
ios_base::iostate __err = ios_base::goodbit;
use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
this->setstate(__err);
}
#ifndef _LIBCPP_NO_EXCEPTIONS
}
catch (...)
{
this->__set_badbit_and_consider_rethrow();
}
#endif // _LIBCPP_NO_EXCEPTIONS
return *this;
} }
template <class _CharT, class _Traits> template <class _Tp, class _CharT, class _Traits>
_LIBCPP_INLINE_VISIBILITY
basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>&
basic_istream<_CharT, _Traits>::operator>>(short& __n) __input_arithmetic_with_numeric_limits(basic_istream<_CharT, _Traits>& __is, _Tp& __n) {
{
#ifndef _LIBCPP_NO_EXCEPTIONS #ifndef _LIBCPP_NO_EXCEPTIONS
try try
{ {
#endif // _LIBCPP_NO_EXCEPTIONS #endif // _LIBCPP_NO_EXCEPTIONS
sentry __s(*this); typename basic_istream<_CharT, _Traits>::sentry __s(__is);
if (__s) if (__s)
{ {
typedef istreambuf_iterator<char_type, traits_type> _Ip; typedef istreambuf_iterator<_CharT, _Traits> _Ip;
typedef num_get<char_type, _Ip> _Fp; typedef num_get<_CharT, _Ip> _Fp;
ios_base::iostate __err = ios_base::goodbit; ios_base::iostate __err = ios_base::goodbit;
long __temp; long __temp;
use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __temp); use_facet<_Fp>(__is.getloc()).get(_Ip(__is), _Ip(), __is, __err, __temp);
if (__temp < numeric_limits<short>::min()) if (__temp < numeric_limits<_Tp>::min())
{ {
__err |= ios_base::failbit; __err |= ios_base::failbit;
__n = numeric_limits<short>::min(); __n = numeric_limits<_Tp>::min();
} }
else if (__temp > numeric_limits<short>::max()) else if (__temp > numeric_limits<_Tp>::max())
{ {
__err |= ios_base::failbit; __err |= ios_base::failbit;
__n = numeric_limits<short>::max(); __n = numeric_limits<_Tp>::max();
} }
else else
__n = static_cast<short>(__temp); __n = static_cast<_Tp>(__temp);
this->setstate(__err); __is.setstate(__err);
} }
#ifndef _LIBCPP_NO_EXCEPTIONS #ifndef _LIBCPP_NO_EXCEPTIONS
} }
catch (...) catch (...)
{ {
this->__set_badbit_and_consider_rethrow(); __is.__set_badbit_and_consider_rethrow();
} }
#endif // _LIBCPP_NO_EXCEPTIONS #endif // _LIBCPP_NO_EXCEPTIONS
return *this; return __is;
} }
template <class _CharT, class _Traits> template <class _CharT, class _Traits>
basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>&
basic_istream<_CharT, _Traits>::operator>>(int& __n) basic_istream<_CharT, _Traits>::operator>>(short& __n)
{
#ifndef _LIBCPP_NO_EXCEPTIONS
try
{
#endif // _LIBCPP_NO_EXCEPTIONS
sentry __s(*this);
if (__s)
{
typedef istreambuf_iterator<char_type, traits_type> _Ip;
typedef num_get<char_type, _Ip> _Fp;
ios_base::iostate __err = ios_base::goodbit;
long __temp;
use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __temp);
if (__temp < numeric_limits<int>::min())
{
__err |= ios_base::failbit;
__n = numeric_limits<int>::min();
}
else if (__temp > numeric_limits<int>::max())
{ {
__err |= ios_base::failbit; return _VSTD::__input_arithmetic_with_numeric_limits<short>(*this, __n);
__n = numeric_limits<int>::max();
} }
else
__n = static_cast<int>(__temp); template <class _CharT, class _Traits>
this->setstate(__err); basic_istream<_CharT, _Traits>&
} basic_istream<_CharT, _Traits>::operator>>(int& __n)
#ifndef _LIBCPP_NO_EXCEPTIONS
}
catch (...)
{ {
this->__set_badbit_and_consider_rethrow(); return _VSTD::__input_arithmetic_with_numeric_limits<int>(*this, __n);
}
#endif // _LIBCPP_NO_EXCEPTIONS
return *this;
} }
template<class _CharT, class _Traits> template<class _CharT, class _Traits>
basic_istream<_CharT, _Traits>& basic_istream<_CharT, _Traits>&
operator>>(basic_istream<_CharT, _Traits>& __is, _CharT* __s) operator>>(basic_istream<_CharT, _Traits>& __is, _CharT* __s)
{ {
#ifndef _LIBCPP_NO_EXCEPTIONS #ifndef _LIBCPP_NO_EXCEPTIONS
try try
▲ Show 20 Lines • Show All 952 Lines • Show Last 20 Lines