mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-12-26 09:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Value -> value

Browse Source
This commit is contained in:
Victor Zverovich 2016-12-30 08:05:26 -08:00
parent 42a319074c
commit acd1811c50
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fmt/format.h
View File

@ -1099,7 +1099,7 @@ struct CustomValue {
// A formatting argument value. // A formatting argument value.
template <typename Context> template <typename Context>
struct Value { struct value {
union { union {
int int_value; int int_value;
unsigned uint_value; unsigned uint_value;
@ -1177,7 +1177,7 @@ constexpr Type type() { return gettype<typename std::decay<T>::type>(); }
// Makes a format_arg object from any type. // Makes a format_arg object from any type.
template <typename Context> template <typename Context>
class MakeValue : public Value<Context> { class MakeValue : public value<Context> {
public: public:
typedef typename Context::char_type Char; typedef typename Context::char_type Char;
@ -1347,7 +1347,7 @@ class basic_format_args;
template <typename Context> template <typename Context>
class basic_format_arg { class basic_format_arg {
private: private:
internal::Value<Context> value_; internal::value<Context> value_;
internal::Type type_; internal::Type type_;
template <typename ContextType, typename T> template <typename ContextType, typename T>
@ -1514,7 +1514,7 @@ constexpr uint64_t make_type<void>() { return 0; }
enum { MAX_PACKED_ARGS = 16 }; enum { MAX_PACKED_ARGS = 16 };
template <bool IS_PACKED, typename Context, typename T> template <bool IS_PACKED, typename Context, typename T>
inline typename std::enable_if<IS_PACKED, Value<Context>>::type inline typename std::enable_if<IS_PACKED, value<Context>>::type
make_arg(const T& value) { make_arg(const T& value) {
return MakeValue<Context>(value); return MakeValue<Context>(value);
} }
@ -1537,7 +1537,7 @@ class format_arg_store {
typedef typename Context::char_type char_type; typedef typename Context::char_type char_type;
typedef typename std::conditional<IS_PACKED, typedef typename std::conditional<IS_PACKED,
internal::Value<Context>, basic_format_arg<Context>>::type value_type; internal::value<Context>, basic_format_arg<Context>>::type value_type;
// If the arguments are not packed, add one more element to mark the end. // If the arguments are not packed, add one more element to mark the end.
typedef std::array<value_type, NUM_ARGS + (IS_PACKED ? 0 : 1)> Array; typedef std::array<value_type, NUM_ARGS + (IS_PACKED ? 0 : 1)> Array;
@ -1581,7 +1581,7 @@ class basic_format_args {
// This is done to reduce compiled code size as storing larger objects // This is done to reduce compiled code size as storing larger objects
// may require more code (at least on x86-64) even if the same amount of // may require more code (at least on x86-64) even if the same amount of
// data is actually copied to stack. It saves ~10% on the bloat test. // data is actually copied to stack. It saves ~10% on the bloat test.
const internal::Value<Context> *values_; const internal::value<Context> *values_;
const format_arg *args_; const format_arg *args_;
}; };
@ -1594,7 +1594,7 @@ class basic_format_args {
friend class internal::ArgMap<Context>; friend class internal::ArgMap<Context>;
void set_data(const internal::Value<Context> *values) { values_ = values; } void set_data(const internal::value<Context> *values) { values_ = values; }
void set_data(const format_arg *args) { args_ = args; } void set_data(const format_arg *args) { args_ = args; }
format_arg get(size_type index) const { format_arg get(size_type index) const {
@ -1602,7 +1602,7 @@ class basic_format_args {
bool use_values = type(internal::MAX_PACKED_ARGS - 1) == internal::NONE; bool use_values = type(internal::MAX_PACKED_ARGS - 1) == internal::NONE;
if (index < internal::MAX_PACKED_ARGS) { if (index < internal::MAX_PACKED_ARGS) {
typename internal::Type arg_type = type(index); typename internal::Type arg_type = type(index);
internal::Value<Context> &val = arg.value_; internal::value<Context> &val = arg.value_;
if (arg_type != internal::NONE) if (arg_type != internal::NONE)
val = use_values ? values_[index] : args_[index].value_; val = use_values ? values_[index] : args_[index].value_;
arg.type_ = arg_type; arg.type_ = arg_type;

4
test/util-test.cc
View File

@ -57,7 +57,7 @@ using fmt::format_arg;
using fmt::Buffer; using fmt::Buffer;
using fmt::StringRef; using fmt::StringRef;
using fmt::internal::MemoryBuffer; using fmt::internal::MemoryBuffer;
using fmt::internal::Value; using fmt::internal::value;
using testing::_; using testing::_;
using testing::Return; using testing::Return;
@ -423,7 +423,7 @@ void format_value(fmt::Writer &, const Test &, CustomContext &ctx) {
TEST(UtilTest, MakeValueWithCustomFormatter) { TEST(UtilTest, MakeValueWithCustomFormatter) {
::Test t; ::Test t;
fmt::internal::Value<CustomContext> arg = fmt::internal::value<CustomContext> arg =
fmt::internal::MakeValue<CustomContext>(t); fmt::internal::MakeValue<CustomContext>(t);
CustomContext ctx = {false}; CustomContext ctx = {false};
fmt::MemoryWriter w; fmt::MemoryWriter w;