Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
spdlog
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
spdlog
Commits
d142f135
Commit
d142f135
authored
Nov 18, 2016
by
gabime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated fmto to version def687462c32ec40757e49eb6069f109d50236d6
parent
e12916c0
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5126 additions
and
5110 deletions
+5126
-5110
include/spdlog/fmt/bundled/format.cc
include/spdlog/fmt/bundled/format.cc
+583
-560
include/spdlog/fmt/bundled/format.h
include/spdlog/fmt/bundled/format.h
+3804
-3795
include/spdlog/fmt/bundled/ostream.cc
include/spdlog/fmt/bundled/ostream.cc
+37
-35
include/spdlog/fmt/bundled/ostream.h
include/spdlog/fmt/bundled/ostream.h
+94
-97
include/spdlog/fmt/bundled/printf.h
include/spdlog/fmt/bundled/printf.h
+608
-623
No files found.
include/spdlog/fmt/bundled/format.cc
View file @
d142f135
...
@@ -25,9 +25,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
...
@@ -25,9 +25,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
*/
// commented out by spdlog
#include "format.h"
// #include "format.h"
// #include "printf.h"
#include <string.h>
#include <string.h>
...
@@ -73,31 +71,37 @@ using fmt::internal::Arg;
...
@@ -73,31 +71,37 @@ using fmt::internal::Arg;
// Dummy implementations of strerror_r and strerror_s called if corresponding
// Dummy implementations of strerror_r and strerror_s called if corresponding
// system functions are not available.
// system functions are not available.
static
inline
fmt
::
internal
::
Null
<>
strerror_r
(
int
,
char
*
,
...)
{
static
inline
fmt
::
internal
::
Null
<>
strerror_r
(
int
,
char
*
,
...)
{
return
fmt
::
internal
::
Null
<>
();
return
fmt
::
internal
::
Null
<>
();
}
}
static
inline
fmt
::
internal
::
Null
<>
strerror_s
(
char
*
,
std
::
size_t
,
...)
{
static
inline
fmt
::
internal
::
Null
<>
strerror_s
(
char
*
,
std
::
size_t
,
...)
{
return
fmt
::
internal
::
Null
<>
();
return
fmt
::
internal
::
Null
<>
();
}
}
namespace
fmt
{
namespace
fmt
{
FMT_FUNC
internal
::
RuntimeError
::~
RuntimeError
()
throw
()
{}
FMT_FUNC
internal
::
RuntimeError
::~
RuntimeError
()
FMT_DTOR_NOEXCEPT
FMT_FUNC
FormatError
::~
FormatError
()
throw
()
{}
{}
FMT_FUNC
SystemError
::~
SystemError
()
throw
()
{}
FMT_FUNC
FormatError
::~
FormatError
()
FMT_DTOR_NOEXCEPT
{}
FMT_FUNC
SystemError
::~
SystemError
()
FMT_DTOR_NOEXCEPT
{}
namespace
{
namespace
{
#ifndef _MSC_VER
#ifndef _MSC_VER
# define FMT_SNPRINTF snprintf
# define FMT_SNPRINTF snprintf
#else // _MSC_VER
#else // _MSC_VER
inline
int
fmt_snprintf
(
char
*
buffer
,
size_t
size
,
const
char
*
format
,
...)
{
inline
int
fmt_snprintf
(
char
*
buffer
,
size_t
size
,
const
char
*
format
,
...)
{
va_list
args
;
va_list
args
;
va_start
(
args
,
format
);
va_start
(
args
,
format
);
int
result
=
vsnprintf_s
(
buffer
,
size
,
_TRUNCATE
,
format
,
args
);
int
result
=
vsnprintf_s
(
buffer
,
size
,
_TRUNCATE
,
format
,
args
);
va_end
(
args
);
va_end
(
args
);
return
result
;
return
result
;
}
}
# define FMT_SNPRINTF fmt_snprintf
# define FMT_SNPRINTF fmt_snprintf
#endif // _MSC_VER
#endif // _MSC_VER
...
@@ -107,40 +111,45 @@ inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...) {
...
@@ -107,40 +111,45 @@ inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...) {
# define FMT_SWPRINTF swprintf
# define FMT_SWPRINTF swprintf
#endif // defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT)
#endif // defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT)
const
char
RESET_COLOR
[]
=
"
\x1b
[0m"
;
const
char
RESET_COLOR
[]
=
"
\x1b
[0m"
;
typedef
void
(
*
FormatFunc
)(
Writer
&
,
int
,
StringRef
);
typedef
void
(
*
FormatFunc
)(
Writer
&
,
int
,
StringRef
);
// Portable thread-safe version of strerror.
// Portable thread-safe version of strerror.
// Sets buffer to point to a string describing the error code.
// Sets buffer to point to a string describing the error code.
// This can be either a pointer to a string stored in buffer,
// This can be either a pointer to a string stored in buffer,
// or a pointer to some static immutable string.
// or a pointer to some static immutable string.
// Returns one of the following values:
// Returns one of the following values:
// 0 - success
// 0 - success
// ERANGE - buffer is not large enough to store the error message
// ERANGE - buffer is not large enough to store the error message
// other - failure
// other - failure
// Buffer should be at least of size 1.
// Buffer should be at least of size 1.
int
safe_strerror
(
int
safe_strerror
(
int
error_code
,
char
*&
buffer
,
std
::
size_t
buffer_size
)
FMT_NOEXCEPT
{
int
error_code
,
char
*&
buffer
,
std
::
size_t
buffer_size
)
FMT_NOEXCEPT
{
FMT_ASSERT
(
buffer
!=
0
&&
buffer_size
!=
0
,
"invalid buffer"
);
FMT_ASSERT
(
buffer
!=
0
&&
buffer_size
!=
0
,
"invalid buffer"
);
class
StrError
{
class
StrError
{
private:
private:
int
error_code_
;
int
error_code_
;
char
*&
buffer_
;
char
*&
buffer_
;
std
::
size_t
buffer_size_
;
std
::
size_t
buffer_size_
;
// A noop assignment operator to avoid bogus warnings.
// A noop assignment operator to avoid bogus warnings.
void
operator
=
(
const
StrError
&
)
{}
void
operator
=
(
const
StrError
&
)
{}
// Handle the result of XSI-compliant version of strerror_r.
// Handle the result of XSI-compliant version of strerror_r.
int
handle
(
int
result
)
{
int
handle
(
int
result
)
{
// glibc versions before 2.13 return result in errno.
// glibc versions before 2.13 return result in errno.
return
result
==
-
1
?
errno
:
result
;
return
result
==
-
1
?
errno
:
result
;
}
}
// Handle the result of GNU-specific version of strerror_r.
// Handle the result of GNU-specific version of strerror_r.
int
handle
(
char
*
message
)
{
int
handle
(
char
*
message
)
{
// If the buffer is full then the message is probably truncated.
// If the buffer is full then the message is probably truncated.
if
(
message
==
buffer_
&&
strlen
(
buffer_
)
==
buffer_size_
-
1
)
if
(
message
==
buffer_
&&
strlen
(
buffer_
)
==
buffer_size_
-
1
)
return
ERANGE
;
return
ERANGE
;
...
@@ -149,19 +158,22 @@ int safe_strerror(
...
@@ -149,19 +158,22 @@ int safe_strerror(
}
}
// Handle the case when strerror_r is not available.
// Handle the case when strerror_r is not available.
int
handle
(
internal
::
Null
<>
)
{
int
handle
(
internal
::
Null
<>
)
{
return
fallback
(
strerror_s
(
buffer_
,
buffer_size_
,
error_code_
));
return
fallback
(
strerror_s
(
buffer_
,
buffer_size_
,
error_code_
));
}
}
// Fallback to strerror_s when strerror_r is not available.
// Fallback to strerror_s when strerror_r is not available.
int
fallback
(
int
result
)
{
int
fallback
(
int
result
)
{
// If the buffer is full then the message is probably truncated.
// If the buffer is full then the message is probably truncated.
return
result
==
0
&&
strlen
(
buffer_
)
==
buffer_size_
-
1
?
return
result
==
0
&&
strlen
(
buffer_
)
==
buffer_size_
-
1
?
ERANGE
:
result
;
ERANGE
:
result
;
}
}
// Fallback to strerror if strerror_r and strerror_s are not available.
// Fallback to strerror if strerror_r and strerror_s are not available.
int
fallback
(
internal
::
Null
<>
)
{
int
fallback
(
internal
::
Null
<>
)
{
errno
=
0
;
errno
=
0
;
buffer_
=
strerror
(
error_code_
);
buffer_
=
strerror
(
error_code_
);
return
errno
;
return
errno
;
...
@@ -169,18 +181,22 @@ int safe_strerror(
...
@@ -169,18 +181,22 @@ int safe_strerror(
public:
public:
StrError
(
int
err_code
,
char
*&
buf
,
std
::
size_t
buf_size
)
StrError
(
int
err_code
,
char
*&
buf
,
std
::
size_t
buf_size
)
:
error_code_
(
err_code
),
buffer_
(
buf
),
buffer_size_
(
buf_size
)
{}
:
error_code_
(
err_code
),
buffer_
(
buf
),
buffer_size_
(
buf_size
)
{}
int
run
()
{
int
run
()
strerror_r
(
0
,
0
,
""
);
// Suppress a warning about unused strerror_r.
{
// Suppress a warning about unused strerror_r.
strerror_r
(
0
,
FMT_NULL
,
""
);
return
handle
(
strerror_r
(
error_code_
,
buffer_
,
buffer_size_
));
return
handle
(
strerror_r
(
error_code_
,
buffer_
,
buffer_size_
));
}
}
};
};
return
StrError
(
error_code
,
buffer
,
buffer_size
).
run
();
return
StrError
(
error_code
,
buffer
,
buffer_size
).
run
();
}
}
void
format_error_code
(
Writer
&
out
,
int
error_code
,
void
format_error_code
(
Writer
&
out
,
int
error_code
,
StringRef
message
)
FMT_NOEXCEPT
{
StringRef
message
)
FMT_NOEXCEPT
{
// Report error code making sure that the output fits into
// Report error code making sure that the output fits into
// INLINE_BUFFER_SIZE to avoid dynamic memory allocation and potential
// INLINE_BUFFER_SIZE to avoid dynamic memory allocation and potential
// bad_alloc.
// bad_alloc.
...
@@ -200,42 +216,46 @@ void format_error_code(Writer &out, int error_code,
...
@@ -200,42 +216,46 @@ void format_error_code(Writer &out, int error_code,
out
<<
message
<<
SEP
;
out
<<
message
<<
SEP
;
out
<<
ERROR_STR
<<
error_code
;
out
<<
ERROR_STR
<<
error_code
;
assert
(
out
.
size
()
<=
internal
::
INLINE_BUFFER_SIZE
);
assert
(
out
.
size
()
<=
internal
::
INLINE_BUFFER_SIZE
);
}
}
void
report_error
(
FormatFunc
func
,
int
error_code
,
void
report_error
(
FormatFunc
func
,
int
error_code
,
StringRef
message
)
FMT_NOEXCEPT
{
StringRef
message
)
FMT_NOEXCEPT
{
MemoryWriter
full_message
;
MemoryWriter
full_message
;
func
(
full_message
,
error_code
,
message
);
func
(
full_message
,
error_code
,
message
);
// Use Writer::data instead of Writer::c_str to avoid potential memory
// Use Writer::data instead of Writer::c_str to avoid potential memory
// allocation.
// allocation.
std
::
fwrite
(
full_message
.
data
(),
full_message
.
size
(),
1
,
stderr
);
std
::
fwrite
(
full_message
.
data
(),
full_message
.
size
(),
1
,
stderr
);
std
::
fputc
(
'\n'
,
stderr
);
std
::
fputc
(
'\n'
,
stderr
);
}
}
}
// namespace
}
// namespace
namespace
internal
{
namespace
internal
{
// This method is used to preserve binary compatibility with fmt 3.0.
// This method is used to preserve binary compatibility with fmt 3.0.
// It can be removed in 4.0.
// It can be removed in 4.0.
FMT_FUNC
void
format_system_error
(
FMT_FUNC
void
format_system_error
(
Writer
&
out
,
int
error_code
,
StringRef
message
)
FMT_NOEXCEPT
{
Writer
&
out
,
int
error_code
,
StringRef
message
)
FMT_NOEXCEPT
{
fmt
::
format_system_error
(
out
,
error_code
,
message
);
fmt
::
format_system_error
(
out
,
error_code
,
message
);
}
}
}
// namespace internal
}
// namespace internal
FMT_FUNC
void
SystemError
::
init
(
FMT_FUNC
void
SystemError
::
init
(
int
err_code
,
CStringRef
format_str
,
ArgList
args
)
{
int
err_code
,
CStringRef
format_str
,
ArgList
args
)
{
error_code_
=
err_code
;
error_code_
=
err_code
;
MemoryWriter
w
;
MemoryWriter
w
;
format_system_error
(
w
,
err_code
,
format
(
format_str
,
args
));
format_system_error
(
w
,
err_code
,
format
(
format_str
,
args
));
std
::
runtime_error
&
base
=
*
this
;
std
::
runtime_error
&
base
=
*
this
;
base
=
std
::
runtime_error
(
w
.
str
());
base
=
std
::
runtime_error
(
w
.
str
());
}
}
template
<
typename
T
>
template
<
typename
T
>
int
internal
::
CharTraits
<
char
>::
format_float
(
int
internal
::
CharTraits
<
char
>::
format_float
(
char
*
buffer
,
std
::
size_t
size
,
const
char
*
format
,
char
*
buffer
,
std
::
size_t
size
,
const
char
*
format
,
unsigned
width
,
int
precision
,
T
value
)
{
unsigned
width
,
int
precision
,
T
value
)
{
if
(
width
==
0
)
{
if
(
width
==
0
)
{
return
precision
<
0
?
return
precision
<
0
?
FMT_SNPRINTF
(
buffer
,
size
,
format
,
value
)
:
FMT_SNPRINTF
(
buffer
,
size
,
format
,
value
)
:
...
@@ -244,12 +264,13 @@ int internal::CharTraits<char>::format_float(
...
@@ -244,12 +264,13 @@ int internal::CharTraits<char>::format_float(
return
precision
<
0
?
return
precision
<
0
?
FMT_SNPRINTF
(
buffer
,
size
,
format
,
width
,
value
)
:
FMT_SNPRINTF
(
buffer
,
size
,
format
,
width
,
value
)
:
FMT_SNPRINTF
(
buffer
,
size
,
format
,
width
,
precision
,
value
);
FMT_SNPRINTF
(
buffer
,
size
,
format
,
width
,
precision
,
value
);
}
}
template
<
typename
T
>
template
<
typename
T
>
int
internal
::
CharTraits
<
wchar_t
>::
format_float
(
int
internal
::
CharTraits
<
wchar_t
>::
format_float
(
wchar_t
*
buffer
,
std
::
size_t
size
,
const
wchar_t
*
format
,
wchar_t
*
buffer
,
std
::
size_t
size
,
const
wchar_t
*
format
,
unsigned
width
,
int
precision
,
T
value
)
{
unsigned
width
,
int
precision
,
T
value
)
{
if
(
width
==
0
)
{
if
(
width
==
0
)
{
return
precision
<
0
?
return
precision
<
0
?
FMT_SWPRINTF
(
buffer
,
size
,
format
,
value
)
:
FMT_SWPRINTF
(
buffer
,
size
,
format
,
value
)
:
...
@@ -258,10 +279,10 @@ int internal::CharTraits<wchar_t>::format_float(
...
@@ -258,10 +279,10 @@ int internal::CharTraits<wchar_t>::format_float(
return
precision
<
0
?
return
precision
<
0
?
FMT_SWPRINTF
(
buffer
,
size
,
format
,
width
,
value
)
:
FMT_SWPRINTF
(
buffer
,
size
,
format
,
width
,
value
)
:
FMT_SWPRINTF
(
buffer
,
size
,
format
,
width
,
precision
,
value
);
FMT_SWPRINTF
(
buffer
,
size
,
format
,
width
,
precision
,
value
);
}
}
template
<
typename
T
>
template
<
typename
T
>
const
char
internal
::
BasicData
<
T
>::
DIGITS
[]
=
const
char
internal
::
BasicData
<
T
>::
DIGITS
[]
=
"0001020304050607080910111213141516171819"
"0001020304050607080910111213141516171819"
"2021222324252627282930313233343536373839"
"2021222324252627282930313233343536373839"
"4041424344454647484950515253545556575859"
"4041424344454647484950515253545556575859"
...
@@ -279,22 +300,23 @@ const char internal::BasicData<T>::DIGITS[] =
...
@@ -279,22 +300,23 @@ const char internal::BasicData<T>::DIGITS[] =
factor * 100000000, \
factor * 100000000, \
factor * 1000000000
factor * 1000000000
template
<
typename
T
>
template
<
typename
T
>
const
uint32_t
internal
::
BasicData
<
T
>::
POWERS_OF_10_32
[]
=
{
const
uint32_t
internal
::
BasicData
<
T
>::
POWERS_OF_10_32
[]
=
{
0
,
FMT_POWERS_OF_10
(
1
)
0
,
FMT_POWERS_OF_10
(
1
)
};
};
template
<
typename
T
>
template
<
typename
T
>
const
uint64_t
internal
::
BasicData
<
T
>::
POWERS_OF_10_64
[]
=
{
const
uint64_t
internal
::
BasicData
<
T
>::
POWERS_OF_10_64
[]
=
{
0
,
0
,
FMT_POWERS_OF_10
(
1
),
FMT_POWERS_OF_10
(
1
),
FMT_POWERS_OF_10
(
ULongLong
(
1000000000
)),
FMT_POWERS_OF_10
(
ULongLong
(
1000000000
)),
// Multiply several constants instead of using a single long long constant
// Multiply several constants instead of using a single long long constant
// to avoid warnings about C++98 not supporting long long.
// to avoid warnings about C++98 not supporting long long.
ULongLong
(
1000000000
)
*
ULongLong
(
1000000000
)
*
10
ULongLong
(
1000000000
)
*
ULongLong
(
1000000000
)
*
10
};
};
FMT_FUNC
void
internal
::
report_unknown_type
(
char
code
,
const
char
*
type
)
{
FMT_FUNC
void
internal
::
report_unknown_type
(
char
code
,
const
char
*
type
)
{
(
void
)
type
;
(
void
)
type
;
if
(
std
::
isprint
(
static_cast
<
unsigned
char
>
(
code
)))
{
if
(
std
::
isprint
(
static_cast
<
unsigned
char
>
(
code
)))
{
FMT_THROW
(
FormatError
(
FMT_THROW
(
FormatError
(
...
@@ -303,17 +325,18 @@ FMT_FUNC void internal::report_unknown_type(char code, const char *type) {
...
@@ -303,17 +325,18 @@ FMT_FUNC void internal::report_unknown_type(char code, const char *type) {
FMT_THROW
(
FormatError
(
FMT_THROW
(
FormatError
(
format
(
"unknown format code '
\\
x{:02x}' for {}"
,
format
(
"unknown format code '
\\
x{:02x}' for {}"
,
static_cast
<
unsigned
>
(
code
),
type
)));
static_cast
<
unsigned
>
(
code
),
type
)));
}
}
#if FMT_USE_WINDOWS_H
#if FMT_USE_WINDOWS_H
FMT_FUNC
internal
::
UTF8ToUTF16
::
UTF8ToUTF16
(
StringRef
s
)
{
FMT_FUNC
internal
::
UTF8ToUTF16
::
UTF8ToUTF16
(
StringRef
s
)
{
static
const
char
ERROR_MSG
[]
=
"cannot convert string from UTF-8 to UTF-16"
;
static
const
char
ERROR_MSG
[]
=
"cannot convert string from UTF-8 to UTF-16"
;
if
(
s
.
size
()
>
INT_MAX
)
if
(
s
.
size
()
>
INT_MAX
)
FMT_THROW
(
WindowsError
(
ERROR_INVALID_PARAMETER
,
ERROR_MSG
));
FMT_THROW
(
WindowsError
(
ERROR_INVALID_PARAMETER
,
ERROR_MSG
));
int
s_size
=
static_cast
<
int
>
(
s
.
size
());
int
s_size
=
static_cast
<
int
>
(
s
.
size
());
int
length
=
MultiByteToWideChar
(
int
length
=
MultiByteToWideChar
(
CP_UTF8
,
MB_ERR_INVALID_CHARS
,
s
.
data
(),
s_size
,
0
,
0
);
CP_UTF8
,
MB_ERR_INVALID_CHARS
,
s
.
data
(),
s_size
,
FMT_NULL
,
0
);
if
(
length
==
0
)
if
(
length
==
0
)
FMT_THROW
(
WindowsError
(
GetLastError
(),
ERROR_MSG
));
FMT_THROW
(
WindowsError
(
GetLastError
(),
ERROR_MSG
));
buffer_
.
resize
(
length
+
1
);
buffer_
.
resize
(
length
+
1
);
...
@@ -322,50 +345,56 @@ FMT_FUNC internal::UTF8ToUTF16::UTF8ToUTF16(StringRef s) {
...
@@ -322,50 +345,56 @@ FMT_FUNC internal::UTF8ToUTF16::UTF8ToUTF16(StringRef s) {
if
(
length
==
0
)
if
(
length
==
0
)
FMT_THROW
(
WindowsError
(
GetLastError
(),
ERROR_MSG
));
FMT_THROW
(
WindowsError
(
GetLastError
(),
ERROR_MSG
));
buffer_
[
length
]
=
0
;
buffer_
[
length
]
=
0
;
}
}
FMT_FUNC
internal
::
UTF16ToUTF8
::
UTF16ToUTF8
(
WStringRef
s
)
{
FMT_FUNC
internal
::
UTF16ToUTF8
::
UTF16ToUTF8
(
WStringRef
s
)
{
if
(
int
error_code
=
convert
(
s
))
{
if
(
int
error_code
=
convert
(
s
))
{
FMT_THROW
(
WindowsError
(
error_code
,
FMT_THROW
(
WindowsError
(
error_code
,
"cannot convert string from UTF-16 to UTF-8"
));
"cannot convert string from UTF-16 to UTF-8"
));
}
}
}
}
FMT_FUNC
int
internal
::
UTF16ToUTF8
::
convert
(
WStringRef
s
)
{
FMT_FUNC
int
internal
::
UTF16ToUTF8
::
convert
(
WStringRef
s
)
{
if
(
s
.
size
()
>
INT_MAX
)
if
(
s
.
size
()
>
INT_MAX
)
return
ERROR_INVALID_PARAMETER
;
return
ERROR_INVALID_PARAMETER
;
int
s_size
=
static_cast
<
int
>
(
s
.
size
());
int
s_size
=
static_cast
<
int
>
(
s
.
size
());
int
length
=
WideCharToMultiByte
(
CP_UTF8
,
0
,
s
.
data
(),
s_size
,
0
,
0
,
0
,
0
);
int
length
=
WideCharToMultiByte
(
CP_UTF8
,
0
,
s
.
data
(),
s_size
,
FMT_NULL
,
0
,
FMT_NULL
,
FMT_NULL
);
if
(
length
==
0
)
if
(
length
==
0
)
return
GetLastError
();
return
GetLastError
();
buffer_
.
resize
(
length
+
1
);
buffer_
.
resize
(
length
+
1
);
length
=
WideCharToMultiByte
(
length
=
WideCharToMultiByte
(
CP_UTF8
,
0
,
s
.
data
(),
s_size
,
&
buffer_
[
0
],
length
,
0
,
0
);
CP_UTF8
,
0
,
s
.
data
(),
s_size
,
&
buffer_
[
0
],
length
,
FMT_NULL
,
FMT_NULL
);
if
(
length
==
0
)
if
(
length
==
0
)
return
GetLastError
();
return
GetLastError
();
buffer_
[
length
]
=
0
;
buffer_
[
length
]
=
0
;
return
0
;
return
0
;
}
}
FMT_FUNC
void
WindowsError
::
init
(
FMT_FUNC
void
WindowsError
::
init
(
int
err_code
,
CStringRef
format_str
,
ArgList
args
)
{
int
err_code
,
CStringRef
format_str
,
ArgList
args
)
{
error_code_
=
err_code
;
error_code_
=
err_code
;
MemoryWriter
w
;
MemoryWriter
w
;
internal
::
format_windows_error
(
w
,
err_code
,
format
(
format_str
,
args
));
internal
::
format_windows_error
(
w
,
err_code
,
format
(
format_str
,
args
));
std
::
runtime_error
&
base
=
*
this
;
std
::
runtime_error
&
base
=
*
this
;
base
=
std
::
runtime_error
(
w
.
str
());
base
=
std
::
runtime_error
(
w
.
str
());
}
}
FMT_FUNC
void
internal
::
format_windows_error
(
FMT_FUNC
void
internal
::
format_windows_error
(
Writer
&
out
,
int
error_code
,
StringRef
message
)
FMT_NOEXCEPT
{
Writer
&
out
,
int
error_code
,
StringRef
message
)
FMT_NOEXCEPT
{
FMT_TRY
{
FMT_TRY
{
MemoryBuffer
<
wchar_t
,
INLINE_BUFFER_SIZE
>
buffer
;
MemoryBuffer
<
wchar_t
,
INLINE_BUFFER_SIZE
>
buffer
;
buffer
.
resize
(
INLINE_BUFFER_SIZE
);
buffer
.
resize
(
INLINE_BUFFER_SIZE
);
for
(;;)
{
for
(;;)
{
wchar_t
*
system_message
=
&
buffer
[
0
];
wchar_t
*
system_message
=
&
buffer
[
0
];
int
result
=
FormatMessageW
(
FORMAT_MESSAGE_FROM_SYSTEM
|
FORMAT_MESSAGE_IGNORE_INSERTS
,
int
result
=
FormatMessageW
(
0
,
error_code
,
MAKELANGID
(
LANG_NEUTRAL
,
SUBLANG_DEFAULT
),
FORMAT_MESSAGE_FROM_SYSTEM
|
FORMAT_MESSAGE_IGNORE_INSERTS
,
system_message
,
static_cast
<
uint32_t
>
(
buffer
.
size
()),
0
);
FMT_NULL
,
error_code
,
MAKELANGID
(
LANG_NEUTRAL
,
SUBLANG_DEFAULT
),
system_message
,
static_cast
<
uint32_t
>
(
buffer
.
size
()),
FMT_NULL
);
if
(
result
!=
0
)
{
if
(
result
!=
0
)
{
UTF16ToUTF8
utf8_message
;
UTF16ToUTF8
utf8_message
;
if
(
utf8_message
.
convert
(
system_message
)
==
ERROR_SUCCESS
)
{
if
(
utf8_message
.
convert
(
system_message
)
==
ERROR_SUCCESS
)
{
...
@@ -378,14 +407,16 @@ FMT_FUNC void internal::format_windows_error(
...
@@ -378,14 +407,16 @@ FMT_FUNC void internal::format_windows_error(
break
;
// Can't get error message, report error code instead.
break
;
// Can't get error message, report error code instead.
buffer
.
resize
(
buffer
.
size
()
*
2
);
buffer
.
resize
(
buffer
.
size
()
*
2
);
}
}
}
FMT_CATCH
(...)
{}
}
FMT_CATCH
(...)
{}
fmt
::
format_error_code
(
out
,
error_code
,
message
);
// 'fmt::' is for bcc32.
fmt
::
format_error_code
(
out
,
error_code
,
message
);
// 'fmt::' is for bcc32.
}
}
#endif // FMT_USE_WINDOWS_H
#endif // FMT_USE_WINDOWS_H
FMT_FUNC
void
format_system_error
(
FMT_FUNC
void
format_system_error
(
Writer
&
out
,
int
error_code
,
StringRef
message
)
FMT_NOEXCEPT
{
Writer
&
out
,
int
error_code
,
StringRef
message
)
FMT_NOEXCEPT
{
FMT_TRY
{
FMT_TRY
{
internal
::
MemoryBuffer
<
char
,
internal
::
INLINE_BUFFER_SIZE
>
buffer
;
internal
::
MemoryBuffer
<
char
,
internal
::
INLINE_BUFFER_SIZE
>
buffer
;
buffer
.
resize
(
internal
::
INLINE_BUFFER_SIZE
);
buffer
.
resize
(
internal
::
INLINE_BUFFER_SIZE
);
...
@@ -400,16 +431,18 @@ FMT_FUNC void format_system_error(
...
@@ -400,16 +431,18 @@ FMT_FUNC void format_system_error(
break
;
// Can't get error message, report error code instead.
break
;
// Can't get error message, report error code instead.
buffer
.
resize
(
buffer
.
size
()
*
2
);
buffer
.
resize
(
buffer
.
size
()
*
2
);
}
}
}
FMT_CATCH
(...)
{}
}
FMT_CATCH
(...)
{}
fmt
::
format_error_code
(
out
,
error_code
,
message
);
// 'fmt::' is for bcc32.
fmt
::
format_error_code
(
out
,
error_code
,
message
);
// 'fmt::' is for bcc32.
}
}
template
<
typename
Char
>
template
<
typename
Char
>
void
internal
::
ArgMap
<
Char
>::
init
(
const
ArgList
&
args
)
{
void
internal
::
ArgMap
<
Char
>::
init
(
const
ArgList
&
args
)
{
if
(
!
map_
.
empty
())
if
(
!
map_
.
empty
())
return
;
return
;
typedef
internal
::
NamedArg
<
Char
>
NamedArg
;
typedef
internal
::
NamedArg
<
Char
>
NamedArg
;
const
NamedArg
*
named_arg
=
0
;
const
NamedArg
*
named_arg
=
FMT_NULL
;
bool
use_values
=
bool
use_values
=
args
.
type
(
ArgList
::
MAX_PACKED_ARGS
-
1
)
==
internal
::
Arg
::
NONE
;
args
.
type
(
ArgList
::
MAX_PACKED_ARGS
-
1
)
==
internal
::
Arg
::
NONE
;
if
(
use_values
)
{
if
(
use_values
)
{
...
@@ -423,8 +456,7 @@ void internal::ArgMap<Char>::init(const ArgList &args) {
...
@@ -423,8 +456,7 @@ void internal::ArgMap<Char>::init(const ArgList &args) {
map_
.
push_back
(
Pair
(
named_arg
->
name
,
*
named_arg
));
map_
.
push_back
(
Pair
(
named_arg
->
name
,
*
named_arg
));
break
;
break
;
default:
default:
/*nothing*/
/*nothing*/
;
;
}
}
}
}
return
;
return
;
...
@@ -445,19 +477,20 @@ void internal::ArgMap<Char>::init(const ArgList &args) {
...
@@ -445,19 +477,20 @@ void internal::ArgMap<Char>::init(const ArgList &args) {
map_
.
push_back
(
Pair
(
named_arg
->
name
,
*
named_arg
));
map_
.
push_back
(
Pair
(
named_arg
->
name
,
*
named_arg
));
break
;
break
;
default:
default:
/*nothing*/
/*nothing*/
;
;
}
}
}
}
}
}
template
<
typename
Char
>
template
<
typename
Char
>
void
internal
::
FixedBuffer
<
Char
>::
grow
(
std
::
size_t
)
{
void
internal
::
FixedBuffer
<
Char
>::
grow
(
std
::
size_t
)
{
FMT_THROW
(
std
::
runtime_error
(
"buffer overflow"
));
FMT_THROW
(
std
::
runtime_error
(
"buffer overflow"
));
}
}
FMT_FUNC
Arg
internal
::
FormatterBase
::
do_get_arg
(
FMT_FUNC
Arg
internal
::
FormatterBase
::
do_get_arg
(
unsigned
arg_index
,
const
char
*&
error
)
{
unsigned
arg_index
,
const
char
*&
error
)
{
Arg
arg
=
args_
[
arg_index
];
Arg
arg
=
args_
[
arg_index
];
switch
(
arg
.
type
)
{
switch
(
arg
.
type
)
{
case
Arg
:
:
NONE
:
case
Arg
:
:
NONE
:
...
@@ -467,87 +500,77 @@ FMT_FUNC Arg internal::FormatterBase::do_get_arg(
...
@@ -467,87 +500,77 @@ FMT_FUNC Arg internal::FormatterBase::do_get_arg(
arg
=
*
static_cast
<
const
internal
::
Arg
*>
(
arg
.
pointer
);
arg
=
*
static_cast
<
const
internal
::
Arg
*>
(
arg
.
pointer
);
break
;
break
;
default:
default:
/*nothing*/
/*nothing*/
;
;
}
}
return
arg
;
return
arg
;
}
}
FMT_FUNC
void
report_system_error
(
FMT_FUNC
void
report_system_error
(
int
error_code
,
fmt
::
StringRef
message
)
FMT_NOEXCEPT
{
int
error_code
,
fmt
::
StringRef
message
)
FMT_NOEXCEPT
{
// 'fmt::' is for bcc32.
// 'fmt::' is for bcc32.
report_error
(
format_system_error
,
error_code
,
message
);
report_error
(
format_system_error
,
error_code
,
message
);
}
}
#if FMT_USE_WINDOWS_H
#if FMT_USE_WINDOWS_H
FMT_FUNC
void
report_windows_error
(
FMT_FUNC
void
report_windows_error
(
int
error_code
,
fmt
::
StringRef
message
)
FMT_NOEXCEPT
{
int
error_code
,
fmt
::
StringRef
message
)
FMT_NOEXCEPT
{
// 'fmt::' is for bcc32.
// 'fmt::' is for bcc32.
report_error
(
internal
::
format_windows_error
,
error_code
,
message
);
report_error
(
internal
::
format_windows_error
,
error_code
,
message
);
}
}
#endif
#endif
FMT_FUNC
void
print
(
std
::
FILE
*
f
,
CStringRef
format_str
,
ArgList
args
)
{
FMT_FUNC
void
print
(
std
::
FILE
*
f
,
CStringRef
format_str
,
ArgList
args
)
{
MemoryWriter
w
;
MemoryWriter
w
;
w
.
write
(
format_str
,
args
);
w
.
write
(
format_str
,
args
);
std
::
fwrite
(
w
.
data
(),
1
,
w
.
size
(),
f
);
std
::
fwrite
(
w
.
data
(),
1
,
w
.
size
(),
f
);
}
}
FMT_FUNC
void
print
(
CStringRef
format_str
,
ArgList
args
)
{
FMT_FUNC
void
print
(
CStringRef
format_str
,
ArgList
args
)
{
print
(
stdout
,
format_str
,
args
);
print
(
stdout
,
format_str
,
args
);
}
}
FMT_FUNC
void
print_colored
(
Color
c
,
CStringRef
format
,
ArgList
args
)
{
FMT_FUNC
void
print_colored
(
Color
c
,
CStringRef
format
,
ArgList
args
)
{
char
escape
[]
=
"
\x1b
[30m"
;
char
escape
[]
=
"
\x1b
[30m"
;
escape
[
3
]
=
static_cast
<
char
>
(
'0'
+
c
);
escape
[
3
]
=
static_cast
<
char
>
(
'0'
+
c
);
std
::
fputs
(
escape
,
stdout
);
std
::
fputs
(
escape
,
stdout
);
print
(
format
,
args
);
print
(
format
,
args
);
std
::
fputs
(
RESET_COLOR
,
stdout
);
std
::
fputs
(
RESET_COLOR
,
stdout
);
}
}
template
<
typename
Char
>
void
printf
(
BasicWriter
<
Char
>
&
w
,
BasicCStringRef
<
Char
>
format
,
ArgList
args
);
FMT_FUNC
int
fprintf
(
std
::
FILE
*
f
,
CStringRef
format
,
ArgList
args
)
{
MemoryWriter
w
;
printf
(
w
,
format
,
args
);
std
::
size_t
size
=
w
.
size
();
return
std
::
fwrite
(
w
.
data
(),
1
,
size
,
f
)
<
size
?
-
1
:
static_cast
<
int
>
(
size
);
}
#ifndef FMT_HEADER_ONLY
#ifndef FMT_HEADER_ONLY
template
struct
internal
::
BasicData
<
void
>;
template
struct
internal
::
BasicData
<
void
>;
// Explicit instantiations for char.
template
void
internal
::
FixedBuffer
<
char
>
::
grow
(
std
::
size_t
);
// Explicit instantiations for char.
template
void
internal
::
ArgMap
<
char
>
::
init
(
const
ArgList
&
args
);
template
void
internal
::
FixedBuffer
<
char
>
::
grow
(
std
::
size_t
);
template
void
PrintfFormatter
<
char
>
::
format
(
CStringRef
format
);
template
void
internal
::
ArgMap
<
char
>
::
init
(
const
ArgList
&
args
);
template
int
internal
::
CharTraits
<
char
>
::
format_float
(
template
int
internal
::
CharTraits
<
char
>
::
format_float
(
char
*
buffer
,
std
::
size_t
size
,
const
char
*
format
,
char
*
buffer
,
std
::
size_t
size
,
const
char
*
format
,
unsigned
width
,
int
precision
,
double
value
);
unsigned
width
,
int
precision
,
double
value
);
template
int
internal
::
CharTraits
<
char
>
::
format_float
(
template
int
internal
::
CharTraits
<
char
>
::
format_float
(
char
*
buffer
,
std
::
size_t
size
,
const
char
*
format
,
char
*
buffer
,
std
::
size_t
size
,
const
char
*
format
,
unsigned
width
,
int
precision
,
long
double
value
);
unsigned
width
,
int
precision
,
long
double
value
);
// Explicit instantiations for wchar_t.
// Explicit instantiations for wchar_t.
template
void
internal
::
FixedBuffer
<
wchar_t
>
::
grow
(
std
::
size_t
);
template
void
internal
::
ArgMap
<
wchar_t
>
::
init
(
const
ArgList
&
args
);
template
void
internal
::
FixedBuffer
<
wchar_t
>
::
grow
(
std
::
size_t
);
template
void
PrintfFormatter
<
wchar_t
>
::
format
(
WCStringRef
format
);
template
void
internal
::
ArgMap
<
wchar_t
>
::
init
(
const
ArgList
&
args
);
template
int
internal
::
CharTraits
<
wchar_t
>
::
format_float
(
template
int
internal
::
CharTraits
<
wchar_t
>
::
format_float
(
wchar_t
*
buffer
,
std
::
size_t
size
,
const
wchar_t
*
format
,
wchar_t
*
buffer
,
std
::
size_t
size
,
const
wchar_t
*
format
,
unsigned
width
,
int
precision
,
double
value
);
unsigned
width
,
int
precision
,
double
value
);
template
int
internal
::
CharTraits
<
wchar_t
>
::
format_float
(
template
int
internal
::
CharTraits
<
wchar_t
>
::
format_float
(
wchar_t
*
buffer
,
std
::
size_t
size
,
const
wchar_t
*
format
,
wchar_t
*
buffer
,
std
::
size_t
size
,
const
wchar_t
*
format
,
unsigned
width
,
int
precision
,
long
double
value
);
unsigned
width
,
int
precision
,
long
double
value
);
...
...
include/spdlog/fmt/bundled/format.h
View file @
d142f135
This source diff could not be displayed because it is too large. You can
view the blob
instead.
include/spdlog/fmt/bundled/ostream.cc
View file @
d142f135
...
@@ -11,8 +11,9 @@ For the license information refer to format.h.
...
@@ -11,8 +11,9 @@ For the license information refer to format.h.
namespace
fmt
{
namespace
fmt
{
namespace
internal
{
namespace
internal
{
FMT_FUNC
void
write
(
std
::
ostream
&
os
,
Writer
&
w
)
{
FMT_FUNC
void
write
(
std
::
ostream
&
os
,
Writer
&
w
)
{
const
char
*
data
=
w
.
data
();
const
char
*
data
=
w
.
data
();
typedef
internal
::
MakeUnsigned
<
std
::
streamsize
>::
Type
UnsignedStreamSize
;
typedef
internal
::
MakeUnsigned
<
std
::
streamsize
>::
Type
UnsignedStreamSize
;
UnsignedStreamSize
size
=
w
.
size
();
UnsignedStreamSize
size
=
w
.
size
();
...
@@ -24,12 +25,13 @@ FMT_FUNC void write(std::ostream &os, Writer &w) {
...
@@ -24,12 +25,13 @@ FMT_FUNC void write(std::ostream &os, Writer &w) {
data
+=
n
;
data
+=
n
;
size
-=
n
;
size
-=
n
;
}
while
(
size
!=
0
);
}
while
(
size
!=
0
);
}
}
}
}
FMT_FUNC
void
print
(
std
::
ostream
&
os
,
CStringRef
format_str
,
ArgList
args
)
{
FMT_FUNC
void
print
(
std
::
ostream
&
os
,
CStringRef
format_str
,
ArgList
args
)
{
MemoryWriter
w
;
MemoryWriter
w
;
w
.
write
(
format_str
,
args
);
w
.
write
(
format_str
,
args
);
internal
::
write
(
os
,
w
);
internal
::
write
(
os
,
w
);
}
}
}
// namespace fmt
}
// namespace fmt
include/spdlog/fmt/bundled/ostream.h
View file @
d142f135
...
@@ -11,35 +11,32 @@ For the license information refer to format.h.
...
@@ -11,35 +11,32 @@ For the license information refer to format.h.
#define FMT_OSTREAM_H_
#define FMT_OSTREAM_H_
// commented out by spdlog
// commented out by spdlog
//#include "format.h"
//
#include "format.h"
#include <ostream>
#include <ostream>
namespace
fmt
namespace
fmt
{
{
namespace
internal
namespace
internal
{
{
template
<
class
Char
>
template
<
class
Char
>
class
FormatBuf
:
public
std
::
basic_streambuf
<
Char
>
class
FormatBuf
:
public
std
::
basic_streambuf
<
Char
>
{
{
private:
private:
typedef
typename
std
::
basic_streambuf
<
Char
>::
int_type
int_type
;
typedef
typename
std
::
basic_streambuf
<
Char
>::
int_type
int_type
;
typedef
typename
std
::
basic_streambuf
<
Char
>::
traits_type
traits_type
;
typedef
typename
std
::
basic_streambuf
<
Char
>::
traits_type
traits_type
;
Buffer
<
Char
>
&
buffer_
;
Buffer
<
Char
>
&
buffer_
;
Char
*
start_
;
Char
*
start_
;
public:
public:
FormatBuf
(
Buffer
<
Char
>
&
buffer
)
:
buffer_
(
buffer
),
start_
(
&
buffer
[
0
])
FormatBuf
(
Buffer
<
Char
>
&
buffer
)
:
buffer_
(
buffer
),
start_
(
&
buffer
[
0
])
{
{
this
->
setp
(
start_
,
start_
+
buffer_
.
capacity
());
this
->
setp
(
start_
,
start_
+
buffer_
.
capacity
());
}
}
int_type
overflow
(
int_type
ch
=
traits_type
::
eof
())
int_type
overflow
(
int_type
ch
=
traits_type
::
eof
())
{
{
if
(
!
traits_type
::
eq_int_type
(
ch
,
traits_type
::
eof
()))
if
(
!
traits_type
::
eq_int_type
(
ch
,
traits_type
::
eof
()))
{
{
size_t
buf_size
=
size
();
size_t
buf_size
=
size
();
buffer_
.
resize
(
buf_size
);
buffer_
.
resize
(
buf_size
);
buffer_
.
reserve
(
buf_size
*
2
);
buffer_
.
reserve
(
buf_size
*
2
);
...
@@ -55,38 +52,38 @@ public:
...
@@ -55,38 +52,38 @@ public:
{
{
return
to_unsigned
(
this
->
pptr
()
-
start_
);
return
to_unsigned
(
this
->
pptr
()
-
start_
);
}
}
};
};
Yes
&
convert
(
std
::
ostream
&
);
Yes
&
convert
(
std
::
ostream
&
);
struct
DummyStream
:
std
::
ostream
struct
DummyStream
:
std
::
ostream
{
{
DummyStream
();
// Suppress a bogus warning in MSVC.
DummyStream
();
// Suppress a bogus warning in MSVC.
// Hide all operator<< overloads from std::ostream.
// Hide all operator<< overloads from std::ostream.
void
operator
<<
(
Null
<>
);
void
operator
<<
(
Null
<>
);
};
};
No
&
operator
<<
(
std
::
ostream
&
,
int
);
No
&
operator
<<
(
std
::
ostream
&
,
int
);
template
<
typename
T
>
template
<
typename
T
>
struct
ConvertToIntImpl
<
T
,
true
>
struct
ConvertToIntImpl
<
T
,
true
>
{
{
// Convert to int only if T doesn't have an overloaded operator<<.
// Convert to int only if T doesn't have an overloaded operator<<.
enum
enum
{
{
value
=
sizeof
(
convert
(
get
<
DummyStream
>
()
<<
get
<
T
>
()))
==
sizeof
(
No
)
value
=
sizeof
(
convert
(
get
<
DummyStream
>
()
<<
get
<
T
>
()))
==
sizeof
(
No
)
};
};
};
};
// Write the content of w to os.
// Write the content of w to os.
void
write
(
std
::
ostream
&
os
,
Writer
&
w
);
void
write
(
std
::
ostream
&
os
,
Writer
&
w
);
}
// namespace internal
}
// namespace internal
// Formats a value.
// Formats a value.
template
<
typename
Char
,
typename
ArgFormatter
,
typename
T
>
template
<
typename
Char
,
typename
ArgFormatter
,
typename
T
>
void
format_arg
(
BasicFormatter
<
Char
,
ArgFormatter
>
&
f
,
void
format_arg
(
BasicFormatter
<
Char
,
ArgFormatter
>
&
f
,
const
Char
*&
format_str
,
const
T
&
value
)
const
Char
*&
format_str
,
const
T
&
value
)
{
{
internal
::
MemoryBuffer
<
Char
,
internal
::
INLINE_BUFFER_SIZE
>
buffer
;
internal
::
MemoryBuffer
<
Char
,
internal
::
INLINE_BUFFER_SIZE
>
buffer
;
internal
::
FormatBuf
<
Char
>
format_buf
(
buffer
);
internal
::
FormatBuf
<
Char
>
format_buf
(
buffer
);
...
@@ -96,19 +93,19 @@ void format_arg(BasicFormatter<Char, ArgFormatter> &f,
...
@@ -96,19 +93,19 @@ void format_arg(BasicFormatter<Char, ArgFormatter> &f,
BasicStringRef
<
Char
>
str
(
&
buffer
[
0
],
format_buf
.
size
());
BasicStringRef
<
Char
>
str
(
&
buffer
[
0
],
format_buf
.
size
());
typedef
internal
::
MakeArg
<
BasicFormatter
<
Char
>
>
MakeArg
;
typedef
internal
::
MakeArg
<
BasicFormatter
<
Char
>
>
MakeArg
;
format_str
=
f
.
format
(
format_str
,
MakeArg
(
str
));
format_str
=
f
.
format
(
format_str
,
MakeArg
(
str
));
}
}
/**
/**
\rst
\rst
Prints formatted data to the stream *os*.
Prints formatted data to the stream *os*.
**Example**::
**Example**::
print(cerr, "Don't {}!", "panic");
print(cerr, "Don't {}!", "panic");
\endrst
\endrst
*/
*/
FMT_API
void
print
(
std
::
ostream
&
os
,
CStringRef
format_str
,
ArgList
args
);
FMT_API
void
print
(
std
::
ostream
&
os
,
CStringRef
format_str
,
ArgList
args
);
FMT_VARIADIC
(
void
,
print
,
std
::
ostream
&
,
CStringRef
)
FMT_VARIADIC
(
void
,
print
,
std
::
ostream
&
,
CStringRef
)
}
// namespace fmt
}
// namespace fmt
#ifdef FMT_HEADER_ONLY
#ifdef FMT_HEADER_ONLY
...
...
include/spdlog/fmt/bundled/printf.h
View file @
d142f135
...
@@ -15,16 +15,14 @@ For the license information refer to format.h.
...
@@ -15,16 +15,14 @@ For the license information refer to format.h.
#include "ostream.h"
#include "ostream.h"
namespace
fmt
namespace
fmt
{
{
namespace
internal
{
namespace
internal
{
// Checks if a value fits in int - used to avoid warnings about comparing
// signed and unsigned integers.
// Checks if a value fits in int - used to avoid warnings about comparing
template
<
bool
IsSigned
>
// signed and unsigned integers.
struct
IntChecker
template
<
bool
IsSigned
>
{
struct
IntChecker
{
template
<
typename
T
>
template
<
typename
T
>
static
bool
fits_in_int
(
T
value
)
static
bool
fits_in_int
(
T
value
)
{
{
...
@@ -35,11 +33,11 @@ struct IntChecker
...
@@ -35,11 +33,11 @@ struct IntChecker
{
{
return
true
;
return
true
;
}
}
};
};
template
<
>
template
<
>
struct
IntChecker
<
true
>
struct
IntChecker
<
true
>
{
{
template
<
typename
T
>
template
<
typename
T
>
static
bool
fits_in_int
(
T
value
)
static
bool
fits_in_int
(
T
value
)
{
{
...
@@ -50,11 +48,11 @@ struct IntChecker<true>
...
@@ -50,11 +48,11 @@ struct IntChecker<true>
{
{
return
true
;
return
true
;
}
}
};
};
class
PrecisionHandler
:
public
ArgVisitor
<
PrecisionHandler
,
int
>
class
PrecisionHandler
:
public
ArgVisitor
<
PrecisionHandler
,
int
>
{
{
public:
public:
void
report_unhandled_arg
()
void
report_unhandled_arg
()
{
{
FMT_THROW
(
FormatError
(
"precision is not integer"
));
FMT_THROW
(
FormatError
(
"precision is not integer"
));
...
@@ -67,47 +65,54 @@ public:
...
@@ -67,47 +65,54 @@ public:
FMT_THROW
(
FormatError
(
"number is too big"
));
FMT_THROW
(
FormatError
(
"number is too big"
));
return
static_cast
<
int
>
(
value
);
return
static_cast
<
int
>
(
value
);
}
}
};
};
// IsZeroInt::visit(arg) returns true iff arg is a zero integer.
// IsZeroInt::visit(arg) returns true iff arg is a zero integer.
class
IsZeroInt
:
public
ArgVisitor
<
IsZeroInt
,
bool
>
class
IsZeroInt
:
public
ArgVisitor
<
IsZeroInt
,
bool
>
{
{
public:
public:
template
<
typename
T
>
template
<
typename
T
>
bool
visit_any_int
(
T
value
)
bool
visit_any_int
(
T
value
)
{
{
return
value
==
0
;
return
value
==
0
;
}
}
};
};
template
<
typename
T
,
typename
U
>
template
<
typename
T
,
typename
U
>
struct
is_same
struct
is_same
{
{
enum
{
value
=
0
};
enum
};
{
value
=
0
template
<
typename
T
>
};
struct
is_same
<
T
,
T
>
};
{
enum
{
value
=
1
};
template
<
typename
T
>
};
struct
is_same
<
T
,
T
>
{
// An argument visitor that converts an integer argument to T for printf,
enum
// if T is an integral type. If T is void, the argument is converted to
{
// corresponding signed or unsigned type depending on the type specifier:
value
=
1
// 'd' and 'i' - signed, other - unsigned)
};
template
<
typename
T
=
void
>
};
class
ArgConverter
:
public
ArgVisitor
<
ArgConverter
<
T
>
,
void
>
{
// An argument visitor that converts an integer argument to T for printf,
private:
// if T is an integral type. If T is void, the argument is converted to
// corresponding signed or unsigned type depending on the type specifier:
// 'd' and 'i' - signed, other - unsigned)
template
<
typename
T
=
void
>
class
ArgConverter
:
public
ArgVisitor
<
ArgConverter
<
T
>
,
void
>
{
private:
internal
::
Arg
&
arg_
;
internal
::
Arg
&
arg_
;
wchar_t
type_
;
wchar_t
type_
;
FMT_DISALLOW_COPY_AND_ASSIGN
(
ArgConverter
);
FMT_DISALLOW_COPY_AND_ASSIGN
(
ArgConverter
);
public:
public:
ArgConverter
(
internal
::
Arg
&
arg
,
wchar_t
type
)
ArgConverter
(
internal
::
Arg
&
arg
,
wchar_t
type
)
:
arg_
(
arg
),
type_
(
type
)
{}
:
arg_
(
arg
),
type_
(
type
)
{}
void
visit_bool
(
bool
value
)
void
visit_bool
(
bool
value
)
{
{
...
@@ -122,51 +127,46 @@ public:
...
@@ -122,51 +127,46 @@ public:
using
internal
::
Arg
;
using
internal
::
Arg
;
typedef
typename
internal
::
Conditional
<
typedef
typename
internal
::
Conditional
<
is_same
<
T
,
void
>::
value
,
U
,
T
>::
type
TargetType
;
is_same
<
T
,
void
>::
value
,
U
,
T
>::
type
TargetType
;
if
(
sizeof
(
TargetType
)
<=
sizeof
(
int
))
if
(
sizeof
(
TargetType
)
<=
sizeof
(
int
))
{
{
// Extra casts are used to silence warnings.
// Extra casts are used to silence warnings.
if
(
is_signed
)
if
(
is_signed
)
{
{
arg_
.
type
=
Arg
::
INT
;
arg_
.
type
=
Arg
::
INT
;
arg_
.
int_value
=
static_cast
<
int
>
(
static_cast
<
TargetType
>
(
value
));
arg_
.
int_value
=
static_cast
<
int
>
(
static_cast
<
TargetType
>
(
value
));
}
}
else
else
{
{
arg_
.
type
=
Arg
::
UINT
;
arg_
.
type
=
Arg
::
UINT
;
typedef
typename
internal
::
MakeUnsigned
<
TargetType
>::
Type
Unsigned
;
typedef
typename
internal
::
MakeUnsigned
<
TargetType
>::
Type
Unsigned
;
arg_
.
uint_value
=
static_cast
<
unsigned
>
(
static_cast
<
Unsigned
>
(
value
));
arg_
.
uint_value
=
static_cast
<
unsigned
>
(
static_cast
<
Unsigned
>
(
value
));
}
}
}
}
else
else
{
{
if
(
is_signed
)
{
if
(
is_signed
)
{
arg_
.
type
=
Arg
::
LONG_LONG
;
arg_
.
type
=
Arg
::
LONG_LONG
;
// glibc's printf doesn't sign extend arguments of smaller types:
// glibc's printf doesn't sign extend arguments of smaller types:
// std::printf("%lld", -42); // prints "4294967254"
// std::printf("%lld", -42); // prints "4294967254"
// but we don't have to do the same because it's a UB.
// but we don't have to do the same because it's a UB.
arg_
.
long_long_value
=
static_cast
<
LongLong
>
(
value
);
arg_
.
long_long_value
=
static_cast
<
LongLong
>
(
value
);
}
}
else
else
{
{
arg_
.
type
=
Arg
::
ULONG_LONG
;
arg_
.
type
=
Arg
::
ULONG_LONG
;
arg_
.
ulong_long_value
=
arg_
.
ulong_long_value
=
static_cast
<
typename
internal
::
MakeUnsigned
<
U
>::
Type
>
(
value
);
static_cast
<
typename
internal
::
MakeUnsigned
<
U
>::
Type
>
(
value
);
}
}
}
}
}
}
};
};
// Converts an integer argument to char for printf.
// Converts an integer argument to char for printf.
class
CharConverter
:
public
ArgVisitor
<
CharConverter
,
void
>
class
CharConverter
:
public
ArgVisitor
<
CharConverter
,
void
>
{
{
private:
private:
internal
::
Arg
&
arg_
;
internal
::
Arg
&
arg_
;
FMT_DISALLOW_COPY_AND_ASSIGN
(
CharConverter
);
FMT_DISALLOW_COPY_AND_ASSIGN
(
CharConverter
);
public:
public:
explicit
CharConverter
(
internal
::
Arg
&
arg
)
:
arg_
(
arg
)
{}
explicit
CharConverter
(
internal
::
Arg
&
arg
)
:
arg_
(
arg
)
{}
template
<
typename
T
>
template
<
typename
T
>
void
visit_any_int
(
T
value
)
void
visit_any_int
(
T
value
)
...
@@ -174,19 +174,20 @@ public:
...
@@ -174,19 +174,20 @@ public:
arg_
.
type
=
internal
::
Arg
::
CHAR
;
arg_
.
type
=
internal
::
Arg
::
CHAR
;
arg_
.
int_value
=
static_cast
<
char
>
(
value
);
arg_
.
int_value
=
static_cast
<
char
>
(
value
);
}
}
};
};
// Checks if an argument is a valid printf width specifier and sets
// Checks if an argument is a valid printf width specifier and sets
// left alignment if it is negative.
// left alignment if it is negative.
class
WidthHandler
:
public
ArgVisitor
<
WidthHandler
,
unsigned
>
class
WidthHandler
:
public
ArgVisitor
<
WidthHandler
,
unsigned
>
{
{
private:
private:
FormatSpec
&
spec_
;
FormatSpec
&
spec_
;
FMT_DISALLOW_COPY_AND_ASSIGN
(
WidthHandler
);
FMT_DISALLOW_COPY_AND_ASSIGN
(
WidthHandler
);
public:
public:
explicit
WidthHandler
(
FormatSpec
&
spec
)
:
spec_
(
spec
)
{}
explicit
WidthHandler
(
FormatSpec
&
spec
)
:
spec_
(
spec
)
{}
void
report_unhandled_arg
()
void
report_unhandled_arg
()
{
{
...
@@ -198,8 +199,7 @@ public:
...
@@ -198,8 +199,7 @@ public:
{
{
typedef
typename
internal
::
IntTraits
<
T
>::
MainType
UnsignedType
;
typedef
typename
internal
::
IntTraits
<
T
>::
MainType
UnsignedType
;
UnsignedType
width
=
static_cast
<
UnsignedType
>
(
value
);
UnsignedType
width
=
static_cast
<
UnsignedType
>
(
value
);
if
(
internal
::
is_negative
(
value
))
if
(
internal
::
is_negative
(
value
))
{
{
spec_
.
align_
=
ALIGN_LEFT
;
spec_
.
align_
=
ALIGN_LEFT
;
width
=
0
-
width
;
width
=
0
-
width
;
}
}
...
@@ -208,30 +208,30 @@ public:
...
@@ -208,30 +208,30 @@ public:
FMT_THROW
(
FormatError
(
"number is too big"
));
FMT_THROW
(
FormatError
(
"number is too big"
));
return
static_cast
<
unsigned
>
(
width
);
return
static_cast
<
unsigned
>
(
width
);
}
}
};
};
}
// namespace internal
}
// namespace internal
/**
/**
\rst
\rst
A ``printf`` argument formatter based on the `curiously recurring template
A ``printf`` argument formatter based on the `curiously recurring template
pattern <http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern>`_.
pattern <http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern>`_.
To use `~fmt::BasicPrintfArgFormatter` define a subclass that implements some
To use `~fmt::BasicPrintfArgFormatter` define a subclass that implements some
or all of the visit methods with the same signatures as the methods in
or all of the visit methods with the same signatures as the methods in
`~fmt::ArgVisitor`, for example, `~fmt::ArgVisitor::visit_int()`.
`~fmt::ArgVisitor`, for example, `~fmt::ArgVisitor::visit_int()`.
Pass the subclass as the *Impl* template parameter. When a formatting
Pass the subclass as the *Impl* template parameter. When a formatting
function processes an argument, it will dispatch to a visit method
function processes an argument, it will dispatch to a visit method
specific to the argument type. For example, if the argument type is
specific to the argument type. For example, if the argument type is
``double`` then the `~fmt::ArgVisitor::visit_double()` method of a subclass
``double`` then the `~fmt::ArgVisitor::visit_double()` method of a subclass
will be called. If the subclass doesn't contain a method with this signature,
will be called. If the subclass doesn't contain a method with this signature,
then a corresponding method of `~fmt::BasicPrintfArgFormatter` or its
then a corresponding method of `~fmt::BasicPrintfArgFormatter` or its
superclass will be called.
superclass will be called.
\endrst
\endrst
*/
*/
template
<
typename
Impl
,
typename
Char
>
template
<
typename
Impl
,
typename
Char
>
class
BasicPrintfArgFormatter
:
public
internal
::
ArgFormatterBase
<
Impl
,
Char
>
class
BasicPrintfArgFormatter
:
public
internal
::
ArgFormatterBase
<
Impl
,
Char
>
{
{
private:
private:
void
write_null_pointer
()
void
write_null_pointer
()
{
{
this
->
spec
().
type_
=
0
;
this
->
spec
().
type_
=
0
;
...
@@ -240,7 +240,7 @@ private:
...
@@ -240,7 +240,7 @@ private:
typedef
internal
::
ArgFormatterBase
<
Impl
,
Char
>
Base
;
typedef
internal
::
ArgFormatterBase
<
Impl
,
Char
>
Base
;
public:
public:
/**
/**
\rst
\rst
Constructs an argument formatter object.
Constructs an argument formatter object.
...
@@ -248,8 +248,9 @@ public:
...
@@ -248,8 +248,9 @@ public:
specifier information for standard argument types.
specifier information for standard argument types.
\endrst
\endrst
*/
*/
BasicPrintfArgFormatter
(
BasicWriter
<
Char
>
&
writer
,
FormatSpec
&
spec
)
BasicPrintfArgFormatter
(
BasicWriter
<
Char
>
&
w
,
FormatSpec
&
s
)
:
internal
::
ArgFormatterBase
<
Impl
,
Char
>
(
writer
,
spec
)
{}
:
internal
::
ArgFormatterBase
<
Impl
,
Char
>
(
w
,
s
)
{}
/** Formats an argument of type ``bool``. */
/** Formats an argument of type ``bool``. */
void
visit_bool
(
bool
value
)
void
visit_bool
(
bool
value
)
...
@@ -270,22 +271,18 @@ public:
...
@@ -270,22 +271,18 @@ public:
w
.
write_int
(
value
,
fmt_spec
);
w
.
write_int
(
value
,
fmt_spec
);
typedef
typename
BasicWriter
<
Char
>::
CharPtr
CharPtr
;
typedef
typename
BasicWriter
<
Char
>::
CharPtr
CharPtr
;
CharPtr
out
=
CharPtr
();
CharPtr
out
=
CharPtr
();
if
(
fmt_spec
.
width_
>
1
)
if
(
fmt_spec
.
width_
>
1
)
{
{
Char
fill
=
' '
;
Char
fill
=
' '
;
out
=
w
.
grow_buffer
(
fmt_spec
.
width_
);
out
=
w
.
grow_buffer
(
fmt_spec
.
width_
);
if
(
fmt_spec
.
align_
!=
ALIGN_LEFT
)
if
(
fmt_spec
.
align_
!=
ALIGN_LEFT
)
{
{
std
::
fill_n
(
out
,
fmt_spec
.
width_
-
1
,
fill
);
std
::
fill_n
(
out
,
fmt_spec
.
width_
-
1
,
fill
);
out
+=
fmt_spec
.
width_
-
1
;
out
+=
fmt_spec
.
width_
-
1
;
}
}
else
else
{
{
std
::
fill_n
(
out
+
1
,
fmt_spec
.
width_
-
1
,
fill
);
std
::
fill_n
(
out
+
1
,
fmt_spec
.
width_
-
1
,
fill
);
}
}
}
}
else
else
{
{
out
=
w
.
grow_buffer
(
1
);
out
=
w
.
grow_buffer
(
1
);
}
}
*
out
=
static_cast
<
Char
>
(
value
);
*
out
=
static_cast
<
Char
>
(
value
);
...
@@ -319,24 +316,25 @@ public:
...
@@ -319,24 +316,25 @@ public:
const
Char
*
format
=
format_str
;
const
Char
*
format
=
format_str
;
c
.
format
(
&
formatter
,
c
.
value
,
&
format
);
c
.
format
(
&
formatter
,
c
.
value
,
&
format
);
}
}
};
};
/** The default printf argument formatter. */
/** The default printf argument formatter. */
template
<
typename
Char
>
template
<
typename
Char
>
class
PrintfArgFormatter
class
PrintfArgFormatter
:
public
BasicPrintfArgFormatter
<
PrintfArgFormatter
<
Char
>
,
Char
>
:
public
BasicPrintfArgFormatter
<
PrintfArgFormatter
<
Char
>
,
Char
>
{
{
public:
public:
/** Constructs an argument formatter object. */
/** Constructs an argument formatter object. */
PrintfArgFormatter
(
BasicWriter
<
Char
>
&
w
,
FormatSpec
&
s
)
PrintfArgFormatter
(
BasicWriter
<
Char
>
&
w
,
FormatSpec
&
s
)
:
BasicPrintfArgFormatter
<
PrintfArgFormatter
<
Char
>
,
Char
>
(
w
,
s
)
{}
:
BasicPrintfArgFormatter
<
PrintfArgFormatter
<
Char
>
,
Char
>
(
w
,
s
)
};
{}
};
/** This template formats data and writes the output to a writer. */
template
<
typename
Char
,
typename
ArgFormatter
=
PrintfArgFormatter
<
Char
>
>
/** This template formats data and writes the output to a writer. */
class
PrintfFormatter
:
private
internal
::
FormatterBase
template
<
typename
Char
,
typename
ArgFormatter
=
PrintfArgFormatter
<
Char
>
>
{
class
PrintfFormatter
:
private
internal
::
FormatterBase
private:
{
private:
BasicWriter
<
Char
>
&
writer_
;
BasicWriter
<
Char
>
&
writer_
;
void
parse_flags
(
FormatSpec
&
spec
,
const
Char
*&
s
);
void
parse_flags
(
FormatSpec
&
spec
,
const
Char
*&
s
);
...
@@ -350,7 +348,7 @@ private:
...
@@ -350,7 +348,7 @@ private:
// Parses argument index, flags and width and returns the argument index.
// Parses argument index, flags and width and returns the argument index.
unsigned
parse_header
(
const
Char
*&
s
,
FormatSpec
&
spec
);
unsigned
parse_header
(
const
Char
*&
s
,
FormatSpec
&
spec
);
public:
public:
/**
/**
\rst
\rst
Constructs a ``PrintfFormatter`` object. References to the arguments and
Constructs a ``PrintfFormatter`` object. References to the arguments and
...
@@ -358,20 +356,19 @@ public:
...
@@ -358,20 +356,19 @@ public:
appropriate lifetimes.
appropriate lifetimes.
\endrst
\endrst
*/
*/
explicit
PrintfFormatter
(
const
ArgList
&
args
,
BasicWriter
<
Char
>
&
w
)
explicit
PrintfFormatter
(
const
ArgList
&
al
,
BasicWriter
<
Char
>
&
w
)
:
FormatterBase
(
args
),
writer_
(
w
)
{}
:
FormatterBase
(
al
),
writer_
(
w
)
{}
/** Formats stored arguments and writes the output to the writer. */
/** Formats stored arguments and writes the output to the writer. */
FMT_API
void
format
(
BasicCStringRef
<
Char
>
format_str
);
FMT_API
void
format
(
BasicCStringRef
<
Char
>
format_str
);
};
};
template
<
typename
Char
,
typename
AF
>
template
<
typename
Char
,
typename
AF
>
void
PrintfFormatter
<
Char
,
AF
>::
parse_flags
(
FormatSpec
&
spec
,
const
Char
*&
s
)
void
PrintfFormatter
<
Char
,
AF
>::
parse_flags
(
FormatSpec
&
spec
,
const
Char
*&
s
)
{
for
(;;)
{
switch
(
*
s
++
)
{
{
for
(;;)
{
switch
(
*
s
++
)
{
case
'-'
:
case
'-'
:
spec
.
align_
=
ALIGN_LEFT
;
spec
.
align_
=
ALIGN_LEFT
;
break
;
break
;
...
@@ -392,43 +389,39 @@ void PrintfFormatter<Char, AF>::parse_flags(FormatSpec &spec, const Char *&s)
...
@@ -392,43 +389,39 @@ void PrintfFormatter<Char, AF>::parse_flags(FormatSpec &spec, const Char *&s)
return
;
return
;
}
}
}
}
}
}
template
<
typename
Char
,
typename
AF
>
template
<
typename
Char
,
typename
AF
>
internal
::
Arg
PrintfFormatter
<
Char
,
AF
>::
get_arg
(
const
Char
*
s
,
internal
::
Arg
PrintfFormatter
<
Char
,
AF
>::
get_arg
(
const
Char
*
s
,
unsigned
arg_index
)
unsigned
arg_index
)
{
{
(
void
)
s
;
(
void
)
s
;
const
char
*
error
=
0
;
const
char
*
error
=
FMT_NULL
;
internal
::
Arg
arg
=
arg_index
==
std
::
numeric_limits
<
unsigned
>::
max
()
?
internal
::
Arg
arg
=
arg_index
==
std
::
numeric_limits
<
unsigned
>::
max
()
?
next_arg
(
error
)
:
FormatterBase
::
get_arg
(
arg_index
-
1
,
error
);
next_arg
(
error
)
:
FormatterBase
::
get_arg
(
arg_index
-
1
,
error
);
if
(
error
)
if
(
error
)
FMT_THROW
(
FormatError
(
!*
s
?
"invalid format string"
:
error
));
FMT_THROW
(
FormatError
(
!*
s
?
"invalid format string"
:
error
));
return
arg
;
return
arg
;
}
}
template
<
typename
Char
,
typename
AF
>
template
<
typename
Char
,
typename
AF
>
unsigned
PrintfFormatter
<
Char
,
AF
>::
parse_header
(
unsigned
PrintfFormatter
<
Char
,
AF
>::
parse_header
(
const
Char
*&
s
,
FormatSpec
&
spec
)
const
Char
*&
s
,
FormatSpec
&
spec
)
{
{
unsigned
arg_index
=
std
::
numeric_limits
<
unsigned
>::
max
();
unsigned
arg_index
=
std
::
numeric_limits
<
unsigned
>::
max
();
Char
c
=
*
s
;
Char
c
=
*
s
;
if
(
c
>=
'0'
&&
c
<=
'9'
)
if
(
c
>=
'0'
&&
c
<=
'9'
)
{
{
// Parse an argument index (if followed by '$') or a width possibly
// Parse an argument index (if followed by '$') or a width possibly
// preceded with '0' flag(s).
// preceded with '0' flag(s).
unsigned
value
=
internal
::
parse_nonnegative_int
(
s
);
unsigned
value
=
internal
::
parse_nonnegative_int
(
s
);
if
(
*
s
==
'$'
)
// value is an argument index
if
(
*
s
==
'$'
)
{
// value is an argument index
{
++
s
;
++
s
;
arg_index
=
value
;
arg_index
=
value
;
}
}
else
else
{
{
if
(
c
==
'0'
)
if
(
c
==
'0'
)
spec
.
fill_
=
'0'
;
spec
.
fill_
=
'0'
;
if
(
value
!=
0
)
if
(
value
!=
0
)
{
{
// Nonzero value means that we parsed width and don't need to
// Nonzero value means that we parsed width and don't need to
// parse it or flags again, so return now.
// parse it or flags again, so return now.
spec
.
width_
=
value
;
spec
.
width_
=
value
;
...
@@ -438,29 +431,25 @@ unsigned PrintfFormatter<Char, AF>::parse_header(
...
@@ -438,29 +431,25 @@ unsigned PrintfFormatter<Char, AF>::parse_header(
}
}
parse_flags
(
spec
,
s
);
parse_flags
(
spec
,
s
);
// Parse width.
// Parse width.
if
(
*
s
>=
'0'
&&
*
s
<=
'9'
)
if
(
*
s
>=
'0'
&&
*
s
<=
'9'
)
{
{
spec
.
width_
=
internal
::
parse_nonnegative_int
(
s
);
spec
.
width_
=
internal
::
parse_nonnegative_int
(
s
);
}
}
else
if
(
*
s
==
'*'
)
else
if
(
*
s
==
'*'
)
{
{
++
s
;
++
s
;
spec
.
width_
=
internal
::
WidthHandler
(
spec
).
visit
(
get_arg
(
s
));
spec
.
width_
=
internal
::
WidthHandler
(
spec
).
visit
(
get_arg
(
s
));
}
}
return
arg_index
;
return
arg_index
;
}
}
template
<
typename
Char
,
typename
AF
>
template
<
typename
Char
,
typename
AF
>
void
PrintfFormatter
<
Char
,
AF
>::
format
(
BasicCStringRef
<
Char
>
format_str
)
void
PrintfFormatter
<
Char
,
AF
>::
format
(
BasicCStringRef
<
Char
>
format_str
)
{
{
const
Char
*
start
=
format_str
.
c_str
();
const
Char
*
start
=
format_str
.
c_str
();
const
Char
*
s
=
start
;
const
Char
*
s
=
start
;
while
(
*
s
)
while
(
*
s
)
{
{
Char
c
=
*
s
++
;
Char
c
=
*
s
++
;
if
(
c
!=
'%'
)
continue
;
if
(
c
!=
'%'
)
continue
;
if
(
*
s
==
c
)
if
(
*
s
==
c
)
{
{
write
(
writer_
,
start
,
s
);
write
(
writer_
,
start
,
s
);
start
=
++
s
;
start
=
++
s
;
continue
;
continue
;
...
@@ -474,15 +463,12 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str)
...
@@ -474,15 +463,12 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str)
unsigned
arg_index
=
parse_header
(
s
,
spec
);
unsigned
arg_index
=
parse_header
(
s
,
spec
);
// Parse precision.
// Parse precision.
if
(
*
s
==
'.'
)
if
(
*
s
==
'.'
)
{
{
++
s
;
++
s
;
if
(
'0'
<=
*
s
&&
*
s
<=
'9'
)
if
(
'0'
<=
*
s
&&
*
s
<=
'9'
)
{
{
spec
.
precision_
=
static_cast
<
int
>
(
internal
::
parse_nonnegative_int
(
s
));
spec
.
precision_
=
static_cast
<
int
>
(
internal
::
parse_nonnegative_int
(
s
));
}
}
else
if
(
*
s
==
'*'
)
else
if
(
*
s
==
'*'
)
{
{
++
s
;
++
s
;
spec
.
precision_
=
internal
::
PrecisionHandler
().
visit
(
get_arg
(
s
));
spec
.
precision_
=
internal
::
PrecisionHandler
().
visit
(
get_arg
(
s
));
}
}
...
@@ -492,8 +478,7 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str)
...
@@ -492,8 +478,7 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str)
Arg
arg
=
get_arg
(
s
,
arg_index
);
Arg
arg
=
get_arg
(
s
,
arg_index
);
if
(
spec
.
flag
(
HASH_FLAG
)
&&
internal
::
IsZeroInt
().
visit
(
arg
))
if
(
spec
.
flag
(
HASH_FLAG
)
&&
internal
::
IsZeroInt
().
visit
(
arg
))
spec
.
flags_
&=
~
internal
::
to_unsigned
<
int
>
(
HASH_FLAG
);
spec
.
flags_
&=
~
internal
::
to_unsigned
<
int
>
(
HASH_FLAG
);
if
(
spec
.
fill_
==
'0'
)
if
(
spec
.
fill_
==
'0'
)
{
{
if
(
arg
.
type
<=
Arg
::
LAST_NUMERIC_TYPE
)
if
(
arg
.
type
<=
Arg
::
LAST_NUMERIC_TYPE
)
spec
.
align_
=
ALIGN_NUMERIC
;
spec
.
align_
=
ALIGN_NUMERIC
;
else
else
...
@@ -502,8 +487,7 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str)
...
@@ -502,8 +487,7 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str)
// Parse length and convert the argument to the required type.
// Parse length and convert the argument to the required type.
using
internal
::
ArgConverter
;
using
internal
::
ArgConverter
;
switch
(
*
s
++
)
switch
(
*
s
++
)
{
{
case
'h'
:
case
'h'
:
if
(
*
s
==
'h'
)
if
(
*
s
==
'h'
)
ArgConverter
<
signed
char
>
(
arg
,
*++
s
).
visit
(
arg
);
ArgConverter
<
signed
char
>
(
arg
,
*++
s
).
visit
(
arg
);
...
@@ -538,13 +522,10 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str)
...
@@ -538,13 +522,10 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str)
if
(
!*
s
)
if
(
!*
s
)
FMT_THROW
(
FormatError
(
"invalid format string"
));
FMT_THROW
(
FormatError
(
"invalid format string"
));
spec
.
type_
=
static_cast
<
char
>
(
*
s
++
);
spec
.
type_
=
static_cast
<
char
>
(
*
s
++
);
if
(
arg
.
type
<=
Arg
::
LAST_INTEGER_TYPE
)
if
(
arg
.
type
<=
Arg
::
LAST_INTEGER_TYPE
)
{
{
// Normalize type.
// Normalize type.
switch
(
spec
.
type_
)
switch
(
spec
.
type_
)
{
{
case
'i'
:
case
'u'
:
case
'i'
:
case
'u'
:
spec
.
type_
=
'd'
;
spec
.
type_
=
'd'
;
break
;
break
;
case
'c'
:
case
'c'
:
...
@@ -560,83 +541,87 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str)
...
@@ -560,83 +541,87 @@ void PrintfFormatter<Char, AF>::format(BasicCStringRef<Char> format_str)
AF
(
writer_
,
spec
).
visit
(
arg
);
AF
(
writer_
,
spec
).
visit
(
arg
);
}
}
write
(
writer_
,
start
,
s
);
write
(
writer_
,
start
,
s
);
}
}
template
<
typename
Char
>
template
<
typename
Char
>
void
printf
(
BasicWriter
<
Char
>
&
w
,
BasicCStringRef
<
Char
>
format
,
ArgList
args
)
void
printf
(
BasicWriter
<
Char
>
&
w
,
BasicCStringRef
<
Char
>
format
,
ArgList
args
)
{
{
PrintfFormatter
<
Char
>
(
args
,
w
).
format
(
format
);
PrintfFormatter
<
Char
>
(
args
,
w
).
format
(
format
);
}
}
/**
/**
\rst
\rst
Formats arguments and returns the result as a string.
Formats arguments and returns the result as a string.
**Example**::
**Example**::
std::string message = fmt::sprintf("The answer is %d", 42);
std::string message = fmt::sprintf("The answer is %d", 42);
\endrst
\endrst
*/
*/
inline
std
::
string
sprintf
(
CStringRef
format
,
ArgList
args
)
inline
std
::
string
sprintf
(
CStringRef
format
,
ArgList
args
)
{
{
MemoryWriter
w
;
MemoryWriter
w
;
printf
(
w
,
format
,
args
);
printf
(
w
,
format
,
args
);
return
w
.
str
();
return
w
.
str
();
}
}
FMT_VARIADIC
(
std
::
string
,
sprintf
,
CStringRef
)
FMT_VARIADIC
(
std
::
string
,
sprintf
,
CStringRef
)
inline
std
::
wstring
sprintf
(
WCStringRef
format
,
ArgList
args
)
inline
std
::
wstring
sprintf
(
WCStringRef
format
,
ArgList
args
)
{
{
WMemoryWriter
w
;
WMemoryWriter
w
;
printf
(
w
,
format
,
args
);
printf
(
w
,
format
,
args
);
return
w
.
str
();
return
w
.
str
();
}
}
FMT_VARIADIC_W
(
std
::
wstring
,
sprintf
,
WCStringRef
)
FMT_VARIADIC_W
(
std
::
wstring
,
sprintf
,
WCStringRef
)
/**
/**
\rst
\rst
Prints formatted data to the file *f*.
Prints formatted data to the file *f*.
**Example**::
**Example**::
fmt::fprintf(stderr, "Don't %s!", "panic");
fmt::fprintf(stderr, "Don't %s!", "panic");
\endrst
\endrst
*/
*/
FMT_API
int
fprintf
(
std
::
FILE
*
f
,
CStringRef
format
,
ArgList
args
);
FMT_API
int
fprintf
(
std
::
FILE
*
f
,
CStringRef
format
,
ArgList
args
);
FMT_VARIADIC
(
int
,
fprintf
,
std
::
FILE
*
,
CStringRef
)
FMT_VARIADIC
(
int
,
fprintf
,
std
::
FILE
*
,
CStringRef
)
/**
/**
\rst
\rst
Prints formatted data to ``stdout``.
Prints formatted data to ``stdout``.
**Example**::
**Example**::
fmt::printf("Elapsed time: %.2f seconds", 1.23);
fmt::printf("Elapsed time: %.2f seconds", 1.23);
\endrst
\endrst
*/
*/
inline
int
printf
(
CStringRef
format
,
ArgList
args
)
inline
int
printf
(
CStringRef
format
,
ArgList
args
)
{
{
return
fprintf
(
stdout
,
format
,
args
);
return
fprintf
(
stdout
,
format
,
args
);
}
}
FMT_VARIADIC
(
int
,
printf
,
CStringRef
)
FMT_VARIADIC
(
int
,
printf
,
CStringRef
)
/**
/**
\rst
\rst
Prints formatted data to the stream *os*.
Prints formatted data to the stream *os*.
**Example**::
**Example**::
fprintf(cerr, "Don't %s!", "panic");
fprintf(cerr, "Don't %s!", "panic");
\endrst
\endrst
*/
*/
inline
int
fprintf
(
std
::
ostream
&
os
,
CStringRef
format_str
,
ArgList
args
)
inline
int
fprintf
(
std
::
ostream
&
os
,
CStringRef
format_str
,
ArgList
args
)
{
{
MemoryWriter
w
;
MemoryWriter
w
;
printf
(
w
,
format_str
,
args
);
printf
(
w
,
format_str
,
args
);
internal
::
write
(
os
,
w
);
internal
::
write
(
os
,
w
);
return
static_cast
<
int
>
(
w
.
size
());
return
static_cast
<
int
>
(
w
.
size
());
}
}
FMT_VARIADIC
(
int
,
fprintf
,
std
::
ostream
&
,
CStringRef
)
FMT_VARIADIC
(
int
,
fprintf
,
std
::
ostream
&
,
CStringRef
)
}
// namespace fmt
}
// namespace fmt
#ifdef FMT_HEADER_ONLY
# include "printf.cc"
#endif
#endif // FMT_PRINTF_H_
#endif // FMT_PRINTF_H_
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment