|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r49325 - branches/release/boost
From: Alexander.Nasonov_at_[hidden]
Date: 2008-10-13 19:54:01
Author: nasonov
Date: 2008-10-13 19:54:01 EDT (Mon, 13 Oct 2008)
New Revision: 49325
URL: http://svn.boost.org/trac/boost/changeset/49325
Log:
Merge lexical_cast from trunk r49262
Text files modified:
branches/release/boost/lexical_cast.hpp | 158 +++++++++++++++++++--------------------
1 files changed, 77 insertions(+), 81 deletions(-)
Modified: branches/release/boost/lexical_cast.hpp
==============================================================================
--- branches/release/boost/lexical_cast.hpp (original)
+++ branches/release/boost/lexical_cast.hpp 2008-10-13 19:54:01 EDT (Mon, 13 Oct 2008)
@@ -17,17 +17,23 @@
#include <climits>
#include <cstddef>
#include <istream>
-#include <locale>
#include <string>
#include <typeinfo>
+#include <exception>
#include <boost/config.hpp>
#include <boost/limits.hpp>
#include <boost/mpl/if.hpp>
#include <boost/throw_exception.hpp>
#include <boost/type_traits/is_pointer.hpp>
+#include <boost/type_traits/make_unsigned.hpp>
#include <boost/call_traits.hpp>
#include <boost/static_assert.hpp>
#include <boost/detail/lcast_precision.hpp>
+#include <boost/detail/workaround.hpp>
+
+#ifndef BOOST_NO_STD_LOCALE
+#include <locale>
+#endif
#ifdef BOOST_NO_STRINGSTREAM
#include <strstream>
@@ -38,13 +44,19 @@
#if defined(BOOST_NO_STRINGSTREAM) || \
defined(BOOST_NO_STD_WSTRING) || \
defined(BOOST_NO_STD_LOCALE)
-#define DISABLE_WIDE_CHAR_SUPPORT
+#define BOOST_LCAST_NO_WCHAR_T
#endif
namespace boost
{
// exception used to indicate runtime lexical_cast failure
class bad_lexical_cast : public std::bad_cast
+
+#if defined(__BORLANDC__) && BOOST_WORKAROUND( __BORLANDC__, < 0x560 )
+ // under bcc32 5.5.1 bad_cast doesn't derive from exception
+ , public std::exception
+#endif
+
{
public:
bad_lexical_cast() :
@@ -94,7 +106,7 @@
};
#endif
-#ifndef DISABLE_WIDE_CHAR_SUPPORT
+#ifndef BOOST_LCAST_NO_WCHAR_T
#ifndef BOOST_NO_INTRINSIC_WCHAR_T
template<>
struct stream_char<wchar_t>
@@ -219,7 +231,7 @@
// lcast_src_length<char, signed char const*>
// lcast_src_length<char, unsigned char const*>
-#ifndef DISABLE_WIDE_CHAR_SUPPORT
+#ifndef BOOST_LCAST_NO_WCHAR_T
template<>
struct lcast_src_length<wchar_t, bool>
{
@@ -258,7 +270,7 @@
static void check_coverage() {}
};
-#ifndef DISABLE_WIDE_CHAR_SUPPORT
+#ifndef BOOST_LCAST_NO_WCHAR_T
template<>
struct lcast_src_length<wchar_t, wchar_t const*>
{
@@ -289,7 +301,7 @@
static void check_coverage() {}
};
-#ifndef DISABLE_WIDE_CHAR_SUPPORT
+#ifndef BOOST_LCAST_NO_WCHAR_T
template<>
struct lcast_src_length< wchar_t, std::basic_string<wchar_t> >
{
@@ -327,34 +339,35 @@
#endif
};
-#define BOOST_AUX_LEXICAL_CAST_DEF1(CharT, T) template<> \
- struct lcast_src_length<CharT, T> : lcast_src_length_integral<T> \
+#define BOOST_LCAST_DEF1(CharT, T) \
+ template<> struct lcast_src_length<CharT, T> \
+ : lcast_src_length_integral<T> \
{ static void check_coverage() {} };
-#ifdef DISABLE_WIDE_CHAR_SUPPORT
-#define BOOST_AUX_LEXICAL_CAST_DEF(T) BOOST_AUX_LEXICAL_CAST_DEF1(char, T)
+#ifdef BOOST_LCAST_NO_WCHAR_T
+#define BOOST_LCAST_DEF(T) BOOST_LCAST_DEF1(char, T)
#else
-#define BOOST_AUX_LEXICAL_CAST_DEF(T) \
- BOOST_AUX_LEXICAL_CAST_DEF1(char, T) \
- BOOST_AUX_LEXICAL_CAST_DEF1(wchar_t, T)
+#define BOOST_LCAST_DEF(T) \
+ BOOST_LCAST_DEF1(char, T) \
+ BOOST_LCAST_DEF1(wchar_t, T)
#endif
- BOOST_AUX_LEXICAL_CAST_DEF(short)
- BOOST_AUX_LEXICAL_CAST_DEF(unsigned short)
- BOOST_AUX_LEXICAL_CAST_DEF(int)
- BOOST_AUX_LEXICAL_CAST_DEF(unsigned int)
- BOOST_AUX_LEXICAL_CAST_DEF(long)
- BOOST_AUX_LEXICAL_CAST_DEF(unsigned long)
+ BOOST_LCAST_DEF(short)
+ BOOST_LCAST_DEF(unsigned short)
+ BOOST_LCAST_DEF(int)
+ BOOST_LCAST_DEF(unsigned int)
+ BOOST_LCAST_DEF(long)
+ BOOST_LCAST_DEF(unsigned long)
#if defined(BOOST_HAS_LONG_LONG)
- BOOST_AUX_LEXICAL_CAST_DEF(boost::ulong_long_type)
- BOOST_AUX_LEXICAL_CAST_DEF(boost::long_long_type )
+ BOOST_LCAST_DEF(boost::ulong_long_type)
+ BOOST_LCAST_DEF(boost::long_long_type )
#elif defined(BOOST_HAS_MS_INT64)
- BOOST_AUX_LEXICAL_CAST_DEF(unsigned __int64)
- BOOST_AUX_LEXICAL_CAST_DEF( __int64)
+ BOOST_LCAST_DEF(unsigned __int64)
+ BOOST_LCAST_DEF( __int64)
#endif
-#undef BOOST_AUX_LEXICAL_CAST_DEF
-#undef BOOST_AUX_LEXICAL_CAST_DEF1
+#undef BOOST_LCAST_DEF
+#undef BOOST_LCAST_DEF1
#ifndef BOOST_LCAST_NO_COMPILE_TIME_PRECISION
// Helper for floating point types.
@@ -400,7 +413,7 @@
static void check_coverage() {}
};
-#ifndef DISABLE_WIDE_CHAR_SUPPORT
+#ifndef BOOST_LCAST_NO_WCHAR_T
template<>
struct lcast_src_length<wchar_t,float>
: lcast_src_length_floating<float>
@@ -422,7 +435,7 @@
static void check_coverage() {}
};
-#endif // #ifndef DISABLE_WIDE_CHAR_SUPPORT
+#endif // #ifndef BOOST_LCAST_NO_WCHAR_T
#endif // #ifndef BOOST_LCAST_NO_COMPILE_TIME_PRECISION
}
@@ -437,7 +450,7 @@
BOOST_STATIC_CONSTANT(char, minus = '-');
};
-#ifndef DISABLE_WIDE_CHAR_SUPPORT
+#ifndef BOOST_LCAST_NO_WCHAR_T
template<>
struct lcast_char_constants<wchar_t>
{
@@ -460,37 +473,21 @@
# pragma warning( push )
// C4146: unary minus operator applied to unsigned type, result still unsigned
# pragma warning( disable : 4146 )
+#elif defined( __BORLANDC__ )
+# pragma option push -w-8041
#endif
-
- inline unsigned int lcast_to_unsigned(int value)
- {
- unsigned int uval = value;
- return value < 0 ? -uval : uval;
- }
-
- inline unsigned long lcast_to_unsigned(long value)
- {
- unsigned long uval = value;
- return value < 0 ? -uval : uval;
- }
-
-#if defined(BOOST_HAS_LONG_LONG)
- inline boost::ulong_long_type lcast_to_unsigned(boost::long_long_type v)
- {
- boost::ulong_long_type uval = v;
- return v < 0 ? -uval : uval;
- }
-#elif defined(BOOST_HAS_MS_INT64)
- inline unsigned __int64 lcast_to_unsigned(__int64 value)
+ template<class T>
+ inline
+ BOOST_DEDUCED_TYPENAME make_unsigned<T>::type lcast_to_unsigned(T value)
{
- unsigned __int64 uval = value;
- return value < 0 ? -uval : uval;
+ typedef BOOST_DEDUCED_TYPENAME make_unsigned<T>::type result_type;
+ result_type uvalue = static_cast<result_type>(value);
+ return value < 0 ? -uvalue : uvalue;
}
-#endif
-
#if (defined _MSC_VER)
-# pragma warning( pop ) // C4146: unary minus operator applied to unsigned type,
- // result still unsigned
+# pragma warning( pop )
+#elif defined( __BORLANDC__ )
+# pragma option pop
#endif
}
@@ -502,22 +499,15 @@
#ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
BOOST_STATIC_ASSERT(!std::numeric_limits<T>::is_signed);
#endif
- CharT thousands_sep = 0;
-#ifdef BOOST_LEXICAL_CAST_ASSUME_C_LOCALE
- char const* grouping = "";
- std::size_t const grouping_size = 0;
-#else
+#ifndef BOOST_LEXICAL_CAST_ASSUME_C_LOCALE
+ // TODO: use BOOST_NO_STD_LOCALE
std::locale loc;
typedef std::numpunct<CharT> numpunct;
numpunct const& np = BOOST_USE_FACET(numpunct, loc);
std::string const& grouping = np.grouping();
std::string::size_type const grouping_size = grouping.size();
-
- if(grouping_size)
- thousands_sep = np.thousands_sep();
-#endif
-
+ CharT thousands_sep = grouping_size ? np.thousands_sep() : 0;
std::string::size_type group = 0; // current group number
char last_grp_size = grouping[0] <= 0 ? CHAR_MAX : grouping[0];
// a) Since grouping is const, grouping[grouping.size()] returns 0.
@@ -526,14 +516,17 @@
#ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
BOOST_STATIC_ASSERT(std::numeric_limits<T>::digits10 < CHAR_MAX);
#endif
+
+ char left = last_grp_size;
+#endif
+
typedef typename Traits::int_type int_type;
CharT const czero = lcast_char_constants<CharT>::zero;
int_type const zero = Traits::to_int_type(czero);
- char left = last_grp_size;
-
do
{
+#ifndef BOOST_LEXICAL_CAST_ASSUME_C_LOCALE
if(left == 0)
{
++group;
@@ -549,6 +542,8 @@
}
--left;
+#endif
+
--finish;
int_type const digit = static_cast<int_type>(n % 10U);
Traits::assign(*finish, Traits::to_char_type(zero + digit));
@@ -614,7 +609,7 @@
stream.str().swap(output);
return true;
}
- #ifndef DISABLE_WIDE_CHAR_SUPPORT
+ #ifndef BOOST_LCAST_NO_WCHAR_T
bool operator>>(std::wstring &output)
{
stream.str().swap(output);
@@ -670,9 +665,10 @@
Traits::assign(*p, ch);
}
-#ifndef DISABLE_WIDE_CHAR_SUPPORT
+#ifndef BOOST_LCAST_NO_WCHAR_T
static void widen_and_assign(wchar_t* p, char ch)
{
+ // TODO: use BOOST_NO_STD_LOCALE
std::locale loc;
wchar_t w = BOOST_USE_FACET(std::ctype<wchar_t>, loc).widen(ch);
Traits::assign(*p, w);
@@ -703,9 +699,9 @@
public:
- lexical_stream_limited_src(CharT* start, CharT* finish)
- : start(start)
- , finish(finish)
+ lexical_stream_limited_src(CharT* sta, CharT* fin)
+ : start(sta)
+ , finish(fin)
{}
public: // output
@@ -720,7 +716,7 @@
bool operator<<(bool);
bool operator<<(char);
-#if !defined(DISABLE_WIDE_CHAR_SUPPORT) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
+#if !defined(BOOST_LCAST_NO_WCHAR_T) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
bool operator<<(wchar_t);
#endif
bool operator<<(CharT const*);
@@ -785,7 +781,7 @@
bool operator>>(std::string&);
-#ifndef DISABLE_WIDE_CHAR_SUPPORT
+#ifndef BOOST_LCAST_NO_WCHAR_T
bool operator>>(std::wstring&);
#endif
@@ -820,7 +816,7 @@
return true;
}
-#if !defined(DISABLE_WIDE_CHAR_SUPPORT) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
+#if !defined(BOOST_LCAST_NO_WCHAR_T) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
template<typename CharT, class Base, class Traits>
inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
wchar_t ch)
@@ -907,7 +903,7 @@
inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator<<(
unsigned short n)
{
- start = lcast_put_unsigned<Traits>(lcast_to_unsigned(n), finish);
+ start = lcast_put_unsigned<Traits>(n, finish);
return true;
}
@@ -994,7 +990,7 @@
return true;
}
-#ifndef DISABLE_WIDE_CHAR_SUPPORT
+#ifndef BOOST_LCAST_NO_WCHAR_T
template<typename CharT, class Base, class Traits>
inline bool lexical_stream_limited_src<CharT,Base,Traits>::operator>>(
std::wstring& str)
@@ -1049,7 +1045,7 @@
BOOST_STATIC_CONSTANT(bool, value = false);
};
-#if !defined(DISABLE_WIDE_CHAR_SUPPORT) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
+#if !defined(BOOST_LCAST_NO_WCHAR_T) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
template<>
struct lcast_streambuf_for_target<wchar_t>
{
@@ -1065,7 +1061,7 @@
BOOST_STATIC_CONSTANT(bool, value = false);
};
-#ifndef DISABLE_WIDE_CHAR_SUPPORT
+#ifndef BOOST_LCAST_NO_WCHAR_T
template<class Traits, class Alloc>
struct lcast_streambuf_for_target<
std::basic_string<wchar_t,Traits,Alloc> >
@@ -1080,7 +1076,7 @@
BOOST_STATIC_CONSTANT(bool, value = false);
};
-#ifndef DISABLE_WIDE_CHAR_SUPPORT
+#ifndef BOOST_LCAST_NO_WCHAR_T
template<>
struct lcast_streambuf_for_target<std::wstring>
{
@@ -1201,5 +1197,5 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#undef DISABLE_WIDE_CHAR_SUPPORT
+#undef BOOST_LCAST_NO_WCHAR_T
#endif
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk