3rd-party/libfort
1
0
Fork 0
Code Releases Activity

[F] Fix incorrect behaviour in case of using standard iostream manipulators with fort::table.

Browse Source
This commit is contained in:
seleznevae
2020-04-21 20:27:32 +03:00
parent 51910b1552
commit 7844a5068f
4 changed files with 128 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/fort.hpp
View File

@@ -34,9 +34,11 @@ SOFTWARE.
#ifndef LIBFORT_HPP
#define LIBFORT_HPP
#include <iomanip>
#include <sstream>
#include <string>
#include <stdexcept>
#include <sstream>
#include <type_traits>
#include "fort.h"
@@ -150,6 +152,41 @@ const table_manipulator endr(1);
*/
const table_manipulator separator(2);
// Utility functions for internal library usage.
namespace detail
{
template <typename T>
constexpr bool is_stream_manipulator_impl() noexcept
{
using Tdec = typename std::decay<T>::type;
// Manipulators for integral types
return std::is_same<Tdec, typename std::decay<decltype(std::dec)>::type>::value
|| std::is_same<Tdec, typename std::decay<decltype(std::hex)>::type>::value
|| std::is_same<Tdec, typename std::decay<decltype(std::oct)>::type>::value
// Floating-point manipulators
|| std::is_same<Tdec, typename std::decay<decltype(std::fixed)>::type>::value
|| std::is_same<Tdec, typename std::decay<decltype(std::scientific)>::type>::value
|| std::is_same<Tdec, typename std::decay<decltype(std::hexfloat)>::type>::value
|| std::is_same<Tdec, typename std::decay<decltype(std::defaultfloat)>::type>::value
// Misc
|| std::is_same<Tdec, typename std::decay<decltype(std::setbase(0))>::type>::value
|| std::is_same<Tdec, typename std::decay<decltype(std::setfill('\0'))>::type>::value
|| std::is_same<Tdec, typename std::decay<decltype(std::setprecision(0))>::type>::value
|| std::is_same<Tdec, typename std::decay<decltype(std::setw(0))>::type>::value;
}
}
/**
* Utility function that is used internally by the library to check if argument
* passed to operator<< is a manipulator. In case default behaviour is not
* enough write custom specialization of this function.
*/
template <typename T>
constexpr bool is_stream_manipulator() noexcept
{
return detail::is_stream_manipulator_impl<T>();
}
/**
* Property owner.
*
@@ -534,8 +571,9 @@ public:
template <typename T>
table &operator<<(const T &arg)
{
constexpr bool is_manip = fort::is_stream_manipulator<typename std::decay<T>::type>();
stream_ << arg;
if (stream_.tellp() >= 0) {
if (stream_.tellp() >= 0 && !is_manip) {
#ifdef FT_HAVE_UTF8
if (TT == table_type::character) {
ft_nwrite(table_, 1, stream_.str().c_str());