fmtlegacy/include/fmt/format.h

3601 lines
115 KiB
C
Raw Normal View History

/*
Formatting library for C++
2018-04-14 19:40:26 +00:00
Copyright (c) 2012 - present, Victor Zverovich
2019-08-22 15:37:36 +00:00
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.
--- Optional exception to the license ---
As an exception, if, as a result of your compiling your source code, portions
of this Software are embedded into a machine-executable object form of such
source code, you may redistribute such embedded portions in such object form
without including the above copyright and permission notices.
*/
#ifndef FMT_FORMAT_H_
#define FMT_FORMAT_H_
2018-01-15 19:30:53 +00:00
#include <algorithm>
#include <cassert>
#include <cmath>
2019-04-05 14:25:29 +00:00
#include <cstdint>
#include <cstring>
2019-06-13 14:25:29 +00:00
#include <iterator>
#include <limits>
#include <memory>
#include <stdexcept>
2019-06-12 05:11:47 +00:00
#include "core.h"
#ifdef __clang__
2019-01-13 02:27:38 +00:00
# define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__)
#else
2019-01-13 02:27:38 +00:00
# define FMT_CLANG_VERSION 0
#endif
#ifdef __INTEL_COMPILER
2019-01-13 02:27:38 +00:00
# define FMT_ICC_VERSION __INTEL_COMPILER
#elif defined(__ICL)
2019-01-13 02:27:38 +00:00
# define FMT_ICC_VERSION __ICL
2017-12-09 16:56:44 +00:00
#else
2019-01-13 02:27:38 +00:00
# define FMT_ICC_VERSION 0
2017-12-09 16:56:44 +00:00
#endif
#ifdef __NVCC__
2019-01-13 02:27:38 +00:00
# define FMT_CUDA_VERSION (__CUDACC_VER_MAJOR__ * 100 + __CUDACC_VER_MINOR__)
#else
2019-01-13 02:27:38 +00:00
# define FMT_CUDA_VERSION 0
#endif
#ifdef __has_builtin
2019-01-13 02:27:38 +00:00
# define FMT_HAS_BUILTIN(x) __has_builtin(x)
#else
2019-01-13 02:27:38 +00:00
# define FMT_HAS_BUILTIN(x) 0
#endif
#ifndef FMT_THROW
2019-01-13 02:27:38 +00:00
# if FMT_EXCEPTIONS
# if FMT_MSC_VER
FMT_BEGIN_NAMESPACE
namespace internal {
2019-01-13 02:27:38 +00:00
template <typename Exception> inline void do_throw(const Exception& x) {
// Silence unreachable code warnings in MSVC because these are nearly
// impossible to fix in a generic code.
volatile bool b = true;
2019-01-13 02:27:38 +00:00
if (b) throw x;
}
2019-01-13 02:27:38 +00:00
} // namespace internal
FMT_END_NAMESPACE
2019-01-13 02:27:38 +00:00
# define FMT_THROW(x) fmt::internal::do_throw(x)
# else
# define FMT_THROW(x) throw x
# endif
# else
2019-01-13 02:27:38 +00:00
# define FMT_THROW(x) \
do { \
static_cast<void>(sizeof(x)); \
assert(false); \
2019-06-14 20:18:00 +00:00
} while (false)
# endif
#endif
#ifndef FMT_USE_USER_DEFINED_LITERALS
2019-06-15 16:44:51 +00:00
// For Intel and NVIDIA compilers both they and the system gcc/msc support UDLs.
2019-01-13 02:27:38 +00:00
# if (FMT_HAS_FEATURE(cxx_user_literals) || FMT_GCC_VERSION >= 407 || \
FMT_MSC_VER >= 1900) && \
(!(FMT_ICC_VERSION || FMT_CUDA_VERSION) || FMT_ICC_VERSION >= 1500 || \
FMT_CUDA_VERSION >= 700)
# define FMT_USE_USER_DEFINED_LITERALS 1
# else
# define FMT_USE_USER_DEFINED_LITERALS 0
# endif
#endif
#ifndef FMT_USE_UDL_TEMPLATE
// EDG front end based compilers (icc, nvcc) do not support UDL templates yet
// and GCC 9 warns about them.
# if FMT_USE_USER_DEFINED_LITERALS && FMT_ICC_VERSION == 0 && \
FMT_CUDA_VERSION == 0 && \
((FMT_GCC_VERSION >= 600 && FMT_GCC_VERSION <= 900 && \
__cplusplus >= 201402L) || \
2019-06-17 17:58:35 +00:00
FMT_CLANG_VERSION >= 304)
# define FMT_USE_UDL_TEMPLATE 1
# else
# define FMT_USE_UDL_TEMPLATE 0
# endif
2017-11-04 15:23:24 +00:00
#endif
2019-04-13 20:04:27 +00:00
#ifdef FMT_USE_INT128
// Do nothing.
#elif defined(__SIZEOF_INT128__)
# define FMT_USE_INT128 1
#else
# define FMT_USE_INT128 0
2019-04-13 14:30:55 +00:00
#endif
// __builtin_clz is broken in clang with Microsoft CodeGen:
// https://github.com/fmtlib/fmt/issues/519
2019-06-19 14:46:09 +00:00
#if (FMT_GCC_VERSION || FMT_HAS_BUILTIN(__builtin_clz)) && !FMT_MSC_VER
# define FMT_BUILTIN_CLZ(n) __builtin_clz(n)
#endif
#if (FMT_GCC_VERSION || FMT_HAS_BUILTIN(__builtin_clzll)) && !FMT_MSC_VER
# define FMT_BUILTIN_CLZLL(n) __builtin_clzll(n)
#endif
// Some compilers masquerade as both MSVC and GCC-likes or otherwise support
// __builtin_clz and __builtin_clzll, so only define FMT_BUILTIN_CLZ using the
// MSVC intrinsics if the clz and clzll builtins are not available.
#if FMT_MSC_VER && !defined(FMT_BUILTIN_CLZLL) && !defined(_MANAGED)
2019-01-13 02:27:38 +00:00
# include <intrin.h> // _BitScanReverse, _BitScanReverse64
2018-05-12 15:33:51 +00:00
FMT_BEGIN_NAMESPACE
namespace internal {
2018-02-10 14:28:33 +00:00
// Avoid Clang with Microsoft CodeGen's -Wunknown-pragmas warning.
2019-01-13 02:27:38 +00:00
# ifndef __clang__
# pragma intrinsic(_BitScanReverse)
# endif
inline uint32_t clz(uint32_t x) {
unsigned long r = 0;
_BitScanReverse(&r, x);
assert(x != 0);
// Static analysis complains about using uninitialized data
// "r", but the only way that can happen is if "x" is 0,
// which the callers guarantee to not happen.
2019-01-13 02:27:38 +00:00
# pragma warning(suppress : 6102)
return 31 - r;
}
2019-01-13 02:27:38 +00:00
# define FMT_BUILTIN_CLZ(n) fmt::internal::clz(n)
2019-01-13 02:27:38 +00:00
# if defined(_WIN64) && !defined(__clang__)
# pragma intrinsic(_BitScanReverse64)
# endif
inline uint32_t clzll(uint64_t x) {
unsigned long r = 0;
2019-01-13 02:27:38 +00:00
# ifdef _WIN64
_BitScanReverse64(&r, x);
2019-01-13 02:27:38 +00:00
# else
// Scan the high 32 bits.
2019-01-13 02:27:38 +00:00
if (_BitScanReverse(&r, static_cast<uint32_t>(x >> 32))) return 63 - (r + 32);
// Scan the low 32 bits.
_BitScanReverse(&r, static_cast<uint32_t>(x));
2019-01-13 02:27:38 +00:00
# endif
assert(x != 0);
// Static analysis complains about using uninitialized data
// "r", but the only way that can happen is if "x" is 0,
// which the callers guarantee to not happen.
2019-01-13 02:27:38 +00:00
# pragma warning(suppress : 6102)
return 63 - r;
}
2019-01-13 02:27:38 +00:00
# define FMT_BUILTIN_CLZLL(n) fmt::internal::clzll(n)
} // namespace internal
2018-05-12 15:33:51 +00:00
FMT_END_NAMESPACE
#endif
2018-05-12 15:33:51 +00:00
FMT_BEGIN_NAMESPACE
namespace internal {
2018-03-01 11:45:25 +00:00
2019-04-05 14:25:29 +00:00
// A fallback implementation of uintptr_t for systems that lack it.
struct fallback_uintptr {
2019-04-05 14:25:29 +00:00
unsigned char value[sizeof(void*)];
};
2019-06-12 15:10:15 +00:00
#ifdef UINTPTR_MAX
using uintptr_t = ::uintptr_t;
#else
using uintptr_t = fallback_uintptr;
2019-06-12 15:10:15 +00:00
#endif
2019-04-05 14:25:29 +00:00
2018-05-06 15:07:28 +00:00
// An equivalent of `*reinterpret_cast<Dest*>(&source)` that doesn't produce
// undefined behavior (e.g. due to type aliasing).
// Example: uint64_t d = bit_cast<uint64_t>(2.718);
template <typename Dest, typename Source>
inline Dest bit_cast(const Source& source) {
static_assert(sizeof(Dest) == sizeof(Source), "size mismatch");
Dest dest;
std::memcpy(&dest, &source, sizeof(dest));
return dest;
}
2019-07-03 14:23:08 +00:00
// An approximation of iterator_t for pre-C++20 systems.
2019-06-14 04:32:58 +00:00
template <typename T>
using iterator_t = decltype(std::begin(std::declval<T&>()));
2019-07-07 18:45:25 +00:00
// Detect the iterator category of *any* given type in a SFINAE-friendly way.
// Unfortunately, older implementations of std::iterator_traits are not safe
// for use in a SFINAE-context.
template <typename It, typename Enable = void>
struct iterator_category : std::false_type {};
template <typename T> struct iterator_category<T*> {
using type = std::random_access_iterator_tag;
};
template <typename It>
struct iterator_category<It, void_t<typename It::iterator_category>> {
using type = typename It::iterator_category;
};
// Detect if *any* given type models the OutputIterator concept.
template <typename It> class is_output_iterator {
// Check for mutability because all iterator categories derived from
// std::input_iterator_tag *may* also meet the requirements of an
// OutputIterator, thereby falling into the category of 'mutable iterators'
// [iterator.requirements.general] clause 4. The compiler reveals this
// property only at the point of *actually dereferencing* the iterator!
template <typename U>
static decltype(*(std::declval<U>())) test(std::input_iterator_tag);
template <typename U> static char& test(std::output_iterator_tag);
template <typename U> static const char& test(...);
using type = decltype(test<It>(typename iterator_category<It>::type{}));
public:
static const bool value = !std::is_const<remove_reference_t<type>>::value;
};
2019-07-03 21:31:01 +00:00
// A workaround for std::string not having mutable data() until C++17.
template <typename Char> inline Char* get_data(std::basic_string<Char>& s) {
return &s[0];
}
template <typename Container>
inline typename Container::value_type* get_data(Container& c) {
return c.data();
}
#ifdef _SECURE_SCL
// Make a checked iterator to avoid MSVC warnings.
template <typename T> using checked_ptr = stdext::checked_array_iterator<T*>;
template <typename T> checked_ptr<T> make_checked(T* p, std::size_t size) {
return {p, size};
}
#else
template <typename T> using checked_ptr = T*;
template <typename T> inline T* make_checked(T* p, std::size_t) { return p; }
#endif
template <typename Container, FMT_ENABLE_IF(is_contiguous<Container>::value)>
inline checked_ptr<typename Container::value_type> reserve(
std::back_insert_iterator<Container>& it, std::size_t n) {
Container& c = get_container(it);
std::size_t size = c.size();
c.resize(size + n);
return make_checked(get_data(c) + size, n);
}
template <typename Iterator>
inline Iterator& reserve(Iterator& it, std::size_t) {
return it;
}
// An output iterator that counts the number of objects written to it and
// discards them.
template <typename T> class counting_iterator {
private:
std::size_t count_;
mutable T blackhole_;
public:
using iterator_category = std::output_iterator_tag;
using value_type = T;
using difference_type = std::ptrdiff_t;
using pointer = T*;
using reference = T&;
using _Unchecked_type = counting_iterator; // Mark iterator as checked.
counting_iterator() : count_(0) {}
std::size_t count() const { return count_; }
counting_iterator& operator++() {
++count_;
return *this;
}
counting_iterator operator++(int) {
auto it = *this;
++*this;
return it;
}
T& operator*() const { return blackhole_; }
};
template <typename OutputIt> class truncating_iterator_base {
protected:
OutputIt out_;
std::size_t limit_;
std::size_t count_;
truncating_iterator_base(OutputIt out, std::size_t limit)
: out_(out), limit_(limit), count_(0) {}
public:
using iterator_category = std::output_iterator_tag;
using difference_type = void;
using pointer = void;
using reference = void;
using _Unchecked_type =
truncating_iterator_base; // Mark iterator as checked.
OutputIt base() const { return out_; }
std::size_t count() const { return count_; }
};
// An output iterator that truncates the output and counts the number of objects
// written to it.
template <typename OutputIt,
typename Enable = typename std::is_void<
typename std::iterator_traits<OutputIt>::value_type>::type>
class truncating_iterator;
template <typename OutputIt>
class truncating_iterator<OutputIt, std::false_type>
: public truncating_iterator_base<OutputIt> {
using traits = std::iterator_traits<OutputIt>;
mutable typename traits::value_type blackhole_;
public:
using value_type = typename traits::value_type;
truncating_iterator(OutputIt out, std::size_t limit)
: truncating_iterator_base<OutputIt>(out, limit) {}
truncating_iterator& operator++() {
if (this->count_++ < this->limit_) ++this->out_;
return *this;
}
truncating_iterator operator++(int) {
auto it = *this;
++*this;
return it;
}
value_type& operator*() const {
return this->count_ < this->limit_ ? *this->out_ : blackhole_;
}
};
template <typename OutputIt>
class truncating_iterator<OutputIt, std::true_type>
: public truncating_iterator_base<OutputIt> {
public:
using value_type = typename OutputIt::container_type::value_type;
truncating_iterator(OutputIt out, std::size_t limit)
: truncating_iterator_base<OutputIt>(out, limit) {}
truncating_iterator& operator=(value_type val) {
if (this->count_++ < this->limit_) this->out_ = val;
return *this;
}
truncating_iterator& operator++() { return *this; }
truncating_iterator& operator++(int) { return *this; }
truncating_iterator& operator*() { return *this; }
};
// A range with the specified output iterator and value type.
2018-05-28 18:25:07 +00:00
template <typename OutputIt, typename T = typename OutputIt::value_type>
class output_range {
private:
OutputIt it_;
public:
using value_type = T;
using iterator = OutputIt;
2019-07-03 14:23:08 +00:00
struct sentinel {};
2018-05-28 18:25:07 +00:00
2019-01-13 02:27:38 +00:00
explicit output_range(OutputIt it) : it_(it) {}
2018-05-28 18:25:07 +00:00
OutputIt begin() const { return it_; }
2019-07-03 14:23:08 +00:00
sentinel end() const { return {}; } // Sentinel is not used yet.
};
// A range with an iterator appending to a buffer.
template <typename T>
class buffer_range
: public output_range<std::back_insert_iterator<buffer<T>>, T> {
public:
using iterator = std::back_insert_iterator<buffer<T>>;
using output_range<iterator, T>::output_range;
buffer_range(buffer<T>& buf)
: output_range<iterator, T>(std::back_inserter(buf)) {}
2018-05-28 18:25:07 +00:00
};
template <typename Char>
inline size_t count_code_points(basic_string_view<Char> s) {
return s.size();
}
// Counts the number of code points in a UTF-8 string.
inline size_t count_code_points(basic_string_view<char8_t> s) {
const char8_t* data = s.data();
size_t num_code_points = 0;
for (size_t i = 0, size = s.size(); i != size; ++i) {
if ((data[i] & 0xc0) != 0x80) ++num_code_points;
}
return num_code_points;
}
inline char8_t to_char8_t(char c) { return static_cast<char8_t>(c); }
template <typename InputIt, typename OutChar>
using needs_conversion = bool_constant<
std::is_same<typename std::iterator_traits<InputIt>::value_type,
char>::value &&
std::is_same<OutChar, char8_t>::value>;
template <typename OutChar, typename InputIt, typename OutputIt,
FMT_ENABLE_IF(!needs_conversion<InputIt, OutChar>::value)>
OutputIt copy_str(InputIt begin, InputIt end, OutputIt it) {
return std::copy(begin, end, it);
}
template <typename OutChar, typename InputIt, typename OutputIt,
FMT_ENABLE_IF(needs_conversion<InputIt, OutChar>::value)>
OutputIt copy_str(InputIt begin, InputIt end, OutputIt it) {
return std::transform(begin, end, it, to_char8_t);
}
#ifndef FMT_USE_GRISU
2019-08-26 13:11:44 +00:00
# define FMT_USE_GRISU 0
#endif
template <typename T> constexpr bool use_grisu() {
return FMT_USE_GRISU && std::numeric_limits<double>::is_iec559 &&
sizeof(T) <= sizeof(double);
}
template <typename T>
template <typename U>
void buffer<T>::append(const U* begin, const U* end) {
std::size_t new_size = size_ + to_unsigned(end - begin);
reserve(new_size);
std::uninitialized_copy(begin, end, make_checked(ptr_, capacity_) + size_);
size_ = new_size;
}
2018-01-14 20:25:03 +00:00
} // namespace internal
// A UTF-8 string view.
2018-07-21 16:13:21 +00:00
class u8string_view : public basic_string_view<char8_t> {
public:
2019-01-13 02:27:38 +00:00
u8string_view(const char* s)
: basic_string_view<char8_t>(reinterpret_cast<const char8_t*>(s)) {}
u8string_view(const char* s, size_t count) FMT_NOEXCEPT
: basic_string_view<char8_t>(reinterpret_cast<const char8_t*>(s), count) {
}
2018-07-21 16:13:21 +00:00
};
#if FMT_USE_USER_DEFINED_LITERALS
inline namespace literals {
2019-01-13 02:27:38 +00:00
inline u8string_view operator"" _u(const char* s, std::size_t n) {
2018-09-23 19:54:25 +00:00
return {s, n};
2018-07-21 16:13:21 +00:00
}
2019-01-13 02:27:38 +00:00
} // namespace literals
2018-07-21 16:13:21 +00:00
#endif
// The number of characters to store in the basic_memory_buffer object itself
// to avoid dynamic memory allocation.
enum { inline_buffer_size = 500 };
/**
\rst
A dynamically growing memory buffer for trivially copyable/constructible types
2018-03-04 17:55:17 +00:00
with the first ``SIZE`` elements stored in the object itself.
2019-07-03 16:52:09 +00:00
You can use one of the following type aliases for common character types:
+----------------+------------------------------+
| Type | Definition |
+================+==============================+
| memory_buffer | basic_memory_buffer<char> |
+----------------+------------------------------+
| wmemory_buffer | basic_memory_buffer<wchar_t> |
+----------------+------------------------------+
**Example**::
2018-03-04 17:55:17 +00:00
fmt::memory_buffer out;
format_to(out, "The answer is {}.", 42);
This will append the following output to the ``out`` object:
.. code-block:: none
The answer is 42.
The output can be converted to an ``std::string`` with ``to_string(out)``.
\endrst
*/
template <typename T, std::size_t SIZE = inline_buffer_size,
2019-01-13 02:27:38 +00:00
typename Allocator = std::allocator<T>>
class basic_memory_buffer : private Allocator, public internal::buffer<T> {
private:
T store_[SIZE];
// Deallocate memory allocated by the buffer.
void deallocate() {
2017-03-12 14:30:20 +00:00
T* data = this->data();
if (data != store_) Allocator::deallocate(data, this->capacity());
}
protected:
2018-02-14 23:30:55 +00:00
void grow(std::size_t size) FMT_OVERRIDE;
public:
2019-07-03 16:52:09 +00:00
using value_type = T;
using const_reference = const T&;
2019-01-13 02:27:38 +00:00
explicit basic_memory_buffer(const Allocator& alloc = Allocator())
2017-03-12 14:30:20 +00:00
: Allocator(alloc) {
this->set(store_, SIZE);
}
~basic_memory_buffer() { deallocate(); }
private:
// Move data from other to this buffer.
2019-01-13 02:27:38 +00:00
void move(basic_memory_buffer& other) {
Allocator &this_alloc = *this, &other_alloc = other;
this_alloc = std::move(other_alloc);
2017-03-12 14:30:20 +00:00
T* data = other.data();
std::size_t size = other.size(), capacity = other.capacity();
if (data == other.store_) {
this->set(store_, capacity);
std::uninitialized_copy(other.store_, other.store_ + size,
2018-04-07 21:54:17 +00:00
internal::make_checked(store_, capacity));
} else {
2017-03-12 14:30:20 +00:00
this->set(data, capacity);
// Set pointer to the inline array so that delete is not called
// when deallocating.
2017-03-12 14:30:20 +00:00
other.set(other.store_, 0);
}
2017-03-12 14:30:20 +00:00
this->resize(size);
}
public:
/**
\rst
Constructs a :class:`fmt::basic_memory_buffer` object moving the content
of the other object to it.
\endrst
*/
2019-01-13 02:27:38 +00:00
basic_memory_buffer(basic_memory_buffer&& other) { move(other); }
/**
\rst
Moves the content of the other ``basic_memory_buffer`` object to this one.
\endrst
*/
2019-01-13 02:27:38 +00:00
basic_memory_buffer& operator=(basic_memory_buffer&& other) {
assert(this != &other);
deallocate();
move(other);
return *this;
}
// Returns a copy of the allocator associated with this buffer.
Allocator get_allocator() const { return *this; }
};
template <typename T, std::size_t SIZE, typename Allocator>
void basic_memory_buffer<T, SIZE, Allocator>::grow(std::size_t size) {
add oss-fuzz support see https://github.com/google/oss-fuzz/pull/2381 the history of the fuzz branch is long and messy and is difficult to rebase on top of the current master. Squashed commit of the following: commit b9d6db50010e185d0af2590a35472e9334102248 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 29 21:50:34 2019 +0200 update exception with a more accurate description commit f3fbaf60cc80c7f57fa95962dc0069b10c3d3e61 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 29 21:34:55 2019 +0200 fix missing flags in reproduce build commit 40a17bec7a1ad724203577842a254ca9c42da388 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 29 21:22:48 2019 +0200 move check for large precision values closer to where needed commit ef6e23e1f52d639c5aec1a1e713157cec380a8c3 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 28 20:55:34 2019 +0200 simplify the fuzzer build script commit eadee6e0557be6df695e80f0f2717046a29846e0 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 28 20:47:54 2019 +0200 minimize source code pollution commit 1ece6416438f199c164ee9aa89f42ad1f21a4985 Merge: f404079b 037b84f2 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 28 20:22:52 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # CMakeLists.txt commit f404079b4e00e51b0d5a4c9218cbe7afb350b777 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 28 20:20:52 2019 +0200 make named_arg write into a string or a memory_buffer this makes the fuzzer consistent with the others. commit 545dbe136817eef9e734c32991a324874a51bb4a Author: Paul Dreik <github@pauldreik.se> Date: Thu Jun 20 06:34:17 2019 +0200 tidy up extra newlines, missing std:: etc. commit 2d816ef2b13fc2a46c0df76a91f7912bd7196087 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:49:08 2019 +0200 update unit test to handle expected result following review comment commit a5b9a26808d0165acd2edc4c3baabf9bff40d8bd Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:40:06 2019 +0200 update build script to reflect changes after review commit 8411cb78984f76c74bca273c0bb18918e084e711 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:39:39 2019 +0200 review comment: clarify what the .gitignore is for commit 18d9e7bb43d98568fe491e076106e4fa29070b33 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:36:56 2019 +0200 review comment: don't touch root .gitignore commit 7683d7faa116a6e261da824ec6c1a6a75689841b Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:35:40 2019 +0200 review comment: condiionally include main.cpp commit be0bdaeb27b0c1914cc0b0fd85c2b3bcc6fd2245 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:31:28 2019 +0200 review comment: drop commented out code not working on travis commit 013429812d7fb745eec146296623ea245c4848b4 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:30:26 2019 +0200 review comment: renumber case labels the old ones were to be able to reuse the corpus, let's drop it commit f66fe7bead4a71978f21d9e47a8f3f9e4935fccd Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:06:47 2019 +0200 review comment: libfmt->fmt commit 4a4ddb654dd5b90646cd7e6ff45318c17b66dc9f Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:05:32 2019 +0200 reuse fmt_safe_duration_cast commit 0a1679411a8bd77c2ff34e1cd572307c92e12040 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:02:48 2019 +0200 review comment: name convention, better name C was for "chrono duration" commit 63084cac00b798c636e0dc13207df46a5c4539f6 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:00:50 2019 +0200 reuse earlier extract fmt_safe_... function commit b23388d4d7f919163ead9a9e9bdd50d14daf80b7 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:58:55 2019 +0200 review comment: don't output inf.inf commit 6f861f1d89d2127bbe2446d176d59a354665cc15 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:57:00 2019 +0200 review comment: extract function for invoking safe_duration_cast commit df19bc87ccff77d4bedf54fa3d3992f78ef699bd Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:47:30 2019 +0200 review comment: leftover garbage commit 84eea802efb1164c4f2a83b2e480a7c5bdf4e921 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:45:22 2019 +0200 review comment: turn cmake option into macro for SAFE_DURATION_CAST decided to have it on by default commit c3a159498c2544a52662cd03d23d5a1d00537bba Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:40:14 2019 +0200 review comment: extra newline commit aa556875c5161d817c347ff984dad171c7a35df9 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:38:49 2019 +0200 review comment: file name convention commit 4102d82c455324bda4ccd64072eab86b3f0ecebf Merge: 28add37d 4912cff6 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 16:29:29 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 28add37df3944cbaa00f614e8063210a6d83c17c Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 21:44:06 2019 +0200 disable check to pass travis commit 4119378aedfd3e4063058e8f1f03c29d9f44d5e8 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 21:32:39 2019 +0200 add missing include commit ba2efb82f20d6ecb5e49a8c6ced96a7febedc175 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 21:04:41 2019 +0200 try working around build issue on travis commit 380671a2cb6e52f2b7d5eaad409d491baba5b7e6 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 20:22:41 2019 +0200 write positive infinity without sign commit fd72b9adace17e00c46aae24e061bf14c3af6bb1 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 20:20:50 2019 +0200 remove leftover from merge commit 1ae3128be2c53914e4c840d12e1b02c59758c378 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 20:14:45 2019 +0200 format to buffer instead of string commit 1d83a561244c2fe81231d17e911c6eb24c87cac4 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 19:50:19 2019 +0200 fix warnings commit a33b45a7bb5cf70eb3ef1cd95908282621195f1f Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 19:43:46 2019 +0200 refactor and fix warnings commit 02afb12dd5b05804a1a8b55e1b9fb7e3de593e84 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 19:17:27 2019 +0200 use fixed size input commit 35f84c8cf20efb18a137efecd10dcdc6bcebf7b5 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 19:07:43 2019 +0200 factor out main into a separate file commit a23b7a198ba739dd813897901855c98441e6f29b Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 18:56:40 2019 +0200 refactor commit 9a3f4cfb3bc32a304a1a49b8ff24fbc2f924266c Merge: 7842582a 12f46838 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 18:20:03 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit 7842582a0089c24a5d44bbb2d156beb732bb7b58 Merge: 90cab5aa cbbee1b3 Author: Paul Dreik <github@pauldreik.se> Date: Thu Jun 13 10:41:34 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 90cab5aa023271a3a746cf9c60dd613b4546ca10 Merge: 8feb8a3f e5422db4 Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 12 18:49:08 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 8feb8a3fe20da043a8303e59b1580b4b2862cc57 Merge: e9fabac1 87fbc6f7 Author: Paul Dreik <github@pauldreik.se> Date: Tue Jun 11 19:18:35 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit e9fabac1dd6d710fec1b30ca51dc953f57f2f9f5 Merge: eaff9316 e1a67b52 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 10 22:38:36 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit eaff93166402ff9a16a9ab0fab1081104f4f06b8 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 22:29:01 2019 +0200 drop old crashes commit 7f861e481abb7367bd187c92fe202e25d36d0dd0 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:47:30 2019 +0200 build fuzzers as part of the linux clang 6 build commit 42c339066dce148723f452d4a94487a6ac80637f Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:42:12 2019 +0200 travis has old libs commit 9264e3ac82582a941eba3501301dee1468175c08 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:33:26 2019 +0200 more travis workarounds commit c6eed3adaf6cf65d440dd58c88a034f61c55114f Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:27:49 2019 +0200 travis workaround commit 5e230d6240841dbc67f0c08ace3a1c24defea54f Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:15:36 2019 +0200 fix constexpr issues commit cc5fc033479c769a8ac19115aef48020c532c943 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:11:13 2019 +0200 add a fuzzer build commit 3997375296eca0d0455e0935ef3aed8b010ecf2d Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:53:04 2019 +0200 fix minor documentation errors commit 1572411261abd5c0756ff2998ab707f1131d4fdf Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:49:25 2019 +0200 polish the documentation commit 9e5274437cfc3e9c82131c14cf7f3a0abdb10025 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:32:45 2019 +0200 remove unused headers commit 4b2492a5e037d3153de342ef7f2729b69e8f5dce Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:28:12 2019 +0200 clang format commit a0004ebb417bce5a24c15ea65a0f3741e45b8480 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:27:02 2019 +0200 format also void* commit 820142ee2076ae17fea25857c41a1ecdca4a8521 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:12:21 2019 +0200 improve two_args with lessons learnt from the others commit 7b8fd7f5123fccf78b600c69ca25d025582c095e Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:11:18 2019 +0200 improve function names commit 641bf36a7a061abf6a02d5e31f3adeb33b079f43 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:07:29 2019 +0200 clang format commit 7975c0c3cbe19a7159336ad8fcb170fa6259b1cb Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:06:02 2019 +0200 apply lessons learned from chrono fuzzer on sprintf commit 972124c9f921f8ef786f99c294f556bb7dd9b9ee Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:55:49 2019 +0200 format to buffer instead of string commit 7b015c692364d1e087a59dfe83dda1b8f8fd2991 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:50:25 2019 +0200 apply lessons learned from the chrono fuzzer at one_arg commit daa8ea95dd71704e367b760fa6605f5a7cac6890 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:41:17 2019 +0200 renumber cases commit a667365d0e0f3eb0bc6d6f2cfee5e128a6574aee Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:38:06 2019 +0200 clang format commit e0e361b8a3594c43e131d661a28381613a186c2b Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:36:35 2019 +0200 disable fuzzing by default commit ccb4274ab246ee1fe3becb2b73432179a8a5fe6f Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:36:25 2019 +0200 refresh named_arg with lessons learnt from the chrono fuzzer commit 60da706d4ef35c18eb967bf4ba8d395ef05a9c61 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:36:00 2019 +0200 fix build error commit e361bfc24246d7c7e91f5e45209eda2f22689d98 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:00:11 2019 +0200 add comment about formatting to string vs. memory buffer commit 74c0ed062d34eae1786ca699886ad4f3bccc7fd1 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:51:23 2019 +0200 try to use better names commit 4efea36f77020eecf3c7826f891417f94aedf6f4 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:46:07 2019 +0200 fix clang build error commit 03cdd2e4631ad302dde3e1048671d3bb08956096 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:44:21 2019 +0200 drop workarounds fixed upstream commit e936829ebbd97ed2e6f8c5f595b414c0982f2e4d Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:41:02 2019 +0200 move the fuzzers into the test/ subdirectory commit 2967765698259764c1f06966a7cdefbc5365e5f2 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:30:03 2019 +0200 revert temporary tests handled upstream commit 749c5027b0eab3d90d8fbfb6e55ee313a7f7dfe4 Merge: dee69088 5d9100fa Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:49:00 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit dee690881bd33bb77bee1d5ffce643e8bef84a33 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:40:37 2019 +0200 keep documentation comment formatted properly commit 87d2c99487eef586ce54d432697f384cbe7a50e1 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:36:12 2019 +0200 switch to fmt constexpr macros commit c23fa59139c425a3dfa2e5eeaeb3269c251c90d1 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:30:22 2019 +0200 clang format commit 9e58207e9b24a8cc90c721277405b409dd61740d Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:27:03 2019 +0200 get rid of safe_duration_cast submodule replaced with an embedded miniature version commit a4d36eac46e5db45ded96f80f84986f4f76ea0ec Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:25:00 2019 +0200 add safe_duration_cast into fmt commit 7d5b0ecef37722c40952251c88d74a2552221d84 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 8 22:39:33 2019 +0200 mark #1194 as fixed commit ee91514ecf7a8788f2081996db85eef50d7cd57b Merge: 60569117 4faadff0 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 8 22:25:37 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 6056911784bc86e6caf56a61fd64142f113d531e Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 5 09:58:30 2019 +0200 format to small size buffer instead of string commit 9f006097255c239188840b589f6e39cbb4476481 Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 5 09:45:23 2019 +0200 switch to fmt::string_view and workaround reported bug commit 387de0d9440852fac974ff165b2555d54e2380da Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 5 06:26:15 2019 +0200 ignore build directories commit 55da271c5bb3c11a239c4e46570b6741803ce329 Merge: 3716491e c264e641 Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 5 06:12:36 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 3716491ec51c34a918834857c67300eea180ba02 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 3 07:03:29 2019 +0200 fix UB in on_second commit 2740241b13b7417a4dae655f825ea5a551ffe7ba Merge: 1c258402 d54e64b3 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 3 06:37:18 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit 1c258402a4bd03f390e0256fa9475cc5187d37f9 Merge: ca9596d1 f57227a1 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 1 08:01:58 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit ca9596d1c91b0315b407ce2c4b3e9e5ba1aeb640 Merge: 1c274cfd d07cc202 Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 19:42:33 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 1c274cfd4112138bfc59dd16f58022016128fe85 Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 08:12:10 2019 +0200 make it easier for the chrono fuzzer to explore using a fixed size makes the cases cross pollinate each other better. the execution speed is much higher as well commit f0d7cccdc70c98576b7129428c416e7c9e68a8aa Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 07:36:21 2019 +0200 add a build adapted for analysis of fuzzing performance commit 56f7cf3fa979de415174a10b18221727e3138b7b Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 06:25:10 2019 +0200 allow negative values again commit a77a5fc505bbeab1cfa36be16d40f7799689317a Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 05:45:55 2019 +0200 fix UB on signed int overflow in chrono_formatter constructor see https://github.com/fmtlib/fmt/issues/1179 commit b6a592720be520b58ed2f2d8668ffc6c8b71f0f7 Merge: 492a2046 30bce6c1 Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 05:26:30 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit 492a204623c3c4bbf04c9d47d69979d3a484959c Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 21:36:00 2019 +0200 fix bad assert commit 0ae68b03fbb0e80e292a01f529d5cd7e76349907 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 21:35:49 2019 +0200 add unsigned types for chrono fuzzing commit 2753d7db76645e8847ff2110c5e98f5c8de4a6b9 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 20:25:21 2019 +0200 use C++17 commit bc12742f098ec8b513985daedc57faa518203eb0 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:44:59 2019 +0200 add symlink for safe_duration_cast commit 67201d2639b93736768e109d73b3e9ccc9401c48 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:40:40 2019 +0200 turn on safe duration cast for the fuzzer builds commit 31a70080a63a5213594e4b4e6a33e7e315cf756e Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:32:52 2019 +0200 clang format commit 981e30c5782d04453ece1b31e887da4f29268370 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:30:19 2019 +0200 reduce maximum allocation size commit 7ba51da81de7ecbc5498a22dc29de5b0648bcad2 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:30:01 2019 +0200 make nan unit test pass commit 95b4b9c28a589c30727826dd4e1367bebfad5894 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 18:39:08 2019 +0200 special case nan and inf commit 2673c965506e51d150c005340698a6e15d98aaba Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 16:40:11 2019 +0200 build a fast fuzzer, for making coverage fast commit db52b62612fd7ea3ceeaee05584fd8cb83e54a35 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 16:39:48 2019 +0200 add safe duration cast as submodule commit c8a028faec5d91728472f5de01ea8b1766fb929d Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 16:00:26 2019 +0200 enable chrono fuzzing for non-negative values commit de3555cc573e561691858ca16586f8b45a3ae703 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 13:06:35 2019 +0200 try start using safe duration cast commit 5c3245118c3debcb3f6f69c04c2c32d48449ee16 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 09:59:34 2019 +0200 add failing test commit 3a565d3b091c29210e24042f86869fecafb70914 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 09:59:09 2019 +0200 fix cmake option type (should be string, not bool) commit 61c67564207a13992b1c69d95614b2c4aec5df86 Merge: 63e7b9e3 bb254d14 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 07:03:42 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 63e7b9e32c714c594d019ef463c9c40a3510a2f2 Merge: 7dd1d80f 5e7bdf1b Author: Paul Dreik <github@pauldreik.se> Date: Fri May 17 19:17:20 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 7dd1d80f3a32465d0fa13ce733bff8686a5b0bad Merge: 2c9aa5a3 2a9e8b52 Author: Paul Dreik <github@pauldreik.se> Date: Tue May 14 19:38:32 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 2c9aa5a31e64af25f8bb4afa8134258822532d3e Merge: 16a442c8 2c77562b Author: Paul Dreik <github@pauldreik.se> Date: Tue May 14 06:33:16 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 16a442c864dbdce70c22b4a859dba5e3b5edaf35 Merge: b1d70b61 f4dfd6e3 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 12 15:24:31 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit b1d70b6144c7a61e580eb44ec7d1bdd2368f5531 Author: Paul Dreik <github@pauldreik.se> Date: Fri May 10 08:52:57 2019 +0200 prevent excessive time (found by oss-fuzz) the following triggered this: std::string message = fmt::format("\377{:.214718908}\377", fmt::arg("/\0", 0.f)); there are probably more places with calls to fill_n which could be checked commit 9a91093a6b20fd22afd6739f5dcba3b00f6f8eaf Merge: 7de0fdec e9bab6d0 Author: Paul Dreik <github@pauldreik.se> Date: Thu May 9 06:06:32 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit 7de0fdec38270f2d0302413904a5ef1b13d47177 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 20:08:53 2019 +0200 clang format commit bb375e1ca10eb3cc2c6684bf698ad4738ab7eb10 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 19:47:10 2019 +0200 seems to pass the unit test now (except for the nan stuff from victor) commit 786b4b7351bc8e305ad7e68d11ca6b542f66d456 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 19:25:23 2019 +0200 add assert triggering data, and unit test commit 2790e480b81ec83d00315aa69407fe71b8c4c637 Merge: fa859a05 ca978b3d Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 18:42:51 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit fa859a05c2c3abef263166f3a44cdbaa3122d642 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 18:18:54 2019 +0200 add crash commit 1f6e341b1c4bc966a44c7a98b63f22bd65958d0b Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 18:18:27 2019 +0200 assert floating point is finite internally commit 50877748d08a0f4433af4f1213c5bc9021e76e7a Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 17:32:03 2019 +0200 invoke undefined behaviour inside chrono commit bac7ac4149f2d001f7b36236e1710484674d029b Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 17:31:35 2019 +0200 refactor the fuzzer build script commit b19c4cd84a0c8b6d4a7beb281ad881156173ce78 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 16:25:11 2019 +0200 add one more crash commit 7607592e06ebaa189dc180441fa1863430e0938e Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 16:24:05 2019 +0200 add crashing input commit b059a98b27b40cd284e08a54493c25363d743557 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 16:21:25 2019 +0200 trigger undefined behaviour with NaN durations commit 7cce33250282b397c00159e6809125f5fc1c0190 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 16:20:51 2019 +0200 add asan only fuzzer commit 757319a4e30978d8661b3be8f75937266071b413 Merge: a574b21c c1d430e6 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 06:34:59 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # test/chrono-test.cc commit a574b21c840339abef5e4ad33612b6efac6ad54b Author: Paul Dreik <github@pauldreik.se> Date: Sat May 4 12:54:13 2019 +0200 disable chrono fuzzing for now it triggers integer overflow and is not trivial to solve. commit ff17322bceba53e0c2d9ebcf3756115ad148195e Merge: d6a59851 29c10fbf Author: Paul Dreik <github@pauldreik.se> Date: Sat May 4 07:29:39 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit d6a598511c7dc0c208c2d688b2943b0d7c092029 Merge: 663b1592 4a4d72f9 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 1 20:44:16 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # test/chrono-test.cc commit 663b159235f8ae5f58fe80bb02d49bfa392056b0 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 22:36:07 2019 +0200 add crash case (triggers assertion) commit 082a5cb226142ea30b415d4231cea9425748741a Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 21:44:19 2019 +0200 add const commit b8d70919ea6be0d2e4c58ef82887496f55125ba9 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 21:29:43 2019 +0200 provoke assertion fmt/include/fmt/core.h:246: typename std::make_unsigned<_Tp>::type fmt::v5::internal::to_unsigned(Int) [with Int = long int; typename std::make_unsigned<_Tp>::type = long unsigned int]: Assertion `(value >= 0) && "negative value"' failed. commit e1966013af4eb7febf047d4629cc6236a6aae0e3 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 20:46:16 2019 +0200 add more crashes commit 1394ae3fe915319ce7dc63d6a9dc820a29c9539e Merge: 89338cad 4c721e3a Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 17:16:14 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 89338cad4eed9441644ec8c5f1687b511c829ea4 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:40:32 2019 +0200 add notes on how to reproduce crashes commit 7dc3e4c7223617da274c4cccb9cf5459d0510e0b Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:28:20 2019 +0200 add crashes from chrono duration commit b62e8bc783134c2d15ebf0372c8a61b41624e6b1 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:26:53 2019 +0200 rename fuzzer commit 7f4ab2b80d072fe3ad96e37e45f3fa807a85c99f Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:15:38 2019 +0200 clang format commit a6cc2a35a9799e88b9ed89e578b7aefd9b09ad09 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:12:04 2019 +0200 add chrono duration fuzzer commit 682713c9a61d52b46e95fdb7d970a8733f77ce88 Merge: 8b934b37 8d8ea21c Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 08:07:56 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 8b934b37161d1389de603ced6560982507bb7ae5 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 10:23:44 2019 +0200 clang format commit 793d97b9af33269f5628094f547f9771e968e3f2 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 10:23:17 2019 +0200 tighten memory allocation commit e2301f2430b15c9817433206597ef82c990f49a0 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 10:19:56 2019 +0200 clean up and set license (BSD 2-clause simplified, same as fmt) commit e64c3fb35719afa644dee1f9f17829cace6e17ff Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 10:04:23 2019 +0200 clean up and add afl commit ab46241206aaf46759fd3f292ee4a1088b652d15 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 09:54:48 2019 +0200 drop c++17 requirement commit 20c01e1acf330c8a28192f55b16efeebddb72ab0 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 09:25:19 2019 +0200 initial oss-fuzz compatible version commit 6cbd91a37cf36a1d0e994bb16cf44a12622f7dca Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 08:42:51 2019 +0200 initial commit of fuzzers from https://github.com/pauldreik/fuzzfmt commit eaddfb16d86ef1c259b737e2aab40145b0c956a6 Merge: e37d7db3 134904c8 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 08:38:19 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit e37d7db3b938c82f569d71e6bb00bd1bf8394db7 Merge: 99b2e08b bd516e34 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 21 17:28:06 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 99b2e08b6bef25b793df5ef07621c9c4402587de Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 21 10:30:56 2019 +0200 stop high memory use when fuzzing
2019-06-30 07:11:13 +00:00
#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
2019-07-03 16:52:09 +00:00
if (size > 1000) throw std::runtime_error("fuzz mode - won't grow that much");
add oss-fuzz support see https://github.com/google/oss-fuzz/pull/2381 the history of the fuzz branch is long and messy and is difficult to rebase on top of the current master. Squashed commit of the following: commit b9d6db50010e185d0af2590a35472e9334102248 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 29 21:50:34 2019 +0200 update exception with a more accurate description commit f3fbaf60cc80c7f57fa95962dc0069b10c3d3e61 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 29 21:34:55 2019 +0200 fix missing flags in reproduce build commit 40a17bec7a1ad724203577842a254ca9c42da388 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 29 21:22:48 2019 +0200 move check for large precision values closer to where needed commit ef6e23e1f52d639c5aec1a1e713157cec380a8c3 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 28 20:55:34 2019 +0200 simplify the fuzzer build script commit eadee6e0557be6df695e80f0f2717046a29846e0 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 28 20:47:54 2019 +0200 minimize source code pollution commit 1ece6416438f199c164ee9aa89f42ad1f21a4985 Merge: f404079b 037b84f2 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 28 20:22:52 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # CMakeLists.txt commit f404079b4e00e51b0d5a4c9218cbe7afb350b777 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 28 20:20:52 2019 +0200 make named_arg write into a string or a memory_buffer this makes the fuzzer consistent with the others. commit 545dbe136817eef9e734c32991a324874a51bb4a Author: Paul Dreik <github@pauldreik.se> Date: Thu Jun 20 06:34:17 2019 +0200 tidy up extra newlines, missing std:: etc. commit 2d816ef2b13fc2a46c0df76a91f7912bd7196087 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:49:08 2019 +0200 update unit test to handle expected result following review comment commit a5b9a26808d0165acd2edc4c3baabf9bff40d8bd Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:40:06 2019 +0200 update build script to reflect changes after review commit 8411cb78984f76c74bca273c0bb18918e084e711 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:39:39 2019 +0200 review comment: clarify what the .gitignore is for commit 18d9e7bb43d98568fe491e076106e4fa29070b33 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:36:56 2019 +0200 review comment: don't touch root .gitignore commit 7683d7faa116a6e261da824ec6c1a6a75689841b Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:35:40 2019 +0200 review comment: condiionally include main.cpp commit be0bdaeb27b0c1914cc0b0fd85c2b3bcc6fd2245 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:31:28 2019 +0200 review comment: drop commented out code not working on travis commit 013429812d7fb745eec146296623ea245c4848b4 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:30:26 2019 +0200 review comment: renumber case labels the old ones were to be able to reuse the corpus, let's drop it commit f66fe7bead4a71978f21d9e47a8f3f9e4935fccd Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:06:47 2019 +0200 review comment: libfmt->fmt commit 4a4ddb654dd5b90646cd7e6ff45318c17b66dc9f Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:05:32 2019 +0200 reuse fmt_safe_duration_cast commit 0a1679411a8bd77c2ff34e1cd572307c92e12040 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:02:48 2019 +0200 review comment: name convention, better name C was for "chrono duration" commit 63084cac00b798c636e0dc13207df46a5c4539f6 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:00:50 2019 +0200 reuse earlier extract fmt_safe_... function commit b23388d4d7f919163ead9a9e9bdd50d14daf80b7 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:58:55 2019 +0200 review comment: don't output inf.inf commit 6f861f1d89d2127bbe2446d176d59a354665cc15 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:57:00 2019 +0200 review comment: extract function for invoking safe_duration_cast commit df19bc87ccff77d4bedf54fa3d3992f78ef699bd Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:47:30 2019 +0200 review comment: leftover garbage commit 84eea802efb1164c4f2a83b2e480a7c5bdf4e921 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:45:22 2019 +0200 review comment: turn cmake option into macro for SAFE_DURATION_CAST decided to have it on by default commit c3a159498c2544a52662cd03d23d5a1d00537bba Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:40:14 2019 +0200 review comment: extra newline commit aa556875c5161d817c347ff984dad171c7a35df9 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:38:49 2019 +0200 review comment: file name convention commit 4102d82c455324bda4ccd64072eab86b3f0ecebf Merge: 28add37d 4912cff6 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 16:29:29 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 28add37df3944cbaa00f614e8063210a6d83c17c Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 21:44:06 2019 +0200 disable check to pass travis commit 4119378aedfd3e4063058e8f1f03c29d9f44d5e8 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 21:32:39 2019 +0200 add missing include commit ba2efb82f20d6ecb5e49a8c6ced96a7febedc175 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 21:04:41 2019 +0200 try working around build issue on travis commit 380671a2cb6e52f2b7d5eaad409d491baba5b7e6 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 20:22:41 2019 +0200 write positive infinity without sign commit fd72b9adace17e00c46aae24e061bf14c3af6bb1 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 20:20:50 2019 +0200 remove leftover from merge commit 1ae3128be2c53914e4c840d12e1b02c59758c378 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 20:14:45 2019 +0200 format to buffer instead of string commit 1d83a561244c2fe81231d17e911c6eb24c87cac4 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 19:50:19 2019 +0200 fix warnings commit a33b45a7bb5cf70eb3ef1cd95908282621195f1f Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 19:43:46 2019 +0200 refactor and fix warnings commit 02afb12dd5b05804a1a8b55e1b9fb7e3de593e84 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 19:17:27 2019 +0200 use fixed size input commit 35f84c8cf20efb18a137efecd10dcdc6bcebf7b5 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 19:07:43 2019 +0200 factor out main into a separate file commit a23b7a198ba739dd813897901855c98441e6f29b Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 18:56:40 2019 +0200 refactor commit 9a3f4cfb3bc32a304a1a49b8ff24fbc2f924266c Merge: 7842582a 12f46838 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 18:20:03 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit 7842582a0089c24a5d44bbb2d156beb732bb7b58 Merge: 90cab5aa cbbee1b3 Author: Paul Dreik <github@pauldreik.se> Date: Thu Jun 13 10:41:34 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 90cab5aa023271a3a746cf9c60dd613b4546ca10 Merge: 8feb8a3f e5422db4 Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 12 18:49:08 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 8feb8a3fe20da043a8303e59b1580b4b2862cc57 Merge: e9fabac1 87fbc6f7 Author: Paul Dreik <github@pauldreik.se> Date: Tue Jun 11 19:18:35 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit e9fabac1dd6d710fec1b30ca51dc953f57f2f9f5 Merge: eaff9316 e1a67b52 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 10 22:38:36 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit eaff93166402ff9a16a9ab0fab1081104f4f06b8 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 22:29:01 2019 +0200 drop old crashes commit 7f861e481abb7367bd187c92fe202e25d36d0dd0 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:47:30 2019 +0200 build fuzzers as part of the linux clang 6 build commit 42c339066dce148723f452d4a94487a6ac80637f Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:42:12 2019 +0200 travis has old libs commit 9264e3ac82582a941eba3501301dee1468175c08 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:33:26 2019 +0200 more travis workarounds commit c6eed3adaf6cf65d440dd58c88a034f61c55114f Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:27:49 2019 +0200 travis workaround commit 5e230d6240841dbc67f0c08ace3a1c24defea54f Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:15:36 2019 +0200 fix constexpr issues commit cc5fc033479c769a8ac19115aef48020c532c943 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:11:13 2019 +0200 add a fuzzer build commit 3997375296eca0d0455e0935ef3aed8b010ecf2d Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:53:04 2019 +0200 fix minor documentation errors commit 1572411261abd5c0756ff2998ab707f1131d4fdf Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:49:25 2019 +0200 polish the documentation commit 9e5274437cfc3e9c82131c14cf7f3a0abdb10025 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:32:45 2019 +0200 remove unused headers commit 4b2492a5e037d3153de342ef7f2729b69e8f5dce Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:28:12 2019 +0200 clang format commit a0004ebb417bce5a24c15ea65a0f3741e45b8480 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:27:02 2019 +0200 format also void* commit 820142ee2076ae17fea25857c41a1ecdca4a8521 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:12:21 2019 +0200 improve two_args with lessons learnt from the others commit 7b8fd7f5123fccf78b600c69ca25d025582c095e Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:11:18 2019 +0200 improve function names commit 641bf36a7a061abf6a02d5e31f3adeb33b079f43 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:07:29 2019 +0200 clang format commit 7975c0c3cbe19a7159336ad8fcb170fa6259b1cb Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:06:02 2019 +0200 apply lessons learned from chrono fuzzer on sprintf commit 972124c9f921f8ef786f99c294f556bb7dd9b9ee Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:55:49 2019 +0200 format to buffer instead of string commit 7b015c692364d1e087a59dfe83dda1b8f8fd2991 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:50:25 2019 +0200 apply lessons learned from the chrono fuzzer at one_arg commit daa8ea95dd71704e367b760fa6605f5a7cac6890 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:41:17 2019 +0200 renumber cases commit a667365d0e0f3eb0bc6d6f2cfee5e128a6574aee Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:38:06 2019 +0200 clang format commit e0e361b8a3594c43e131d661a28381613a186c2b Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:36:35 2019 +0200 disable fuzzing by default commit ccb4274ab246ee1fe3becb2b73432179a8a5fe6f Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:36:25 2019 +0200 refresh named_arg with lessons learnt from the chrono fuzzer commit 60da706d4ef35c18eb967bf4ba8d395ef05a9c61 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:36:00 2019 +0200 fix build error commit e361bfc24246d7c7e91f5e45209eda2f22689d98 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:00:11 2019 +0200 add comment about formatting to string vs. memory buffer commit 74c0ed062d34eae1786ca699886ad4f3bccc7fd1 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:51:23 2019 +0200 try to use better names commit 4efea36f77020eecf3c7826f891417f94aedf6f4 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:46:07 2019 +0200 fix clang build error commit 03cdd2e4631ad302dde3e1048671d3bb08956096 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:44:21 2019 +0200 drop workarounds fixed upstream commit e936829ebbd97ed2e6f8c5f595b414c0982f2e4d Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:41:02 2019 +0200 move the fuzzers into the test/ subdirectory commit 2967765698259764c1f06966a7cdefbc5365e5f2 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:30:03 2019 +0200 revert temporary tests handled upstream commit 749c5027b0eab3d90d8fbfb6e55ee313a7f7dfe4 Merge: dee69088 5d9100fa Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:49:00 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit dee690881bd33bb77bee1d5ffce643e8bef84a33 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:40:37 2019 +0200 keep documentation comment formatted properly commit 87d2c99487eef586ce54d432697f384cbe7a50e1 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:36:12 2019 +0200 switch to fmt constexpr macros commit c23fa59139c425a3dfa2e5eeaeb3269c251c90d1 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:30:22 2019 +0200 clang format commit 9e58207e9b24a8cc90c721277405b409dd61740d Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:27:03 2019 +0200 get rid of safe_duration_cast submodule replaced with an embedded miniature version commit a4d36eac46e5db45ded96f80f84986f4f76ea0ec Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:25:00 2019 +0200 add safe_duration_cast into fmt commit 7d5b0ecef37722c40952251c88d74a2552221d84 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 8 22:39:33 2019 +0200 mark #1194 as fixed commit ee91514ecf7a8788f2081996db85eef50d7cd57b Merge: 60569117 4faadff0 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 8 22:25:37 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 6056911784bc86e6caf56a61fd64142f113d531e Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 5 09:58:30 2019 +0200 format to small size buffer instead of string commit 9f006097255c239188840b589f6e39cbb4476481 Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 5 09:45:23 2019 +0200 switch to fmt::string_view and workaround reported bug commit 387de0d9440852fac974ff165b2555d54e2380da Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 5 06:26:15 2019 +0200 ignore build directories commit 55da271c5bb3c11a239c4e46570b6741803ce329 Merge: 3716491e c264e641 Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 5 06:12:36 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 3716491ec51c34a918834857c67300eea180ba02 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 3 07:03:29 2019 +0200 fix UB in on_second commit 2740241b13b7417a4dae655f825ea5a551ffe7ba Merge: 1c258402 d54e64b3 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 3 06:37:18 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit 1c258402a4bd03f390e0256fa9475cc5187d37f9 Merge: ca9596d1 f57227a1 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 1 08:01:58 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit ca9596d1c91b0315b407ce2c4b3e9e5ba1aeb640 Merge: 1c274cfd d07cc202 Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 19:42:33 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 1c274cfd4112138bfc59dd16f58022016128fe85 Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 08:12:10 2019 +0200 make it easier for the chrono fuzzer to explore using a fixed size makes the cases cross pollinate each other better. the execution speed is much higher as well commit f0d7cccdc70c98576b7129428c416e7c9e68a8aa Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 07:36:21 2019 +0200 add a build adapted for analysis of fuzzing performance commit 56f7cf3fa979de415174a10b18221727e3138b7b Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 06:25:10 2019 +0200 allow negative values again commit a77a5fc505bbeab1cfa36be16d40f7799689317a Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 05:45:55 2019 +0200 fix UB on signed int overflow in chrono_formatter constructor see https://github.com/fmtlib/fmt/issues/1179 commit b6a592720be520b58ed2f2d8668ffc6c8b71f0f7 Merge: 492a2046 30bce6c1 Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 05:26:30 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit 492a204623c3c4bbf04c9d47d69979d3a484959c Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 21:36:00 2019 +0200 fix bad assert commit 0ae68b03fbb0e80e292a01f529d5cd7e76349907 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 21:35:49 2019 +0200 add unsigned types for chrono fuzzing commit 2753d7db76645e8847ff2110c5e98f5c8de4a6b9 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 20:25:21 2019 +0200 use C++17 commit bc12742f098ec8b513985daedc57faa518203eb0 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:44:59 2019 +0200 add symlink for safe_duration_cast commit 67201d2639b93736768e109d73b3e9ccc9401c48 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:40:40 2019 +0200 turn on safe duration cast for the fuzzer builds commit 31a70080a63a5213594e4b4e6a33e7e315cf756e Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:32:52 2019 +0200 clang format commit 981e30c5782d04453ece1b31e887da4f29268370 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:30:19 2019 +0200 reduce maximum allocation size commit 7ba51da81de7ecbc5498a22dc29de5b0648bcad2 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:30:01 2019 +0200 make nan unit test pass commit 95b4b9c28a589c30727826dd4e1367bebfad5894 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 18:39:08 2019 +0200 special case nan and inf commit 2673c965506e51d150c005340698a6e15d98aaba Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 16:40:11 2019 +0200 build a fast fuzzer, for making coverage fast commit db52b62612fd7ea3ceeaee05584fd8cb83e54a35 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 16:39:48 2019 +0200 add safe duration cast as submodule commit c8a028faec5d91728472f5de01ea8b1766fb929d Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 16:00:26 2019 +0200 enable chrono fuzzing for non-negative values commit de3555cc573e561691858ca16586f8b45a3ae703 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 13:06:35 2019 +0200 try start using safe duration cast commit 5c3245118c3debcb3f6f69c04c2c32d48449ee16 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 09:59:34 2019 +0200 add failing test commit 3a565d3b091c29210e24042f86869fecafb70914 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 09:59:09 2019 +0200 fix cmake option type (should be string, not bool) commit 61c67564207a13992b1c69d95614b2c4aec5df86 Merge: 63e7b9e3 bb254d14 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 07:03:42 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 63e7b9e32c714c594d019ef463c9c40a3510a2f2 Merge: 7dd1d80f 5e7bdf1b Author: Paul Dreik <github@pauldreik.se> Date: Fri May 17 19:17:20 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 7dd1d80f3a32465d0fa13ce733bff8686a5b0bad Merge: 2c9aa5a3 2a9e8b52 Author: Paul Dreik <github@pauldreik.se> Date: Tue May 14 19:38:32 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 2c9aa5a31e64af25f8bb4afa8134258822532d3e Merge: 16a442c8 2c77562b Author: Paul Dreik <github@pauldreik.se> Date: Tue May 14 06:33:16 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 16a442c864dbdce70c22b4a859dba5e3b5edaf35 Merge: b1d70b61 f4dfd6e3 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 12 15:24:31 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit b1d70b6144c7a61e580eb44ec7d1bdd2368f5531 Author: Paul Dreik <github@pauldreik.se> Date: Fri May 10 08:52:57 2019 +0200 prevent excessive time (found by oss-fuzz) the following triggered this: std::string message = fmt::format("\377{:.214718908}\377", fmt::arg("/\0", 0.f)); there are probably more places with calls to fill_n which could be checked commit 9a91093a6b20fd22afd6739f5dcba3b00f6f8eaf Merge: 7de0fdec e9bab6d0 Author: Paul Dreik <github@pauldreik.se> Date: Thu May 9 06:06:32 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit 7de0fdec38270f2d0302413904a5ef1b13d47177 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 20:08:53 2019 +0200 clang format commit bb375e1ca10eb3cc2c6684bf698ad4738ab7eb10 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 19:47:10 2019 +0200 seems to pass the unit test now (except for the nan stuff from victor) commit 786b4b7351bc8e305ad7e68d11ca6b542f66d456 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 19:25:23 2019 +0200 add assert triggering data, and unit test commit 2790e480b81ec83d00315aa69407fe71b8c4c637 Merge: fa859a05 ca978b3d Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 18:42:51 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit fa859a05c2c3abef263166f3a44cdbaa3122d642 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 18:18:54 2019 +0200 add crash commit 1f6e341b1c4bc966a44c7a98b63f22bd65958d0b Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 18:18:27 2019 +0200 assert floating point is finite internally commit 50877748d08a0f4433af4f1213c5bc9021e76e7a Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 17:32:03 2019 +0200 invoke undefined behaviour inside chrono commit bac7ac4149f2d001f7b36236e1710484674d029b Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 17:31:35 2019 +0200 refactor the fuzzer build script commit b19c4cd84a0c8b6d4a7beb281ad881156173ce78 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 16:25:11 2019 +0200 add one more crash commit 7607592e06ebaa189dc180441fa1863430e0938e Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 16:24:05 2019 +0200 add crashing input commit b059a98b27b40cd284e08a54493c25363d743557 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 16:21:25 2019 +0200 trigger undefined behaviour with NaN durations commit 7cce33250282b397c00159e6809125f5fc1c0190 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 16:20:51 2019 +0200 add asan only fuzzer commit 757319a4e30978d8661b3be8f75937266071b413 Merge: a574b21c c1d430e6 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 06:34:59 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # test/chrono-test.cc commit a574b21c840339abef5e4ad33612b6efac6ad54b Author: Paul Dreik <github@pauldreik.se> Date: Sat May 4 12:54:13 2019 +0200 disable chrono fuzzing for now it triggers integer overflow and is not trivial to solve. commit ff17322bceba53e0c2d9ebcf3756115ad148195e Merge: d6a59851 29c10fbf Author: Paul Dreik <github@pauldreik.se> Date: Sat May 4 07:29:39 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit d6a598511c7dc0c208c2d688b2943b0d7c092029 Merge: 663b1592 4a4d72f9 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 1 20:44:16 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # test/chrono-test.cc commit 663b159235f8ae5f58fe80bb02d49bfa392056b0 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 22:36:07 2019 +0200 add crash case (triggers assertion) commit 082a5cb226142ea30b415d4231cea9425748741a Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 21:44:19 2019 +0200 add const commit b8d70919ea6be0d2e4c58ef82887496f55125ba9 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 21:29:43 2019 +0200 provoke assertion fmt/include/fmt/core.h:246: typename std::make_unsigned<_Tp>::type fmt::v5::internal::to_unsigned(Int) [with Int = long int; typename std::make_unsigned<_Tp>::type = long unsigned int]: Assertion `(value >= 0) && "negative value"' failed. commit e1966013af4eb7febf047d4629cc6236a6aae0e3 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 20:46:16 2019 +0200 add more crashes commit 1394ae3fe915319ce7dc63d6a9dc820a29c9539e Merge: 89338cad 4c721e3a Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 17:16:14 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 89338cad4eed9441644ec8c5f1687b511c829ea4 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:40:32 2019 +0200 add notes on how to reproduce crashes commit 7dc3e4c7223617da274c4cccb9cf5459d0510e0b Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:28:20 2019 +0200 add crashes from chrono duration commit b62e8bc783134c2d15ebf0372c8a61b41624e6b1 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:26:53 2019 +0200 rename fuzzer commit 7f4ab2b80d072fe3ad96e37e45f3fa807a85c99f Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:15:38 2019 +0200 clang format commit a6cc2a35a9799e88b9ed89e578b7aefd9b09ad09 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:12:04 2019 +0200 add chrono duration fuzzer commit 682713c9a61d52b46e95fdb7d970a8733f77ce88 Merge: 8b934b37 8d8ea21c Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 08:07:56 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 8b934b37161d1389de603ced6560982507bb7ae5 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 10:23:44 2019 +0200 clang format commit 793d97b9af33269f5628094f547f9771e968e3f2 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 10:23:17 2019 +0200 tighten memory allocation commit e2301f2430b15c9817433206597ef82c990f49a0 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 10:19:56 2019 +0200 clean up and set license (BSD 2-clause simplified, same as fmt) commit e64c3fb35719afa644dee1f9f17829cace6e17ff Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 10:04:23 2019 +0200 clean up and add afl commit ab46241206aaf46759fd3f292ee4a1088b652d15 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 09:54:48 2019 +0200 drop c++17 requirement commit 20c01e1acf330c8a28192f55b16efeebddb72ab0 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 09:25:19 2019 +0200 initial oss-fuzz compatible version commit 6cbd91a37cf36a1d0e994bb16cf44a12622f7dca Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 08:42:51 2019 +0200 initial commit of fuzzers from https://github.com/pauldreik/fuzzfmt commit eaddfb16d86ef1c259b737e2aab40145b0c956a6 Merge: e37d7db3 134904c8 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 08:38:19 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit e37d7db3b938c82f569d71e6bb00bd1bf8394db7 Merge: 99b2e08b bd516e34 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 21 17:28:06 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 99b2e08b6bef25b793df5ef07621c9c4402587de Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 21 10:30:56 2019 +0200 stop high memory use when fuzzing
2019-06-30 07:11:13 +00:00
#endif
2017-03-12 14:30:20 +00:00
std::size_t old_capacity = this->capacity();
std::size_t new_capacity = old_capacity + old_capacity / 2;
2019-01-13 02:27:38 +00:00
if (size > new_capacity) new_capacity = size;
T* old_data = this->data();
2019-06-15 16:44:51 +00:00
T* new_data = std::allocator_traits<Allocator>::allocate(*this, new_capacity);
// The following code doesn't throw, so the raw pointer above doesn't leak.
2017-03-12 14:30:20 +00:00
std::uninitialized_copy(old_data, old_data + this->size(),
2018-04-07 21:54:17 +00:00
internal::make_checked(new_data, new_capacity));
2017-03-12 14:30:20 +00:00
this->set(new_data, new_capacity);
// deallocate must not throw according to the standard, but even if it does,
// the buffer already uses the new storage and will deallocate it in
// destructor.
2019-01-13 02:27:38 +00:00
if (old_data != store_) Allocator::deallocate(old_data, old_capacity);
}
2019-07-03 16:52:09 +00:00
using memory_buffer = basic_memory_buffer<char>;
using wmemory_buffer = basic_memory_buffer<wchar_t>;
/** A formatting error such as invalid format string. */
class FMT_API format_error : public std::runtime_error {
public:
explicit format_error(const char* message) : std::runtime_error(message) {}
explicit format_error(const std::string& message)
: std::runtime_error(message) {}
~format_error() FMT_NOEXCEPT;
};
namespace internal {
// Returns true if value is negative, false otherwise.
2019-07-03 18:05:20 +00:00
// Same as `value < 0` but doesn't produce warnings if T is an unsigned type.
2019-03-16 19:58:18 +00:00
template <typename T, FMT_ENABLE_IF(std::numeric_limits<T>::is_signed)>
FMT_CONSTEXPR bool is_negative(T value) {
2017-02-19 14:46:51 +00:00
return value < 0;
}
2019-03-16 19:58:18 +00:00
template <typename T, FMT_ENABLE_IF(!std::numeric_limits<T>::is_signed)>
FMT_CONSTEXPR bool is_negative(T) {
2017-02-19 14:46:51 +00:00
return false;
}
2019-07-03 23:01:21 +00:00
// Smallest of uint32_t and uint64_t that is large enough to represent all
// values of T.
template <typename T>
using uint32_or_64_t =
conditional_t<std::numeric_limits<T>::digits <= 32, uint32_t, uint64_t>;
// Static data is placed in this class template for the header-only config.
Fix DLL visibility of explicit instantiation "declaration" of internal::basic_data<void> in header format.h and the explicit instantiation "definition" in format.cc (#1134) * Update format.cc As the explicit instantiation *declaration* of `internal::basic_data<void>` in format.h, this explicit instantiation *definition* should mirror FMT_API also. * Mirror visibility of explicit instantiation declaration explicit instantiation declaration of internal::basic_data<void> should mirror visibility of FMT_API * Eliminate `__declspec(dllexport)` designation on extern template internal::basic_data<> when `extern` affected during exporting phase. * Add `FMT_EXTERN_TEMPLATE_API` for designate DLL export `extern template` When exporting DLL, do not designate `__declspec(dllexport)` any template that has any explicit class template declaration a.k.a. `extern template`. Instead, designate `__declspec(dllexport)` at single point where we have explicit class template definition a.k.a. normal instantiation without `extern` Note: this is a c++11 feature. * Delete whole `FMT_USE_EXTERN_TEMPLATES` block and its condition 1. Remove whole `FMT_USE_EXTERN_TEMPLATES` block (trailing `FMT_UDL_TEMPLATE` block) ```` #ifndef FMT_USE_EXTERN_TEMPLATES # ifndef FMT_HEADER_ONLY # define FMT_USE_EXTERN_TEMPLATES \ ((FMT_CLANG_VERSION >= 209 && __cplusplus >= 201103L) || \ (FMT_GCC_VERSION >= 303 && FMT_HAS_GXX_CXX11)) # else # define FMT_USE_EXTERN_TEMPLATES 0 # endif #endif ```` 2. Delete `FMT_USE_EXTERN_TEMPLATES` condition, only condition, that trailing basic_data class template definition. ```` #if FMT_USE_EXTERN_TEMPLATES extern template struct basic_data<void>; #endif ```` 3. Replace `FMT_API` with new `FMT_EXTERN_TEMPLATE_API` added in `core.h` for sake of extern template of `basic_data<void>` * Add `#define FMT_EXTERN extern` only when not `FMT_HEADER_ONLY` * Replace `extern` on basic_data<void> with the `FMT_EXTERN` condition in core.h * replace misspelled if !define() with ifndef
2019-05-02 14:49:01 +00:00
template <typename T = void> struct FMT_EXTERN_TEMPLATE_API basic_data {
static const uint64_t powers_of_10_64[];
static const uint32_t zero_or_powers_of_10_32[];
static const uint64_t zero_or_powers_of_10_64[];
static const uint64_t pow10_significands[];
static const int16_t pow10_exponents[];
static const char digits[];
static const char hex_digits[];
static const char foreground_color[];
static const char background_color[];
static const char reset_color[5];
static const wchar_t wreset_color[5];
};
Fix DLL visibility of explicit instantiation "declaration" of internal::basic_data<void> in header format.h and the explicit instantiation "definition" in format.cc (#1134) * Update format.cc As the explicit instantiation *declaration* of `internal::basic_data<void>` in format.h, this explicit instantiation *definition* should mirror FMT_API also. * Mirror visibility of explicit instantiation declaration explicit instantiation declaration of internal::basic_data<void> should mirror visibility of FMT_API * Eliminate `__declspec(dllexport)` designation on extern template internal::basic_data<> when `extern` affected during exporting phase. * Add `FMT_EXTERN_TEMPLATE_API` for designate DLL export `extern template` When exporting DLL, do not designate `__declspec(dllexport)` any template that has any explicit class template declaration a.k.a. `extern template`. Instead, designate `__declspec(dllexport)` at single point where we have explicit class template definition a.k.a. normal instantiation without `extern` Note: this is a c++11 feature. * Delete whole `FMT_USE_EXTERN_TEMPLATES` block and its condition 1. Remove whole `FMT_USE_EXTERN_TEMPLATES` block (trailing `FMT_UDL_TEMPLATE` block) ```` #ifndef FMT_USE_EXTERN_TEMPLATES # ifndef FMT_HEADER_ONLY # define FMT_USE_EXTERN_TEMPLATES \ ((FMT_CLANG_VERSION >= 209 && __cplusplus >= 201103L) || \ (FMT_GCC_VERSION >= 303 && FMT_HAS_GXX_CXX11)) # else # define FMT_USE_EXTERN_TEMPLATES 0 # endif #endif ```` 2. Delete `FMT_USE_EXTERN_TEMPLATES` condition, only condition, that trailing basic_data class template definition. ```` #if FMT_USE_EXTERN_TEMPLATES extern template struct basic_data<void>; #endif ```` 3. Replace `FMT_API` with new `FMT_EXTERN_TEMPLATE_API` added in `core.h` for sake of extern template of `basic_data<void>` * Add `#define FMT_EXTERN extern` only when not `FMT_HEADER_ONLY` * Replace `extern` on basic_data<void> with the `FMT_EXTERN` condition in core.h * replace misspelled if !define() with ifndef
2019-05-02 14:49:01 +00:00
FMT_EXTERN template struct basic_data<void>;
// This is a struct rather than an alias to avoid shadowing warnings in gcc.
struct data : basic_data<> {};
#ifdef FMT_BUILTIN_CLZLL
// Returns the number of decimal digits in n. Leading zeros are not counted
// except for n == 0 in which case count_digits returns 1.
inline int count_digits(uint64_t n) {
// Based on http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog10
// and the benchmark https://github.com/localvoid/cxx-benchmark-count-digits.
int t = (64 - FMT_BUILTIN_CLZLL(n | 1)) * 1233 >> 12;
return t - (n < data::zero_or_powers_of_10_64[t]) + 1;
}
#else
// Fallback version of count_digits used when __builtin_clz is not available.
inline int count_digits(uint64_t n) {
int count = 1;
for (;;) {
// Integer division is slow so do it for a group of four digits instead
// of for every digit. The idea comes from the talk by Alexandrescu
// "Three Optimization Tips for C++". See speed-test for a comparison.
if (n < 10) return count;
if (n < 100) return count + 1;
if (n < 1000) return count + 2;
if (n < 10000) return count + 3;
n /= 10000u;
count += 4;
}
}
#endif
2019-04-06 03:06:32 +00:00
// Counts the number of digits in n. BITS = log2(radix).
template <unsigned BITS, typename UInt> inline int count_digits(UInt n) {
int num_digits = 0;
do {
++num_digits;
} while ((n >>= BITS) != 0);
return num_digits;
}
template <> int count_digits<4>(internal::fallback_uintptr n);
#if FMT_HAS_CPP_ATTRIBUTE(always_inline)
2019-01-13 02:27:38 +00:00
# define FMT_ALWAYS_INLINE __attribute__((always_inline))
#else
2019-01-13 02:27:38 +00:00
# define FMT_ALWAYS_INLINE
#endif
template <typename Handler>
2019-01-13 02:27:38 +00:00
inline char* lg(uint32_t n, Handler h) FMT_ALWAYS_INLINE;
// Computes g = floor(log10(n)) and calls h.on<g>(n);
2019-01-13 02:27:38 +00:00
template <typename Handler> inline char* lg(uint32_t n, Handler h) {
return n < 100 ? n < 10 ? h.template on<0>(n) : h.template on<1>(n)
: n < 1000000
? n < 10000 ? n < 1000 ? h.template on<2>(n)
: h.template on<3>(n)
: n < 100000 ? h.template on<4>(n)
: h.template on<5>(n)
: n < 100000000 ? n < 10000000 ? h.template on<6>(n)
: h.template on<7>(n)
: n < 1000000000 ? h.template on<8>(n)
: h.template on<9>(n);
}
// An lg handler that formats a decimal number.
// Usage: lg(n, decimal_formatter(buffer));
class decimal_formatter {
private:
2019-01-13 02:27:38 +00:00
char* buffer_;
void write_pair(unsigned N, uint32_t index) {
std::memcpy(buffer_ + N, data::digits + index * 2, 2);
}
public:
2019-01-13 02:27:38 +00:00
explicit decimal_formatter(char* buf) : buffer_(buf) {}
2019-01-13 02:27:38 +00:00
template <unsigned N> char* on(uint32_t u) {
if (N == 0) {
*buffer_ = static_cast<char>(u) + '0';
} else if (N == 1) {
write_pair(0, u);
} else {
2017-12-11 00:09:35 +00:00
// The idea of using 4.32 fixed-point numbers is based on
// https://github.com/jeaiii/itoa
unsigned n = N - 1;
unsigned a = n / 5 * n * 53 / 16;
2019-01-13 02:27:38 +00:00
uint64_t t =
((1ULL << (32 + a)) / data::zero_or_powers_of_10_32[n] + 1 - n / 9);
t = ((t * u) >> a) + n / 5 * 4;
write_pair(0, t >> 32);
2018-06-27 12:31:20 +00:00
for (unsigned i = 2; i < N; i += 2) {
t = 100ULL * static_cast<uint32_t>(t);
write_pair(i, t >> 32);
}
if (N % 2 == 0) {
2019-01-13 02:27:38 +00:00
buffer_[N] =
static_cast<char>((10ULL * static_cast<uint32_t>(t)) >> 32) + '0';
}
}
return buffer_ += N + 1;
}
};
#ifdef FMT_BUILTIN_CLZ
// Optional version of count_digits for better performance on 32-bit platforms.
inline int count_digits(uint32_t n) {
int t = (32 - FMT_BUILTIN_CLZ(n | 1)) * 1233 >> 12;
return t - (n < data::zero_or_powers_of_10_32[t]) + 1;
}
#endif
2019-01-13 02:27:38 +00:00
template <typename Char> FMT_API Char thousands_sep_impl(locale_ref loc);
template <typename Char> inline Char thousands_sep(locale_ref loc) {
2018-11-14 17:39:37 +00:00
return Char(thousands_sep_impl<char>(loc));
}
2019-01-13 02:27:38 +00:00
template <> inline wchar_t thousands_sep(locale_ref loc) {
2018-11-14 17:39:37 +00:00
return thousands_sep_impl<wchar_t>(loc);
}
2019-07-04 00:25:57 +00:00
template <typename Char> FMT_API Char decimal_point_impl(locale_ref loc);
template <typename Char> inline Char decimal_point(locale_ref loc) {
return Char(decimal_point_impl<char>(loc));
}
template <> inline wchar_t decimal_point(locale_ref loc) {
return decimal_point_impl<wchar_t>(loc);
}
// Formats a decimal unsigned integer value writing into buffer.
2019-07-03 23:18:12 +00:00
// add_thousands_sep is called after writing each char to add a thousands
// separator if necessary.
template <typename UInt, typename Char, typename F>
2019-01-13 02:27:38 +00:00
inline Char* format_decimal(Char* buffer, UInt value, int num_digits,
2019-07-03 23:18:12 +00:00
F add_thousands_sep) {
FMT_ASSERT(num_digits >= 0, "invalid digit count");
buffer += num_digits;
2019-01-13 02:27:38 +00:00
Char* end = buffer;
while (value >= 100) {
// Integer division is slow so do it for a group of two digits instead
// of for every digit. The idea comes from the talk by Alexandrescu
// "Three Optimization Tips for C++". See speed-test for a comparison.
unsigned index = static_cast<unsigned>((value % 100) * 2);
value /= 100;
*--buffer = static_cast<Char>(data::digits[index + 1]);
2019-07-03 23:18:12 +00:00
add_thousands_sep(buffer);
*--buffer = static_cast<Char>(data::digits[index]);
2019-07-03 23:18:12 +00:00
add_thousands_sep(buffer);
}
if (value < 10) {
2018-09-30 18:39:20 +00:00
*--buffer = static_cast<Char>('0' + value);
2018-01-15 19:30:53 +00:00
return end;
}
unsigned index = static_cast<unsigned>(value * 2);
*--buffer = static_cast<Char>(data::digits[index + 1]);
2019-07-03 23:18:12 +00:00
add_thousands_sep(buffer);
*--buffer = static_cast<Char>(data::digits[index]);
2018-01-15 19:30:53 +00:00
return end;
}
2019-07-03 23:18:12 +00:00
template <typename Char, typename UInt, typename Iterator, typename F>
2019-01-13 02:27:38 +00:00
inline Iterator format_decimal(Iterator out, UInt value, int num_digits,
2019-07-03 23:18:12 +00:00
F add_thousands_sep) {
FMT_ASSERT(num_digits >= 0, "invalid digit count");
2018-10-13 13:52:33 +00:00
// Buffer should be large enough to hold all digits (<= digits10 + 1).
enum { max_size = std::numeric_limits<UInt>::digits10 + 1 };
Char buffer[max_size + max_size / 3];
2019-07-03 23:18:12 +00:00
auto end = format_decimal(buffer, value, num_digits, add_thousands_sep);
return internal::copy_str<Char>(buffer, end, out);
2018-01-15 19:30:53 +00:00
}
template <typename Char, typename It, typename UInt>
inline It format_decimal(It out, UInt value, int num_digits) {
return format_decimal<Char>(out, value, num_digits, [](Char*) {});
2018-01-15 19:30:53 +00:00
}
template <unsigned BASE_BITS, typename Char, typename UInt>
2019-01-13 02:27:38 +00:00
inline Char* format_uint(Char* buffer, UInt value, int num_digits,
2018-01-15 19:30:53 +00:00
bool upper = false) {
buffer += num_digits;
2019-01-13 02:27:38 +00:00
Char* end = buffer;
2018-01-15 19:30:53 +00:00
do {
const char* digits = upper ? "0123456789ABCDEF" : data::hex_digits;
2018-01-15 19:30:53 +00:00
unsigned digit = (value & ((1 << BASE_BITS) - 1));
*--buffer = static_cast<Char>(BASE_BITS < 4 ? static_cast<char>('0' + digit)
: digits[digit]);
2018-01-15 19:30:53 +00:00
} while ((value >>= BASE_BITS) != 0);
return end;
}
template <unsigned BASE_BITS, typename Char>
Char* format_uint(Char* buffer, internal::fallback_uintptr n, int num_digits,
bool = false) {
auto char_digits = std::numeric_limits<unsigned char>::digits / 4;
int start = (num_digits + char_digits - 1) / char_digits - 1;
2019-04-07 05:10:10 +00:00
if (int start_digits = num_digits % char_digits) {
unsigned value = n.value[start--];
buffer = format_uint<BASE_BITS>(buffer, value, start_digits);
}
for (; start >= 0; --start) {
2019-04-07 05:10:10 +00:00
unsigned value = n.value[start];
buffer += char_digits;
auto p = buffer;
for (int i = 0; i < char_digits; ++i) {
unsigned digit = (value & ((1 << BASE_BITS) - 1));
*--p = static_cast<Char>(data::hex_digits[digit]);
value >>= BASE_BITS;
}
}
return buffer;
}
2018-09-30 21:09:03 +00:00
template <unsigned BASE_BITS, typename Char, typename It, typename UInt>
2019-01-13 02:27:38 +00:00
inline It format_uint(It out, UInt value, int num_digits, bool upper = false) {
2019-07-07 14:21:20 +00:00
// Buffer should be large enough to hold all digits (digits / BASE_BITS + 1).
char buffer[std::numeric_limits<UInt>::digits / BASE_BITS + 1];
2018-01-15 19:30:53 +00:00
format_uint<BASE_BITS>(buffer, value, num_digits, upper);
2018-09-30 21:09:03 +00:00
return internal::copy_str<Char>(buffer, buffer + num_digits, out);
}
#ifndef _WIN32
2019-01-13 02:27:38 +00:00
# define FMT_USE_WINDOWS_H 0
#elif !defined(FMT_USE_WINDOWS_H)
2019-01-13 02:27:38 +00:00
# define FMT_USE_WINDOWS_H 1
#endif
// Define FMT_USE_WINDOWS_H to 0 to disable use of windows.h.
// All the functionality that relies on it will be disabled too.
#if FMT_USE_WINDOWS_H
// A converter from UTF-8 to UTF-16.
// It is only provided for Windows since other systems support UTF-8 natively.
2017-02-19 14:46:51 +00:00
class utf8_to_utf16 {
private:
2017-02-19 14:46:51 +00:00
wmemory_buffer buffer_;
public:
2017-02-19 14:46:51 +00:00
FMT_API explicit utf8_to_utf16(string_view s);
operator wstring_view() const { return wstring_view(&buffer_[0], size()); }
size_t size() const { return buffer_.size() - 1; }
2019-01-13 02:27:38 +00:00
const wchar_t* c_str() const { return &buffer_[0]; }
std::wstring str() const { return std::wstring(&buffer_[0], size()); }
};
// A converter from UTF-16 to UTF-8.
// It is only provided for Windows since other systems support UTF-8 natively.
2017-02-19 16:41:38 +00:00
class utf16_to_utf8 {
private:
2017-02-19 14:46:51 +00:00
memory_buffer buffer_;
public:
2017-02-19 16:41:38 +00:00
utf16_to_utf8() {}
FMT_API explicit utf16_to_utf8(wstring_view s);
operator string_view() const { return string_view(&buffer_[0], size()); }
size_t size() const { return buffer_.size() - 1; }
2019-01-13 02:27:38 +00:00
const char* c_str() const { return &buffer_[0]; }
std::string str() const { return std::string(&buffer_[0], size()); }
// Performs conversion returning a system error code instead of
// throwing exception on conversion error. This method may still throw
// in case of memory allocation error.
FMT_API int convert(wstring_view s);
};
FMT_API void format_windows_error(fmt::internal::buffer<char>& out,
int error_code,
fmt::string_view message) FMT_NOEXCEPT;
#endif
2019-01-13 02:27:38 +00:00
template <typename T = void> struct null {};
// Workaround an array initialization issue in gcc 4.8.
template <typename Char> struct fill_t {
private:
Char data_[6];
public:
FMT_CONSTEXPR Char& operator[](size_t index) { return data_[index]; }
FMT_CONSTEXPR const Char& operator[](size_t index) const {
return data_[index];
}
static FMT_CONSTEXPR fill_t<Char> make() {
auto fill = fill_t<Char>();
fill[0] = Char(' ');
return fill;
}
};
} // namespace internal
// We cannot use enum classes as bit fields because of a gcc bug
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61414.
namespace align {
enum type { none, left, right, center, numeric };
}
using align_t = align::type;
namespace sign {
enum type { none, minus, plus, space };
}
using sign_t = sign::type;
// Format specifiers for built-in and string types.
template <typename Char> struct basic_format_specs {
int width;
int precision;
char type;
align_t align : 4;
sign_t sign : 3;
bool alt : 1; // Alternate form ('#').
internal::fill_t<Char> fill;
constexpr basic_format_specs()
: width(0),
precision(-1),
type(0),
align(align::none),
sign(sign::none),
alt(false),
fill(internal::fill_t<Char>::make()) {}
};
using format_specs = basic_format_specs<char>;
namespace internal {
// Writes the exponent exp in the form "[+-]d{2,3}" to buffer.
template <typename Char, typename It> It write_exponent(int exp, It it) {
FMT_ASSERT(-1000 < exp && exp < 1000, "exponent out of range");
if (exp < 0) {
*it++ = static_cast<Char>('-');
exp = -exp;
} else {
*it++ = static_cast<Char>('+');
}
if (exp >= 100) {
*it++ = static_cast<Char>(static_cast<char>('0' + exp / 100));
exp %= 100;
}
2019-07-07 14:21:20 +00:00
const char* d = data::digits + exp * 2;
*it++ = static_cast<Char>(d[0]);
*it++ = static_cast<Char>(d[1]);
return it;
}
2019-07-07 13:54:25 +00:00
struct gen_digits_params {
int num_digits;
bool fixed;
bool upper;
bool trailing_zeros;
};
// The number is given as v = digits * pow(10, exp).
template <typename Char, typename It>
2019-04-27 13:52:46 +00:00
It grisu_prettify(const char* digits, int size, int exp, It it,
2019-07-04 00:25:57 +00:00
gen_digits_params params, Char decimal_point) {
// pow(10, full_exp - 1) <= v <= pow(10, full_exp).
int full_exp = size + exp;
if (!params.fixed) {
// Insert a decimal point after the first digit and add an exponent.
*it++ = static_cast<Char>(*digits);
2019-07-04 00:25:57 +00:00
if (size > 1) *it++ = decimal_point;
exp += size - 1;
it = copy_str<Char>(digits + 1, digits + size, it);
if (size < params.num_digits)
it = std::fill_n(it, params.num_digits - size, static_cast<Char>('0'));
*it++ = static_cast<Char>(params.upper ? 'E' : 'e');
return write_exponent<Char>(exp, it);
}
if (size <= full_exp) {
// 1234e7 -> 12340000000[.0+]
it = copy_str<Char>(digits, digits + size, it);
it = std::fill_n(it, full_exp - size, static_cast<Char>('0'));
int num_zeros = (std::max)(params.num_digits - full_exp, 1);
if (params.trailing_zeros) {
2019-07-04 00:25:57 +00:00
*it++ = decimal_point;
add oss-fuzz support see https://github.com/google/oss-fuzz/pull/2381 the history of the fuzz branch is long and messy and is difficult to rebase on top of the current master. Squashed commit of the following: commit b9d6db50010e185d0af2590a35472e9334102248 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 29 21:50:34 2019 +0200 update exception with a more accurate description commit f3fbaf60cc80c7f57fa95962dc0069b10c3d3e61 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 29 21:34:55 2019 +0200 fix missing flags in reproduce build commit 40a17bec7a1ad724203577842a254ca9c42da388 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 29 21:22:48 2019 +0200 move check for large precision values closer to where needed commit ef6e23e1f52d639c5aec1a1e713157cec380a8c3 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 28 20:55:34 2019 +0200 simplify the fuzzer build script commit eadee6e0557be6df695e80f0f2717046a29846e0 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 28 20:47:54 2019 +0200 minimize source code pollution commit 1ece6416438f199c164ee9aa89f42ad1f21a4985 Merge: f404079b 037b84f2 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 28 20:22:52 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # CMakeLists.txt commit f404079b4e00e51b0d5a4c9218cbe7afb350b777 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 28 20:20:52 2019 +0200 make named_arg write into a string or a memory_buffer this makes the fuzzer consistent with the others. commit 545dbe136817eef9e734c32991a324874a51bb4a Author: Paul Dreik <github@pauldreik.se> Date: Thu Jun 20 06:34:17 2019 +0200 tidy up extra newlines, missing std:: etc. commit 2d816ef2b13fc2a46c0df76a91f7912bd7196087 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:49:08 2019 +0200 update unit test to handle expected result following review comment commit a5b9a26808d0165acd2edc4c3baabf9bff40d8bd Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:40:06 2019 +0200 update build script to reflect changes after review commit 8411cb78984f76c74bca273c0bb18918e084e711 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:39:39 2019 +0200 review comment: clarify what the .gitignore is for commit 18d9e7bb43d98568fe491e076106e4fa29070b33 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:36:56 2019 +0200 review comment: don't touch root .gitignore commit 7683d7faa116a6e261da824ec6c1a6a75689841b Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:35:40 2019 +0200 review comment: condiionally include main.cpp commit be0bdaeb27b0c1914cc0b0fd85c2b3bcc6fd2245 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:31:28 2019 +0200 review comment: drop commented out code not working on travis commit 013429812d7fb745eec146296623ea245c4848b4 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:30:26 2019 +0200 review comment: renumber case labels the old ones were to be able to reuse the corpus, let's drop it commit f66fe7bead4a71978f21d9e47a8f3f9e4935fccd Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:06:47 2019 +0200 review comment: libfmt->fmt commit 4a4ddb654dd5b90646cd7e6ff45318c17b66dc9f Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:05:32 2019 +0200 reuse fmt_safe_duration_cast commit 0a1679411a8bd77c2ff34e1cd572307c92e12040 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:02:48 2019 +0200 review comment: name convention, better name C was for "chrono duration" commit 63084cac00b798c636e0dc13207df46a5c4539f6 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:00:50 2019 +0200 reuse earlier extract fmt_safe_... function commit b23388d4d7f919163ead9a9e9bdd50d14daf80b7 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:58:55 2019 +0200 review comment: don't output inf.inf commit 6f861f1d89d2127bbe2446d176d59a354665cc15 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:57:00 2019 +0200 review comment: extract function for invoking safe_duration_cast commit df19bc87ccff77d4bedf54fa3d3992f78ef699bd Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:47:30 2019 +0200 review comment: leftover garbage commit 84eea802efb1164c4f2a83b2e480a7c5bdf4e921 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:45:22 2019 +0200 review comment: turn cmake option into macro for SAFE_DURATION_CAST decided to have it on by default commit c3a159498c2544a52662cd03d23d5a1d00537bba Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:40:14 2019 +0200 review comment: extra newline commit aa556875c5161d817c347ff984dad171c7a35df9 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:38:49 2019 +0200 review comment: file name convention commit 4102d82c455324bda4ccd64072eab86b3f0ecebf Merge: 28add37d 4912cff6 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 16:29:29 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 28add37df3944cbaa00f614e8063210a6d83c17c Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 21:44:06 2019 +0200 disable check to pass travis commit 4119378aedfd3e4063058e8f1f03c29d9f44d5e8 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 21:32:39 2019 +0200 add missing include commit ba2efb82f20d6ecb5e49a8c6ced96a7febedc175 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 21:04:41 2019 +0200 try working around build issue on travis commit 380671a2cb6e52f2b7d5eaad409d491baba5b7e6 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 20:22:41 2019 +0200 write positive infinity without sign commit fd72b9adace17e00c46aae24e061bf14c3af6bb1 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 20:20:50 2019 +0200 remove leftover from merge commit 1ae3128be2c53914e4c840d12e1b02c59758c378 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 20:14:45 2019 +0200 format to buffer instead of string commit 1d83a561244c2fe81231d17e911c6eb24c87cac4 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 19:50:19 2019 +0200 fix warnings commit a33b45a7bb5cf70eb3ef1cd95908282621195f1f Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 19:43:46 2019 +0200 refactor and fix warnings commit 02afb12dd5b05804a1a8b55e1b9fb7e3de593e84 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 19:17:27 2019 +0200 use fixed size input commit 35f84c8cf20efb18a137efecd10dcdc6bcebf7b5 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 19:07:43 2019 +0200 factor out main into a separate file commit a23b7a198ba739dd813897901855c98441e6f29b Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 18:56:40 2019 +0200 refactor commit 9a3f4cfb3bc32a304a1a49b8ff24fbc2f924266c Merge: 7842582a 12f46838 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 18:20:03 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit 7842582a0089c24a5d44bbb2d156beb732bb7b58 Merge: 90cab5aa cbbee1b3 Author: Paul Dreik <github@pauldreik.se> Date: Thu Jun 13 10:41:34 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 90cab5aa023271a3a746cf9c60dd613b4546ca10 Merge: 8feb8a3f e5422db4 Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 12 18:49:08 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 8feb8a3fe20da043a8303e59b1580b4b2862cc57 Merge: e9fabac1 87fbc6f7 Author: Paul Dreik <github@pauldreik.se> Date: Tue Jun 11 19:18:35 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit e9fabac1dd6d710fec1b30ca51dc953f57f2f9f5 Merge: eaff9316 e1a67b52 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 10 22:38:36 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit eaff93166402ff9a16a9ab0fab1081104f4f06b8 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 22:29:01 2019 +0200 drop old crashes commit 7f861e481abb7367bd187c92fe202e25d36d0dd0 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:47:30 2019 +0200 build fuzzers as part of the linux clang 6 build commit 42c339066dce148723f452d4a94487a6ac80637f Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:42:12 2019 +0200 travis has old libs commit 9264e3ac82582a941eba3501301dee1468175c08 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:33:26 2019 +0200 more travis workarounds commit c6eed3adaf6cf65d440dd58c88a034f61c55114f Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:27:49 2019 +0200 travis workaround commit 5e230d6240841dbc67f0c08ace3a1c24defea54f Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:15:36 2019 +0200 fix constexpr issues commit cc5fc033479c769a8ac19115aef48020c532c943 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:11:13 2019 +0200 add a fuzzer build commit 3997375296eca0d0455e0935ef3aed8b010ecf2d Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:53:04 2019 +0200 fix minor documentation errors commit 1572411261abd5c0756ff2998ab707f1131d4fdf Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:49:25 2019 +0200 polish the documentation commit 9e5274437cfc3e9c82131c14cf7f3a0abdb10025 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:32:45 2019 +0200 remove unused headers commit 4b2492a5e037d3153de342ef7f2729b69e8f5dce Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:28:12 2019 +0200 clang format commit a0004ebb417bce5a24c15ea65a0f3741e45b8480 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:27:02 2019 +0200 format also void* commit 820142ee2076ae17fea25857c41a1ecdca4a8521 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:12:21 2019 +0200 improve two_args with lessons learnt from the others commit 7b8fd7f5123fccf78b600c69ca25d025582c095e Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:11:18 2019 +0200 improve function names commit 641bf36a7a061abf6a02d5e31f3adeb33b079f43 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:07:29 2019 +0200 clang format commit 7975c0c3cbe19a7159336ad8fcb170fa6259b1cb Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:06:02 2019 +0200 apply lessons learned from chrono fuzzer on sprintf commit 972124c9f921f8ef786f99c294f556bb7dd9b9ee Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:55:49 2019 +0200 format to buffer instead of string commit 7b015c692364d1e087a59dfe83dda1b8f8fd2991 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:50:25 2019 +0200 apply lessons learned from the chrono fuzzer at one_arg commit daa8ea95dd71704e367b760fa6605f5a7cac6890 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:41:17 2019 +0200 renumber cases commit a667365d0e0f3eb0bc6d6f2cfee5e128a6574aee Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:38:06 2019 +0200 clang format commit e0e361b8a3594c43e131d661a28381613a186c2b Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:36:35 2019 +0200 disable fuzzing by default commit ccb4274ab246ee1fe3becb2b73432179a8a5fe6f Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:36:25 2019 +0200 refresh named_arg with lessons learnt from the chrono fuzzer commit 60da706d4ef35c18eb967bf4ba8d395ef05a9c61 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:36:00 2019 +0200 fix build error commit e361bfc24246d7c7e91f5e45209eda2f22689d98 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:00:11 2019 +0200 add comment about formatting to string vs. memory buffer commit 74c0ed062d34eae1786ca699886ad4f3bccc7fd1 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:51:23 2019 +0200 try to use better names commit 4efea36f77020eecf3c7826f891417f94aedf6f4 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:46:07 2019 +0200 fix clang build error commit 03cdd2e4631ad302dde3e1048671d3bb08956096 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:44:21 2019 +0200 drop workarounds fixed upstream commit e936829ebbd97ed2e6f8c5f595b414c0982f2e4d Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:41:02 2019 +0200 move the fuzzers into the test/ subdirectory commit 2967765698259764c1f06966a7cdefbc5365e5f2 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:30:03 2019 +0200 revert temporary tests handled upstream commit 749c5027b0eab3d90d8fbfb6e55ee313a7f7dfe4 Merge: dee69088 5d9100fa Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:49:00 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit dee690881bd33bb77bee1d5ffce643e8bef84a33 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:40:37 2019 +0200 keep documentation comment formatted properly commit 87d2c99487eef586ce54d432697f384cbe7a50e1 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:36:12 2019 +0200 switch to fmt constexpr macros commit c23fa59139c425a3dfa2e5eeaeb3269c251c90d1 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:30:22 2019 +0200 clang format commit 9e58207e9b24a8cc90c721277405b409dd61740d Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:27:03 2019 +0200 get rid of safe_duration_cast submodule replaced with an embedded miniature version commit a4d36eac46e5db45ded96f80f84986f4f76ea0ec Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:25:00 2019 +0200 add safe_duration_cast into fmt commit 7d5b0ecef37722c40952251c88d74a2552221d84 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 8 22:39:33 2019 +0200 mark #1194 as fixed commit ee91514ecf7a8788f2081996db85eef50d7cd57b Merge: 60569117 4faadff0 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 8 22:25:37 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 6056911784bc86e6caf56a61fd64142f113d531e Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 5 09:58:30 2019 +0200 format to small size buffer instead of string commit 9f006097255c239188840b589f6e39cbb4476481 Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 5 09:45:23 2019 +0200 switch to fmt::string_view and workaround reported bug commit 387de0d9440852fac974ff165b2555d54e2380da Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 5 06:26:15 2019 +0200 ignore build directories commit 55da271c5bb3c11a239c4e46570b6741803ce329 Merge: 3716491e c264e641 Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 5 06:12:36 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 3716491ec51c34a918834857c67300eea180ba02 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 3 07:03:29 2019 +0200 fix UB in on_second commit 2740241b13b7417a4dae655f825ea5a551ffe7ba Merge: 1c258402 d54e64b3 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 3 06:37:18 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit 1c258402a4bd03f390e0256fa9475cc5187d37f9 Merge: ca9596d1 f57227a1 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 1 08:01:58 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit ca9596d1c91b0315b407ce2c4b3e9e5ba1aeb640 Merge: 1c274cfd d07cc202 Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 19:42:33 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 1c274cfd4112138bfc59dd16f58022016128fe85 Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 08:12:10 2019 +0200 make it easier for the chrono fuzzer to explore using a fixed size makes the cases cross pollinate each other better. the execution speed is much higher as well commit f0d7cccdc70c98576b7129428c416e7c9e68a8aa Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 07:36:21 2019 +0200 add a build adapted for analysis of fuzzing performance commit 56f7cf3fa979de415174a10b18221727e3138b7b Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 06:25:10 2019 +0200 allow negative values again commit a77a5fc505bbeab1cfa36be16d40f7799689317a Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 05:45:55 2019 +0200 fix UB on signed int overflow in chrono_formatter constructor see https://github.com/fmtlib/fmt/issues/1179 commit b6a592720be520b58ed2f2d8668ffc6c8b71f0f7 Merge: 492a2046 30bce6c1 Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 05:26:30 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit 492a204623c3c4bbf04c9d47d69979d3a484959c Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 21:36:00 2019 +0200 fix bad assert commit 0ae68b03fbb0e80e292a01f529d5cd7e76349907 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 21:35:49 2019 +0200 add unsigned types for chrono fuzzing commit 2753d7db76645e8847ff2110c5e98f5c8de4a6b9 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 20:25:21 2019 +0200 use C++17 commit bc12742f098ec8b513985daedc57faa518203eb0 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:44:59 2019 +0200 add symlink for safe_duration_cast commit 67201d2639b93736768e109d73b3e9ccc9401c48 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:40:40 2019 +0200 turn on safe duration cast for the fuzzer builds commit 31a70080a63a5213594e4b4e6a33e7e315cf756e Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:32:52 2019 +0200 clang format commit 981e30c5782d04453ece1b31e887da4f29268370 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:30:19 2019 +0200 reduce maximum allocation size commit 7ba51da81de7ecbc5498a22dc29de5b0648bcad2 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:30:01 2019 +0200 make nan unit test pass commit 95b4b9c28a589c30727826dd4e1367bebfad5894 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 18:39:08 2019 +0200 special case nan and inf commit 2673c965506e51d150c005340698a6e15d98aaba Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 16:40:11 2019 +0200 build a fast fuzzer, for making coverage fast commit db52b62612fd7ea3ceeaee05584fd8cb83e54a35 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 16:39:48 2019 +0200 add safe duration cast as submodule commit c8a028faec5d91728472f5de01ea8b1766fb929d Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 16:00:26 2019 +0200 enable chrono fuzzing for non-negative values commit de3555cc573e561691858ca16586f8b45a3ae703 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 13:06:35 2019 +0200 try start using safe duration cast commit 5c3245118c3debcb3f6f69c04c2c32d48449ee16 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 09:59:34 2019 +0200 add failing test commit 3a565d3b091c29210e24042f86869fecafb70914 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 09:59:09 2019 +0200 fix cmake option type (should be string, not bool) commit 61c67564207a13992b1c69d95614b2c4aec5df86 Merge: 63e7b9e3 bb254d14 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 07:03:42 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 63e7b9e32c714c594d019ef463c9c40a3510a2f2 Merge: 7dd1d80f 5e7bdf1b Author: Paul Dreik <github@pauldreik.se> Date: Fri May 17 19:17:20 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 7dd1d80f3a32465d0fa13ce733bff8686a5b0bad Merge: 2c9aa5a3 2a9e8b52 Author: Paul Dreik <github@pauldreik.se> Date: Tue May 14 19:38:32 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 2c9aa5a31e64af25f8bb4afa8134258822532d3e Merge: 16a442c8 2c77562b Author: Paul Dreik <github@pauldreik.se> Date: Tue May 14 06:33:16 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 16a442c864dbdce70c22b4a859dba5e3b5edaf35 Merge: b1d70b61 f4dfd6e3 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 12 15:24:31 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit b1d70b6144c7a61e580eb44ec7d1bdd2368f5531 Author: Paul Dreik <github@pauldreik.se> Date: Fri May 10 08:52:57 2019 +0200 prevent excessive time (found by oss-fuzz) the following triggered this: std::string message = fmt::format("\377{:.214718908}\377", fmt::arg("/\0", 0.f)); there are probably more places with calls to fill_n which could be checked commit 9a91093a6b20fd22afd6739f5dcba3b00f6f8eaf Merge: 7de0fdec e9bab6d0 Author: Paul Dreik <github@pauldreik.se> Date: Thu May 9 06:06:32 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit 7de0fdec38270f2d0302413904a5ef1b13d47177 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 20:08:53 2019 +0200 clang format commit bb375e1ca10eb3cc2c6684bf698ad4738ab7eb10 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 19:47:10 2019 +0200 seems to pass the unit test now (except for the nan stuff from victor) commit 786b4b7351bc8e305ad7e68d11ca6b542f66d456 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 19:25:23 2019 +0200 add assert triggering data, and unit test commit 2790e480b81ec83d00315aa69407fe71b8c4c637 Merge: fa859a05 ca978b3d Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 18:42:51 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit fa859a05c2c3abef263166f3a44cdbaa3122d642 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 18:18:54 2019 +0200 add crash commit 1f6e341b1c4bc966a44c7a98b63f22bd65958d0b Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 18:18:27 2019 +0200 assert floating point is finite internally commit 50877748d08a0f4433af4f1213c5bc9021e76e7a Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 17:32:03 2019 +0200 invoke undefined behaviour inside chrono commit bac7ac4149f2d001f7b36236e1710484674d029b Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 17:31:35 2019 +0200 refactor the fuzzer build script commit b19c4cd84a0c8b6d4a7beb281ad881156173ce78 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 16:25:11 2019 +0200 add one more crash commit 7607592e06ebaa189dc180441fa1863430e0938e Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 16:24:05 2019 +0200 add crashing input commit b059a98b27b40cd284e08a54493c25363d743557 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 16:21:25 2019 +0200 trigger undefined behaviour with NaN durations commit 7cce33250282b397c00159e6809125f5fc1c0190 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 16:20:51 2019 +0200 add asan only fuzzer commit 757319a4e30978d8661b3be8f75937266071b413 Merge: a574b21c c1d430e6 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 06:34:59 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # test/chrono-test.cc commit a574b21c840339abef5e4ad33612b6efac6ad54b Author: Paul Dreik <github@pauldreik.se> Date: Sat May 4 12:54:13 2019 +0200 disable chrono fuzzing for now it triggers integer overflow and is not trivial to solve. commit ff17322bceba53e0c2d9ebcf3756115ad148195e Merge: d6a59851 29c10fbf Author: Paul Dreik <github@pauldreik.se> Date: Sat May 4 07:29:39 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit d6a598511c7dc0c208c2d688b2943b0d7c092029 Merge: 663b1592 4a4d72f9 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 1 20:44:16 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # test/chrono-test.cc commit 663b159235f8ae5f58fe80bb02d49bfa392056b0 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 22:36:07 2019 +0200 add crash case (triggers assertion) commit 082a5cb226142ea30b415d4231cea9425748741a Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 21:44:19 2019 +0200 add const commit b8d70919ea6be0d2e4c58ef82887496f55125ba9 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 21:29:43 2019 +0200 provoke assertion fmt/include/fmt/core.h:246: typename std::make_unsigned<_Tp>::type fmt::v5::internal::to_unsigned(Int) [with Int = long int; typename std::make_unsigned<_Tp>::type = long unsigned int]: Assertion `(value >= 0) && "negative value"' failed. commit e1966013af4eb7febf047d4629cc6236a6aae0e3 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 20:46:16 2019 +0200 add more crashes commit 1394ae3fe915319ce7dc63d6a9dc820a29c9539e Merge: 89338cad 4c721e3a Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 17:16:14 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 89338cad4eed9441644ec8c5f1687b511c829ea4 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:40:32 2019 +0200 add notes on how to reproduce crashes commit 7dc3e4c7223617da274c4cccb9cf5459d0510e0b Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:28:20 2019 +0200 add crashes from chrono duration commit b62e8bc783134c2d15ebf0372c8a61b41624e6b1 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:26:53 2019 +0200 rename fuzzer commit 7f4ab2b80d072fe3ad96e37e45f3fa807a85c99f Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:15:38 2019 +0200 clang format commit a6cc2a35a9799e88b9ed89e578b7aefd9b09ad09 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:12:04 2019 +0200 add chrono duration fuzzer commit 682713c9a61d52b46e95fdb7d970a8733f77ce88 Merge: 8b934b37 8d8ea21c Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 08:07:56 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 8b934b37161d1389de603ced6560982507bb7ae5 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 10:23:44 2019 +0200 clang format commit 793d97b9af33269f5628094f547f9771e968e3f2 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 10:23:17 2019 +0200 tighten memory allocation commit e2301f2430b15c9817433206597ef82c990f49a0 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 10:19:56 2019 +0200 clean up and set license (BSD 2-clause simplified, same as fmt) commit e64c3fb35719afa644dee1f9f17829cace6e17ff Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 10:04:23 2019 +0200 clean up and add afl commit ab46241206aaf46759fd3f292ee4a1088b652d15 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 09:54:48 2019 +0200 drop c++17 requirement commit 20c01e1acf330c8a28192f55b16efeebddb72ab0 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 09:25:19 2019 +0200 initial oss-fuzz compatible version commit 6cbd91a37cf36a1d0e994bb16cf44a12622f7dca Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 08:42:51 2019 +0200 initial commit of fuzzers from https://github.com/pauldreik/fuzzfmt commit eaddfb16d86ef1c259b737e2aab40145b0c956a6 Merge: e37d7db3 134904c8 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 08:38:19 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit e37d7db3b938c82f569d71e6bb00bd1bf8394db7 Merge: 99b2e08b bd516e34 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 21 17:28:06 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 99b2e08b6bef25b793df5ef07621c9c4402587de Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 21 10:30:56 2019 +0200 stop high memory use when fuzzing
2019-06-30 07:11:13 +00:00
#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
2019-07-03 16:52:09 +00:00
if (num_zeros > 1000)
add oss-fuzz support see https://github.com/google/oss-fuzz/pull/2381 the history of the fuzz branch is long and messy and is difficult to rebase on top of the current master. Squashed commit of the following: commit b9d6db50010e185d0af2590a35472e9334102248 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 29 21:50:34 2019 +0200 update exception with a more accurate description commit f3fbaf60cc80c7f57fa95962dc0069b10c3d3e61 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 29 21:34:55 2019 +0200 fix missing flags in reproduce build commit 40a17bec7a1ad724203577842a254ca9c42da388 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 29 21:22:48 2019 +0200 move check for large precision values closer to where needed commit ef6e23e1f52d639c5aec1a1e713157cec380a8c3 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 28 20:55:34 2019 +0200 simplify the fuzzer build script commit eadee6e0557be6df695e80f0f2717046a29846e0 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 28 20:47:54 2019 +0200 minimize source code pollution commit 1ece6416438f199c164ee9aa89f42ad1f21a4985 Merge: f404079b 037b84f2 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 28 20:22:52 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # CMakeLists.txt commit f404079b4e00e51b0d5a4c9218cbe7afb350b777 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 28 20:20:52 2019 +0200 make named_arg write into a string or a memory_buffer this makes the fuzzer consistent with the others. commit 545dbe136817eef9e734c32991a324874a51bb4a Author: Paul Dreik <github@pauldreik.se> Date: Thu Jun 20 06:34:17 2019 +0200 tidy up extra newlines, missing std:: etc. commit 2d816ef2b13fc2a46c0df76a91f7912bd7196087 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:49:08 2019 +0200 update unit test to handle expected result following review comment commit a5b9a26808d0165acd2edc4c3baabf9bff40d8bd Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:40:06 2019 +0200 update build script to reflect changes after review commit 8411cb78984f76c74bca273c0bb18918e084e711 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:39:39 2019 +0200 review comment: clarify what the .gitignore is for commit 18d9e7bb43d98568fe491e076106e4fa29070b33 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:36:56 2019 +0200 review comment: don't touch root .gitignore commit 7683d7faa116a6e261da824ec6c1a6a75689841b Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:35:40 2019 +0200 review comment: condiionally include main.cpp commit be0bdaeb27b0c1914cc0b0fd85c2b3bcc6fd2245 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:31:28 2019 +0200 review comment: drop commented out code not working on travis commit 013429812d7fb745eec146296623ea245c4848b4 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:30:26 2019 +0200 review comment: renumber case labels the old ones were to be able to reuse the corpus, let's drop it commit f66fe7bead4a71978f21d9e47a8f3f9e4935fccd Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:06:47 2019 +0200 review comment: libfmt->fmt commit 4a4ddb654dd5b90646cd7e6ff45318c17b66dc9f Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:05:32 2019 +0200 reuse fmt_safe_duration_cast commit 0a1679411a8bd77c2ff34e1cd572307c92e12040 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:02:48 2019 +0200 review comment: name convention, better name C was for "chrono duration" commit 63084cac00b798c636e0dc13207df46a5c4539f6 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 20:00:50 2019 +0200 reuse earlier extract fmt_safe_... function commit b23388d4d7f919163ead9a9e9bdd50d14daf80b7 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:58:55 2019 +0200 review comment: don't output inf.inf commit 6f861f1d89d2127bbe2446d176d59a354665cc15 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:57:00 2019 +0200 review comment: extract function for invoking safe_duration_cast commit df19bc87ccff77d4bedf54fa3d3992f78ef699bd Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:47:30 2019 +0200 review comment: leftover garbage commit 84eea802efb1164c4f2a83b2e480a7c5bdf4e921 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:45:22 2019 +0200 review comment: turn cmake option into macro for SAFE_DURATION_CAST decided to have it on by default commit c3a159498c2544a52662cd03d23d5a1d00537bba Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:40:14 2019 +0200 review comment: extra newline commit aa556875c5161d817c347ff984dad171c7a35df9 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 19:38:49 2019 +0200 review comment: file name convention commit 4102d82c455324bda4ccd64072eab86b3f0ecebf Merge: 28add37d 4912cff6 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 17 16:29:29 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 28add37df3944cbaa00f614e8063210a6d83c17c Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 21:44:06 2019 +0200 disable check to pass travis commit 4119378aedfd3e4063058e8f1f03c29d9f44d5e8 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 21:32:39 2019 +0200 add missing include commit ba2efb82f20d6ecb5e49a8c6ced96a7febedc175 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 21:04:41 2019 +0200 try working around build issue on travis commit 380671a2cb6e52f2b7d5eaad409d491baba5b7e6 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 20:22:41 2019 +0200 write positive infinity without sign commit fd72b9adace17e00c46aae24e061bf14c3af6bb1 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 20:20:50 2019 +0200 remove leftover from merge commit 1ae3128be2c53914e4c840d12e1b02c59758c378 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 20:14:45 2019 +0200 format to buffer instead of string commit 1d83a561244c2fe81231d17e911c6eb24c87cac4 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 19:50:19 2019 +0200 fix warnings commit a33b45a7bb5cf70eb3ef1cd95908282621195f1f Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 19:43:46 2019 +0200 refactor and fix warnings commit 02afb12dd5b05804a1a8b55e1b9fb7e3de593e84 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 19:17:27 2019 +0200 use fixed size input commit 35f84c8cf20efb18a137efecd10dcdc6bcebf7b5 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 19:07:43 2019 +0200 factor out main into a separate file commit a23b7a198ba739dd813897901855c98441e6f29b Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 18:56:40 2019 +0200 refactor commit 9a3f4cfb3bc32a304a1a49b8ff24fbc2f924266c Merge: 7842582a 12f46838 Author: Paul Dreik <github@pauldreik.se> Date: Fri Jun 14 18:20:03 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit 7842582a0089c24a5d44bbb2d156beb732bb7b58 Merge: 90cab5aa cbbee1b3 Author: Paul Dreik <github@pauldreik.se> Date: Thu Jun 13 10:41:34 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 90cab5aa023271a3a746cf9c60dd613b4546ca10 Merge: 8feb8a3f e5422db4 Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 12 18:49:08 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 8feb8a3fe20da043a8303e59b1580b4b2862cc57 Merge: e9fabac1 87fbc6f7 Author: Paul Dreik <github@pauldreik.se> Date: Tue Jun 11 19:18:35 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit e9fabac1dd6d710fec1b30ca51dc953f57f2f9f5 Merge: eaff9316 e1a67b52 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 10 22:38:36 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit eaff93166402ff9a16a9ab0fab1081104f4f06b8 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 22:29:01 2019 +0200 drop old crashes commit 7f861e481abb7367bd187c92fe202e25d36d0dd0 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:47:30 2019 +0200 build fuzzers as part of the linux clang 6 build commit 42c339066dce148723f452d4a94487a6ac80637f Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:42:12 2019 +0200 travis has old libs commit 9264e3ac82582a941eba3501301dee1468175c08 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:33:26 2019 +0200 more travis workarounds commit c6eed3adaf6cf65d440dd58c88a034f61c55114f Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:27:49 2019 +0200 travis workaround commit 5e230d6240841dbc67f0c08ace3a1c24defea54f Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:15:36 2019 +0200 fix constexpr issues commit cc5fc033479c769a8ac19115aef48020c532c943 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 21:11:13 2019 +0200 add a fuzzer build commit 3997375296eca0d0455e0935ef3aed8b010ecf2d Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:53:04 2019 +0200 fix minor documentation errors commit 1572411261abd5c0756ff2998ab707f1131d4fdf Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:49:25 2019 +0200 polish the documentation commit 9e5274437cfc3e9c82131c14cf7f3a0abdb10025 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:32:45 2019 +0200 remove unused headers commit 4b2492a5e037d3153de342ef7f2729b69e8f5dce Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:28:12 2019 +0200 clang format commit a0004ebb417bce5a24c15ea65a0f3741e45b8480 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:27:02 2019 +0200 format also void* commit 820142ee2076ae17fea25857c41a1ecdca4a8521 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:12:21 2019 +0200 improve two_args with lessons learnt from the others commit 7b8fd7f5123fccf78b600c69ca25d025582c095e Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:11:18 2019 +0200 improve function names commit 641bf36a7a061abf6a02d5e31f3adeb33b079f43 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:07:29 2019 +0200 clang format commit 7975c0c3cbe19a7159336ad8fcb170fa6259b1cb Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 20:06:02 2019 +0200 apply lessons learned from chrono fuzzer on sprintf commit 972124c9f921f8ef786f99c294f556bb7dd9b9ee Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:55:49 2019 +0200 format to buffer instead of string commit 7b015c692364d1e087a59dfe83dda1b8f8fd2991 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:50:25 2019 +0200 apply lessons learned from the chrono fuzzer at one_arg commit daa8ea95dd71704e367b760fa6605f5a7cac6890 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:41:17 2019 +0200 renumber cases commit a667365d0e0f3eb0bc6d6f2cfee5e128a6574aee Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:38:06 2019 +0200 clang format commit e0e361b8a3594c43e131d661a28381613a186c2b Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:36:35 2019 +0200 disable fuzzing by default commit ccb4274ab246ee1fe3becb2b73432179a8a5fe6f Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:36:25 2019 +0200 refresh named_arg with lessons learnt from the chrono fuzzer commit 60da706d4ef35c18eb967bf4ba8d395ef05a9c61 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:36:00 2019 +0200 fix build error commit e361bfc24246d7c7e91f5e45209eda2f22689d98 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 19:00:11 2019 +0200 add comment about formatting to string vs. memory buffer commit 74c0ed062d34eae1786ca699886ad4f3bccc7fd1 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:51:23 2019 +0200 try to use better names commit 4efea36f77020eecf3c7826f891417f94aedf6f4 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:46:07 2019 +0200 fix clang build error commit 03cdd2e4631ad302dde3e1048671d3bb08956096 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:44:21 2019 +0200 drop workarounds fixed upstream commit e936829ebbd97ed2e6f8c5f595b414c0982f2e4d Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:41:02 2019 +0200 move the fuzzers into the test/ subdirectory commit 2967765698259764c1f06966a7cdefbc5365e5f2 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 18:30:03 2019 +0200 revert temporary tests handled upstream commit 749c5027b0eab3d90d8fbfb6e55ee313a7f7dfe4 Merge: dee69088 5d9100fa Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:49:00 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit dee690881bd33bb77bee1d5ffce643e8bef84a33 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:40:37 2019 +0200 keep documentation comment formatted properly commit 87d2c99487eef586ce54d432697f384cbe7a50e1 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:36:12 2019 +0200 switch to fmt constexpr macros commit c23fa59139c425a3dfa2e5eeaeb3269c251c90d1 Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:30:22 2019 +0200 clang format commit 9e58207e9b24a8cc90c721277405b409dd61740d Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:27:03 2019 +0200 get rid of safe_duration_cast submodule replaced with an embedded miniature version commit a4d36eac46e5db45ded96f80f84986f4f76ea0ec Author: Paul Dreik <github@pauldreik.se> Date: Sun Jun 9 17:25:00 2019 +0200 add safe_duration_cast into fmt commit 7d5b0ecef37722c40952251c88d74a2552221d84 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 8 22:39:33 2019 +0200 mark #1194 as fixed commit ee91514ecf7a8788f2081996db85eef50d7cd57b Merge: 60569117 4faadff0 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 8 22:25:37 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 6056911784bc86e6caf56a61fd64142f113d531e Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 5 09:58:30 2019 +0200 format to small size buffer instead of string commit 9f006097255c239188840b589f6e39cbb4476481 Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 5 09:45:23 2019 +0200 switch to fmt::string_view and workaround reported bug commit 387de0d9440852fac974ff165b2555d54e2380da Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 5 06:26:15 2019 +0200 ignore build directories commit 55da271c5bb3c11a239c4e46570b6741803ce329 Merge: 3716491e c264e641 Author: Paul Dreik <github@pauldreik.se> Date: Wed Jun 5 06:12:36 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 3716491ec51c34a918834857c67300eea180ba02 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 3 07:03:29 2019 +0200 fix UB in on_second commit 2740241b13b7417a4dae655f825ea5a551ffe7ba Merge: 1c258402 d54e64b3 Author: Paul Dreik <github@pauldreik.se> Date: Mon Jun 3 06:37:18 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit 1c258402a4bd03f390e0256fa9475cc5187d37f9 Merge: ca9596d1 f57227a1 Author: Paul Dreik <github@pauldreik.se> Date: Sat Jun 1 08:01:58 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit ca9596d1c91b0315b407ce2c4b3e9e5ba1aeb640 Merge: 1c274cfd d07cc202 Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 19:42:33 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 1c274cfd4112138bfc59dd16f58022016128fe85 Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 08:12:10 2019 +0200 make it easier for the chrono fuzzer to explore using a fixed size makes the cases cross pollinate each other better. the execution speed is much higher as well commit f0d7cccdc70c98576b7129428c416e7c9e68a8aa Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 07:36:21 2019 +0200 add a build adapted for analysis of fuzzing performance commit 56f7cf3fa979de415174a10b18221727e3138b7b Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 06:25:10 2019 +0200 allow negative values again commit a77a5fc505bbeab1cfa36be16d40f7799689317a Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 05:45:55 2019 +0200 fix UB on signed int overflow in chrono_formatter constructor see https://github.com/fmtlib/fmt/issues/1179 commit b6a592720be520b58ed2f2d8668ffc6c8b71f0f7 Merge: 492a2046 30bce6c1 Author: Paul Dreik <github@pauldreik.se> Date: Thu May 30 05:26:30 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit 492a204623c3c4bbf04c9d47d69979d3a484959c Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 21:36:00 2019 +0200 fix bad assert commit 0ae68b03fbb0e80e292a01f529d5cd7e76349907 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 21:35:49 2019 +0200 add unsigned types for chrono fuzzing commit 2753d7db76645e8847ff2110c5e98f5c8de4a6b9 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 20:25:21 2019 +0200 use C++17 commit bc12742f098ec8b513985daedc57faa518203eb0 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:44:59 2019 +0200 add symlink for safe_duration_cast commit 67201d2639b93736768e109d73b3e9ccc9401c48 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:40:40 2019 +0200 turn on safe duration cast for the fuzzer builds commit 31a70080a63a5213594e4b4e6a33e7e315cf756e Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:32:52 2019 +0200 clang format commit 981e30c5782d04453ece1b31e887da4f29268370 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:30:19 2019 +0200 reduce maximum allocation size commit 7ba51da81de7ecbc5498a22dc29de5b0648bcad2 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 19:30:01 2019 +0200 make nan unit test pass commit 95b4b9c28a589c30727826dd4e1367bebfad5894 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 18:39:08 2019 +0200 special case nan and inf commit 2673c965506e51d150c005340698a6e15d98aaba Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 16:40:11 2019 +0200 build a fast fuzzer, for making coverage fast commit db52b62612fd7ea3ceeaee05584fd8cb83e54a35 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 16:39:48 2019 +0200 add safe duration cast as submodule commit c8a028faec5d91728472f5de01ea8b1766fb929d Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 16:00:26 2019 +0200 enable chrono fuzzing for non-negative values commit de3555cc573e561691858ca16586f8b45a3ae703 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 13:06:35 2019 +0200 try start using safe duration cast commit 5c3245118c3debcb3f6f69c04c2c32d48449ee16 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 09:59:34 2019 +0200 add failing test commit 3a565d3b091c29210e24042f86869fecafb70914 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 09:59:09 2019 +0200 fix cmake option type (should be string, not bool) commit 61c67564207a13992b1c69d95614b2c4aec5df86 Merge: 63e7b9e3 bb254d14 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 29 07:03:42 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 63e7b9e32c714c594d019ef463c9c40a3510a2f2 Merge: 7dd1d80f 5e7bdf1b Author: Paul Dreik <github@pauldreik.se> Date: Fri May 17 19:17:20 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 7dd1d80f3a32465d0fa13ce733bff8686a5b0bad Merge: 2c9aa5a3 2a9e8b52 Author: Paul Dreik <github@pauldreik.se> Date: Tue May 14 19:38:32 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 2c9aa5a31e64af25f8bb4afa8134258822532d3e Merge: 16a442c8 2c77562b Author: Paul Dreik <github@pauldreik.se> Date: Tue May 14 06:33:16 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 16a442c864dbdce70c22b4a859dba5e3b5edaf35 Merge: b1d70b61 f4dfd6e3 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 12 15:24:31 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit b1d70b6144c7a61e580eb44ec7d1bdd2368f5531 Author: Paul Dreik <github@pauldreik.se> Date: Fri May 10 08:52:57 2019 +0200 prevent excessive time (found by oss-fuzz) the following triggered this: std::string message = fmt::format("\377{:.214718908}\377", fmt::arg("/\0", 0.f)); there are probably more places with calls to fill_n which could be checked commit 9a91093a6b20fd22afd6739f5dcba3b00f6f8eaf Merge: 7de0fdec e9bab6d0 Author: Paul Dreik <github@pauldreik.se> Date: Thu May 9 06:06:32 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # include/fmt/chrono.h commit 7de0fdec38270f2d0302413904a5ef1b13d47177 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 20:08:53 2019 +0200 clang format commit bb375e1ca10eb3cc2c6684bf698ad4738ab7eb10 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 19:47:10 2019 +0200 seems to pass the unit test now (except for the nan stuff from victor) commit 786b4b7351bc8e305ad7e68d11ca6b542f66d456 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 19:25:23 2019 +0200 add assert triggering data, and unit test commit 2790e480b81ec83d00315aa69407fe71b8c4c637 Merge: fa859a05 ca978b3d Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 18:42:51 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit fa859a05c2c3abef263166f3a44cdbaa3122d642 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 18:18:54 2019 +0200 add crash commit 1f6e341b1c4bc966a44c7a98b63f22bd65958d0b Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 18:18:27 2019 +0200 assert floating point is finite internally commit 50877748d08a0f4433af4f1213c5bc9021e76e7a Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 17:32:03 2019 +0200 invoke undefined behaviour inside chrono commit bac7ac4149f2d001f7b36236e1710484674d029b Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 17:31:35 2019 +0200 refactor the fuzzer build script commit b19c4cd84a0c8b6d4a7beb281ad881156173ce78 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 16:25:11 2019 +0200 add one more crash commit 7607592e06ebaa189dc180441fa1863430e0938e Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 16:24:05 2019 +0200 add crashing input commit b059a98b27b40cd284e08a54493c25363d743557 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 16:21:25 2019 +0200 trigger undefined behaviour with NaN durations commit 7cce33250282b397c00159e6809125f5fc1c0190 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 16:20:51 2019 +0200 add asan only fuzzer commit 757319a4e30978d8661b3be8f75937266071b413 Merge: a574b21c c1d430e6 Author: Paul Dreik <github@pauldreik.se> Date: Sun May 5 06:34:59 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # test/chrono-test.cc commit a574b21c840339abef5e4ad33612b6efac6ad54b Author: Paul Dreik <github@pauldreik.se> Date: Sat May 4 12:54:13 2019 +0200 disable chrono fuzzing for now it triggers integer overflow and is not trivial to solve. commit ff17322bceba53e0c2d9ebcf3756115ad148195e Merge: d6a59851 29c10fbf Author: Paul Dreik <github@pauldreik.se> Date: Sat May 4 07:29:39 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit d6a598511c7dc0c208c2d688b2943b0d7c092029 Merge: 663b1592 4a4d72f9 Author: Paul Dreik <github@pauldreik.se> Date: Wed May 1 20:44:16 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz # Conflicts: # test/chrono-test.cc commit 663b159235f8ae5f58fe80bb02d49bfa392056b0 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 22:36:07 2019 +0200 add crash case (triggers assertion) commit 082a5cb226142ea30b415d4231cea9425748741a Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 21:44:19 2019 +0200 add const commit b8d70919ea6be0d2e4c58ef82887496f55125ba9 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 21:29:43 2019 +0200 provoke assertion fmt/include/fmt/core.h:246: typename std::make_unsigned<_Tp>::type fmt::v5::internal::to_unsigned(Int) [with Int = long int; typename std::make_unsigned<_Tp>::type = long unsigned int]: Assertion `(value >= 0) && "negative value"' failed. commit e1966013af4eb7febf047d4629cc6236a6aae0e3 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 20:46:16 2019 +0200 add more crashes commit 1394ae3fe915319ce7dc63d6a9dc820a29c9539e Merge: 89338cad 4c721e3a Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 17:16:14 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 89338cad4eed9441644ec8c5f1687b511c829ea4 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:40:32 2019 +0200 add notes on how to reproduce crashes commit 7dc3e4c7223617da274c4cccb9cf5459d0510e0b Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:28:20 2019 +0200 add crashes from chrono duration commit b62e8bc783134c2d15ebf0372c8a61b41624e6b1 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:26:53 2019 +0200 rename fuzzer commit 7f4ab2b80d072fe3ad96e37e45f3fa807a85c99f Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:15:38 2019 +0200 clang format commit a6cc2a35a9799e88b9ed89e578b7aefd9b09ad09 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 09:12:04 2019 +0200 add chrono duration fuzzer commit 682713c9a61d52b46e95fdb7d970a8733f77ce88 Merge: 8b934b37 8d8ea21c Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 28 08:07:56 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 8b934b37161d1389de603ced6560982507bb7ae5 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 10:23:44 2019 +0200 clang format commit 793d97b9af33269f5628094f547f9771e968e3f2 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 10:23:17 2019 +0200 tighten memory allocation commit e2301f2430b15c9817433206597ef82c990f49a0 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 10:19:56 2019 +0200 clean up and set license (BSD 2-clause simplified, same as fmt) commit e64c3fb35719afa644dee1f9f17829cace6e17ff Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 10:04:23 2019 +0200 clean up and add afl commit ab46241206aaf46759fd3f292ee4a1088b652d15 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 09:54:48 2019 +0200 drop c++17 requirement commit 20c01e1acf330c8a28192f55b16efeebddb72ab0 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 09:25:19 2019 +0200 initial oss-fuzz compatible version commit 6cbd91a37cf36a1d0e994bb16cf44a12622f7dca Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 08:42:51 2019 +0200 initial commit of fuzzers from https://github.com/pauldreik/fuzzfmt commit eaddfb16d86ef1c259b737e2aab40145b0c956a6 Merge: e37d7db3 134904c8 Author: Paul Dreik <github@pauldreik.se> Date: Sat Apr 27 08:38:19 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit e37d7db3b938c82f569d71e6bb00bd1bf8394db7 Merge: 99b2e08b bd516e34 Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 21 17:28:06 2019 +0200 Merge remote-tracking branch 'upstream/master' into fuzz commit 99b2e08b6bef25b793df5ef07621c9c4402587de Author: Paul Dreik <github@pauldreik.se> Date: Sun Apr 21 10:30:56 2019 +0200 stop high memory use when fuzzing
2019-06-30 07:11:13 +00:00
throw std::runtime_error("fuzz mode - avoiding excessive cpu use");
#endif
it = std::fill_n(it, num_zeros, static_cast<Char>('0'));
}
} else if (full_exp > 0) {
// 1234e-2 -> 12.34[0+]
it = copy_str<Char>(digits, digits + full_exp, it);
if (!params.trailing_zeros) {
// Remove trailing zeros.
2019-03-17 19:05:07 +00:00
while (size > full_exp && digits[size - 1] == '0') --size;
2019-07-04 00:25:57 +00:00
if (size != full_exp) *it++ = decimal_point;
2019-03-16 19:17:35 +00:00
return copy_str<Char>(digits + full_exp, digits + size, it);
}
2019-07-04 00:25:57 +00:00
*it++ = decimal_point;
2019-03-16 19:17:35 +00:00
it = copy_str<Char>(digits + full_exp, digits + size, it);
if (params.num_digits > size) {
// Add trailing zeros.
int num_zeros = params.num_digits - size;
it = std::fill_n(it, num_zeros, static_cast<Char>('0'));
}
} else {
// 1234e-6 -> 0.001234
*it++ = static_cast<Char>('0');
int num_zeros = -full_exp;
if (params.num_digits >= 0 && params.num_digits < num_zeros)
num_zeros = params.num_digits;
2019-04-27 14:42:27 +00:00
if (!params.trailing_zeros)
while (size > 0 && digits[size - 1] == '0') --size;
if (num_zeros != 0 || size != 0) {
2019-07-04 00:25:57 +00:00
*it++ = decimal_point;
it = std::fill_n(it, num_zeros, static_cast<Char>('0'));
it = copy_str<Char>(digits, digits + size, it);
}
}
return it;
}
2019-07-07 13:54:25 +00:00
namespace grisu_options {
enum { fixed = 1, grisu3 = 2 };
}
// Formats value using the Grisu algorithm:
// https://www.cs.tufts.edu/~nr/cs257/archive/florian-loitsch/printf.pdf
template <typename Double, FMT_ENABLE_IF(sizeof(Double) == sizeof(uint64_t))>
FMT_API bool grisu_format(Double, buffer<char>&, int, unsigned, int&);
template <typename Double, FMT_ENABLE_IF(sizeof(Double) != sizeof(uint64_t))>
inline bool grisu_format(Double, buffer<char>&, int, unsigned, int&) {
return false;
}
struct sprintf_specs {
int precision;
char type;
bool alt : 1;
template <typename Char>
constexpr sprintf_specs(basic_format_specs<Char> specs)
: precision(specs.precision), type(specs.type), alt(specs.alt) {}
constexpr bool has_precision() const { return precision >= 0; }
};
template <typename Double>
2019-07-07 13:54:25 +00:00
char* sprintf_format(Double, internal::buffer<char>&, sprintf_specs);
2018-09-30 18:39:20 +00:00
template <typename Handler>
2019-01-13 02:27:38 +00:00
FMT_CONSTEXPR void handle_int_type_spec(char spec, Handler&& handler) {
2017-11-23 17:14:37 +00:00
switch (spec) {
2019-01-13 02:27:38 +00:00
case 0:
case 'd':
2017-11-08 13:56:52 +00:00
handler.on_dec();
break;
2019-01-13 02:27:38 +00:00
case 'x':
case 'X':
2017-11-08 13:56:52 +00:00
handler.on_hex();
break;
2019-01-13 02:27:38 +00:00
case 'b':
case 'B':
2017-11-08 13:56:52 +00:00
handler.on_bin();
break;
case 'o':
handler.on_oct();
break;
case 'n':
handler.on_num();
break;
default:
handler.on_error();
}
}
2018-09-30 18:39:20 +00:00
template <typename Handler>
2019-01-13 02:27:38 +00:00
FMT_CONSTEXPR void handle_float_type_spec(char spec, Handler&& handler) {
2017-11-23 17:14:37 +00:00
switch (spec) {
2019-01-13 02:27:38 +00:00
case 0:
case 'g':
case 'G':
2017-11-23 17:14:37 +00:00
handler.on_general();
break;
2019-01-13 02:27:38 +00:00
case 'e':
case 'E':
2017-11-23 17:14:37 +00:00
handler.on_exp();
break;
2019-01-13 02:27:38 +00:00
case 'f':
case 'F':
2017-11-23 17:14:37 +00:00
handler.on_fixed();
break;
case '%':
handler.on_percent();
break;
2019-01-13 02:27:38 +00:00
case 'a':
case 'A':
2017-11-23 17:14:37 +00:00
handler.on_hex();
break;
2019-07-03 23:36:23 +00:00
case 'n':
handler.on_num();
break;
2017-11-23 17:14:37 +00:00
default:
handler.on_error();
break;
}
}
2017-11-24 15:54:22 +00:00
template <typename Char, typename Handler>
2019-01-13 02:27:38 +00:00
FMT_CONSTEXPR void handle_char_specs(const basic_format_specs<Char>* specs,
Handler&& handler) {
2018-09-12 14:34:22 +00:00
if (!specs) return handler.on_char();
if (specs->type && specs->type != 'c') return handler.on_int();
if (specs->align == align::numeric || specs->sign != sign::none || specs->alt)
2017-11-24 15:54:22 +00:00
handler.on_error("invalid format specifier for char");
handler.on_char();
}
2018-03-15 13:45:31 +00:00
template <typename Char, typename Handler>
2019-01-13 02:27:38 +00:00
FMT_CONSTEXPR void handle_cstring_type_spec(Char spec, Handler&& handler) {
2017-11-24 17:54:28 +00:00
if (spec == 0 || spec == 's')
handler.on_string();
else if (spec == 'p')
handler.on_pointer();
else
handler.on_error("invalid type specifier");
}
2018-01-14 15:19:23 +00:00
template <typename Char, typename ErrorHandler>
2019-01-13 02:27:38 +00:00
FMT_CONSTEXPR void check_string_type_spec(Char spec, ErrorHandler&& eh) {
if (spec != 0 && spec != 's') eh.on_error("invalid type specifier");
2017-11-24 17:54:28 +00:00
}
2018-03-15 13:45:31 +00:00
template <typename Char, typename ErrorHandler>
2019-01-13 02:27:38 +00:00
FMT_CONSTEXPR void check_pointer_type_spec(Char spec, ErrorHandler&& eh) {
if (spec != 0 && spec != 'p') eh.on_error("invalid type specifier");
}
2019-01-13 02:27:38 +00:00
template <typename ErrorHandler> class int_type_checker : private ErrorHandler {
2017-11-16 14:55:49 +00:00
public:
2018-02-03 14:14:10 +00:00
FMT_CONSTEXPR explicit int_type_checker(ErrorHandler eh) : ErrorHandler(eh) {}
2017-11-16 14:55:49 +00:00
2018-02-03 14:14:10 +00:00
FMT_CONSTEXPR void on_dec() {}
FMT_CONSTEXPR void on_hex() {}
FMT_CONSTEXPR void on_bin() {}
FMT_CONSTEXPR void on_oct() {}
FMT_CONSTEXPR void on_num() {}
2018-02-03 14:14:10 +00:00
FMT_CONSTEXPR void on_error() {
2017-11-18 14:58:14 +00:00
ErrorHandler::on_error("invalid type specifier");
}
};
2017-11-23 17:14:37 +00:00
template <typename ErrorHandler>
class float_type_checker : private ErrorHandler {
public:
2018-02-03 14:14:10 +00:00
FMT_CONSTEXPR explicit float_type_checker(ErrorHandler eh)
2019-01-13 02:27:38 +00:00
: ErrorHandler(eh) {}
2017-11-23 17:14:37 +00:00
2018-02-03 14:14:10 +00:00
FMT_CONSTEXPR void on_general() {}
FMT_CONSTEXPR void on_exp() {}
FMT_CONSTEXPR void on_fixed() {}
FMT_CONSTEXPR void on_percent() {}
2018-02-03 14:14:10 +00:00
FMT_CONSTEXPR void on_hex() {}
2019-07-03 23:36:23 +00:00
FMT_CONSTEXPR void on_num() {}
2017-11-23 17:14:37 +00:00
2018-02-03 14:14:10 +00:00
FMT_CONSTEXPR void on_error() {
2017-11-23 17:14:37 +00:00
ErrorHandler::on_error("invalid type specifier");
}
};
2018-09-30 18:39:20 +00:00
template <typename ErrorHandler>
2017-11-24 15:54:22 +00:00
class char_specs_checker : public ErrorHandler {
private:
2018-09-30 18:39:20 +00:00
char type_;
2017-11-24 15:54:22 +00:00
public:
2018-09-30 18:39:20 +00:00
FMT_CONSTEXPR char_specs_checker(char type, ErrorHandler eh)
2019-01-13 02:27:38 +00:00
: ErrorHandler(eh), type_(type) {}
2017-11-24 15:54:22 +00:00
2018-02-03 14:14:10 +00:00
FMT_CONSTEXPR void on_int() {
2017-11-24 15:54:22 +00:00
handle_int_type_spec(type_, int_type_checker<ErrorHandler>(*this));
}
2018-02-03 14:14:10 +00:00
FMT_CONSTEXPR void on_char() {}
2017-11-24 15:54:22 +00:00
};
2017-11-24 17:54:28 +00:00
template <typename ErrorHandler>
class cstring_type_checker : public ErrorHandler {
public:
2018-02-03 14:14:10 +00:00
FMT_CONSTEXPR explicit cstring_type_checker(ErrorHandler eh)
2019-01-13 02:27:38 +00:00
: ErrorHandler(eh) {}
2017-11-24 17:54:28 +00:00
2018-02-03 14:14:10 +00:00
FMT_CONSTEXPR void on_string() {}
FMT_CONSTEXPR void on_pointer() {}
2017-11-24 17:54:28 +00:00
};
template <typename Context>
2019-01-13 02:27:38 +00:00
void arg_map<Context>::init(const basic_format_args<Context>& args) {
if (map_) return;
2019-07-17 19:57:30 +00:00
map_ = new entry[internal::to_unsigned(args.max_size())];
if (args.is_packed()) {
2019-07-17 19:07:05 +00:00
for (int i = 0;; ++i) {
2017-09-06 14:12:07 +00:00
internal::type arg_type = args.type(i);
2019-06-14 20:18:00 +00:00
if (arg_type == internal::none_type) return;
if (arg_type == internal::named_arg_type) push_back(args.values_[i]);
2019-01-13 02:27:38 +00:00
}
}
for (int i = 0, n = args.max_size(); i < n; ++i) {
2019-06-14 20:18:00 +00:00
auto type = args.args_[i].type_;
if (type == internal::named_arg_type) push_back(args.args_[i].value_);
}
}
2019-07-07 14:21:20 +00:00
// This template provides operations for formatting and writing data into a
// character range.
2019-07-03 16:52:09 +00:00
template <typename Range> class basic_writer {
public:
2019-07-07 14:21:20 +00:00
using char_type = typename Range::value_type;
using iterator = typename Range::iterator;
using format_specs = basic_format_specs<char_type>;
private:
2019-07-03 16:52:09 +00:00
iterator out_; // Output iterator.
internal::locale_ref locale_;
2019-07-03 16:52:09 +00:00
// Attempts to reserve space for n extra characters in the output range.
// Returns a pointer to the reserved range or a reference to out_.
auto reserve(std::size_t n) -> decltype(internal::reserve(out_, n)) {
return internal::reserve(out_, n);
}
2018-10-04 01:22:26 +00:00
2019-07-03 16:52:09 +00:00
template <typename F> struct padded_int_writer {
size_t size_;
string_view prefix;
char_type fill;
std::size_t padding;
F f;
2018-10-04 01:22:26 +00:00
2019-07-03 16:52:09 +00:00
size_t size() const { return size_; }
size_t width() const { return size_; }
template <typename It> void operator()(It&& it) const {
if (prefix.size() != 0)
it = internal::copy_str<char_type>(prefix.begin(), prefix.end(), it);
it = std::fill_n(it, padding, fill);
f(it);
}
2018-02-07 15:08:14 +00:00
};
2019-07-03 16:52:09 +00:00
// Writes an integer in the format
// <left-padding><prefix><numeric-padding><digits><right-padding>
// where <digits> are written by f(it).
2019-07-07 13:39:20 +00:00
template <typename F>
void write_int(int num_digits, string_view prefix, format_specs specs, F f) {
2019-07-03 16:52:09 +00:00
std::size_t size = prefix.size() + internal::to_unsigned(num_digits);
2019-07-07 13:39:20 +00:00
char_type fill = specs.fill[0];
2019-07-03 16:52:09 +00:00
std::size_t padding = 0;
2019-07-07 13:39:20 +00:00
if (specs.align == align::numeric) {
2019-07-17 19:07:05 +00:00
auto unsiged_width = internal::to_unsigned(specs.width);
if (unsiged_width > size) {
padding = unsiged_width - size;
size = unsiged_width;
2019-07-03 16:52:09 +00:00
}
2019-07-07 13:39:20 +00:00
} else if (specs.precision > num_digits) {
size = prefix.size() + internal::to_unsigned(specs.precision);
padding = internal::to_unsigned(specs.precision - num_digits);
2019-07-03 16:52:09 +00:00
fill = static_cast<char_type>('0');
}
2019-07-07 13:39:20 +00:00
if (specs.align == align::none) specs.align = align::right;
write_padded(specs, padded_int_writer<F>{size, prefix, fill, padding, f});
2017-11-24 15:54:22 +00:00
}
2019-07-03 16:52:09 +00:00
// Writes a decimal integer.
template <typename Int> void write_decimal(Int value) {
2019-07-03 23:01:21 +00:00
auto abs_value = static_cast<uint32_or_64_t<Int>>(value);
2019-07-03 16:52:09 +00:00
bool is_negative = internal::is_negative(value);
if (is_negative) abs_value = 0 - abs_value;
int num_digits = internal::count_digits(abs_value);
auto&& it =
reserve((is_negative ? 1 : 0) + static_cast<size_t>(num_digits));
if (is_negative) *it++ = static_cast<char_type>('-');
it = internal::format_decimal<char_type>(it, abs_value, num_digits);
}
2019-07-03 16:52:09 +00:00
// The handle_int_type_spec handler that writes an integer.
2019-07-07 13:39:20 +00:00
template <typename Int, typename Specs> struct int_writer {
2019-07-03 23:01:21 +00:00
using unsigned_type = uint32_or_64_t<Int>;
2019-07-03 16:52:09 +00:00
basic_writer<Range>& writer;
2019-07-07 13:39:20 +00:00
const Specs& specs;
2019-07-03 16:52:09 +00:00
unsigned_type abs_value;
char prefix[4];
unsigned prefix_size;
2019-07-03 16:52:09 +00:00
string_view get_prefix() const { return string_view(prefix, prefix_size); }
2019-07-07 13:39:20 +00:00
int_writer(basic_writer<Range>& w, Int value, const Specs& s)
2019-07-03 16:52:09 +00:00
: writer(w),
2019-07-07 13:39:20 +00:00
specs(s),
2019-07-03 16:52:09 +00:00
abs_value(static_cast<unsigned_type>(value)),
prefix_size(0) {
if (internal::is_negative(value)) {
prefix[0] = '-';
++prefix_size;
abs_value = 0 - abs_value;
2019-07-07 13:39:20 +00:00
} else if (specs.sign != sign::none && specs.sign != sign::minus) {
prefix[0] = specs.sign == sign::plus ? '+' : ' ';
2019-07-03 16:52:09 +00:00
++prefix_size;
}
}
2019-07-03 16:52:09 +00:00
struct dec_writer {
unsigned_type abs_value;
int num_digits;
2016-12-27 15:43:25 +00:00
2019-07-03 16:52:09 +00:00
template <typename It> void operator()(It&& it) const {
it = internal::format_decimal<char_type>(it, abs_value, num_digits);
}
};
2019-07-03 16:52:09 +00:00
void on_dec() {
int num_digits = internal::count_digits(abs_value);
2019-07-07 13:39:20 +00:00
writer.write_int(num_digits, get_prefix(), specs,
2019-07-03 16:52:09 +00:00
dec_writer{abs_value, num_digits});
}
2019-07-03 16:52:09 +00:00
struct hex_writer {
int_writer& self;
int num_digits;
2019-07-03 16:52:09 +00:00
template <typename It> void operator()(It&& it) const {
it = internal::format_uint<4, char_type>(it, self.abs_value, num_digits,
2019-07-07 13:39:20 +00:00
self.specs.type != 'x');
2019-07-03 16:52:09 +00:00
}
};
2016-11-19 15:39:07 +00:00
2019-07-03 16:52:09 +00:00
void on_hex() {
2019-07-07 13:39:20 +00:00
if (specs.alt) {
2019-07-03 16:52:09 +00:00
prefix[prefix_size++] = '0';
2019-07-07 13:39:20 +00:00
prefix[prefix_size++] = specs.type;
2019-07-03 16:52:09 +00:00
}
int num_digits = internal::count_digits<4>(abs_value);
2019-07-07 13:39:20 +00:00
writer.write_int(num_digits, get_prefix(), specs,
2019-07-03 16:52:09 +00:00
hex_writer{*this, num_digits});
}
2017-11-24 15:54:22 +00:00
2019-07-03 16:52:09 +00:00
template <int BITS> struct bin_writer {
unsigned_type abs_value;
int num_digits;
2017-11-24 15:54:22 +00:00
2019-07-03 16:52:09 +00:00
template <typename It> void operator()(It&& it) const {
it = internal::format_uint<BITS, char_type>(it, abs_value, num_digits);
}
};
void on_bin() {
2019-07-07 13:39:20 +00:00
if (specs.alt) {
2019-07-03 16:52:09 +00:00
prefix[prefix_size++] = '0';
2019-07-07 13:39:20 +00:00
prefix[prefix_size++] = static_cast<char>(specs.type);
2019-07-03 16:52:09 +00:00
}
int num_digits = internal::count_digits<1>(abs_value);
2019-07-07 13:39:20 +00:00
writer.write_int(num_digits, get_prefix(), specs,
2019-07-03 16:52:09 +00:00
bin_writer<1>{abs_value, num_digits});
2018-09-12 14:34:22 +00:00
}
2018-03-03 22:04:59 +00:00
2019-07-03 16:52:09 +00:00
void on_oct() {
int num_digits = internal::count_digits<3>(abs_value);
2019-07-07 13:39:20 +00:00
if (specs.alt && specs.precision <= num_digits) {
2019-07-03 16:52:09 +00:00
// Octal prefix '0' is counted as a digit, so only add it if precision
// is not greater than the number of digits.
prefix[prefix_size++] = '0';
}
2019-07-07 13:39:20 +00:00
writer.write_int(num_digits, get_prefix(), specs,
2019-07-03 16:52:09 +00:00
bin_writer<3>{abs_value, num_digits});
}
2017-11-24 17:54:28 +00:00
2019-07-07 14:21:20 +00:00
enum { sep_size = 1 };
2017-11-24 17:54:28 +00:00
2019-07-03 16:52:09 +00:00
struct num_writer {
unsigned_type abs_value;
int size;
char_type sep;
2018-03-03 22:04:59 +00:00
2019-07-03 16:52:09 +00:00
template <typename It> void operator()(It&& it) const {
2019-07-07 14:21:20 +00:00
basic_string_view<char_type> s(&sep, sep_size);
2019-07-03 22:50:05 +00:00
// Index of a decimal digit with the least significant digit having
// index 0.
unsigned digit_index = 0;
2019-07-03 16:52:09 +00:00
it = internal::format_decimal<char_type>(
2019-07-03 22:50:05 +00:00
it, abs_value, size, [s, &digit_index](char_type*& buffer) {
if (++digit_index % 3 != 0) return;
buffer -= s.size();
std::uninitialized_copy(s.data(), s.data() + s.size(),
internal::make_checked(buffer, s.size()));
});
2019-07-03 16:52:09 +00:00
}
};
2019-07-03 16:52:09 +00:00
void on_num() {
char_type sep = internal::thousands_sep<char_type>(writer.locale_);
if (!sep) return on_dec();
int num_digits = internal::count_digits(abs_value);
2019-07-07 14:21:20 +00:00
int size = num_digits + sep_size * ((num_digits - 1) / 3);
2019-07-07 13:39:20 +00:00
writer.write_int(size, get_prefix(), specs,
2019-07-03 16:52:09 +00:00
num_writer{abs_value, size, sep});
2018-09-12 14:34:22 +00:00
}
2019-07-03 16:52:09 +00:00
FMT_NORETURN void on_error() {
FMT_THROW(format_error("invalid type specifier"));
}
};
2019-07-07 14:21:20 +00:00
enum { inf_size = 3 }; // This is an enum to workaround a bug in MSVC.
2019-07-03 16:52:09 +00:00
struct inf_or_nan_writer {
char sign;
bool as_percentage;
const char* str;
size_t size() const {
2019-07-07 14:21:20 +00:00
return static_cast<std::size_t>(inf_size + (sign ? 1 : 0) +
2019-07-03 16:52:09 +00:00
(as_percentage ? 1 : 0));
2018-09-09 16:47:28 +00:00
}
2019-07-03 16:52:09 +00:00
size_t width() const { return size(); }
2018-09-09 16:47:28 +00:00
2019-07-03 16:52:09 +00:00
template <typename It> void operator()(It&& it) const {
if (sign) *it++ = static_cast<char_type>(sign);
it = internal::copy_str<char_type>(
2019-07-07 14:21:20 +00:00
str, str + static_cast<std::size_t>(inf_size), it);
2019-07-03 16:52:09 +00:00
if (as_percentage) *it++ = static_cast<char_type>('%');
}
};
2019-02-10 03:34:42 +00:00
2019-07-03 16:52:09 +00:00
struct double_writer {
char sign;
internal::buffer<char>& buffer;
char* decimal_point_pos;
char_type decimal_point;
2019-07-03 16:52:09 +00:00
size_t size() const { return buffer.size() + (sign ? 1 : 0); }
size_t width() const { return size(); }
2019-07-03 16:52:09 +00:00
template <typename It> void operator()(It&& it) {
if (sign) *it++ = static_cast<char_type>(sign);
auto begin = buffer.begin();
if (decimal_point_pos) {
it = internal::copy_str<char_type>(begin, decimal_point_pos, it);
*it++ = decimal_point;
begin = decimal_point_pos + 1;
}
it = internal::copy_str<char_type>(begin, buffer.end(), it);
2019-07-03 16:52:09 +00:00
}
};
2019-07-03 16:52:09 +00:00
class grisu_writer {
private:
internal::buffer<char>& digits_;
size_t size_;
char sign_;
int exp_;
internal::gen_digits_params params_;
2019-07-04 00:25:57 +00:00
char_type decimal_point_;
2016-11-20 16:47:24 +00:00
2019-07-03 16:52:09 +00:00
public:
grisu_writer(char sign, internal::buffer<char>& digits, int exp,
2019-07-04 00:25:57 +00:00
const internal::gen_digits_params& params,
char_type decimal_point)
: digits_(digits),
sign_(sign),
exp_(exp),
params_(params),
decimal_point_(decimal_point) {
2019-07-03 16:52:09 +00:00
int num_digits = static_cast<int>(digits.size());
int full_exp = num_digits + exp - 1;
int precision = params.num_digits > 0 ? params.num_digits : 11;
params_.fixed |= full_exp >= -4 && full_exp < precision;
auto it = internal::grisu_prettify<char>(
digits.data(), num_digits, exp, internal::counting_iterator<char>(),
2019-07-04 00:25:57 +00:00
params_, '.');
2019-07-03 16:52:09 +00:00
size_ = it.count();
}
size_t size() const { return size_ + (sign_ ? 1 : 0); }
size_t width() const { return size(); }
template <typename It> void operator()(It&& it) {
if (sign_) *it++ = static_cast<char_type>(sign_);
int num_digits = static_cast<int>(digits_.size());
it = internal::grisu_prettify<char_type>(digits_.data(), num_digits, exp_,
2019-07-04 00:25:57 +00:00
it, params_, decimal_point_);
2019-07-03 16:52:09 +00:00
}
};
2019-07-03 16:52:09 +00:00
template <typename Char> struct str_writer {
const Char* s;
size_t size_;
2017-08-13 20:09:02 +00:00
2019-07-03 16:52:09 +00:00
size_t size() const { return size_; }
size_t width() const {
return internal::count_code_points(basic_string_view<Char>(s, size_));
}
2016-11-07 00:11:24 +00:00
2019-07-03 16:52:09 +00:00
template <typename It> void operator()(It&& it) const {
it = internal::copy_str<char_type>(s, s + size_, it);
}
};
2019-07-03 16:52:09 +00:00
template <typename UIntPtr> struct pointer_writer {
UIntPtr value;
int num_digits;
2019-07-17 19:07:05 +00:00
size_t size() const { return to_unsigned(num_digits) + 2; }
2019-07-03 16:52:09 +00:00
size_t width() const { return size(); }
template <typename It> void operator()(It&& it) const {
*it++ = static_cast<char_type>('0');
*it++ = static_cast<char_type>('x');
it = internal::format_uint<4, char_type>(it, value, num_digits);
}
};
public:
2019-07-03 16:52:09 +00:00
/** Constructs a ``basic_writer`` object. */
explicit basic_writer(Range out,
internal::locale_ref loc = internal::locale_ref())
: out_(out.begin()), locale_(loc) {}
2019-07-03 16:52:09 +00:00
iterator out() const { return out_; }
2019-07-03 16:52:09 +00:00
// Writes a value in the format
// <left-padding><value><right-padding>
// where <value> is written by f(it).
2019-07-07 13:39:20 +00:00
template <typename F> void write_padded(const format_specs& specs, F&& f) {
2019-07-17 19:07:05 +00:00
// User-perceived width (in code points).
unsigned width = to_unsigned(specs.width);
2019-07-18 04:28:53 +00:00
size_t size = f.size(); // The number of code units.
2019-07-03 16:52:09 +00:00
size_t num_code_points = width != 0 ? f.width() : size;
if (width <= num_code_points) return f(reserve(size));
auto&& it = reserve(width + (size - num_code_points));
2019-07-07 13:39:20 +00:00
char_type fill = specs.fill[0];
2019-07-03 16:52:09 +00:00
std::size_t padding = width - num_code_points;
2019-07-07 13:39:20 +00:00
if (specs.align == align::right) {
2019-07-03 16:52:09 +00:00
it = std::fill_n(it, padding, fill);
f(it);
2019-07-07 13:39:20 +00:00
} else if (specs.align == align::center) {
2019-07-03 16:52:09 +00:00
std::size_t left_padding = padding / 2;
it = std::fill_n(it, left_padding, fill);
f(it);
it = std::fill_n(it, padding - left_padding, fill);
} else {
f(it);
it = std::fill_n(it, padding, fill);
}
}
2019-07-03 16:52:09 +00:00
void write(int value) { write_decimal(value); }
void write(long value) { write_decimal(value); }
void write(long long value) { write_decimal(value); }
2019-07-03 16:52:09 +00:00
void write(unsigned value) { write_decimal(value); }
void write(unsigned long value) { write_decimal(value); }
void write(unsigned long long value) { write_decimal(value); }
2017-11-12 14:58:11 +00:00
2019-07-03 16:52:09 +00:00
// Writes a formatted integer.
template <typename T, typename Spec>
void write_int(T value, const Spec& spec) {
internal::handle_int_type_spec(spec.type,
int_writer<T, Spec>(*this, value, spec));
}
2019-07-07 13:39:20 +00:00
void write(double value, const format_specs& specs = format_specs()) {
write_double(value, specs);
}
2016-06-14 15:11:33 +00:00
2019-07-03 16:52:09 +00:00
/**
\rst
Formats *value* using the general format for floating-point numbers
(``'g'``) and writes it to the buffer.
\endrst
*/
2019-07-07 13:39:20 +00:00
void write(long double value, const format_specs& specs = format_specs()) {
write_double(value, specs);
2018-09-30 18:39:20 +00:00
}
2019-07-03 16:52:09 +00:00
// Formats a floating-point number (double or long double).
template <typename T, bool USE_GRISU = fmt::internal::use_grisu<T>()>
2019-07-07 13:39:20 +00:00
void write_double(T value, const format_specs& specs);
2019-07-03 16:52:09 +00:00
/** Writes a character to the buffer. */
void write(char value) {
auto&& it = reserve(1);
*it++ = value;
}
2019-07-03 16:52:09 +00:00
template <typename Char, FMT_ENABLE_IF(std::is_same<Char, char_type>::value)>
void write(Char value) {
auto&& it = reserve(1);
*it++ = value;
}
2019-07-03 16:52:09 +00:00
/**
\rst
Writes *value* to the buffer.
\endrst
*/
void write(string_view value) {
auto&& it = reserve(value.size());
it = internal::copy_str<char_type>(value.begin(), value.end(), it);
}
2019-07-03 16:52:09 +00:00
void write(wstring_view value) {
static_assert(std::is_same<char_type, wchar_t>::value, "");
auto&& it = reserve(value.size());
it = std::copy(value.begin(), value.end(), it);
}
2019-07-03 16:52:09 +00:00
// Writes a formatted string.
template <typename Char>
2019-07-07 13:39:20 +00:00
void write(const Char* s, std::size_t size, const format_specs& specs) {
write_padded(specs, str_writer<Char>{s, size});
}
2019-07-03 16:52:09 +00:00
template <typename Char>
void write(basic_string_view<Char> s,
2019-07-07 13:39:20 +00:00
const format_specs& specs = format_specs()) {
2019-07-03 16:52:09 +00:00
const Char* data = s.data();
std::size_t size = s.size();
2019-07-07 13:39:20 +00:00
if (specs.precision >= 0 && internal::to_unsigned(specs.precision) < size)
size = internal::to_unsigned(specs.precision);
write(data, size, specs);
}
2019-07-03 16:52:09 +00:00
template <typename UIntPtr>
2019-07-07 13:39:20 +00:00
void write_pointer(UIntPtr value, const format_specs* specs) {
2019-07-03 16:52:09 +00:00
int num_digits = internal::count_digits<4>(value);
auto pw = pointer_writer<UIntPtr>{value, num_digits};
2019-07-17 19:07:05 +00:00
if (!specs) return pw(reserve(to_unsigned(num_digits) + 2));
2019-07-07 13:39:20 +00:00
format_specs specs_copy = *specs;
if (specs_copy.align == align::none) specs_copy.align = align::right;
write_padded(specs_copy, pw);
}
2019-07-03 16:52:09 +00:00
};
2019-07-03 16:52:09 +00:00
using writer = basic_writer<buffer_range<char>>;
2019-07-03 16:52:09 +00:00
template <typename Range, typename ErrorHandler = internal::error_handler>
class arg_formatter_base {
public:
2019-07-07 14:21:20 +00:00
using char_type = typename Range::value_type;
using iterator = typename Range::iterator;
using format_specs = basic_format_specs<char_type>;
private:
2019-07-07 14:21:20 +00:00
using writer_type = basic_writer<Range>;
2019-07-03 16:52:09 +00:00
writer_type writer_;
format_specs* specs_;
2019-07-03 16:52:09 +00:00
struct char_writer {
char_type value;
2019-07-03 16:52:09 +00:00
size_t size() const { return 1; }
size_t width() const { return 1; }
2019-06-12 02:22:19 +00:00
2019-07-03 16:52:09 +00:00
template <typename It> void operator()(It&& it) const { *it++ = value; }
};
2019-07-03 16:52:09 +00:00
void write_char(char_type value) {
if (specs_)
writer_.write_padded(*specs_, char_writer{value});
else
writer_.write(value);
}
2019-07-03 16:52:09 +00:00
void write_pointer(const void* p) {
writer_.write_pointer(internal::bit_cast<internal::uintptr_t>(p), specs_);
}
2019-07-03 16:52:09 +00:00
protected:
writer_type& writer() { return writer_; }
2019-07-07 13:39:20 +00:00
FMT_DEPRECATED format_specs* spec() { return specs_; }
format_specs* specs() { return specs_; }
2019-07-03 16:52:09 +00:00
iterator out() { return writer_.out(); }
void write(bool value) {
string_view sv(value ? "true" : "false");
specs_ ? writer_.write(sv, *specs_) : writer_.write(sv);
}
2019-07-03 16:52:09 +00:00
void write(const char_type* value) {
2019-08-11 13:53:03 +00:00
if (!value) {
FMT_THROW(format_error("string pointer is null"));
} else {
auto length = std::char_traits<char_type>::length(value);
basic_string_view<char_type> sv(value, length);
specs_ ? writer_.write(sv, *specs_) : writer_.write(sv);
}
2019-07-03 16:52:09 +00:00
}
2017-11-13 03:14:35 +00:00
2019-07-03 16:52:09 +00:00
public:
arg_formatter_base(Range r, format_specs* s, locale_ref loc)
: writer_(r, loc), specs_(s) {}
2019-01-19 17:10:57 +00:00
2019-07-03 16:52:09 +00:00
iterator operator()(monostate) {
FMT_ASSERT(false, "invalid argument type");
return out();
2019-02-10 03:34:42 +00:00
}
2019-07-03 16:52:09 +00:00
template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
iterator operator()(T value) {
if (specs_)
writer_.write_int(value, *specs_);
else
writer_.write(value);
return out();
2019-02-10 03:34:42 +00:00
}
2019-07-03 16:52:09 +00:00
iterator operator()(char_type value) {
internal::handle_char_specs(
specs_, char_spec_handler(*this, static_cast<char_type>(value)));
return out();
}
2019-07-03 16:52:09 +00:00
iterator operator()(bool value) {
if (specs_ && specs_->type) return (*this)(value ? 1 : 0);
write(value != 0);
return out();
}
2019-07-03 16:52:09 +00:00
template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value)>
iterator operator()(T value) {
writer_.write_double(value, specs_ ? *specs_ : format_specs());
return out();
}
2019-07-03 16:52:09 +00:00
struct char_spec_handler : ErrorHandler {
arg_formatter_base& formatter;
char_type value;
2019-07-03 16:52:09 +00:00
char_spec_handler(arg_formatter_base& f, char_type val)
: formatter(f), value(val) {}
2019-07-03 16:52:09 +00:00
void on_int() {
if (formatter.specs_)
formatter.writer_.write_int(value, *formatter.specs_);
else
formatter.writer_.write(value);
}
void on_char() { formatter.write_char(value); }
};
2019-07-03 16:52:09 +00:00
struct cstring_spec_handler : internal::error_handler {
arg_formatter_base& formatter;
const char_type* value;
2019-07-03 16:52:09 +00:00
cstring_spec_handler(arg_formatter_base& f, const char_type* val)
: formatter(f), value(val) {}
2019-07-03 16:52:09 +00:00
void on_string() { formatter.write(value); }
void on_pointer() { formatter.write_pointer(value); }
};
2019-07-03 16:52:09 +00:00
iterator operator()(const char_type* value) {
if (!specs_) return write(value), out();
internal::handle_cstring_type_spec(specs_->type,
cstring_spec_handler(*this, value));
return out();
}
iterator operator()(basic_string_view<char_type> value) {
if (specs_) {
internal::check_string_type_spec(specs_->type, internal::error_handler());
writer_.write(value, *specs_);
} else {
writer_.write(value);
}
return out();
}
iterator operator()(const void* value) {
if (specs_)
check_pointer_type_spec(specs_->type, internal::error_handler());
write_pointer(value);
return out();
}
};
2019-07-03 16:52:09 +00:00
template <typename Char> FMT_CONSTEXPR bool is_name_start(Char c) {
return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || '_' == c;
}
2019-07-03 16:52:09 +00:00
// Parses the range [begin, end) as an unsigned integer. This function assumes
// that the range is non-empty and the first character is a digit.
template <typename Char, typename ErrorHandler>
2019-07-17 19:07:05 +00:00
FMT_CONSTEXPR int parse_nonnegative_int(const Char*& begin, const Char* end,
ErrorHandler&& eh) {
2019-07-03 16:52:09 +00:00
assert(begin != end && '0' <= *begin && *begin <= '9');
if (*begin == '0') {
++begin;
return 0;
}
unsigned value = 0;
// Convert to unsigned to prevent a warning.
2019-08-11 13:53:03 +00:00
constexpr unsigned max_int = (std::numeric_limits<int>::max)();
2019-07-03 16:52:09 +00:00
unsigned big = max_int / 10;
do {
// Check for overflow.
if (value > big) {
value = max_int + 1;
break;
}
value = value * 10 + unsigned(*begin - '0');
++begin;
} while (begin != end && '0' <= *begin && *begin <= '9');
if (value > max_int) eh.on_error("number is too big");
2019-07-17 19:07:05 +00:00
return static_cast<int>(value);
2019-07-03 16:52:09 +00:00
}
2019-07-03 16:52:09 +00:00
template <typename Context> class custom_formatter {
private:
2019-07-07 16:35:08 +00:00
using char_type = typename Context::char_type;
2017-11-12 14:58:11 +00:00
2019-07-03 16:52:09 +00:00
basic_parse_context<char_type>& parse_ctx_;
Context& ctx_;
public:
explicit custom_formatter(basic_parse_context<char_type>& parse_ctx,
Context& ctx)
: parse_ctx_(parse_ctx), ctx_(ctx) {}
bool operator()(typename basic_format_arg<Context>::handle h) const {
h.format(parse_ctx_, ctx_);
return true;
}
2019-07-03 16:52:09 +00:00
template <typename T> bool operator()(T) const { return false; }
};
2019-07-07 16:35:08 +00:00
template <typename T>
using is_integer =
bool_constant<std::is_integral<T>::value && !std::is_same<T, bool>::value &&
!std::is_same<T, char>::value &&
!std::is_same<T, wchar_t>::value>;
2019-07-03 16:52:09 +00:00
template <typename ErrorHandler> class width_checker {
public:
explicit FMT_CONSTEXPR width_checker(ErrorHandler& eh) : handler_(eh) {}
template <typename T, FMT_ENABLE_IF(is_integer<T>::value)>
FMT_CONSTEXPR unsigned long long operator()(T value) {
if (is_negative(value)) handler_.on_error("negative width");
return static_cast<unsigned long long>(value);
}
2019-07-03 16:52:09 +00:00
template <typename T, FMT_ENABLE_IF(!is_integer<T>::value)>
FMT_CONSTEXPR unsigned long long operator()(T) {
handler_.on_error("width is not integer");
return 0;
2017-11-13 03:14:35 +00:00
}
private:
2019-07-03 16:52:09 +00:00
ErrorHandler& handler_;
};
2019-07-03 16:52:09 +00:00
template <typename ErrorHandler> class precision_checker {
public:
explicit FMT_CONSTEXPR precision_checker(ErrorHandler& eh) : handler_(eh) {}
2019-07-03 16:52:09 +00:00
template <typename T, FMT_ENABLE_IF(is_integer<T>::value)>
FMT_CONSTEXPR unsigned long long operator()(T value) {
if (is_negative(value)) handler_.on_error("negative precision");
return static_cast<unsigned long long>(value);
}
2019-07-03 16:52:09 +00:00
template <typename T, FMT_ENABLE_IF(!is_integer<T>::value)>
FMT_CONSTEXPR unsigned long long operator()(T) {
handler_.on_error("precision is not integer");
return 0;
}
2019-07-03 16:52:09 +00:00
private:
ErrorHandler& handler_;
};
2019-07-03 16:52:09 +00:00
// A format specifier handler that sets fields in basic_format_specs.
template <typename Char> class specs_setter {
public:
explicit FMT_CONSTEXPR specs_setter(basic_format_specs<Char>& specs)
: specs_(specs) {}
2018-09-09 16:47:28 +00:00
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR specs_setter(const specs_setter& other)
: specs_(other.specs_) {}
FMT_CONSTEXPR void on_align(align_t align) { specs_.align = align; }
FMT_CONSTEXPR void on_fill(Char fill) { specs_.fill[0] = fill; }
FMT_CONSTEXPR void on_plus() { specs_.sign = sign::plus; }
FMT_CONSTEXPR void on_minus() { specs_.sign = sign::minus; }
FMT_CONSTEXPR void on_space() { specs_.sign = sign::space; }
FMT_CONSTEXPR void on_hash() { specs_.alt = true; }
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void on_zero() {
specs_.align = align::numeric;
specs_.fill[0] = Char('0');
}
2019-07-17 19:07:05 +00:00
FMT_CONSTEXPR void on_width(int width) { specs_.width = width; }
FMT_CONSTEXPR void on_precision(int precision) {
specs_.precision = precision;
2018-02-03 14:14:10 +00:00
}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void end_precision() {}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void on_type(Char type) {
specs_.type = static_cast<char>(type);
}
protected:
basic_format_specs<Char>& specs_;
};
2019-07-03 16:52:09 +00:00
template <typename ErrorHandler> class numeric_specs_checker {
public:
FMT_CONSTEXPR numeric_specs_checker(ErrorHandler& eh, internal::type arg_type)
: error_handler_(eh), arg_type_(arg_type) {}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void require_numeric_argument() {
if (!is_arithmetic(arg_type_))
error_handler_.on_error("format specifier requires numeric argument");
2018-02-03 14:14:10 +00:00
}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void check_sign() {
require_numeric_argument();
if (is_integral(arg_type_) && arg_type_ != int_type &&
arg_type_ != long_long_type && arg_type_ != internal::char_type) {
error_handler_.on_error("format specifier requires signed argument");
}
2017-01-23 03:11:47 +00:00
}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void check_precision() {
if (is_integral(arg_type_) || arg_type_ == internal::pointer_type)
error_handler_.on_error("precision not allowed for this argument type");
2019-01-13 02:27:38 +00:00
}
2016-04-25 15:07:27 +00:00
2019-07-03 16:52:09 +00:00
private:
ErrorHandler& error_handler_;
internal::type arg_type_;
};
2019-07-03 16:52:09 +00:00
// A format specifier handler that checks if specifiers are consistent with the
// argument type.
template <typename Handler> class specs_checker : public Handler {
public:
FMT_CONSTEXPR specs_checker(const Handler& handler, internal::type arg_type)
: Handler(handler), checker_(*this, arg_type) {}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR specs_checker(const specs_checker& other)
: Handler(other), checker_(*this, other.arg_type_) {}
FMT_CONSTEXPR void on_align(align_t align) {
if (align == align::numeric) checker_.require_numeric_argument();
2019-07-03 16:52:09 +00:00
Handler::on_align(align);
}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void on_plus() {
checker_.check_sign();
Handler::on_plus();
}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void on_minus() {
checker_.check_sign();
Handler::on_minus();
}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void on_space() {
checker_.check_sign();
Handler::on_space();
}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void on_hash() {
checker_.require_numeric_argument();
Handler::on_hash();
}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void on_zero() {
checker_.require_numeric_argument();
Handler::on_zero();
}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void end_precision() { checker_.check_precision(); }
2019-07-03 16:52:09 +00:00
private:
numeric_specs_checker<Handler> checker_;
};
2019-07-03 16:52:09 +00:00
template <template <typename> class Handler, typename T, typename FormatArg,
typename ErrorHandler>
FMT_CONSTEXPR void set_dynamic_spec(T& value, FormatArg arg, ErrorHandler eh) {
unsigned long long big_value =
visit_format_arg(Handler<ErrorHandler>(eh), arg);
if (big_value > to_unsigned((std::numeric_limits<int>::max)()))
eh.on_error("number is too big");
value = static_cast<T>(big_value);
}
2019-07-03 16:52:09 +00:00
struct auto_id {};
2018-07-14 20:17:40 +00:00
2019-07-03 16:52:09 +00:00
template <typename Context>
2019-08-11 13:53:03 +00:00
FMT_CONSTEXPR typename Context::format_arg get_arg(Context& ctx, int id) {
2019-07-03 16:52:09 +00:00
auto arg = ctx.arg(id);
if (!arg) ctx.on_error("argument index out of range");
return arg;
2018-07-14 20:17:40 +00:00
}
2019-07-03 16:52:09 +00:00
// The standard format specifier handler with checking.
template <typename ParseContext, typename Context>
class specs_handler : public specs_setter<typename Context::char_type> {
public:
2019-07-07 16:35:08 +00:00
using char_type = typename Context::char_type;
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR specs_handler(basic_format_specs<char_type>& specs,
ParseContext& parse_ctx, Context& ctx)
: specs_setter<char_type>(specs),
parse_context_(parse_ctx),
context_(ctx) {}
template <typename Id> FMT_CONSTEXPR void on_dynamic_width(Id arg_id) {
set_dynamic_spec<width_checker>(this->specs_.width, get_arg(arg_id),
2019-07-03 16:52:09 +00:00
context_.error_handler());
2018-09-09 16:47:28 +00:00
}
2019-07-03 16:52:09 +00:00
template <typename Id> FMT_CONSTEXPR void on_dynamic_precision(Id arg_id) {
set_dynamic_spec<precision_checker>(this->specs_.precision, get_arg(arg_id),
context_.error_handler());
2018-09-09 16:47:28 +00:00
}
2019-07-03 16:52:09 +00:00
void on_error(const char* message) { context_.on_error(message); }
private:
// This is only needed for compatibility with gcc 4.4.
2019-07-07 16:35:08 +00:00
using format_arg = typename Context::format_arg;
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR format_arg get_arg(auto_id) {
return internal::get_arg(context_, parse_context_.next_arg_id());
}
2019-08-11 13:53:03 +00:00
FMT_CONSTEXPR format_arg get_arg(int arg_id) {
2019-07-03 16:52:09 +00:00
parse_context_.check_arg_id(arg_id);
return internal::get_arg(context_, arg_id);
}
2017-11-08 13:56:52 +00:00
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR format_arg get_arg(basic_string_view<char_type> arg_id) {
parse_context_.check_arg_id(arg_id);
return context_.arg(arg_id);
}
2017-11-08 13:56:52 +00:00
2019-07-03 16:52:09 +00:00
ParseContext& parse_context_;
Context& context_;
};
2017-11-08 13:56:52 +00:00
2019-07-03 16:52:09 +00:00
struct string_view_metadata {
FMT_CONSTEXPR string_view_metadata() : offset_(0u), size_(0u) {}
template <typename Char>
FMT_CONSTEXPR string_view_metadata(basic_string_view<Char> primary_string,
basic_string_view<Char> view)
2019-07-18 04:28:53 +00:00
: offset_(to_unsigned(view.data() - primary_string.data())),
size_(view.size()) {}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR string_view_metadata(std::size_t offset, std::size_t size)
: offset_(offset), size_(size) {}
template <typename Char>
FMT_CONSTEXPR basic_string_view<Char> to_view(const Char* str) const {
return {str + offset_, size_};
}
2019-07-03 16:52:09 +00:00
std::size_t offset_;
std::size_t size_;
};
2019-07-07 16:35:08 +00:00
enum class arg_id_kind { none, index, name };
2019-07-03 16:52:09 +00:00
// An argument reference.
template <typename Char> struct arg_ref {
2019-07-07 16:35:08 +00:00
FMT_CONSTEXPR arg_ref() : kind(arg_id_kind::none), val() {}
2019-07-17 19:07:05 +00:00
FMT_CONSTEXPR explicit arg_ref(int index)
2019-07-07 16:35:08 +00:00
: kind(arg_id_kind::index), val(index) {}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR explicit arg_ref(string_view_metadata name)
2019-07-07 16:35:08 +00:00
: kind(arg_id_kind::name), val(name) {}
2019-07-03 16:52:09 +00:00
2019-07-17 19:07:05 +00:00
FMT_CONSTEXPR arg_ref& operator=(int idx) {
2019-07-07 16:35:08 +00:00
kind = arg_id_kind::index;
2019-07-03 16:52:09 +00:00
val.index = idx;
return *this;
}
2017-11-08 13:56:52 +00:00
2019-07-07 16:35:08 +00:00
arg_id_kind kind;
2019-07-03 16:52:09 +00:00
union value {
FMT_CONSTEXPR value() : index(0u) {}
2019-07-17 19:07:05 +00:00
FMT_CONSTEXPR value(int id) : index(id) {}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR value(string_view_metadata n) : name(n) {}
2017-11-08 13:56:52 +00:00
2019-07-17 19:07:05 +00:00
int index;
2019-07-03 16:52:09 +00:00
string_view_metadata name;
} val;
};
// Format specifiers with width and precision resolved at formatting rather
// than parsing time to allow re-using the same parsed specifiers with
// different sets of arguments (precompilation of format strings).
template <typename Char>
struct dynamic_format_specs : basic_format_specs<Char> {
arg_ref<Char> width_ref;
arg_ref<Char> precision_ref;
};
// Format spec handler that saves references to arguments representing dynamic
// width and precision to be resolved at formatting time.
template <typename ParseContext>
class dynamic_specs_handler
: public specs_setter<typename ParseContext::char_type> {
public:
2019-07-07 17:44:06 +00:00
using char_type = typename ParseContext::char_type;
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR dynamic_specs_handler(dynamic_format_specs<char_type>& specs,
ParseContext& ctx)
: specs_setter<char_type>(specs), specs_(specs), context_(ctx) {}
FMT_CONSTEXPR dynamic_specs_handler(const dynamic_specs_handler& other)
: specs_setter<char_type>(other),
specs_(other.specs_),
context_(other.context_) {}
template <typename Id> FMT_CONSTEXPR void on_dynamic_width(Id arg_id) {
specs_.width_ref = make_arg_ref(arg_id);
}
template <typename Id> FMT_CONSTEXPR void on_dynamic_precision(Id arg_id) {
specs_.precision_ref = make_arg_ref(arg_id);
2017-11-19 14:35:23 +00:00
}
2019-01-13 02:27:38 +00:00
FMT_CONSTEXPR void on_error(const char* message) {
2017-11-19 14:35:23 +00:00
context_.on_error(message);
}
2017-11-08 13:56:52 +00:00
private:
2019-07-07 17:44:06 +00:00
using arg_ref_type = arg_ref<char_type>;
2019-07-17 19:07:05 +00:00
FMT_CONSTEXPR arg_ref_type make_arg_ref(int arg_id) {
2019-07-03 16:52:09 +00:00
context_.check_arg_id(arg_id);
return arg_ref_type(arg_id);
}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR arg_ref_type make_arg_ref(auto_id) {
return arg_ref_type(context_.next_arg_id());
}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR arg_ref_type make_arg_ref(basic_string_view<char_type> arg_id) {
context_.check_arg_id(arg_id);
2019-07-18 04:28:53 +00:00
basic_string_view<char_type> format_str(
context_.begin(), to_unsigned(context_.end() - context_.begin()));
2019-07-03 16:52:09 +00:00
const auto id_metadata = string_view_metadata(format_str, arg_id);
return arg_ref_type(id_metadata);
}
dynamic_format_specs<char_type>& specs_;
ParseContext& context_;
};
2019-07-03 16:52:09 +00:00
template <typename Char, typename IDHandler>
FMT_CONSTEXPR const Char* parse_arg_id(const Char* begin, const Char* end,
IDHandler&& handler) {
assert(begin != end);
Char c = *begin;
if (c == '}' || c == ':') return handler(), begin;
if (c >= '0' && c <= '9') {
2019-07-17 19:07:05 +00:00
int index = parse_nonnegative_int(begin, end, handler);
2019-07-03 16:52:09 +00:00
if (begin == end || (*begin != '}' && *begin != ':'))
return handler.on_error("invalid format string"), begin;
handler(index);
return begin;
}
if (!is_name_start(c))
return handler.on_error("invalid format string"), begin;
auto it = begin;
do {
++it;
} while (it != end && (is_name_start(c = *it) || ('0' <= c && c <= '9')));
handler(basic_string_view<Char>(begin, to_unsigned(it - begin)));
return it;
}
2019-07-03 16:52:09 +00:00
// Adapts SpecHandler to IDHandler API for dynamic width.
template <typename SpecHandler, typename Char> struct width_adapter {
explicit FMT_CONSTEXPR width_adapter(SpecHandler& h) : handler(h) {}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void operator()() { handler.on_dynamic_width(auto_id()); }
2019-07-17 19:07:05 +00:00
FMT_CONSTEXPR void operator()(int id) { handler.on_dynamic_width(id); }
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void operator()(basic_string_view<Char> id) {
handler.on_dynamic_width(id);
}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void on_error(const char* message) {
handler.on_error(message);
}
2018-01-21 22:30:38 +00:00
2019-07-03 16:52:09 +00:00
SpecHandler& handler;
};
2019-07-03 16:52:09 +00:00
// Adapts SpecHandler to IDHandler API for dynamic precision.
template <typename SpecHandler, typename Char> struct precision_adapter {
explicit FMT_CONSTEXPR precision_adapter(SpecHandler& h) : handler(h) {}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void operator()() { handler.on_dynamic_precision(auto_id()); }
2019-07-18 04:28:53 +00:00
FMT_CONSTEXPR void operator()(int id) { handler.on_dynamic_precision(id); }
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void operator()(basic_string_view<Char> id) {
handler.on_dynamic_precision(id);
}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void on_error(const char* message) {
handler.on_error(message);
}
2019-07-03 16:52:09 +00:00
SpecHandler& handler;
};
2019-07-03 16:52:09 +00:00
// Parses fill and alignment.
template <typename Char, typename Handler>
FMT_CONSTEXPR const Char* parse_align(const Char* begin, const Char* end,
Handler&& handler) {
FMT_ASSERT(begin != end, "");
auto align = align::none;
2019-07-03 16:52:09 +00:00
int i = 0;
if (begin + 1 != end) ++i;
do {
switch (static_cast<char>(begin[i])) {
case '<':
align = align::left;
2019-07-03 16:52:09 +00:00
break;
case '>':
align = align::right;
2019-07-03 16:52:09 +00:00
break;
case '=':
align = align::numeric;
2019-07-03 16:52:09 +00:00
break;
case '^':
align = align::center;
2019-07-03 16:52:09 +00:00
break;
2018-02-11 14:50:56 +00:00
}
if (align != align::none) {
2019-07-03 16:52:09 +00:00
if (i > 0) {
auto c = *begin;
if (c == '{')
return handler.on_error("invalid fill character '{'"), begin;
begin += 2;
handler.on_fill(c);
} else
++begin;
handler.on_align(align);
break;
2017-12-30 15:42:56 +00:00
}
2019-07-03 16:52:09 +00:00
} while (i-- > 0);
return begin;
}
2019-07-03 16:52:09 +00:00
template <typename Char, typename Handler>
FMT_CONSTEXPR const Char* parse_width(const Char* begin, const Char* end,
Handler&& handler) {
FMT_ASSERT(begin != end, "");
if ('0' <= *begin && *begin <= '9') {
handler.on_width(parse_nonnegative_int(begin, end, handler));
} else if (*begin == '{') {
++begin;
if (begin != end)
begin = parse_arg_id(begin, end, width_adapter<Handler, Char>(handler));
if (begin == end || *begin != '}')
return handler.on_error("invalid format string"), begin;
++begin;
}
2019-07-03 16:52:09 +00:00
return begin;
}
2019-07-03 16:52:09 +00:00
template <typename Char, typename Handler>
FMT_CONSTEXPR const Char* parse_precision(const Char* begin, const Char* end,
Handler&& handler) {
++begin;
auto c = begin != end ? *begin : Char();
if ('0' <= c && c <= '9') {
handler.on_precision(parse_nonnegative_int(begin, end, handler));
} else if (c == '{') {
++begin;
if (begin != end) {
begin =
parse_arg_id(begin, end, precision_adapter<Handler, Char>(handler));
2017-12-30 15:42:56 +00:00
}
2019-07-03 16:52:09 +00:00
if (begin == end || *begin++ != '}')
return handler.on_error("invalid format string"), begin;
} else {
return handler.on_error("missing precision specifier"), begin;
}
handler.end_precision();
return begin;
}
2017-12-30 15:42:56 +00:00
2019-07-03 16:52:09 +00:00
// Parses standard format specifiers and sends notifications about parsed
// components to handler.
template <typename Char, typename SpecHandler>
FMT_CONSTEXPR const Char* parse_format_specs(const Char* begin, const Char* end,
SpecHandler&& handler) {
if (begin == end || *begin == '}') return begin;
2018-02-11 15:05:14 +00:00
2019-07-03 16:52:09 +00:00
begin = parse_align(begin, end, handler);
if (begin == end) return begin;
2017-12-30 15:42:56 +00:00
2019-07-03 16:52:09 +00:00
// Parse sign.
switch (static_cast<char>(*begin)) {
case '+':
handler.on_plus();
++begin;
break;
case '-':
handler.on_minus();
++begin;
break;
case ' ':
handler.on_space();
++begin;
break;
}
if (begin == end) return begin;
2017-12-30 15:42:56 +00:00
2019-07-03 16:52:09 +00:00
if (*begin == '#') {
handler.on_hash();
if (++begin == end) return begin;
}
2018-02-11 15:05:14 +00:00
2019-07-03 16:52:09 +00:00
// Parse zero flag.
if (*begin == '0') {
handler.on_zero();
if (++begin == end) return begin;
}
2018-02-11 15:05:14 +00:00
2019-07-03 16:52:09 +00:00
begin = parse_width(begin, end, handler);
if (begin == end) return begin;
2018-02-11 15:05:14 +00:00
2019-07-03 16:52:09 +00:00
// Parse precision.
if (*begin == '.') {
begin = parse_precision(begin, end, handler);
}
2017-12-30 15:42:56 +00:00
2019-07-03 16:52:09 +00:00
// Parse type.
if (begin != end && *begin != '}') handler.on_type(*begin++);
return begin;
}
2019-07-03 16:52:09 +00:00
// Return the result via the out param to workaround gcc bug 77539.
template <bool IS_CONSTEXPR, typename T, typename Ptr = const T*>
FMT_CONSTEXPR bool find(Ptr first, Ptr last, T value, Ptr& out) {
for (out = first; out != last; ++out) {
if (*out == value) return true;
2017-12-30 15:42:56 +00:00
}
2019-07-03 16:52:09 +00:00
return false;
}
2019-07-03 16:52:09 +00:00
template <>
inline bool find<false, char>(const char* first, const char* last, char value,
const char*& out) {
out = static_cast<const char*>(
std::memchr(first, value, internal::to_unsigned(last - first)));
return out != nullptr;
}
2018-02-11 14:50:56 +00:00
2019-07-03 16:52:09 +00:00
template <typename Handler, typename Char> struct id_adapter {
FMT_CONSTEXPR void operator()() { handler.on_arg_id(); }
2019-08-11 13:53:03 +00:00
FMT_CONSTEXPR void operator()(int id) { handler.on_arg_id(id); }
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void operator()(basic_string_view<Char> id) {
handler.on_arg_id(id);
}
FMT_CONSTEXPR void on_error(const char* message) {
handler.on_error(message);
}
Handler& handler;
};
2018-02-11 14:50:56 +00:00
2019-07-03 16:52:09 +00:00
template <bool IS_CONSTEXPR, typename Char, typename Handler>
FMT_CONSTEXPR void parse_format_string(basic_string_view<Char> format_str,
Handler&& handler) {
struct pfs_writer {
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void operator()(const Char* begin, const Char* end) {
if (begin == end) return;
for (;;) {
const Char* p = nullptr;
if (!find<IS_CONSTEXPR>(begin, end, '}', p))
return handler_.on_text(begin, end);
++p;
if (p == end || *p != '}')
return handler_.on_error("unmatched '}' in format string");
handler_.on_text(begin, p);
begin = p + 1;
}
}
2019-07-03 16:52:09 +00:00
Handler& handler_;
} write{handler};
auto begin = format_str.data();
auto end = begin + format_str.size();
while (begin != end) {
// Doing two passes with memchr (one for '{' and another for '}') is up to
// 2.5x faster than the naive one-pass implementation on big format strings.
const Char* p = begin;
if (*begin != '{' && !find<IS_CONSTEXPR>(begin, end, '{', p))
return write(begin, end);
write(begin, p);
++p;
if (p == end) return handler.on_error("invalid format string");
if (static_cast<char>(*p) == '}') {
handler.on_arg_id();
handler.on_replacement_field(p);
} else if (*p == '{') {
handler.on_text(p, p + 1);
} else {
p = parse_arg_id(p, end, id_adapter<Handler, Char>{handler});
Char c = p != end ? *p : Char();
if (c == '}') {
handler.on_replacement_field(p);
} else if (c == ':') {
p = handler.on_format_specs(p + 1, end);
if (p == end || *p != '}')
return handler.on_error("unknown format specifier");
} else {
return handler.on_error("missing '}' in format string");
}
2018-02-11 14:50:56 +00:00
}
2019-07-03 16:52:09 +00:00
begin = p + 1;
}
}
2018-02-11 14:50:56 +00:00
2019-07-03 16:52:09 +00:00
template <typename T, typename ParseContext>
FMT_CONSTEXPR const typename ParseContext::char_type* parse_format_specs(
ParseContext& ctx) {
using char_type = typename ParseContext::char_type;
using context = buffer_context<char_type>;
using mapped_type =
conditional_t<internal::mapped_type_constant<T, context>::value !=
internal::custom_type,
decltype(arg_mapper<context>().map(std::declval<T>())), T>;
conditional_t<has_formatter<mapped_type, context>::value,
formatter<mapped_type, char_type>,
internal::fallback_formatter<T, char_type>>
f;
return f.parse(ctx);
}
2018-10-04 01:22:26 +00:00
2019-07-03 16:52:09 +00:00
template <typename Char, typename ErrorHandler, typename... Args>
class format_string_checker {
public:
explicit FMT_CONSTEXPR format_string_checker(
basic_string_view<Char> format_str, ErrorHandler eh)
: arg_id_((std::numeric_limits<unsigned>::max)()),
context_(format_str, eh),
parse_funcs_{&parse_format_specs<Args, parse_context_type>...} {}
2018-02-11 14:50:56 +00:00
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void on_text(const Char*, const Char*) {}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void on_arg_id() {
arg_id_ = context_.next_arg_id();
check_arg_id();
}
2019-08-11 13:53:03 +00:00
FMT_CONSTEXPR void on_arg_id(int id) {
2019-07-03 16:52:09 +00:00
arg_id_ = id;
context_.check_arg_id(id);
check_arg_id();
}
FMT_CONSTEXPR void on_arg_id(basic_string_view<Char>) {
on_error("compile-time checks don't support named arguments");
}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void on_replacement_field(const Char*) {}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR const Char* on_format_specs(const Char* begin, const Char*) {
advance_to(context_, begin);
2019-07-07 17:44:06 +00:00
return arg_id_ < num_args ? parse_funcs_[arg_id_](context_) : begin;
2019-07-03 16:52:09 +00:00
}
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void on_error(const char* message) {
context_.on_error(message);
}
2019-07-03 16:52:09 +00:00
private:
2019-07-07 17:44:06 +00:00
using parse_context_type = basic_parse_context<Char, ErrorHandler>;
enum { num_args = sizeof...(Args) };
2018-10-04 01:22:26 +00:00
2019-07-03 16:52:09 +00:00
FMT_CONSTEXPR void check_arg_id() {
2019-07-07 17:44:06 +00:00
if (arg_id_ >= num_args) context_.on_error("argument index out of range");
2019-07-03 16:52:09 +00:00
}
2018-02-11 14:50:56 +00:00
2019-07-03 16:52:09 +00:00
// Format specifier parsing function.
2019-07-07 17:44:06 +00:00
using parse_func = const Char* (*)(parse_context_type&);
2018-02-11 14:50:56 +00:00
2019-07-03 16:52:09 +00:00
unsigned arg_id_;
parse_context_type context_;
2019-07-07 17:44:06 +00:00
parse_func parse_funcs_[num_args > 0 ? num_args : 1];
2019-07-03 16:52:09 +00:00
};
2019-04-06 03:06:32 +00:00
2019-07-03 16:52:09 +00:00
template <typename Char, typename ErrorHandler, typename... Args>
FMT_CONSTEXPR bool do_check_format_string(basic_string_view<Char> s,
ErrorHandler eh = ErrorHandler()) {
format_string_checker<Char, ErrorHandler, Args...> checker(s, eh);
parse_format_string<true>(s, checker);
return true;
}
2019-04-06 03:06:32 +00:00
2019-07-03 16:52:09 +00:00
template <typename... Args, typename S,
enable_if_t<(is_compile_string<S>::value), int>>
void check_format_string(S format_str) {
FMT_CONSTEXPR_DECL bool invalid_format =
2019-07-07 17:44:06 +00:00
internal::do_check_format_string<typename S::char_type,
internal::error_handler, Args...>(
to_string_view(format_str));
2019-07-03 16:52:09 +00:00
(void)invalid_format;
}
2019-04-06 03:06:32 +00:00
2019-07-03 16:52:09 +00:00
template <template <typename> class Handler, typename Spec, typename Context>
void handle_dynamic_spec(Spec& value, arg_ref<typename Context::char_type> ref,
Context& ctx,
const typename Context::char_type* format_str) {
switch (ref.kind) {
2019-07-07 16:35:08 +00:00
case arg_id_kind::none:
2019-07-03 16:52:09 +00:00
break;
2019-07-07 16:35:08 +00:00
case arg_id_kind::index:
2019-07-03 16:52:09 +00:00
internal::set_dynamic_spec<Handler>(value, ctx.arg(ref.val.index),
ctx.error_handler());
break;
2019-07-07 16:35:08 +00:00
case arg_id_kind::name: {
2019-07-03 16:52:09 +00:00
const auto arg_id = ref.val.name.to_view(format_str);
internal::set_dynamic_spec<Handler>(value, ctx.arg(arg_id),
ctx.error_handler());
2019-07-07 16:35:08 +00:00
break;
}
2019-07-03 16:52:09 +00:00
}
}
} // namespace internal
2019-07-03 16:52:09 +00:00
template <typename Range>
using basic_writer FMT_DEPRECATED_ALIAS = internal::basic_writer<Range>;
using writer FMT_DEPRECATED_ALIAS = internal::writer;
using wwriter FMT_DEPRECATED_ALIAS =
2019-07-03 16:52:09 +00:00
internal::basic_writer<internal::buffer_range<wchar_t>>;
2019-07-03 16:52:09 +00:00
/** The default argument formatter. */
template <typename Range>
class arg_formatter : public internal::arg_formatter_base<Range> {
private:
2019-07-07 17:44:06 +00:00
using char_type = typename Range::value_type;
using base = internal::arg_formatter_base<Range>;
using context_type = basic_format_context<typename base::iterator, char_type>;
2019-07-03 16:52:09 +00:00
context_type& ctx_;
basic_parse_context<char_type>* parse_ctx_;
2018-01-27 15:03:26 +00:00
2019-07-03 16:52:09 +00:00
public:
2019-07-07 17:44:06 +00:00
using range = Range;
using iterator = typename base::iterator;
using format_specs = typename base::format_specs;
/**
\rst
2019-07-03 16:52:09 +00:00
Constructs an argument formatter object.
*ctx* is a reference to the formatting context,
2019-07-07 13:39:20 +00:00
*specs* contains format specifier information for standard argument types.
\endrst
*/
2019-07-03 16:52:09 +00:00
explicit arg_formatter(context_type& ctx,
basic_parse_context<char_type>* parse_ctx = nullptr,
2019-07-07 13:39:20 +00:00
format_specs* specs = nullptr)
: base(Range(ctx.out()), specs, ctx.locale()),
2019-07-03 16:52:09 +00:00
ctx_(ctx),
parse_ctx_(parse_ctx) {}
2019-07-03 16:52:09 +00:00
using base::operator();
2019-07-03 16:52:09 +00:00
/** Formats an argument of a user-defined type. */
iterator operator()(typename basic_format_arg<context_type>::handle handle) {
handle.format(*parse_ctx_, ctx_);
return this->out();
}
2019-07-03 16:52:09 +00:00
};
2019-06-03 23:37:15 +00:00
2019-07-03 16:52:09 +00:00
/**
An error returned by an operating system or a language runtime,
for example a file opening error.
*/
class FMT_API system_error : public std::runtime_error {
private:
2019-07-17 06:32:54 +00:00
void init(int err_code, string_view format_str, format_args args);
2019-07-03 16:52:09 +00:00
protected:
int error_code_;
2019-08-11 13:53:03 +00:00
system_error() : std::runtime_error(""), error_code_(0) {}
2019-07-03 16:52:09 +00:00
public:
/**
2019-07-03 16:52:09 +00:00
\rst
Constructs a :class:`fmt::system_error` object with a description
formatted with `fmt::format_system_error`. *message* and additional
arguments passed into the constructor are formatted similarly to
`fmt::format`.
2019-07-03 16:52:09 +00:00
**Example**::
2019-07-03 16:52:09 +00:00
// This throws a system_error with the description
// cannot open file 'madeup': No such file or directory
// or similar (system message may vary).
const char *filename = "madeup";
std::FILE *file = std::fopen(filename, "r");
if (!file)
throw fmt::system_error(errno, "cannot open file '{}'", filename);
\endrst
*/
template <typename... Args>
system_error(int error_code, string_view message, const Args&... args)
: std::runtime_error("") {
init(error_code, message, make_format_args(args...));
}
2019-07-03 16:52:09 +00:00
~system_error() FMT_NOEXCEPT;
2018-02-17 09:38:46 +00:00
2019-07-03 16:52:09 +00:00
int error_code() const { return error_code_; }
};
2019-07-03 16:52:09 +00:00
/**
\rst
Formats an error returned by an operating system or a language runtime,
for example a file opening error, and writes it to *out* in the following
form:
.. parsed-literal::
*<message>*: *<system-message>*
where *<message>* is the passed message and *<system-message>* is
the system message corresponding to the error code.
*error_code* is a system error code as given by ``errno``.
If *error_code* is not a valid error code such as -1, the system message
may look like "Unknown error -1" and is platform-dependent.
\endrst
*/
FMT_API void format_system_error(internal::buffer<char>& out, int error_code,
fmt::string_view message) FMT_NOEXCEPT;
2018-03-03 22:04:59 +00:00
struct float_spec_handler {
2018-09-30 18:39:20 +00:00
char type;
2018-03-03 22:04:59 +00:00
bool upper;
2019-02-22 19:05:01 +00:00
bool fixed;
bool as_percentage;
2019-07-03 23:36:23 +00:00
bool use_locale;
2017-11-23 17:14:37 +00:00
explicit float_spec_handler(char t)
2019-07-03 23:36:23 +00:00
: type(t),
upper(false),
fixed(false),
as_percentage(false),
use_locale(false) {}
2017-11-23 17:14:37 +00:00
2018-03-03 22:04:59 +00:00
void on_general() {
if (type == 'G') upper = true;
2018-03-03 22:04:59 +00:00
}
2017-11-23 17:14:37 +00:00
2018-03-03 22:04:59 +00:00
void on_exp() {
2019-01-13 02:27:38 +00:00
if (type == 'E') upper = true;
2018-03-03 22:04:59 +00:00
}
2017-11-23 17:14:37 +00:00
2018-03-03 22:04:59 +00:00
void on_fixed() {
2019-02-22 19:05:01 +00:00
fixed = true;
if (type == 'F') upper = true;
2018-03-03 22:04:59 +00:00
}
2017-11-23 17:14:37 +00:00
void on_percent() {
fixed = true;
as_percentage = true;
}
2018-03-03 22:04:59 +00:00
void on_hex() {
2019-01-13 02:27:38 +00:00
if (type == 'A') upper = true;
2018-03-03 22:04:59 +00:00
}
2017-11-23 17:14:37 +00:00
2019-07-03 23:36:23 +00:00
void on_num() { use_locale = true; }
FMT_NORETURN void on_error() {
FMT_THROW(format_error("invalid type specifier"));
}
2018-03-03 22:04:59 +00:00
};
template <typename Range>
template <typename T, bool USE_GRISU>
2019-07-03 16:52:09 +00:00
void internal::basic_writer<Range>::write_double(T value,
2019-07-07 13:39:20 +00:00
const format_specs& specs) {
2018-03-03 22:04:59 +00:00
// Check type.
2019-07-07 13:39:20 +00:00
float_spec_handler handler(static_cast<char>(specs.type));
2018-09-30 18:39:20 +00:00
internal::handle_float_type_spec(handler.type, handler);
2017-09-03 15:28:30 +00:00
char sign = 0;
// Use signbit instead of value < 0 since the latter is always false for NaN.
2018-10-10 16:41:01 +00:00
if (std::signbit(value)) {
sign = '-';
value = -value;
2019-07-07 13:39:20 +00:00
} else if (specs.sign != sign::none) {
if (specs.sign == sign::plus)
sign = '+';
2019-07-07 13:39:20 +00:00
else if (specs.sign == sign::space)
sign = ' ';
2017-09-03 15:28:30 +00:00
}
2019-03-17 19:05:07 +00:00
if (!std::isfinite(value)) {
// Format infinity and NaN ourselves because sprintf's output is not
// consistent across platforms.
2019-03-17 21:49:19 +00:00
const char* str = std::isinf(value) ? (handler.upper ? "INF" : "inf")
: (handler.upper ? "NAN" : "nan");
2019-07-07 13:39:20 +00:00
return write_padded(specs,
2019-03-17 19:05:07 +00:00
inf_or_nan_writer{sign, handler.as_percentage, str});
}
if (handler.as_percentage) value *= 100;
2017-09-03 15:28:30 +00:00
2018-09-30 21:09:03 +00:00
memory_buffer buffer;
int exp = 0;
2019-07-07 13:39:20 +00:00
int precision = specs.precision >= 0 || !specs.type ? specs.precision : 6;
2019-04-27 13:52:46 +00:00
unsigned options = handler.fixed ? internal::grisu_options::fixed : 0;
bool use_grisu = USE_GRISU &&
2019-07-07 13:39:20 +00:00
(specs.type != 'a' && specs.type != 'A' &&
specs.type != 'e' && specs.type != 'E') &&
2019-04-27 13:52:46 +00:00
internal::grisu_format(static_cast<double>(value), buffer,
precision, options, exp);
char* decimal_point_pos = nullptr;
if (!use_grisu)
2019-07-07 13:39:20 +00:00
decimal_point_pos = internal::sprintf_format(value, buffer, specs);
if (handler.as_percentage) {
buffer.push_back('%');
--exp; // Adjust decimal place position.
}
2019-07-07 13:39:20 +00:00
format_specs as = specs;
if (specs.align == align::numeric) {
2018-05-28 18:25:07 +00:00
if (sign) {
2019-01-13 02:27:38 +00:00
auto&& it = reserve(1);
2018-09-30 18:39:20 +00:00
*it++ = static_cast<char_type>(sign);
2018-05-28 18:25:07 +00:00
sign = 0;
if (as.width) --as.width;
2018-05-28 18:25:07 +00:00
}
as.align = align::right;
2019-07-07 13:39:20 +00:00
} else if (specs.align == align::none) {
as.align = align::right;
2018-05-28 18:25:07 +00:00
}
2019-07-04 00:25:57 +00:00
char_type decimal_point = handler.use_locale
? internal::decimal_point<char_type>(locale_)
: static_cast<char_type>('.');
if (use_grisu) {
auto params = internal::gen_digits_params();
params.fixed = handler.fixed;
params.num_digits = precision;
params.trailing_zeros =
2019-07-07 13:39:20 +00:00
(precision != 0 && (handler.fixed || !specs.type)) || specs.alt;
2019-07-04 00:25:57 +00:00
write_padded(as, grisu_writer(sign, buffer, exp, params, decimal_point));
} else {
write_padded(as,
double_writer{sign, buffer, decimal_point_pos, decimal_point});
}
2018-05-28 18:25:07 +00:00
}
2017-12-30 15:42:56 +00:00
// Reports a system error without throwing an exception.
// Can be used to report errors from destructors.
FMT_API void report_system_error(int error_code,
string_view message) FMT_NOEXCEPT;
2017-09-03 15:28:30 +00:00
#if FMT_USE_WINDOWS_H
2017-08-13 20:09:02 +00:00
/** A Windows error. */
class windows_error : public system_error {
private:
2017-12-03 15:32:04 +00:00
FMT_API void init(int error_code, string_view format_str, format_args args);
2017-09-03 15:28:30 +00:00
2017-08-13 20:09:02 +00:00
public:
/**
\rst
Constructs a :class:`fmt::windows_error` object with the description
of the form
.. parsed-literal::
*<message>*: *<system-message>*
where *<message>* is the formatted message and *<system-message>* is the
system message corresponding to the error code.
*error_code* is a Windows error code as given by ``GetLastError``.
If *error_code* is not a valid error code such as -1, the system message
will look like "error -1".
**Example**::
// This throws a windows_error with the description
// cannot open file 'madeup': The system cannot find the file specified.
// or similar (system message may vary).
const char *filename = "madeup";
LPOFSTRUCT of = LPOFSTRUCT();
HFILE file = OpenFile(filename, &of, OF_READ);
if (file == HFILE_ERROR) {
throw fmt::windows_error(GetLastError(),
"cannot open file '{}'", filename);
}
\endrst
*/
template <typename... Args>
2019-01-13 02:27:38 +00:00
windows_error(int error_code, string_view message, const Args&... args) {
2018-04-08 14:21:26 +00:00
init(error_code, message, make_format_args(args...));
}
2017-08-13 20:09:02 +00:00
};
// Reports a Windows error without throwing an exception.
// Can be used to report errors from destructors.
FMT_API void report_windows_error(int error_code,
string_view message) FMT_NOEXCEPT;
2017-08-13 20:09:02 +00:00
#endif
2017-08-13 20:09:02 +00:00
2018-01-15 19:30:53 +00:00
/** Fast integer formatter. */
2018-05-19 15:57:31 +00:00
class format_int {
private:
// Buffer should be large enough to hold all digits (digits10 + 1),
// a sign and a null character.
2019-07-07 16:35:08 +00:00
enum { buffer_size = std::numeric_limits<unsigned long long>::digits10 + 3 };
mutable char buffer_[buffer_size];
2019-01-13 02:27:38 +00:00
char* str_;
// Formats value in reverse and returns a pointer to the beginning.
2019-01-13 02:27:38 +00:00
char* format_decimal(unsigned long long value) {
2019-07-07 16:35:08 +00:00
char* ptr = buffer_ + (buffer_size - 1); // Parens to workaround MSVC bug.
while (value >= 100) {
// Integer division is slow so do it for a group of two digits instead
// of for every digit. The idea comes from the talk by Alexandrescu
// "Three Optimization Tips for C++". See speed-test for a comparison.
unsigned index = static_cast<unsigned>((value % 100) * 2);
value /= 100;
*--ptr = internal::data::digits[index + 1];
*--ptr = internal::data::digits[index];
}
if (value < 10) {
*--ptr = static_cast<char>('0' + value);
return ptr;
}
unsigned index = static_cast<unsigned>(value * 2);
*--ptr = internal::data::digits[index + 1];
*--ptr = internal::data::digits[index];
return ptr;
}
void format_signed(long long value) {
unsigned long long abs_value = static_cast<unsigned long long>(value);
bool negative = value < 0;
2019-01-13 02:27:38 +00:00
if (negative) abs_value = 0 - abs_value;
str_ = format_decimal(abs_value);
2019-01-13 02:27:38 +00:00
if (negative) *--str_ = '-';
}
public:
2018-05-19 15:57:31 +00:00
explicit format_int(int value) { format_signed(value); }
explicit format_int(long value) { format_signed(value); }
explicit format_int(long long value) { format_signed(value); }
explicit format_int(unsigned value) : str_(format_decimal(value)) {}
explicit format_int(unsigned long value) : str_(format_decimal(value)) {}
explicit format_int(unsigned long long value) : str_(format_decimal(value)) {}
2017-10-29 15:19:55 +00:00
/** Returns the number of characters written to the output buffer. */
std::size_t size() const {
2019-07-07 16:35:08 +00:00
return internal::to_unsigned(buffer_ - str_ + buffer_size - 1);
2017-10-29 15:19:55 +00:00
}
/**
Returns a pointer to the output buffer content. No terminating null
character is appended.
*/
2019-01-13 02:27:38 +00:00
const char* data() const { return str_; }
/**
Returns a pointer to the output buffer content with terminating null
character appended.
*/
2019-01-13 02:27:38 +00:00
const char* c_str() const {
2019-07-07 16:35:08 +00:00
buffer_[buffer_size - 1] = '\0';
return str_;
2017-10-29 15:19:55 +00:00
}
/**
\rst
Returns the content of the output buffer as an ``std::string``.
\endrst
*/
std::string str() const { return std::string(str_, size()); }
2017-10-29 15:19:55 +00:00
};
2019-06-07 14:08:04 +00:00
// A formatter specialization for the core types corresponding to internal::type
// constants.
2017-08-13 20:09:02 +00:00
template <typename T, typename Char>
struct formatter<T, Char,
enable_if_t<internal::type_constant<T, Char>::value !=
2019-06-10 04:10:09 +00:00
internal::custom_type>> {
FMT_CONSTEXPR formatter() : format_str_(nullptr) {}
2019-02-10 03:34:42 +00:00
2017-08-13 20:09:02 +00:00
// Parses format specifiers stopping either at the end of the range or at the
// terminating '}'.
template <typename ParseContext>
FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
2019-02-10 03:34:42 +00:00
format_str_ = ctx.begin();
using handler_type = internal::dynamic_specs_handler<ParseContext>;
auto type = internal::type_constant<T, Char>::value;
2019-01-13 02:27:38 +00:00
internal::specs_checker<handler_type> handler(handler_type(specs_, ctx),
type);
auto it = parse_format_specs(ctx.begin(), ctx.end(), handler);
2017-11-23 17:14:37 +00:00
auto eh = ctx.error_handler();
switch (type) {
case internal::none_type:
case internal::named_arg_type:
2017-11-23 17:14:37 +00:00
FMT_ASSERT(false, "invalid argument type");
break;
case internal::int_type:
case internal::uint_type:
case internal::long_long_type:
case internal::ulong_long_type:
case internal::bool_type:
handle_int_type_spec(specs_.type,
2019-01-13 02:27:38 +00:00
internal::int_type_checker<decltype(eh)>(eh));
2017-11-23 17:14:37 +00:00
break;
case internal::char_type:
handle_char_specs(
&specs_, internal::char_specs_checker<decltype(eh)>(specs_.type, eh));
2017-11-23 17:14:37 +00:00
break;
case internal::double_type:
case internal::long_double_type:
handle_float_type_spec(specs_.type,
2019-01-13 02:27:38 +00:00
internal::float_type_checker<decltype(eh)>(eh));
2017-11-23 17:14:37 +00:00
break;
case internal::cstring_type:
2017-11-24 17:54:28 +00:00
internal::handle_cstring_type_spec(
specs_.type, internal::cstring_type_checker<decltype(eh)>(eh));
2017-11-24 17:54:28 +00:00
break;
case internal::string_type:
internal::check_string_type_spec(specs_.type, eh);
2017-11-23 17:14:37 +00:00
break;
case internal::pointer_type:
internal::check_pointer_type_spec(specs_.type, eh);
2017-11-23 17:14:37 +00:00
break;
case internal::custom_type:
2017-11-23 17:14:37 +00:00
// Custom format specifiers should be checked in parse functions of
// formatter specializations.
break;
2017-11-16 14:55:49 +00:00
}
return it;
}
2018-01-14 19:00:27 +00:00
template <typename FormatContext>
2019-01-13 02:27:38 +00:00
auto format(const T& val, FormatContext& ctx) -> decltype(ctx.out()) {
2017-10-21 14:13:20 +00:00
internal::handle_dynamic_spec<internal::width_checker>(
specs_.width, specs_.width_ref, ctx, format_str_);
2017-10-21 14:13:20 +00:00
internal::handle_dynamic_spec<internal::precision_checker>(
2019-02-10 03:34:42 +00:00
specs_.precision, specs_.precision_ref, ctx, format_str_);
using range_type =
internal::output_range<typename FormatContext::iterator,
typename FormatContext::char_type>;
return visit_format_arg(arg_formatter<range_type>(ctx, nullptr, &specs_),
2019-01-13 02:27:38 +00:00
internal::make_arg<FormatContext>(val));
}
private:
2017-08-13 20:09:02 +00:00
internal::dynamic_format_specs<Char> specs_;
2019-02-10 03:34:42 +00:00
const Char* format_str_;
2017-08-13 20:09:02 +00:00
};
#define FMT_FORMAT_AS(Type, Base) \
template <typename Char> \
struct formatter<Type, Char> : formatter<Base, Char> { \
template <typename FormatContext> \
auto format(const Type& val, FormatContext& ctx) -> decltype(ctx.out()) { \
return formatter<Base, Char>::format(val, ctx); \
} \
}
FMT_FORMAT_AS(signed char, int);
FMT_FORMAT_AS(unsigned char, unsigned);
FMT_FORMAT_AS(short, int);
FMT_FORMAT_AS(unsigned short, unsigned);
FMT_FORMAT_AS(long, long long);
FMT_FORMAT_AS(unsigned long, unsigned long long);
FMT_FORMAT_AS(float, double);
FMT_FORMAT_AS(Char*, const Char*);
FMT_FORMAT_AS(std::basic_string<Char>, basic_string_view<Char>);
FMT_FORMAT_AS(std::nullptr_t, const void*);
2019-06-23 02:48:37 +00:00
FMT_FORMAT_AS(internal::std_string_view<Char>, basic_string_view<Char>);
template <typename Char>
struct formatter<void*, Char> : formatter<const void*, Char> {
template <typename FormatContext>
auto format(void* val, FormatContext& ctx) -> decltype(ctx.out()) {
return formatter<const void*, Char>::format(val, ctx);
}
};
template <typename Char, size_t N>
struct formatter<Char[N], Char> : formatter<basic_string_view<Char>, Char> {
template <typename FormatContext>
auto format(const Char* val, FormatContext& ctx) -> decltype(ctx.out()) {
return formatter<basic_string_view<Char>, Char>::format(val, ctx);
}
};
2017-09-03 15:28:30 +00:00
// A formatter for types known only at run time such as variant alternatives.
//
// Usage:
2019-07-07 17:44:06 +00:00
// using variant = std::variant<int, std::string>;
2017-09-03 15:28:30 +00:00
// template <>
// struct formatter<variant>: dynamic_formatter<> {
// void format(buffer &buf, const variant &v, context &ctx) {
// visit([&](const auto &val) { format(buf, val, ctx); }, v);
// }
// };
2019-01-13 02:27:38 +00:00
template <typename Char = char> class dynamic_formatter {
2018-03-03 22:04:59 +00:00
private:
2019-01-13 02:27:38 +00:00
struct null_handler : internal::error_handler {
void on_align(align_t) {}
2018-03-03 22:04:59 +00:00
void on_plus() {}
void on_minus() {}
void on_space() {}
void on_hash() {}
};
public:
template <typename ParseContext>
2019-01-13 02:27:38 +00:00
auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
2019-02-10 03:34:42 +00:00
format_str_ = ctx.begin();
2017-09-03 15:28:30 +00:00
// Checks are deferred to formatting time when the argument type is known.
internal::dynamic_specs_handler<ParseContext> handler(specs_, ctx);
return parse_format_specs(ctx.begin(), ctx.end(), handler);
2017-09-03 15:28:30 +00:00
}
2018-01-14 19:00:27 +00:00
template <typename T, typename FormatContext>
2019-01-13 02:27:38 +00:00
auto format(const T& val, FormatContext& ctx) -> decltype(ctx.out()) {
2017-09-03 15:28:30 +00:00
handle_specs(ctx);
2019-01-13 02:27:38 +00:00
internal::specs_checker<null_handler> checker(
2019-06-11 04:21:45 +00:00
null_handler(),
internal::mapped_type_constant<T, FormatContext>::value);
checker.on_align(specs_.align);
switch (specs_.sign) {
case sign::none:
break;
case sign::plus:
checker.on_plus();
break;
case sign::minus:
2017-09-03 15:28:30 +00:00
checker.on_minus();
break;
case sign::space:
checker.on_space();
break;
}
if (specs_.alt) checker.on_hash();
if (specs_.precision >= 0) checker.end_precision();
2019-07-07 17:44:06 +00:00
using range = internal::output_range<typename FormatContext::iterator,
typename FormatContext::char_type>;
visit_format_arg(arg_formatter<range>(ctx, nullptr, &specs_),
2019-01-13 02:27:38 +00:00
internal::make_arg<FormatContext>(val));
2018-04-22 16:16:32 +00:00
return ctx.out();
2017-09-03 15:28:30 +00:00
}
private:
2019-01-13 02:27:38 +00:00
template <typename Context> void handle_specs(Context& ctx) {
2017-10-21 14:13:20 +00:00
internal::handle_dynamic_spec<internal::width_checker>(
specs_.width, specs_.width_ref, ctx, format_str_);
2017-10-21 14:13:20 +00:00
internal::handle_dynamic_spec<internal::precision_checker>(
2019-02-10 03:34:42 +00:00
specs_.precision, specs_.precision_ref, ctx, format_str_);
2017-09-03 15:28:30 +00:00
}
internal::dynamic_format_specs<Char> specs_;
2019-02-10 03:34:42 +00:00
const Char* format_str_;
2017-09-03 15:28:30 +00:00
};
2018-01-21 22:30:38 +00:00
template <typename Range, typename Char>
2018-04-08 13:45:21 +00:00
typename basic_format_context<Range, Char>::format_arg
2019-01-19 17:10:57 +00:00
basic_format_context<Range, Char>::arg(basic_string_view<char_type> name) {
2019-02-10 03:34:42 +00:00
map_.init(args_);
2018-01-06 17:09:50 +00:00
format_arg arg = map_.find(name);
2019-01-13 02:27:38 +00:00
if (arg.type() == internal::none_type) this->on_error("argument not found");
2018-01-06 17:09:50 +00:00
return arg;
}
template <typename Char, typename ErrorHandler>
FMT_CONSTEXPR void advance_to(basic_parse_context<Char, ErrorHandler>& ctx,
const Char* p) {
ctx.advance_to(ctx.begin() + (p - &*ctx.begin()));
}
2016-11-07 00:11:24 +00:00
template <typename ArgFormatter, typename Char, typename Context>
2018-03-03 22:04:59 +00:00
struct format_handler : internal::error_handler {
2019-07-07 17:44:06 +00:00
using range = typename ArgFormatter::range;
2017-10-27 14:25:29 +00:00
2018-03-03 22:04:59 +00:00
format_handler(range r, basic_string_view<Char> str,
2018-11-14 17:39:37 +00:00
basic_format_args<Context> format_args,
internal::locale_ref loc)
2019-02-10 03:34:42 +00:00
: parse_context(str), context(r.begin(), format_args, loc) {}
2019-01-13 02:27:38 +00:00
void on_text(const Char* begin, const Char* end) {
2018-06-27 12:31:20 +00:00
auto size = internal::to_unsigned(end - begin);
2018-04-22 16:16:32 +00:00
auto out = context.out();
2019-01-13 02:27:38 +00:00
auto&& it = internal::reserve(out, size);
2018-03-03 22:04:59 +00:00
it = std::copy_n(begin, size, it);
context.advance_to(out);
}
2019-08-11 13:53:03 +00:00
void get_arg(int id) { arg = internal::get_arg(context, id); }
2019-02-10 03:34:42 +00:00
void on_arg_id() { get_arg(parse_context.next_arg_id()); }
2019-08-11 13:53:03 +00:00
void on_arg_id(int id) {
2019-02-10 03:34:42 +00:00
parse_context.check_arg_id(id);
get_arg(id);
2018-03-03 22:04:59 +00:00
}
void on_arg_id(basic_string_view<Char> id) { arg = context.arg(id); }
2019-01-13 02:27:38 +00:00
void on_replacement_field(const Char* p) {
advance_to(parse_context, p);
2019-02-10 03:34:42 +00:00
internal::custom_formatter<Context> f(parse_context, context);
2018-10-05 14:15:41 +00:00
if (!visit_format_arg(f, arg))
2019-02-10 03:34:42 +00:00
context.advance_to(
visit_format_arg(ArgFormatter(context, &parse_context), arg));
2018-03-03 22:04:59 +00:00
}
2019-01-13 02:27:38 +00:00
const Char* on_format_specs(const Char* begin, const Char* end) {
advance_to(parse_context, begin);
2019-02-10 03:34:42 +00:00
internal::custom_formatter<Context> f(parse_context, context);
if (visit_format_arg(f, arg)) return parse_context.begin();
2018-03-03 22:04:59 +00:00
basic_format_specs<Char> specs;
using internal::specs_handler;
2019-07-07 17:44:06 +00:00
using parse_context_t = basic_parse_context<Char>;
2019-02-10 03:34:42 +00:00
internal::specs_checker<specs_handler<parse_context_t, Context>> handler(
specs_handler<parse_context_t, Context>(specs, parse_context, context),
arg.type());
begin = parse_format_specs(begin, end, handler);
2019-01-13 02:27:38 +00:00
if (begin == end || *begin != '}') on_error("missing '}' in format string");
advance_to(parse_context, begin);
2019-02-10 03:34:42 +00:00
context.advance_to(
visit_format_arg(ArgFormatter(context, &parse_context, &specs), arg));
return begin;
2018-03-03 22:04:59 +00:00
}
2019-02-10 03:34:42 +00:00
basic_parse_context<Char> parse_context;
2018-03-03 22:04:59 +00:00
Context context;
basic_format_arg<Context> arg;
2018-03-03 22:04:59 +00:00
};
2018-03-30 18:31:41 +00:00
/** Formats arguments and writes the output to the range. */
2018-03-03 22:04:59 +00:00
template <typename ArgFormatter, typename Char, typename Context>
2018-11-14 17:39:37 +00:00
typename Context::iterator vformat_to(
2019-01-13 02:27:38 +00:00
typename ArgFormatter::range out, basic_string_view<Char> format_str,
2018-11-14 17:39:37 +00:00
basic_format_args<Context> args,
internal::locale_ref loc = internal::locale_ref()) {
format_handler<ArgFormatter, Char, Context> h(out, format_str, args, loc);
2018-07-14 20:17:40 +00:00
internal::parse_format_string<false>(format_str, h);
2018-04-22 16:16:32 +00:00
return h.context.out();
2016-11-07 00:11:24 +00:00
}
// Casts ``p`` to ``const void*`` for pointer formatting.
// Example:
// auto s = format("{}", ptr(p));
2019-01-13 02:27:38 +00:00
template <typename T> inline const void* ptr(const T* p) { return p; }
template <typename T> inline const void* ptr(const std::unique_ptr<T>& p) {
return p.get();
}
template <typename T> inline const void* ptr(const std::shared_ptr<T>& p) {
return p.get();
}
2019-07-09 18:50:16 +00:00
template <typename It, typename Char> struct arg_join : internal::view {
2018-01-28 00:04:45 +00:00
It begin;
It end;
basic_string_view<Char> sep;
2019-07-09 18:50:16 +00:00
arg_join(It b, It e, basic_string_view<Char> s) : begin(b), end(e), sep(s) {}
2018-01-28 00:04:45 +00:00
};
template <typename It, typename Char>
2019-01-13 02:27:38 +00:00
struct formatter<arg_join<It, Char>, Char>
: formatter<typename std::iterator_traits<It>::value_type, Char> {
2018-01-28 00:04:45 +00:00
template <typename FormatContext>
2019-01-13 02:27:38 +00:00
auto format(const arg_join<It, Char>& value, FormatContext& ctx)
2018-04-22 16:16:32 +00:00
-> decltype(ctx.out()) {
2019-07-07 17:44:06 +00:00
using base = formatter<typename std::iterator_traits<It>::value_type, Char>;
2018-01-28 00:04:45 +00:00
auto it = value.begin;
2018-04-22 16:16:32 +00:00
auto out = ctx.out();
2018-01-28 00:04:45 +00:00
if (it != value.end) {
out = base::format(*it++, ctx);
while (it != value.end) {
out = std::copy(value.sep.begin(), value.sep.end(), out);
ctx.advance_to(out);
out = base::format(*it++, ctx);
}
}
return out;
}
};
/**
Returns an object that formats the iterator range `[begin, end)` with elements
separated by `sep`.
*/
2018-01-28 00:04:45 +00:00
template <typename It>
arg_join<It, char> join(It begin, It end, string_view sep) {
2019-06-17 17:58:35 +00:00
return {begin, end, sep};
2018-01-28 00:04:45 +00:00
}
template <typename It>
arg_join<It, wchar_t> join(It begin, It end, wstring_view sep) {
2019-06-17 17:58:35 +00:00
return {begin, end, sep};
2018-01-28 00:04:45 +00:00
}
/**
\rst
Returns an object that formats `range` with elements separated by `sep`.
**Example**::
std::vector<int> v = {1, 2, 3};
fmt::print("{}", fmt::join(v, ", "));
// Output: "1, 2, 3"
\endrst
*/
2018-01-28 00:04:45 +00:00
template <typename Range>
2019-06-14 20:18:00 +00:00
arg_join<internal::iterator_t<const Range>, char> join(const Range& range,
string_view sep) {
return join(std::begin(range), std::end(range), sep);
2018-01-28 00:04:45 +00:00
}
template <typename Range>
2019-06-14 20:18:00 +00:00
arg_join<internal::iterator_t<const Range>, wchar_t> join(const Range& range,
wstring_view sep) {
return join(std::begin(range), std::end(range), sep);
2018-01-28 00:04:45 +00:00
}
2018-01-14 20:25:03 +00:00
/**
\rst
Converts *value* to ``std::string`` using the default format for type *T*.
2018-07-18 13:44:46 +00:00
It doesn't support user-defined types with custom formatters.
2018-01-14 20:25:03 +00:00
**Example**::
2018-03-10 17:25:17 +00:00
#include <fmt/format.h>
2018-01-14 20:25:03 +00:00
std::string answer = fmt::to_string(42);
\endrst
*/
2019-04-06 02:14:55 +00:00
template <typename T> inline std::string to_string(const T& value) {
return format("{}", value);
2018-01-14 15:19:23 +00:00
}
2018-05-13 16:11:29 +00:00
/**
Converts *value* to ``std::wstring`` using the default format for type *T*.
*/
2019-04-06 02:14:55 +00:00
template <typename T> inline std::wstring to_wstring(const T& value) {
return format(L"{}", value);
2018-02-07 15:08:14 +00:00
}
template <typename Char, std::size_t SIZE>
2019-01-13 02:27:38 +00:00
std::basic_string<Char> to_string(const basic_memory_buffer<Char, SIZE>& buf) {
return std::basic_string<Char>(buf.data(), buf.size());
2018-01-14 15:19:23 +00:00
}
2018-10-25 01:42:42 +00:00
template <typename Char>
2019-06-03 00:13:50 +00:00
typename buffer_context<Char>::iterator internal::vformat_to(
internal::buffer<Char>& buf, basic_string_view<Char> format_str,
2019-06-03 00:13:50 +00:00
basic_format_args<buffer_context<Char>> args) {
using range = buffer_range<Char>;
2019-01-13 02:27:38 +00:00
return vformat_to<arg_formatter<range>>(buf, to_string_view(format_str),
args);
}
2019-06-01 19:32:24 +00:00
template <typename S, typename Char = char_t<S>,
2019-03-16 19:58:18 +00:00
FMT_ENABLE_IF(internal::is_string<S>::value)>
2019-06-03 00:13:50 +00:00
inline typename buffer_context<Char>::iterator vformat_to(
internal::buffer<Char>& buf, const S& format_str,
2019-06-03 00:13:50 +00:00
basic_format_args<buffer_context<Char>> args) {
return internal::vformat_to(buf, to_string_view(format_str), args);
2018-10-25 01:42:42 +00:00
}
2019-01-13 02:27:38 +00:00
template <typename S, typename... Args, std::size_t SIZE = inline_buffer_size,
2019-06-01 19:32:24 +00:00
typename Char = enable_if_t<internal::is_string<S>::value, char_t<S>>>
2019-06-03 00:13:50 +00:00
inline typename buffer_context<Char>::iterator format_to(
2019-07-09 18:50:16 +00:00
basic_memory_buffer<Char, SIZE>& buf, const S& format_str, Args&&... args) {
internal::check_format_string<Args...>(format_str);
2019-06-03 00:13:50 +00:00
using context = buffer_context<Char>;
return internal::vformat_to(buf, to_string_view(format_str),
2019-07-07 22:40:34 +00:00
{make_format_args<context>(args...)});
2018-01-14 20:25:03 +00:00
}
2018-01-18 06:04:24 +00:00
template <typename OutputIt, typename Char = char>
using format_context_t = basic_format_context<OutputIt, Char>;
2018-01-18 06:04:24 +00:00
2018-01-21 22:30:38 +00:00
template <typename OutputIt, typename Char = char>
using format_args_t = basic_format_args<format_context_t<OutputIt, Char>>;
2018-01-18 06:04:24 +00:00
2019-06-01 19:32:24 +00:00
template <typename S, typename OutputIt, typename... Args,
FMT_ENABLE_IF(
internal::is_output_iterator<OutputIt>::value &&
!internal::is_contiguous_back_insert_iterator<OutputIt>::value)>
inline OutputIt vformat_to(OutputIt out, const S& format_str,
format_args_t<OutputIt, char_t<S>> args) {
2019-07-07 22:40:34 +00:00
using range = internal::output_range<OutputIt, char_t<S>>;
return vformat_to<arg_formatter<range>>(range(out),
to_string_view(format_str), args);
}
2018-01-18 06:04:24 +00:00
2018-05-16 14:58:43 +00:00
/**
\rst
Formats arguments, writes the result to the output iterator ``out`` and returns
the iterator past the end of the output range.
2018-05-16 15:19:26 +00:00
**Example**::
2018-05-16 14:58:43 +00:00
2018-05-16 15:19:26 +00:00
std::vector<char> out;
fmt::format_to(std::back_inserter(out), "{}", 42);
2018-05-16 14:58:43 +00:00
\endrst
*/
2019-08-03 15:35:02 +00:00
template <typename OutputIt, typename S, typename... Args,
FMT_ENABLE_IF(
internal::is_output_iterator<OutputIt>::value &&
!internal::is_contiguous_back_insert_iterator<OutputIt>::value &&
internal::is_string<S>::value)>
2019-07-09 18:50:16 +00:00
inline OutputIt format_to(OutputIt out, const S& format_str, Args&&... args) {
internal::check_format_string<Args...>(format_str);
2019-07-07 22:40:34 +00:00
using context = format_context_t<OutputIt, char_t<S>>;
return vformat_to(out, to_string_view(format_str),
2019-07-07 22:40:34 +00:00
{make_format_args<context>(args...)});
}
2019-01-13 02:27:38 +00:00
template <typename OutputIt> struct format_to_n_result {
2018-03-30 18:31:41 +00:00
/** Iterator past the end of the output range. */
2018-03-30 01:13:10 +00:00
OutputIt out;
2018-03-30 18:31:41 +00:00
/** Total (not truncated) output size. */
2018-03-30 01:13:10 +00:00
std::size_t size;
};
template <typename OutputIt, typename Char = typename OutputIt::value_type>
using format_to_n_context =
format_context_t<fmt::internal::truncating_iterator<OutputIt>, Char>;
2018-06-23 14:03:00 +00:00
template <typename OutputIt, typename Char = typename OutputIt::value_type>
using format_to_n_args = basic_format_args<format_to_n_context<OutputIt, Char>>;
2018-06-23 14:03:00 +00:00
2019-01-13 02:27:38 +00:00
template <typename OutputIt, typename Char, typename... Args>
inline format_arg_store<format_to_n_context<OutputIt, Char>, Args...>
2019-01-13 02:27:38 +00:00
make_format_to_n_args(const Args&... args) {
return format_arg_store<format_to_n_context<OutputIt, Char>, Args...>(
args...);
2018-06-23 14:03:00 +00:00
}
2019-03-16 19:58:18 +00:00
template <typename OutputIt, typename Char, typename... Args,
FMT_ENABLE_IF(internal::is_output_iterator<OutputIt>::value)>
inline format_to_n_result<OutputIt> vformat_to_n(
OutputIt out, std::size_t n, basic_string_view<Char> format_str,
format_to_n_args<OutputIt, Char> args) {
2019-07-07 22:40:34 +00:00
auto it = vformat_to(internal::truncating_iterator<OutputIt>(out, n),
format_str, args);
2018-06-23 14:03:00 +00:00
return {it.base(), it.count()};
}
2018-03-30 18:31:41 +00:00
/**
\rst
Formats arguments, writes up to ``n`` characters of the result to the output
2018-09-08 16:06:54 +00:00
iterator ``out`` and returns the total output size and the iterator past the
end of the output range.
2018-03-30 18:31:41 +00:00
\endrst
*/
2019-03-16 19:58:18 +00:00
template <typename OutputIt, typename S, typename... Args,
FMT_ENABLE_IF(internal::is_string<S>::value&&
internal::is_output_iterator<OutputIt>::value)>
inline format_to_n_result<OutputIt> format_to_n(OutputIt out, std::size_t n,
const S& format_str,
const Args&... args) {
internal::check_format_string<Args...>(format_str);
2019-07-07 22:40:34 +00:00
using context = format_to_n_context<OutputIt, char_t<S>>;
return vformat_to_n(out, n, to_string_view(format_str),
2019-07-07 22:40:34 +00:00
{make_format_args<context>(args...)});
}
2018-03-30 01:13:10 +00:00
template <typename Char>
inline std::basic_string<Char> internal::vformat(
basic_string_view<Char> format_str,
2019-06-03 00:13:50 +00:00
basic_format_args<buffer_context<Char>> args) {
basic_memory_buffer<Char> buffer;
internal::vformat_to(buffer, format_str, args);
2018-01-14 20:25:03 +00:00
return fmt::to_string(buffer);
}
2018-05-16 15:19:26 +00:00
/**
Returns the number of characters in the output of
``format(format_str, args...)``.
2018-05-16 15:19:26 +00:00
*/
2018-01-18 06:04:24 +00:00
template <typename... Args>
2019-01-13 02:27:38 +00:00
inline std::size_t formatted_size(string_view format_str, const Args&... args) {
2018-03-31 17:47:30 +00:00
auto it = format_to(internal::counting_iterator<char>(), format_str, args...);
return it.count();
2018-01-18 06:04:24 +00:00
}
#if FMT_USE_USER_DEFINED_LITERALS
namespace internal {
# if FMT_USE_UDL_TEMPLATE
2019-01-13 02:27:38 +00:00
template <typename Char, Char... CHARS> class udl_formatter {
public:
2017-11-04 16:02:47 +00:00
template <typename... Args>
std::basic_string<Char> operator()(Args&&... args) const {
2018-02-04 16:58:21 +00:00
FMT_CONSTEXPR_DECL Char s[] = {CHARS..., '\0'};
FMT_CONSTEXPR_DECL bool invalid_format =
2018-11-03 23:20:45 +00:00
do_check_format_string<Char, error_handler, Args...>(
2019-01-13 02:27:38 +00:00
basic_string_view<Char>(s, sizeof...(CHARS)));
2017-11-16 14:55:49 +00:00
(void)invalid_format;
return format(s, std::forward<Args>(args)...);
2017-11-04 16:02:47 +00:00
}
};
2019-01-13 02:27:38 +00:00
# else
template <typename Char> struct udl_formatter {
basic_string_view<Char> str;
template <typename... Args>
2019-07-27 21:56:55 +00:00
std::basic_string<Char> operator()(Args&&... args) const {
return format(str, std::forward<Args>(args)...);
}
};
# endif // FMT_USE_UDL_TEMPLATE
2019-01-13 02:27:38 +00:00
template <typename Char> struct udl_arg {
basic_string_view<Char> str;
2019-01-13 02:27:38 +00:00
template <typename T> named_arg<T, Char> operator=(T&& value) const {
return {str, std::forward<T>(value)};
}
};
2019-01-13 02:27:38 +00:00
} // namespace internal
inline namespace literals {
# if FMT_USE_UDL_TEMPLATE
2019-06-17 16:21:29 +00:00
# pragma GCC diagnostic push
# if FMT_CLANG_VERSION
# pragma GCC diagnostic ignored "-Wgnu-string-literal-operator-template"
# endif
2017-11-04 16:02:47 +00:00
template <typename Char, Char... CHARS>
2018-02-03 14:14:10 +00:00
FMT_CONSTEXPR internal::udl_formatter<Char, CHARS...> operator""_format() {
2017-11-04 16:02:47 +00:00
return {};
}
2019-06-17 16:21:29 +00:00
# pragma GCC diagnostic pop
2019-01-13 02:27:38 +00:00
# else
/**
\rst
User-defined literal equivalent of :func:`fmt::format`.
**Example**::
using namespace fmt::literals;
std::string message = "The answer is {}"_format(42);
\endrst
*/
FMT_CONSTEXPR internal::udl_formatter<char> operator"" _format(const char* s,
std::size_t n) {
return {{s, n}};
2019-01-13 02:27:38 +00:00
}
FMT_CONSTEXPR internal::udl_formatter<wchar_t> operator"" _format(
const wchar_t* s, std::size_t n) {
return {{s, n}};
2019-01-13 02:27:38 +00:00
}
# endif // FMT_USE_UDL_TEMPLATE
/**
\rst
User-defined literal equivalent of :func:`fmt::arg`.
**Example**::
using namespace fmt::literals;
2018-03-04 17:55:17 +00:00
fmt::print("Elapsed time: {s:.2f} seconds", "s"_a=1.23);
\endrst
*/
2019-07-27 22:04:51 +00:00
FMT_CONSTEXPR internal::udl_arg<char> operator"" _a(const char* s,
std::size_t n) {
return {{s, n}};
2019-01-13 02:27:38 +00:00
}
2019-07-27 22:04:51 +00:00
FMT_CONSTEXPR internal::udl_arg<wchar_t> operator"" _a(const wchar_t* s,
std::size_t n) {
return {{s, n}};
2019-01-13 02:27:38 +00:00
}
} // namespace literals
#endif // FMT_USE_USER_DEFINED_LITERALS
2018-05-12 15:33:51 +00:00
FMT_END_NAMESPACE
/**
\rst
Constructs a compile-time format string.
**Example**::
// A compile-time error because 'd' is an invalid specifier for strings.
std::string s = format(FMT_STRING("{:d}"), "foo");
\endrst
*/
2019-07-07 22:40:34 +00:00
#define FMT_STRING(s) \
[] { \
struct str : fmt::compile_string { \
using char_type = typename std::remove_cv<std::remove_pointer< \
typename std::decay<decltype(s)>::type>::type>::type; \
FMT_CONSTEXPR operator fmt::basic_string_view<char_type>() const { \
return {s, sizeof(s) / sizeof(char_type) - 1}; \
} \
} result; \
/* Suppress Qt Creator warning about unused operator. */ \
(void)static_cast<fmt::basic_string_view<typename str::char_type>>( \
result); \
return result; \
}()
2017-11-04 15:23:24 +00:00
#if defined(FMT_STRING_ALIAS) && FMT_STRING_ALIAS
2018-03-10 17:25:17 +00:00
/**
\rst
2018-09-13 14:20:43 +00:00
Constructs a compile-time format string. This macro is disabled by default to
prevent potential name collisions. To enable it define ``FMT_STRING_ALIAS`` to
1 before including ``fmt/format.h``.
2018-03-10 17:25:17 +00:00
**Example**::
2018-09-13 14:37:20 +00:00
#define FMT_STRING_ALIAS 1
2018-03-10 17:25:17 +00:00
#include <fmt/format.h>
2018-03-16 20:26:31 +00:00
// A compile-time error because 'd' is an invalid specifier for strings.
2018-05-19 15:57:31 +00:00
std::string s = format(fmt("{:d}"), "foo");
2018-03-10 17:25:17 +00:00
\endrst
*/
2019-01-13 02:27:38 +00:00
# define fmt(s) FMT_STRING(s)
#endif
2017-08-21 13:50:57 +00:00
#ifdef FMT_HEADER_ONLY
2019-01-13 02:27:38 +00:00
# define FMT_FUNC inline
# include "format-inl.h"
2017-08-21 13:50:57 +00:00
#else
2019-01-13 02:27:38 +00:00
# define FMT_FUNC
2017-08-21 13:50:57 +00:00
#endif
#endif // FMT_FORMAT_H_