coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-04-30 19:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Created integral to_string.

Browse Source 
Started etl::string tests.
This commit is contained in:
John Wellbelove 2019-04-06 21:10:20 +01:00
parent fe9a881388
commit 7feb3c1cc4
15 changed files with 948 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/etl/cstring.h
View File

@ -55,6 +55,8 @@ namespace etl
{
public:
typedef istring base_type;
typedef istring::value_type value_type;
static const size_t MAX_SIZE = MAX_SIZE_;

165
include/etl/format_spec.h Normal file
View File

@ -0,0 +1,165 @@
///\file
/******************************************************************************
The MIT License(MIT)
Embedded Template Library.
https://github.com/ETLCPP/etl
https://www.etlcpp.com
Copyright(c) 2019 jwellbelove
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files(the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions :
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
******************************************************************************/
#ifndef ETL_FORMAT_SPEC_INCLUDED
#define ETL_FORMAT_SPEC_INCLUDED
///\ingroup string
#include "platform.h"
#include "type_traits.h"
#include "static_assert.h"
namespace etl
{
template <typename TString>
class format_spec
{
public:
//***************************************************************************
/// Default constructor.
/// Sets:-
/// Base = 10
/// Width = 0
/// Upper case (for hex) = true
/// Rifght Justified = true
//***************************************************************************
format_spec()
: base_(10)
, width_(0)
, upper_case_(true)
, right_justified_(true)
, fill_(typename TString::value_type(' '))
{
}
//***************************************************************************
/// Sets the base.
/// \return A reference to the format_spec.
//***************************************************************************
format_spec& base(const uint32_t b)
{
base_ = static_cast<uint_least8_t>(b);
return *this;
}
//***************************************************************************
/// Gets the base.
//***************************************************************************
uint32_t base() const
{
return base_;
}
//***************************************************************************
/// Sets the width.
/// \return A reference to the format_spec.
//***************************************************************************
format_spec& width(const uint32_t w)
{
width_ = static_cast<uint_least8_t>(w);
return *this;
}
//***************************************************************************
/// Gets the width.
//***************************************************************************
uint32_t width() const
{
return width_;
}
//***************************************************************************
/// Sets the upper case flag.
/// \return A reference to the format_spec.
//***************************************************************************
format_spec& upper_case(const bool u)
{
upper_case_ = u;
return *this;
}
//***************************************************************************
/// Gets the upper case flag.
//***************************************************************************
bool upper_case(const bool u) const
{
return upper_case_;
}
//***************************************************************************
/// Sets the fill character.
/// \return A reference to the format_spec.
//***************************************************************************
format_spec& fill(const typename TString::value_type c)
{
fill_ = c;
return *this;
}
//***************************************************************************
/// Gets the fill character.
//***************************************************************************
typename TString::value_type fill() const
{
return fill_;
}
//***************************************************************************
/// Sets the right justify flag.
/// \return A reference to the format_spec.
//***************************************************************************
format_spec& right_justified(const bool r)
{
right_justified_ = r;
return *this;
}
//***************************************************************************
/// Gets the right justify flag.
//***************************************************************************
bool right_justified() const
{
return right_justified_;
}
private:
uint_least8_t base_;
uint_least8_t width_;
bool upper_case_;
bool right_justified_;
typename TString::value_type fill_;
};
}
#endif

60
include/etl/negative.h Normal file
View File

@ -0,0 +1,60 @@
///\file
/******************************************************************************
The MIT License(MIT)
Embedded Template Library.
https://github.com/ETLCPP/etl
https://www.etlcpp.com
Copyright(c) 2018 jwellbelove
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files(the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions :
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
******************************************************************************/
#ifndef ETL_NEGATIVE_INCLUDED
#define ETL_NEGATIVE_INCLUDED
#include "type_traits.h"
namespace etl
{
//***************************************************************************
// For signed types.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_signed<T>::value, bool>::type
is_negative(const T value)
{
return (value < T(0));
}
//***************************************************************************
// For unsigned types.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_unsigned<T>::value, T>::type
is_negative(const T)
{
return false;
}
}
#endif

120
include/etl/private/to_string_helper.h Normal file
View File

@ -0,0 +1,120 @@
///\file
/******************************************************************************
The MIT License(MIT)
Embedded Template Library.
https://github.com/ETLCPP/etl
https://www.etlcpp.com
Copyright(c) 2019 jwellbelove
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files(the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions :
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
******************************************************************************/
#ifndef ETL_TO_STRING_HELPER_INCLUDED
#define ETL_TO_STRING_HELPER_INCLUDED
///\ingroup private
#include "../platform.h"
#include "../absolute.h"
#include "../negative.h"
#include "../format_spec.h"
#include "../type_traits.h"
#include "../stl/algorithm.h"
#include "../stl/iterator.h"
namespace etl
{
//***************************************************************************
/// Helper function for integrals.
//***************************************************************************
template <typename T, typename TIString>
typename etl::enable_if<etl::is_integral<T>::value, const TIString&>::type
to_string_helper(T value,
TIString& str,
const etl::format_spec<TIString>& format,
const bool append)
{
typedef typename TIString::value_type type;
typedef typename TIString::iterator iterator;
const bool negative = etl::is_negative(value);
if (!append)
{
str.clear();
}
iterator start = str.end();
if (value == 0)
{
str.push_back(type('0'));
}
else
{
// Extract the digits, in reverse order.
while (value != 0)
{
T remainder = etl::absolute(value % T(format.base()));
str.push_back((remainder > 9) ? type('a' + (remainder - 10)) : type('0' + remainder));
value = value / T(format.base());
}
// If number is negative, append '-'
if ((format.base() == 10) && negative)
{
str.push_back(type('-'));
}
// Reverse the string we appended.
std::reverse(start, str.end());
}
// Do we have a width specification?
if (format.width() != 0)
{
uint32_t length = static_cast<uint32_t>(std::distance(start, str.end()));
// Is the length of the string less than the width?
if (length < format.width())
{
uint32_t fill_length = format.width() - length;
if (format.right_justified())
{
// Insert fill characters on the left.
str.insert(start, fill_length, format.fill());
}
else
{
// Insert fill characters on the right.
str.insert(str.end(), fill_length, format.fill());
}
}
}
return str;
}
}
#endif

144
include/etl/to_string.h
View File

@ -28,73 +28,121 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
******************************************************************************/
#ifndef ETL_TO_STRING_INCLUDED
#define ETL_TO_STRING_INCLUDED
#ifndef ETL_TO_U32STRING_INCLUDED
#define ETL_TO_U32STRING_INCLUDED
///\ingroup utilities
///\ingroup string
#include "platform.h"
#include "type_traits.h"
#include "stl/algorithm.h"
#include "cstring.h"
#include "format_spec.h"
#include "private/to_string_helper.h"
namespace etl
{
template <typename T, typename TString>
void to_string_helper(T value, const bool negative, TString& str, const int base, const bool upper_case)
//***************************************************************************
/// For signed integrals less than 64 bits. Default format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_signed<T>::value &&
!etl::is_same<T, int64_t>::value, const etl::istring&>::type
to_string(const T value, etl::istring& str, const bool append = false)
{
typedef typename TString::value_type type;
typedef typename TString::iterator iterator;
etl::format_spec<etl::istring> format;
iterator start = str.end();
if (value == 0)
{
str.push_back(type('0'));
}
else
{
// Extract the digits, in reverse order.
while (value != 0)
{
T remainder = value % base;
str.push_back((remainder > 9) ? type('a' + (remainder - 10)) : type('0' + remainder));
value = value / base;
}
// If number is negative, append '-'
if ((base == 10) && negative)
{
str.push_back(type('-'));
}
// Reverse the string we appended.
std::reverse(start, str.end());
}
return to_string_helper(int32_t(value), str, format, append);
}
//***************************************************************************
///
/// For signed integrals less than 64 bits. Supplied format spec.
//***************************************************************************
template <typename T, typename TString>
typename etl::enable_if<etl::is_integral<T>::value && etl::is_signed<T>::value, void>::type
to_string(T value, TString& str, const int base = 10, const bool upper_case = true)
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_signed<T>::value &&
!etl::is_same<T, int64_t>::value, const etl::istring&>::type
to_string(const T value, etl::istring& str, const etl::format_spec<etl::istring>& format, const bool append = false)
{
typedef typename etl::make_unsigned<T>::type Unsigned;
const bool negative = (value < 0);
const Unsigned uvalue = (negative ? -value : value);
to_string_helper(uvalue, negative, str, base, upper_case);
return to_string_helper(int32_t(value), str, format, append);
}
//***************************************************************************
///
/// For unsigned integrals less then 64 bits. Default format spec.
//***************************************************************************
template <typename T, typename TString>
typename etl::enable_if<etl::is_integral<T>::value && etl::is_unsigned<T>::value, void>::type
to_string(T value, TString& str, const int base = 10, const bool upper_case = true)
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_unsigned<T>::value &&
!etl::is_same<T, uint64_t>::value, const etl::istring&>::type
to_string(const T value, etl::istring& str, const bool append = false)
{
to_string_helper(value, false, str, base, upper_case);
etl::format_spec<etl::istring> format;
return to_string_helper(uint32_t(value), str, format, append);
}
//***************************************************************************
/// For unsigned integrals less than 64 bits. Supplied format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_unsigned<T>::value &&
!etl::is_same<T, uint64_t>::value, const etl::istring&>::type
to_string(const T value, etl::istring& str, const etl::format_spec<etl::istring>& format, const bool append = false)
{
return to_string_helper(uint32_t(value), str, format, append);
}
//***************************************************************************
/// For signed 64 bit integrals. Default format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_signed<T>::value &&
etl::is_same<T, int64_t>::value, const etl::istring&>::type
to_string(const T value, etl::istring& str, const bool append = false)
{
etl::format_spec<etl::istring> format;
return to_string_helper(int64_t(value), str, format, append);
}
//***************************************************************************
/// For signed 64 bit integrals. Supplied format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_signed<T>::value &&
etl::is_same<T, int64_t>::value, const etl::istring&>::type
to_string(const T value, etl::istring& str, const etl::format_spec<etl::istring>& format, const bool append = false)
{
return to_string_helper(int64_t(value), str, format, append);
}
//***************************************************************************
/// For unsigned 64 bit integrals. Default format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_unsigned<T>::value &&
etl::is_same<T, uint64_t>::value, const etl::istring&>::type
to_string(const T value, etl::istring& str, const bool append = false)
{
etl::format_spec<etl::istring> format;
return to_string_helper(uint64_t(value), str, format, append);
}
//***************************************************************************
/// For unsigned 64 bit integrals. Supplied format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_unsigned<T>::value &&
etl::is_same<T, uint64_t>::value, const etl::istring&>::type
to_string(const T value, etl::istring& str, const etl::format_spec<etl::istring>& format, const bool append = false)
{
return to_string_helper(uint64_t(value), str, format, append);
}
}

149
include/etl/to_u16string.h Normal file
View File

@ -0,0 +1,149 @@
///\file
/******************************************************************************
The MIT License(MIT)
Embedded Template Library.
https://github.com/ETLCPP/etl
https://www.etlcpp.com
Copyright(c) 2019 jwellbelove
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files(the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions :
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
******************************************************************************/
#ifndef ETL_TO_U16STRING_INCLUDED
#define ETL_TO_U16STRING_INCLUDED
///\ingroup string
#include "platform.h"
#include "type_traits.h"
#include "u16string.h"
#include "format_spec.h"
#include "private/to_string_helper.h"
namespace etl
{
//***************************************************************************
/// For signed integrals less than 64 bits. Default format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_signed<T>::value &&
!etl::is_same<T, int64_t>::value, const etl::iu16string&>::type
to_string(const T value, etl::iu16string& str, const bool append = false)
{
etl::format_spec<etl::iu16string> format;
return to_string_helper(int32_t(value), str, format, append);
}
//***************************************************************************
/// For signed integrals less than 64 bits. Supplied format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_signed<T>::value &&
!etl::is_same<T, int64_t>::value, const etl::iu16string&>::type
to_string(const T value, etl::iu16string& str, const etl::format_spec<etl::iu16string>& format, const bool append = false)
{
return to_string_helper(int32_t(value), str, format, append);
}
//***************************************************************************
/// For unsigned integrals less then 64 bits. Default format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_unsigned<T>::value &&
!etl::is_same<T, uint64_t>::value, const etl::iu16string&>::type
to_string(const T value, etl::iu16string& str, const bool append = false)
{
etl::format_spec<etl::iu16string> format;
return to_string_helper(uint32_t(value), str, format, append);
}
//***************************************************************************
/// For unsigned integrals less than 64 bits. Supplied format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_unsigned<T>::value &&
!etl::is_same<T, uint64_t>::value, const etl::iu16string&>::type
to_string(const T value, etl::iu16string& str, const etl::format_spec<etl::iu16string>& format, const bool append = false)
{
return to_string_helper(uint32_t(value), str, format, append);
}
//***************************************************************************
/// For signed 64 bit integrals. Default format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_signed<T>::value &&
etl::is_same<T, int64_t>::value, const etl::iu16string&>::type
to_string(const T value, etl::iu16string& str, const bool append = false)
{
etl::format_spec<etl::iu16string> format;
return to_string_helper(int64_t(value), str, format, append);
}
//***************************************************************************
/// For signed 64 bit integrals. Supplied format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_signed<T>::value &&
etl::is_same<T, int64_t>::value, const etl::iu16string&>::type
to_string(const T value, etl::iu16string& str, const etl::format_spec<etl::iu16string>& format, const bool append = false)
{
return to_string_helper(int64_t(value), str, format, append);
}
//***************************************************************************
/// For unsigned 64 bit integrals. Default format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_unsigned<T>::value &&
etl::is_same<T, uint64_t>::value, const etl::iu16string&>::type
to_string(const T value, etl::iu16string& str, const bool append = false)
{
etl::format_spec<etl::iu16string> format;
return to_string_helper(uint64_t(value), str, format, append);
}
//***************************************************************************
/// For unsigned 64 bit integrals. Supplied format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_unsigned<T>::value &&
etl::is_same<T, uint64_t>::value, const etl::iu16string&>::type
to_string(const T value, etl::iu16string& str, const etl::format_spec<etl::iu16string>& format, const bool append = false)
{
return to_string_helper(uint64_t(value), str, format, append);
}
}
#endif

149
include/etl/to_u32string.h Normal file
View File

@ -0,0 +1,149 @@
///\file
/******************************************************************************
The MIT License(MIT)
Embedded Template Library.
https://github.com/ETLCPP/etl
https://www.etlcpp.com
Copyright(c) 2019 jwellbelove
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files(the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions :
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
******************************************************************************/
#ifndef ETL_TO_U32STRING_INCLUDED
#define ETL_TO_U32STRING_INCLUDED
///\ingroup string
#include "platform.h"
#include "type_traits.h"
#include "u32string.h"
#include "format_spec.h"
#include "private/to_string_helper.h"
namespace etl
{
//***************************************************************************
/// For signed integrals less than 64 bits. Default format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_signed<T>::value &&
!etl::is_same<T, int64_t>::value, const etl::iu32string&>::type
to_string(const T value, etl::iu32string& str, const bool append = false)
{
etl::format_spec<etl::iu32string> format;
return to_string_helper(int32_t(value), str, format, append);
}
//***************************************************************************
/// For signed integrals less than 64 bits. Supplied format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_signed<T>::value &&
!etl::is_same<T, int64_t>::value, const etl::iu32string&>::type
to_string(const T value, etl::iu32string& str, const etl::format_spec<etl::iu32string>& format, const bool append = false)
{
return to_string_helper(int32_t(value), str, format, append);
}
//***************************************************************************
/// For unsigned integrals less then 64 bits. Default format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_unsigned<T>::value &&
!etl::is_same<T, uint64_t>::value, const etl::iu32string&>::type
to_string(const T value, etl::iu32string& str, const bool append = false)
{
etl::format_spec<etl::iu32string> format;
return to_string_helper(uint32_t(value), str, format, append);
}
//***************************************************************************
/// For unsigned integrals less than 64 bits. Supplied format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_unsigned<T>::value &&
!etl::is_same<T, uint64_t>::value, const etl::iu32string&>::type
to_string(const T value, etl::iu32string& str, const etl::format_spec<etl::iu32string>& format, const bool append = false)
{
return to_string_helper(uint32_t(value), str, format, append);
}
//***************************************************************************
/// For signed 64 bit integrals. Default format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_signed<T>::value &&
etl::is_same<T, int64_t>::value, const etl::iu32string&>::type
to_string(const T value, etl::iu32string& str, const bool append = false)
{
etl::format_spec<etl::iu32string> format;
return to_string_helper(int64_t(value), str, format, append);
}
//***************************************************************************
/// For signed 64 bit integrals. Supplied format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_signed<T>::value &&
etl::is_same<T, int64_t>::value, const etl::iu32string&>::type
to_string(const T value, etl::iu32string& str, const etl::format_spec<etl::iu32string>& format, const bool append = false)
{
return to_string_helper(int64_t(value), str, format, append);
}
//***************************************************************************
/// For unsigned 64 bit integrals. Default format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_unsigned<T>::value &&
etl::is_same<T, uint64_t>::value, const etl::iu32string&>::type
to_string(const T value, etl::iu32string& str, const bool append = false)
{
etl::format_spec<etl::iu32string> format;
return to_string_helper(uint64_t(value), str, format, append);
}
//***************************************************************************
/// For unsigned 64 bit integrals. Supplied format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_unsigned<T>::value &&
etl::is_same<T, uint64_t>::value, const etl::iu32string&>::type
to_string(const T value, etl::iu32string& str, const etl::format_spec<etl::iu32string>& format, const bool append = false)
{
return to_string_helper(uint64_t(value), str, format, append);
}
}
#endif

149
include/etl/to_wstring.h Normal file
View File

@ -0,0 +1,149 @@
///\file
/******************************************************************************
The MIT License(MIT)
Embedded Template Library.
https://github.com/ETLCPP/etl
https://www.etlcpp.com
Copyright(c) 2019 jwellbelove
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files(the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions :
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
******************************************************************************/
#ifndef ETL_TO_WSTRING_INCLUDED
#define ETL_TO_WSTRING_INCLUDED
///\ingroup string
#include "platform.h"
#include "type_traits.h"
#include "wstring.h"
#include "format_spec.h"
#include "private/to_string_helper.h"
namespace etl
{
//***************************************************************************
/// For signed integrals less than 64 bits. Default format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_signed<T>::value &&
!etl::is_same<T, int64_t>::value, const etl::iwstring&>::type
to_string(const T value, etl::iwstring& str, const bool append = false)
{
etl::format_spec<etl::iwstring> format;
return to_string_helper(int32_t(value), str, format, append);
}
//***************************************************************************
/// For signed integrals less than 64 bits. Supplied format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_signed<T>::value &&
!etl::is_same<T, int64_t>::value, const etl::iwstring&>::type
to_string(const T value, etl::iwstring& str, const etl::format_spec<etl::iwstring>& format, const bool append = false)
{
return to_string_helper(int32_t(value), str, format, append);
}
//***************************************************************************
/// For unsigned integrals less then 64 bits. Default format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_unsigned<T>::value &&
!etl::is_same<T, uint64_t>::value, const etl::iwstring&>::type
to_string(const T value, etl::iwstring& str, const bool append = false)
{
etl::format_spec<etl::iwstring> format;
return to_string_helper(uint32_t(value), str, format, append);
}
//***************************************************************************
/// For unsigned integrals less than 64 bits. Supplied format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_unsigned<T>::value &&
!etl::is_same<T, uint64_t>::value, const etl::iwstring&>::type
to_string(const T value, etl::iwstring& str, const etl::format_spec<etl::iwstring>& format, const bool append = false)
{
return to_string_helper(uint32_t(value), str, format, append);
}
//***************************************************************************
/// For signed 64 bit integrals. Default format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_signed<T>::value &&
etl::is_same<T, int64_t>::value, const etl::iwstring&>::type
to_string(const T value, etl::iwstring& str, const bool append = false)
{
etl::format_spec<etl::iwstring> format;
return to_string_helper(int64_t(value), str, format, append);
}
//***************************************************************************
/// For signed 64 bit integrals. Supplied format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_signed<T>::value &&
etl::is_same<T, int64_t>::value, const etl::iwstring&>::type
to_string(const T value, etl::iwstring& str, const etl::format_spec<etl::iwstring>& format, const bool append = false)
{
return to_string_helper(int64_t(value), str, format, append);
}
//***************************************************************************
/// For unsigned 64 bit integrals. Default format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_unsigned<T>::value &&
etl::is_same<T, uint64_t>::value, const etl::iwstring&>::type
to_string(const T value, etl::iwstring& str, const bool append = false)
{
etl::format_spec<etl::iwstring> format;
return to_string_helper(uint64_t(value), str, format, append);
}
//***************************************************************************
/// For unsigned 64 bit integrals. Supplied format spec.
//***************************************************************************
template <typename T>
typename etl::enable_if<etl::is_integral<T>::value &&
etl::is_unsigned<T>::value &&
etl::is_same<T, uint64_t>::value, const etl::iwstring&>::type
to_string(const T value, etl::iwstring& str, const etl::format_spec<etl::iwstring>& format, const bool append = false)
{
return to_string_helper(uint64_t(value), str, format, append);
}
}
#endif

2
include/etl/u16string.h
View File

@ -55,6 +55,8 @@ namespace etl
{
public:
typedef iu16string base_type;
typedef iu16string::value_type value_type;
static const size_t MAX_SIZE = MAX_SIZE_;

2
include/etl/u32string.h
View File

@ -55,6 +55,8 @@ namespace etl
{
public:
typedef iu32string base_type;
typedef iu32string::value_type value_type;
static const size_t MAX_SIZE = MAX_SIZE_;

2
include/etl/wstring.h
View File

@ -55,6 +55,8 @@ namespace etl
{
public:
typedef iwstring base_type;
typedef iwstring::value_type value_type;
static const size_t MAX_SIZE = MAX_SIZE_;

7
test/codeblocks/ETL.cbp
View File

@ -197,6 +197,7 @@
<Unit filename="../../include/etl/flat_multiset.h" />
<Unit filename="../../include/etl/flat_set.h" />
<Unit filename="../../include/etl/fnv_1.h" />
<Unit filename="../../include/etl/format_spec.h" />
<Unit filename="../../include/etl/forward_list.h" />
<Unit filename="../../include/etl/frame_check_sequence.h" />
<Unit filename="../../include/etl/fsm.h" />
@ -247,6 +248,7 @@
<Unit filename="../../include/etl/priority_queue.h" />
<Unit filename="../../include/etl/private/ivectorpointer.h" />
<Unit filename="../../include/etl/private/pvoidvector.h" />
<Unit filename="../../include/etl/private/to_string_helper.h" />
<Unit filename="../../include/etl/private/vector_base.h" />
<Unit filename="../../include/etl/profiles/arduino_arm.h" />
<Unit filename="../../include/etl/profiles/armv5.h" />
@ -297,6 +299,10 @@
<Unit filename="../../include/etl/task.h" />
<Unit filename="../../include/etl/temp.h" />
<Unit filename="../../include/etl/timer.h" />
<Unit filename="../../include/etl/to_string.h" />
<Unit filename="../../include/etl/to_u16string.h" />
<Unit filename="../../include/etl/to_u32string.h" />
<Unit filename="../../include/etl/to_wstring.h" />
<Unit filename="../../include/etl/type_def.h" />
<Unit filename="../../include/etl/type_lookup.h" />
<Unit filename="../../include/etl/type_lookup_generator.h" />
@ -428,6 +434,7 @@
<Unit filename="../test_string_view.cpp" />
<Unit filename="../test_string_wchar_t.cpp" />
<Unit filename="../test_task_scheduler.cpp" />
<Unit filename="../test_to_string.cpp" />
<Unit filename="../test_type_def.cpp" />
<Unit filename="../test_type_lookup.cpp" />
<Unit filename="../test_type_select.cpp" />

85
test/test_to_string.cpp
View File

@ -32,84 +32,41 @@ SOFTWARE.
#include "etl/to_string.h"
#include "etl/cstring.h"
#include "etl/format_spec.h"
#undef STR
#define STR(x) x
namespace
{
/* A utility function to reverse a string */
void reverse(char str[], int length)
{
int start = 0;
int end = length - 1;
while (start < end)
{
std::swap(*(str + start), *(str + end));
start++;
end--;
}
}
// Implementation of itoa()
char* itoa(int num, char* str, int base)
{
int i = 0;
bool isNegative = false;
/* Handle 0 explicitely, otherwise empty string is printed for 0 */
if (num == 0)
{
str[i++] = '0';
str[i] = '\0';
return str;
}
// In standard itoa(), negative numbers are handled only with
// base 10. Otherwise numbers are considered unsigned.
if (num < 0 && base == 10)
{
isNegative = true;
num = -num;
}
// Process individual digits
while (num != 0)
{
int rem = num % base;
str[i++] = (rem > 9) ? (rem - 10) + 'a' : rem + '0';
num = num / base;
}
// If number is negative, append '-'
if (isNegative)
str[i++] = '-';
str[i] = '\0'; // Append string terminator
// Reverse the string
reverse(str, i);
return str;
}
typedef etl::format_spec<etl::istring> Format;
SUITE(test_string_char)
{
//*************************************************************************
TEST(test_x)
TEST(test_default_format_no_append)
{
//char str[100];
etl::string<20> str;
etl::string<10> str;
CHECK(etl::string<20>(STR("0")) == etl::to_string(uint8_t(0), str));
CHECK(etl::string<20>(STR("0")) == etl::to_string(uint16_t(0), str));
CHECK(etl::string<20>(STR("0")) == etl::to_string(uint32_t(0), str));
CHECK(etl::string<20>(STR("0")) == etl::to_string(uint64_t(0), str));
etl::to_string(char(127), str, 10);
CHECK(etl::string<20>(STR("128")) == etl::to_string(uint8_t(128), str));
CHECK(etl::string<20>(STR("32768")) == etl::to_string(uint16_t(32768), str));
CHECK(etl::string<20>(STR("2147483648")) == etl::to_string(uint32_t(2147483648ul), str));
CHECK(etl::string<20>(STR("9223372036854775808")) == etl::to_string(uint64_t(9223372036854775808ull), str));
str.clear();
etl::to_string(char(-128), str, 10);
//itoa(-1567, str, 10);
//itoa(1567, str, 2);
//itoa(1567, str, 8);
//itoa(1567, str, 16);
CHECK(etl::string<20>(STR("127")) == etl::to_string(int8_t(127), str));
CHECK(etl::string<20>(STR("32767")) == etl::to_string(int16_t(32767), str));
CHECK(etl::string<20>(STR("2147483647")) == etl::to_string(int32_t(2147483647ll), str));
CHECK(etl::string<20>(STR("9223372036854775807")) == etl::to_string(int64_t(9223372036854775807ll), str));
CHECK(etl::string<20>(STR("-128")) == etl::to_string(int8_t(-128), str));
CHECK(etl::string<20>(STR("-32768")) == etl::to_string(int16_t(-32768), str));
CHECK(etl::string<20>(STR("-2147483648")) == etl::to_string(int32_t(-2147483648ll), str));
CHECK(etl::string<20>(STR("-9223372036854775808")) == etl::to_string(int64_t(-9223372036854775808ll), str));
}
};
}

6
test/vs2017/etl.vcxproj
View File

@ -371,12 +371,15 @@
<ClInclude Include="..\..\include\etl\crc32_c.h" />
<ClInclude Include="..\..\include\etl\cumulative_moving_average.h" />
<ClInclude Include="..\..\include\etl\c\ecl_timer.h" />
<ClInclude Include="..\..\include\etl\format_spec.h" />
<ClInclude Include="..\..\include\etl\frame_check_sequence.h" />
<ClInclude Include="..\..\include\etl\fsm.h" />
<ClInclude Include="..\..\include\etl\fsm_generator.h" />
<ClInclude Include="..\..\include\etl\callback_service.h" />
<ClInclude Include="..\..\include\etl\largest_generator.h" />
<ClInclude Include="..\..\include\etl\absolute.h" />
<ClInclude Include="..\..\include\etl\negative.h" />
<ClInclude Include="..\..\include\etl\private\to_string_helper.h" />
<ClInclude Include="..\..\include\etl\queue_spsc_locked.h" />
<ClInclude Include="..\..\include\etl\scaled_rounding.h" />
<ClInclude Include="..\..\include\etl\state_chart.h" />
@ -435,6 +438,9 @@
<ClInclude Include="..\..\include\etl\task.h" />
<ClInclude Include="..\..\include\etl\timer.h" />
<ClInclude Include="..\..\include\etl\to_string.h" />
<ClInclude Include="..\..\include\etl\to_u16string.h" />
<ClInclude Include="..\..\include\etl\to_u32string.h" />
<ClInclude Include="..\..\include\etl\to_wstring.h" />
<ClInclude Include="..\..\include\etl\type_lookup.h" />
<ClInclude Include="..\..\include\etl\type_lookup_generator.h" />
<ClInclude Include="..\..\include\etl\type_select.h" />

18
test/vs2017/etl.vcxproj.filters
View File

@ -735,6 +735,24 @@
<ClInclude Include="..\..\include\etl\to_string.h">
<Filter>ETL\Utilities</Filter>
</ClInclude>
<ClInclude Include="..\..\include\etl\negative.h">
<Filter>ETL\Utilities</Filter>
</ClInclude>
<ClInclude Include="..\..\include\etl\format_spec.h">
<Filter>ETL\Utilities</Filter>
</ClInclude>
<ClInclude Include="..\..\include\etl\to_u16string.h">
<Filter>ETL\Utilities</Filter>
</ClInclude>
<ClInclude Include="..\..\include\etl\to_u32string.h">
<Filter>ETL\Utilities</Filter>
</ClInclude>
<ClInclude Include="..\..\include\etl\to_wstring.h">
<Filter>ETL\Utilities</Filter>
</ClInclude>
<ClInclude Include="..\..\include\etl\private\to_string_helper.h">
<Filter>ETL\Private</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\main.cpp">