dep/fmt: Bump to v11.0.2
This commit is contained in:
parent
dc998f72ab
commit
6357d95c22
|
@ -1,9 +1,9 @@
|
||||||
cmake_minimum_required(VERSION 3.8...3.26)
|
cmake_minimum_required(VERSION 3.8...3.28)
|
||||||
|
|
||||||
# Fallback for using newer policies on CMake <3.12.
|
# Fallback for using newer policies on CMake <3.12.
|
||||||
if(${CMAKE_VERSION} VERSION_LESS 3.12)
|
if (${CMAKE_VERSION} VERSION_LESS 3.12)
|
||||||
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
||||||
endif()
|
endif ()
|
||||||
|
|
||||||
# Determine if fmt is built as a subproject (using add_subdirectory)
|
# Determine if fmt is built as a subproject (using add_subdirectory)
|
||||||
# or if it is the master project.
|
# or if it is the master project.
|
||||||
|
@ -36,6 +36,12 @@ function(enable_module target)
|
||||||
endif ()
|
endif ()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
|
set(FMT_USE_CMAKE_MODULES FALSE)
|
||||||
|
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.28 AND
|
||||||
|
CMAKE_GENERATOR STREQUAL "Ninja")
|
||||||
|
set(FMT_USE_CMAKE_MODULES TRUE)
|
||||||
|
endif ()
|
||||||
|
|
||||||
# Adds a library compiled with C++20 module support.
|
# Adds a library compiled with C++20 module support.
|
||||||
# `enabled` is a CMake variables that specifies if modules are enabled.
|
# `enabled` is a CMake variables that specifies if modules are enabled.
|
||||||
# If modules are disabled `add_module_library` falls back to creating a
|
# If modules are disabled `add_module_library` falls back to creating a
|
||||||
|
@ -53,6 +59,7 @@ function(add_module_library name)
|
||||||
if (NOT ${${AML_IF}})
|
if (NOT ${${AML_IF}})
|
||||||
# Create a non-modular library.
|
# Create a non-modular library.
|
||||||
target_sources(${name} PRIVATE ${AML_FALLBACK})
|
target_sources(${name} PRIVATE ${AML_FALLBACK})
|
||||||
|
set_target_properties(${name} PROPERTIES CXX_SCAN_FOR_MODULES OFF)
|
||||||
return()
|
return()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
@ -62,48 +69,55 @@ function(add_module_library name)
|
||||||
target_compile_options(${name} PUBLIC -fmodules-ts)
|
target_compile_options(${name} PUBLIC -fmodules-ts)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
# `std` is affected by CMake options and may be higher than C++20.
|
target_compile_definitions(${name} PRIVATE FMT_MODULE)
|
||||||
get_target_property(std ${name} CXX_STANDARD)
|
|
||||||
|
|
||||||
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
if (FMT_USE_CMAKE_MODULES)
|
||||||
set(pcms)
|
target_sources(${name} PUBLIC FILE_SET fmt TYPE CXX_MODULES
|
||||||
foreach (src ${sources})
|
FILES ${sources})
|
||||||
get_filename_component(pcm ${src} NAME_WE)
|
else()
|
||||||
set(pcm ${pcm}.pcm)
|
# `std` is affected by CMake options and may be higher than C++20.
|
||||||
|
get_target_property(std ${name} CXX_STANDARD)
|
||||||
|
|
||||||
# Propagate -fmodule-file=*.pcm to targets that link with this library.
|
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||||
target_compile_options(
|
set(pcms)
|
||||||
${name} PUBLIC -fmodule-file=${CMAKE_CURRENT_BINARY_DIR}/${pcm})
|
foreach (src ${sources})
|
||||||
|
get_filename_component(pcm ${src} NAME_WE)
|
||||||
|
set(pcm ${pcm}.pcm)
|
||||||
|
|
||||||
# Use an absolute path to prevent target_link_libraries prepending -l
|
# Propagate -fmodule-file=*.pcm to targets that link with this library.
|
||||||
# to it.
|
target_compile_options(
|
||||||
set(pcms ${pcms} ${CMAKE_CURRENT_BINARY_DIR}/${pcm})
|
${name} PUBLIC -fmodule-file=${CMAKE_CURRENT_BINARY_DIR}/${pcm})
|
||||||
add_custom_command(
|
|
||||||
OUTPUT ${pcm}
|
|
||||||
COMMAND ${CMAKE_CXX_COMPILER}
|
|
||||||
-std=c++${std} -x c++-module --precompile -c
|
|
||||||
-o ${pcm} ${CMAKE_CURRENT_SOURCE_DIR}/${src}
|
|
||||||
"-I$<JOIN:$<TARGET_PROPERTY:${name},INCLUDE_DIRECTORIES>,;-I>"
|
|
||||||
# Required by the -I generator expression above.
|
|
||||||
COMMAND_EXPAND_LISTS
|
|
||||||
DEPENDS ${src})
|
|
||||||
endforeach ()
|
|
||||||
|
|
||||||
# Add .pcm files as sources to make sure they are built before the library.
|
# Use an absolute path to prevent target_link_libraries prepending -l
|
||||||
set(sources)
|
# to it.
|
||||||
foreach (pcm ${pcms})
|
set(pcms ${pcms} ${CMAKE_CURRENT_BINARY_DIR}/${pcm})
|
||||||
get_filename_component(pcm_we ${pcm} NAME_WE)
|
add_custom_command(
|
||||||
set(obj ${pcm_we}.o)
|
OUTPUT ${pcm}
|
||||||
# Use an absolute path to prevent target_link_libraries prepending -l.
|
COMMAND ${CMAKE_CXX_COMPILER}
|
||||||
set(sources ${sources} ${pcm} ${CMAKE_CURRENT_BINARY_DIR}/${obj})
|
-std=c++${std} -x c++-module --precompile -c
|
||||||
add_custom_command(
|
-o ${pcm} ${CMAKE_CURRENT_SOURCE_DIR}/${src}
|
||||||
OUTPUT ${obj}
|
"-I$<JOIN:$<TARGET_PROPERTY:${name},INCLUDE_DIRECTORIES>,;-I>"
|
||||||
COMMAND ${CMAKE_CXX_COMPILER} $<TARGET_PROPERTY:${name},COMPILE_OPTIONS>
|
# Required by the -I generator expression above.
|
||||||
-c -o ${obj} ${pcm}
|
COMMAND_EXPAND_LISTS
|
||||||
DEPENDS ${pcm})
|
DEPENDS ${src})
|
||||||
endforeach ()
|
endforeach ()
|
||||||
endif ()
|
|
||||||
target_sources(${name} PRIVATE ${sources})
|
# Add .pcm files as sources to make sure they are built before the library.
|
||||||
|
set(sources)
|
||||||
|
foreach (pcm ${pcms})
|
||||||
|
get_filename_component(pcm_we ${pcm} NAME_WE)
|
||||||
|
set(obj ${pcm_we}.o)
|
||||||
|
# Use an absolute path to prevent target_link_libraries prepending -l.
|
||||||
|
set(sources ${sources} ${pcm} ${CMAKE_CURRENT_BINARY_DIR}/${obj})
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT ${obj}
|
||||||
|
COMMAND ${CMAKE_CXX_COMPILER} $<TARGET_PROPERTY:${name},COMPILE_OPTIONS>
|
||||||
|
-c -o ${obj} ${pcm}
|
||||||
|
DEPENDS ${pcm})
|
||||||
|
endforeach ()
|
||||||
|
endif ()
|
||||||
|
target_sources(${name} PRIVATE ${sources})
|
||||||
|
endif()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
include(CMakeParseArguments)
|
include(CMakeParseArguments)
|
||||||
|
@ -150,9 +164,10 @@ option(FMT_INSTALL "Generate the install target." ON)
|
||||||
option(FMT_TEST "Generate the test target." ${FMT_MASTER_PROJECT})
|
option(FMT_TEST "Generate the test target." ${FMT_MASTER_PROJECT})
|
||||||
option(FMT_FUZZ "Generate the fuzz target." OFF)
|
option(FMT_FUZZ "Generate the fuzz target." OFF)
|
||||||
option(FMT_CUDA_TEST "Generate the cuda-test target." OFF)
|
option(FMT_CUDA_TEST "Generate the cuda-test target." OFF)
|
||||||
option(FMT_OS "Include core requiring OS (Windows/Posix) " ON)
|
option(FMT_OS "Include OS-specific APIs." ON)
|
||||||
option(FMT_MODULE "Build a module instead of a traditional library." OFF)
|
option(FMT_MODULE "Build a module instead of a traditional library." OFF)
|
||||||
option(FMT_SYSTEM_HEADERS "Expose headers with marking them as system." OFF)
|
option(FMT_SYSTEM_HEADERS "Expose headers with marking them as system." OFF)
|
||||||
|
option(FMT_UNICODE "Enable Unicode support." ON)
|
||||||
|
|
||||||
if (FMT_TEST AND FMT_MODULE)
|
if (FMT_TEST AND FMT_MODULE)
|
||||||
# The tests require {fmt} to be compiled as traditional library
|
# The tests require {fmt} to be compiled as traditional library
|
||||||
|
@ -162,15 +177,15 @@ set(FMT_SYSTEM_HEADERS_ATTRIBUTE "")
|
||||||
if (FMT_SYSTEM_HEADERS)
|
if (FMT_SYSTEM_HEADERS)
|
||||||
set(FMT_SYSTEM_HEADERS_ATTRIBUTE SYSTEM)
|
set(FMT_SYSTEM_HEADERS_ATTRIBUTE SYSTEM)
|
||||||
endif ()
|
endif ()
|
||||||
if(CMAKE_SYSTEM_NAME STREQUAL "MSDOS")
|
if (CMAKE_SYSTEM_NAME STREQUAL "MSDOS")
|
||||||
set(FMT_TEST OFF)
|
set(FMT_TEST OFF)
|
||||||
message(STATUS "MSDOS is incompatible with gtest")
|
message(STATUS "MSDOS is incompatible with gtest")
|
||||||
endif()
|
endif ()
|
||||||
|
|
||||||
# Get version from core.h
|
# Get version from base.h
|
||||||
file(READ include/fmt/core.h core_h)
|
file(READ include/fmt/base.h base_h)
|
||||||
if (NOT core_h MATCHES "FMT_VERSION ([0-9]+)([0-9][0-9])([0-9][0-9])")
|
if (NOT base_h MATCHES "FMT_VERSION ([0-9]+)([0-9][0-9])([0-9][0-9])")
|
||||||
message(FATAL_ERROR "Cannot get FMT_VERSION from core.h.")
|
message(FATAL_ERROR "Cannot get FMT_VERSION from base.h.")
|
||||||
endif ()
|
endif ()
|
||||||
# Use math to skip leading zeros if any.
|
# Use math to skip leading zeros if any.
|
||||||
math(EXPR CPACK_PACKAGE_VERSION_MAJOR ${CMAKE_MATCH_1})
|
math(EXPR CPACK_PACKAGE_VERSION_MAJOR ${CMAKE_MATCH_1})
|
||||||
|
@ -178,7 +193,7 @@ math(EXPR CPACK_PACKAGE_VERSION_MINOR ${CMAKE_MATCH_2})
|
||||||
math(EXPR CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_3})
|
math(EXPR CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_3})
|
||||||
join(FMT_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.
|
join(FMT_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.
|
||||||
${CPACK_PACKAGE_VERSION_PATCH})
|
${CPACK_PACKAGE_VERSION_PATCH})
|
||||||
message(STATUS "Version: ${FMT_VERSION}")
|
message(STATUS "{fmt} version: ${FMT_VERSION}")
|
||||||
|
|
||||||
message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
|
message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
|
||||||
|
|
||||||
|
@ -274,20 +289,21 @@ function(add_headers VAR)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
# Define the fmt library, its includes and the needed defines.
|
# Define the fmt library, its includes and the needed defines.
|
||||||
add_headers(FMT_HEADERS args.h chrono.h color.h compile.h core.h format.h
|
add_headers(FMT_HEADERS args.h base.h chrono.h color.h compile.h core.h format.h
|
||||||
format-inl.h os.h ostream.h printf.h ranges.h std.h
|
format-inl.h os.h ostream.h printf.h ranges.h std.h
|
||||||
xchar.h)
|
xchar.h)
|
||||||
set(FMT_SOURCES src/format.cc)
|
set(FMT_SOURCES src/format.cc)
|
||||||
if (FMT_OS)
|
|
||||||
set(FMT_SOURCES ${FMT_SOURCES} src/os.cc)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
add_module_library(fmt src/fmt.cc FALLBACK
|
add_module_library(fmt src/fmt.cc FALLBACK
|
||||||
${FMT_SOURCES} ${FMT_HEADERS} README.rst ChangeLog.rst
|
${FMT_SOURCES} ${FMT_HEADERS} README.md ChangeLog.md
|
||||||
IF FMT_MODULE)
|
IF FMT_MODULE)
|
||||||
add_library(fmt::fmt ALIAS fmt)
|
add_library(fmt::fmt ALIAS fmt)
|
||||||
if (FMT_MODULE)
|
if (FMT_MODULE)
|
||||||
enable_module(fmt)
|
enable_module(fmt)
|
||||||
|
elseif (FMT_OS)
|
||||||
|
target_sources(fmt PRIVATE src/os.cc)
|
||||||
|
else()
|
||||||
|
target_compile_definitions(fmt PRIVATE FMT_OS=0)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (FMT_WERROR)
|
if (FMT_WERROR)
|
||||||
|
@ -312,7 +328,15 @@ set(FMT_DEBUG_POSTFIX d CACHE STRING "Debug library postfix.")
|
||||||
set_target_properties(fmt PROPERTIES
|
set_target_properties(fmt PROPERTIES
|
||||||
VERSION ${FMT_VERSION} SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}
|
VERSION ${FMT_VERSION} SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}
|
||||||
PUBLIC_HEADER "${FMT_HEADERS}"
|
PUBLIC_HEADER "${FMT_HEADERS}"
|
||||||
DEBUG_POSTFIX "${FMT_DEBUG_POSTFIX}")
|
DEBUG_POSTFIX "${FMT_DEBUG_POSTFIX}"
|
||||||
|
|
||||||
|
# Workaround for Visual Studio 2017:
|
||||||
|
# Ensure the .pdb is created with the same name and in the same directory
|
||||||
|
# as the .lib. Newer VS versions already do this by default, but there is no
|
||||||
|
# harm in setting it for those too. Ignored by other generators.
|
||||||
|
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
|
||||||
|
COMPILE_PDB_NAME "fmt"
|
||||||
|
COMPILE_PDB_NAME_DEBUG "fmt${FMT_DEBUG_POSTFIX}")
|
||||||
|
|
||||||
# Set FMT_LIB_NAME for pkg-config fmt.pc. We cannot use the OUTPUT_NAME target
|
# Set FMT_LIB_NAME for pkg-config fmt.pc. We cannot use the OUTPUT_NAME target
|
||||||
# property because it's not set by default.
|
# property because it's not set by default.
|
||||||
|
@ -326,15 +350,26 @@ if (BUILD_SHARED_LIBS)
|
||||||
endif ()
|
endif ()
|
||||||
if (FMT_SAFE_DURATION_CAST)
|
if (FMT_SAFE_DURATION_CAST)
|
||||||
target_compile_definitions(fmt PUBLIC FMT_SAFE_DURATION_CAST)
|
target_compile_definitions(fmt PUBLIC FMT_SAFE_DURATION_CAST)
|
||||||
endif()
|
endif ()
|
||||||
|
|
||||||
add_library(fmt-header-only INTERFACE)
|
add_library(fmt-header-only INTERFACE)
|
||||||
add_library(fmt::fmt-header-only ALIAS fmt-header-only)
|
add_library(fmt::fmt-header-only ALIAS fmt-header-only)
|
||||||
|
|
||||||
|
if (NOT MSVC)
|
||||||
|
# Unicode is always supported on compilers other than MSVC.
|
||||||
|
elseif (FMT_UNICODE)
|
||||||
|
# Unicode support requires compiling with /utf-8.
|
||||||
|
target_compile_options(fmt PUBLIC $<$<COMPILE_LANGUAGE:CXX>:/utf-8>)
|
||||||
|
target_compile_options(fmt-header-only INTERFACE $<$<COMPILE_LANGUAGE:CXX>:/utf-8>)
|
||||||
|
else ()
|
||||||
|
target_compile_definitions(fmt PUBLIC FMT_UNICODE=0)
|
||||||
|
endif ()
|
||||||
|
|
||||||
target_compile_definitions(fmt-header-only INTERFACE FMT_HEADER_ONLY=1)
|
target_compile_definitions(fmt-header-only INTERFACE FMT_HEADER_ONLY=1)
|
||||||
target_compile_features(fmt-header-only INTERFACE cxx_std_11)
|
target_compile_features(fmt-header-only INTERFACE cxx_std_11)
|
||||||
|
|
||||||
target_include_directories(fmt-header-only ${FMT_SYSTEM_HEADERS_ATTRIBUTE} INTERFACE
|
target_include_directories(fmt-header-only
|
||||||
|
${FMT_SYSTEM_HEADERS_ATTRIBUTE} INTERFACE
|
||||||
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
|
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
|
||||||
$<INSTALL_INTERFACE:${FMT_INC_DIR}>)
|
$<INSTALL_INTERFACE:${FMT_INC_DIR}>)
|
||||||
|
|
||||||
|
@ -379,12 +414,18 @@ if (FMT_INSTALL)
|
||||||
|
|
||||||
set(INSTALL_TARGETS fmt fmt-header-only)
|
set(INSTALL_TARGETS fmt fmt-header-only)
|
||||||
|
|
||||||
|
set(INSTALL_FILE_SET)
|
||||||
|
if (FMT_USE_CMAKE_MODULES)
|
||||||
|
set(INSTALL_FILE_SET FILE_SET fmt DESTINATION "${FMT_INC_DIR}/fmt")
|
||||||
|
endif()
|
||||||
|
|
||||||
# Install the library and headers.
|
# Install the library and headers.
|
||||||
install(TARGETS ${INSTALL_TARGETS} EXPORT ${targets_export_name}
|
install(TARGETS ${INSTALL_TARGETS} EXPORT ${targets_export_name}
|
||||||
LIBRARY DESTINATION ${FMT_LIB_DIR}
|
LIBRARY DESTINATION ${FMT_LIB_DIR}
|
||||||
ARCHIVE DESTINATION ${FMT_LIB_DIR}
|
ARCHIVE DESTINATION ${FMT_LIB_DIR}
|
||||||
PUBLIC_HEADER DESTINATION "${FMT_INC_DIR}/fmt"
|
PUBLIC_HEADER DESTINATION "${FMT_INC_DIR}/fmt"
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||||
|
${INSTALL_FILE_SET})
|
||||||
|
|
||||||
# Use a namespace because CMake provides better diagnostics for namespaced
|
# Use a namespace because CMake provides better diagnostics for namespaced
|
||||||
# imported targets.
|
# imported targets.
|
||||||
|
@ -401,8 +442,44 @@ if (FMT_INSTALL)
|
||||||
install(FILES "${pkgconfig}" DESTINATION "${FMT_PKGCONFIG_DIR}")
|
install(FILES "${pkgconfig}" DESTINATION "${FMT_PKGCONFIG_DIR}")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
function(add_doc_target)
|
||||||
|
find_program(DOXYGEN doxygen
|
||||||
|
PATHS "$ENV{ProgramFiles}/doxygen/bin"
|
||||||
|
"$ENV{ProgramFiles\(x86\)}/doxygen/bin")
|
||||||
|
if (NOT DOXYGEN)
|
||||||
|
message(STATUS "Target 'doc' disabled because doxygen not found")
|
||||||
|
return ()
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
find_program(MKDOCS mkdocs)
|
||||||
|
if (NOT MKDOCS)
|
||||||
|
message(STATUS "Target 'doc' disabled because mkdocs not found")
|
||||||
|
return ()
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
set(sources )
|
||||||
|
foreach (source api.md index.md syntax.md get-started.md fmt.css fmt.js)
|
||||||
|
set(sources ${sources} doc/${source})
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
add_custom_target(
|
||||||
|
doc
|
||||||
|
COMMAND
|
||||||
|
${CMAKE_COMMAND}
|
||||||
|
-E env PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/support/python
|
||||||
|
${MKDOCS} build -f ${CMAKE_CURRENT_SOURCE_DIR}/support/mkdocs.yml
|
||||||
|
# MkDocs requires the site dir to be outside of the doc dir.
|
||||||
|
--site-dir ${CMAKE_CURRENT_BINARY_DIR}/doc-html
|
||||||
|
--no-directory-urls
|
||||||
|
SOURCES ${sources})
|
||||||
|
|
||||||
|
include(GNUInstallDirs)
|
||||||
|
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc-html/
|
||||||
|
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/doc/fmt OPTIONAL)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
if (FMT_DOC)
|
if (FMT_DOC)
|
||||||
add_subdirectory(doc)
|
add_doc_target()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (FMT_TEST)
|
if (FMT_TEST)
|
||||||
|
@ -432,13 +509,12 @@ if (FMT_MASTER_PROJECT AND EXISTS ${gitignore})
|
||||||
string(REPLACE "*" ".*" line "${line}")
|
string(REPLACE "*" ".*" line "${line}")
|
||||||
set(ignored_files ${ignored_files} "${line}$" "${line}/")
|
set(ignored_files ${ignored_files} "${line}$" "${line}/")
|
||||||
endforeach ()
|
endforeach ()
|
||||||
set(ignored_files ${ignored_files}
|
set(ignored_files ${ignored_files} /.git /build/doxyxml .vagrant)
|
||||||
/.git /breathe /format-benchmark sphinx/ .buildinfo .doctrees)
|
|
||||||
|
|
||||||
set(CPACK_SOURCE_GENERATOR ZIP)
|
set(CPACK_SOURCE_GENERATOR ZIP)
|
||||||
set(CPACK_SOURCE_IGNORE_FILES ${ignored_files})
|
set(CPACK_SOURCE_IGNORE_FILES ${ignored_files})
|
||||||
set(CPACK_SOURCE_PACKAGE_FILE_NAME fmt-${FMT_VERSION})
|
set(CPACK_SOURCE_PACKAGE_FILE_NAME fmt-${FMT_VERSION})
|
||||||
set(CPACK_PACKAGE_NAME fmt)
|
set(CPACK_PACKAGE_NAME fmt)
|
||||||
set(CPACK_RESOURCE_FILE_README ${PROJECT_SOURCE_DIR}/README.rst)
|
set(CPACK_RESOURCE_FILE_README ${PROJECT_SOURCE_DIR}/README.md)
|
||||||
include(CPack)
|
include(CPack)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,484 @@
|
||||||
|
<img src="https://user-images.githubusercontent.com/576385/156254208-f5b743a9-88cf-439d-b0c0-923d53e8d551.png" alt="{fmt}" width="25%"/>
|
||||||
|
|
||||||
|
[![image](https://github.com/fmtlib/fmt/workflows/linux/badge.svg)](https://github.com/fmtlib/fmt/actions?query=workflow%3Alinux)
|
||||||
|
[![image](https://github.com/fmtlib/fmt/workflows/macos/badge.svg)](https://github.com/fmtlib/fmt/actions?query=workflow%3Amacos)
|
||||||
|
[![image](https://github.com/fmtlib/fmt/workflows/windows/badge.svg)](https://github.com/fmtlib/fmt/actions?query=workflow%3Awindows)
|
||||||
|
[![fmt is continuously fuzzed at oss-fuzz](https://oss-fuzz-build-logs.storage.googleapis.com/badges/fmt.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?\%0Acolspec=ID%20Type%20Component%20Status%20Proj%20Reported%20Owner%20\%0ASummary&q=proj%3Dfmt&can=1)
|
||||||
|
[![Ask questions at StackOverflow with the tag fmt](https://img.shields.io/badge/stackoverflow-fmt-blue.svg)](https://stackoverflow.com/questions/tagged/fmt)
|
||||||
|
[![image](https://api.securityscorecards.dev/projects/github.com/fmtlib/fmt/badge)](https://securityscorecards.dev/viewer/?uri=github.com/fmtlib/fmt)
|
||||||
|
|
||||||
|
**{fmt}** is an open-source formatting library providing a fast and safe
|
||||||
|
alternative to C stdio and C++ iostreams.
|
||||||
|
|
||||||
|
If you like this project, please consider donating to one of the funds
|
||||||
|
that help victims of the war in Ukraine: <https://www.stopputin.net/>.
|
||||||
|
|
||||||
|
[Documentation](https://fmt.dev)
|
||||||
|
|
||||||
|
[Cheat Sheets](https://hackingcpp.com/cpp/libs/fmt.html)
|
||||||
|
|
||||||
|
Q&A: ask questions on [StackOverflow with the tag
|
||||||
|
fmt](https://stackoverflow.com/questions/tagged/fmt).
|
||||||
|
|
||||||
|
Try {fmt} in [Compiler Explorer](https://godbolt.org/z/8Mx1EW73v).
|
||||||
|
|
||||||
|
# Features
|
||||||
|
|
||||||
|
- Simple [format API](https://fmt.dev/latest/api/) with positional
|
||||||
|
arguments for localization
|
||||||
|
- Implementation of [C++20
|
||||||
|
std::format](https://en.cppreference.com/w/cpp/utility/format) and
|
||||||
|
[C++23 std::print](https://en.cppreference.com/w/cpp/io/print)
|
||||||
|
- [Format string syntax](https://fmt.dev/latest/syntax/) similar
|
||||||
|
to Python\'s
|
||||||
|
[format](https://docs.python.org/3/library/stdtypes.html#str.format)
|
||||||
|
- Fast IEEE 754 floating-point formatter with correct rounding,
|
||||||
|
shortness and round-trip guarantees using the
|
||||||
|
[Dragonbox](https://github.com/jk-jeon/dragonbox) algorithm
|
||||||
|
- Portable Unicode support
|
||||||
|
- Safe [printf
|
||||||
|
implementation](https://fmt.dev/latest/api/#printf-formatting)
|
||||||
|
including the POSIX extension for positional arguments
|
||||||
|
- Extensibility: [support for user-defined
|
||||||
|
types](https://fmt.dev/latest/api/#formatting-user-defined-types)
|
||||||
|
- High performance: faster than common standard library
|
||||||
|
implementations of `(s)printf`, iostreams, `to_string` and
|
||||||
|
`to_chars`, see [Speed tests](#speed-tests) and [Converting a
|
||||||
|
hundred million integers to strings per
|
||||||
|
second](http://www.zverovich.net/2020/06/13/fast-int-to-string-revisited.html)
|
||||||
|
- Small code size both in terms of source code with the minimum
|
||||||
|
configuration consisting of just three files, `core.h`, `format.h`
|
||||||
|
and `format-inl.h`, and compiled code; see [Compile time and code
|
||||||
|
bloat](#compile-time-and-code-bloat)
|
||||||
|
- Reliability: the library has an extensive set of
|
||||||
|
[tests](https://github.com/fmtlib/fmt/tree/master/test) and is
|
||||||
|
[continuously fuzzed](https://bugs.chromium.org/p/oss-fuzz/issues/list?colspec=ID%20Type%20Component%20Status%20Proj%20Reported%20Owner%20Summary&q=proj%3Dfmt&can=1)
|
||||||
|
- Safety: the library is fully type-safe, errors in format strings can
|
||||||
|
be reported at compile time, automatic memory management prevents
|
||||||
|
buffer overflow errors
|
||||||
|
- Ease of use: small self-contained code base, no external
|
||||||
|
dependencies, permissive MIT
|
||||||
|
[license](https://github.com/fmtlib/fmt/blob/master/LICENSE)
|
||||||
|
- [Portability](https://fmt.dev/latest/#portability) with
|
||||||
|
consistent output across platforms and support for older compilers
|
||||||
|
- Clean warning-free codebase even on high warning levels such as
|
||||||
|
`-Wall -Wextra -pedantic`
|
||||||
|
- Locale independence by default
|
||||||
|
- Optional header-only configuration enabled with the
|
||||||
|
`FMT_HEADER_ONLY` macro
|
||||||
|
|
||||||
|
See the [documentation](https://fmt.dev) for more details.
|
||||||
|
|
||||||
|
# Examples
|
||||||
|
|
||||||
|
**Print to stdout** ([run](https://godbolt.org/z/Tevcjh))
|
||||||
|
|
||||||
|
``` c++
|
||||||
|
#include <fmt/core.h>
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
fmt::print("Hello, world!\n");
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Format a string** ([run](https://godbolt.org/z/oK8h33))
|
||||||
|
|
||||||
|
``` c++
|
||||||
|
std::string s = fmt::format("The answer is {}.", 42);
|
||||||
|
// s == "The answer is 42."
|
||||||
|
```
|
||||||
|
|
||||||
|
**Format a string using positional arguments**
|
||||||
|
([run](https://godbolt.org/z/Yn7Txe))
|
||||||
|
|
||||||
|
``` c++
|
||||||
|
std::string s = fmt::format("I'd rather be {1} than {0}.", "right", "happy");
|
||||||
|
// s == "I'd rather be happy than right."
|
||||||
|
```
|
||||||
|
|
||||||
|
**Print dates and times** ([run](https://godbolt.org/z/c31ExdY3W))
|
||||||
|
|
||||||
|
``` c++
|
||||||
|
#include <fmt/chrono.h>
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
auto now = std::chrono::system_clock::now();
|
||||||
|
fmt::print("Date and time: {}\n", now);
|
||||||
|
fmt::print("Time: {:%H:%M}\n", now);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Output:
|
||||||
|
|
||||||
|
Date and time: 2023-12-26 19:10:31.557195597
|
||||||
|
Time: 19:10
|
||||||
|
|
||||||
|
**Print a container** ([run](https://godbolt.org/z/MxM1YqjE7))
|
||||||
|
|
||||||
|
``` c++
|
||||||
|
#include <vector>
|
||||||
|
#include <fmt/ranges.h>
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
std::vector<int> v = {1, 2, 3};
|
||||||
|
fmt::print("{}\n", v);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Output:
|
||||||
|
|
||||||
|
[1, 2, 3]
|
||||||
|
|
||||||
|
**Check a format string at compile time**
|
||||||
|
|
||||||
|
``` c++
|
||||||
|
std::string s = fmt::format("{:d}", "I am not a number");
|
||||||
|
```
|
||||||
|
|
||||||
|
This gives a compile-time error in C++20 because `d` is an invalid
|
||||||
|
format specifier for a string.
|
||||||
|
|
||||||
|
**Write a file from a single thread**
|
||||||
|
|
||||||
|
``` c++
|
||||||
|
#include <fmt/os.h>
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
auto out = fmt::output_file("guide.txt");
|
||||||
|
out.print("Don't {}", "Panic");
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
This can be [5 to 9 times faster than
|
||||||
|
fprintf](http://www.zverovich.net/2020/08/04/optimal-file-buffer-size.html).
|
||||||
|
|
||||||
|
**Print with colors and text styles**
|
||||||
|
|
||||||
|
``` c++
|
||||||
|
#include <fmt/color.h>
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
fmt::print(fg(fmt::color::crimson) | fmt::emphasis::bold,
|
||||||
|
"Hello, {}!\n", "world");
|
||||||
|
fmt::print(fg(fmt::color::floral_white) | bg(fmt::color::slate_gray) |
|
||||||
|
fmt::emphasis::underline, "Olá, {}!\n", "Mundo");
|
||||||
|
fmt::print(fg(fmt::color::steel_blue) | fmt::emphasis::italic,
|
||||||
|
"你好{}!\n", "世界");
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Output on a modern terminal with Unicode support:
|
||||||
|
|
||||||
|
![image](https://github.com/fmtlib/fmt/assets/%0A576385/2a93c904-d6fa-4aa6-b453-2618e1c327d7)
|
||||||
|
|
||||||
|
# Benchmarks
|
||||||
|
|
||||||
|
## Speed tests
|
||||||
|
|
||||||
|
| Library | Method | Run Time, s |
|
||||||
|
|-------------------|---------------|-------------|
|
||||||
|
| libc | printf | 0.91 |
|
||||||
|
| libc++ | std::ostream | 2.49 |
|
||||||
|
| {fmt} 9.1 | fmt::print | 0.74 |
|
||||||
|
| Boost Format 1.80 | boost::format | 6.26 |
|
||||||
|
| Folly Format | folly::format | 1.87 |
|
||||||
|
|
||||||
|
{fmt} is the fastest of the benchmarked methods, \~20% faster than
|
||||||
|
`printf`.
|
||||||
|
|
||||||
|
The above results were generated by building `tinyformat_test.cpp` on
|
||||||
|
macOS 12.6.1 with `clang++ -O3 -DNDEBUG -DSPEED_TEST -DHAVE_FORMAT`, and
|
||||||
|
taking the best of three runs. In the test, the format string
|
||||||
|
`"%0.10f:%04d:%+g:%s:%p:%c:%%\n"` or equivalent is filled 2,000,000
|
||||||
|
times with output sent to `/dev/null`; for further details refer to the
|
||||||
|
[source](https://github.com/fmtlib/format-benchmark/blob/master/src/tinyformat-test.cc).
|
||||||
|
|
||||||
|
{fmt} is up to 20-30x faster than `std::ostringstream` and `sprintf` on
|
||||||
|
IEEE754 `float` and `double` formatting
|
||||||
|
([dtoa-benchmark](https://github.com/fmtlib/dtoa-benchmark)) and faster
|
||||||
|
than [double-conversion](https://github.com/google/double-conversion)
|
||||||
|
and [ryu](https://github.com/ulfjack/ryu):
|
||||||
|
|
||||||
|
[![image](https://user-images.githubusercontent.com/576385/95684665-11719600-0ba8-11eb-8e5b-972ff4e49428.png)](https://fmt.dev/unknown_mac64_clang12.0.html)
|
||||||
|
|
||||||
|
## Compile time and code bloat
|
||||||
|
|
||||||
|
The script [bloat-test.py][test] from [format-benchmark][bench] tests compile
|
||||||
|
time and code bloat for nontrivial projects. It generates 100 translation units
|
||||||
|
and uses `printf()` or its alternative five times in each to simulate a
|
||||||
|
medium-sized project. The resulting executable size and compile time (Apple
|
||||||
|
clang version 15.0.0 (clang-1500.1.0.2.5), macOS Sonoma, best of three) is shown
|
||||||
|
in the following tables.
|
||||||
|
|
||||||
|
[test]: https://github.com/fmtlib/format-benchmark/blob/master/bloat-test.py
|
||||||
|
[bench]: https://github.com/fmtlib/format-benchmark
|
||||||
|
|
||||||
|
**Optimized build (-O3)**
|
||||||
|
|
||||||
|
| Method | Compile Time, s | Executable size, KiB | Stripped size, KiB |
|
||||||
|
|---------------|-----------------|----------------------|--------------------|
|
||||||
|
| printf | 1.6 | 54 | 50 |
|
||||||
|
| IOStreams | 25.9 | 98 | 84 |
|
||||||
|
| fmt 83652df | 4.8 | 54 | 50 |
|
||||||
|
| tinyformat | 29.1 | 161 | 136 |
|
||||||
|
| Boost Format | 55.0 | 530 | 317 |
|
||||||
|
|
||||||
|
{fmt} is fast to compile and is comparable to `printf` in terms of per-call
|
||||||
|
binary size (within a rounding error on this system).
|
||||||
|
|
||||||
|
**Non-optimized build**
|
||||||
|
|
||||||
|
| Method | Compile Time, s | Executable size, KiB | Stripped size, KiB |
|
||||||
|
|---------------|-----------------|----------------------|--------------------|
|
||||||
|
| printf | 1.4 | 54 | 50 |
|
||||||
|
| IOStreams | 23.4 | 92 | 68 |
|
||||||
|
| {fmt} 83652df | 4.4 | 89 | 85 |
|
||||||
|
| tinyformat | 24.5 | 204 | 161 |
|
||||||
|
| Boost Format | 36.4 | 831 | 462 |
|
||||||
|
|
||||||
|
`libc`, `lib(std)c++`, and `libfmt` are all linked as shared libraries
|
||||||
|
to compare formatting function overhead only. Boost Format is a
|
||||||
|
header-only library so it doesn\'t provide any linkage options.
|
||||||
|
|
||||||
|
## Running the tests
|
||||||
|
|
||||||
|
Please refer to [Building the
|
||||||
|
library](https://fmt.dev/latest/get-started/#building-from-source) for
|
||||||
|
instructions on how to build the library and run the unit tests.
|
||||||
|
|
||||||
|
Benchmarks reside in a separate repository,
|
||||||
|
[format-benchmarks](https://github.com/fmtlib/format-benchmark), so to
|
||||||
|
run the benchmarks you first need to clone this repository and generate
|
||||||
|
Makefiles with CMake:
|
||||||
|
|
||||||
|
$ git clone --recursive https://github.com/fmtlib/format-benchmark.git
|
||||||
|
$ cd format-benchmark
|
||||||
|
$ cmake .
|
||||||
|
|
||||||
|
Then you can run the speed test:
|
||||||
|
|
||||||
|
$ make speed-test
|
||||||
|
|
||||||
|
or the bloat test:
|
||||||
|
|
||||||
|
$ make bloat-test
|
||||||
|
|
||||||
|
# Migrating code
|
||||||
|
|
||||||
|
[clang-tidy](https://clang.llvm.org/extra/clang-tidy/) v18 provides the
|
||||||
|
[modernize-use-std-print](https://clang.llvm.org/extra/clang-tidy/checks/modernize/use-std-print.html)
|
||||||
|
check that is capable of converting occurrences of `printf` and
|
||||||
|
`fprintf` to `fmt::print` if configured to do so. (By default it
|
||||||
|
converts to `std::print`.)
|
||||||
|
|
||||||
|
# Notable projects using this library
|
||||||
|
|
||||||
|
- [0 A.D.](https://play0ad.com/): a free, open-source, cross-platform
|
||||||
|
real-time strategy game
|
||||||
|
- [AMPL/MP](https://github.com/ampl/mp): an open-source library for
|
||||||
|
mathematical programming
|
||||||
|
- [Apple's FoundationDB](https://github.com/apple/foundationdb): an open-source,
|
||||||
|
distributed, transactional key-value store
|
||||||
|
- [Aseprite](https://github.com/aseprite/aseprite): animated sprite
|
||||||
|
editor & pixel art tool
|
||||||
|
- [AvioBook](https://www.aviobook.aero/en): a comprehensive aircraft
|
||||||
|
operations suite
|
||||||
|
- [Blizzard Battle.net](https://battle.net/): an online gaming
|
||||||
|
platform
|
||||||
|
- [Celestia](https://celestia.space/): real-time 3D visualization of
|
||||||
|
space
|
||||||
|
- [Ceph](https://ceph.com/): a scalable distributed storage system
|
||||||
|
- [ccache](https://ccache.dev/): a compiler cache
|
||||||
|
- [ClickHouse](https://github.com/ClickHouse/ClickHouse): an
|
||||||
|
analytical database management system
|
||||||
|
- [Contour](https://github.com/contour-terminal/contour/): a modern
|
||||||
|
terminal emulator
|
||||||
|
- [CUAUV](https://cuauv.org/): Cornell University\'s autonomous
|
||||||
|
underwater vehicle
|
||||||
|
- [Drake](https://drake.mit.edu/): a planning, control, and analysis
|
||||||
|
toolbox for nonlinear dynamical systems (MIT)
|
||||||
|
- [Envoy](https://github.com/envoyproxy/envoy): C++ L7 proxy and
|
||||||
|
communication bus (Lyft)
|
||||||
|
- [FiveM](https://fivem.net/): a modification framework for GTA V
|
||||||
|
- [fmtlog](https://github.com/MengRao/fmtlog): a performant
|
||||||
|
fmtlib-style logging library with latency in nanoseconds
|
||||||
|
- [Folly](https://github.com/facebook/folly): Facebook open-source
|
||||||
|
library
|
||||||
|
- [GemRB](https://gemrb.org/): a portable open-source implementation
|
||||||
|
of Bioware's Infinity Engine
|
||||||
|
- [Grand Mountain
|
||||||
|
Adventure](https://store.steampowered.com/app/1247360/Grand_Mountain_Adventure/):
|
||||||
|
a beautiful open-world ski & snowboarding game
|
||||||
|
- [HarpyWar/pvpgn](https://github.com/pvpgn/pvpgn-server): Player vs
|
||||||
|
Player Gaming Network with tweaks
|
||||||
|
- [KBEngine](https://github.com/kbengine/kbengine): an open-source
|
||||||
|
MMOG server engine
|
||||||
|
- [Keypirinha](https://keypirinha.com/): a semantic launcher for
|
||||||
|
Windows
|
||||||
|
- [Kodi](https://kodi.tv/) (formerly xbmc): home theater software
|
||||||
|
- [Knuth](https://kth.cash/): high-performance Bitcoin full-node
|
||||||
|
- [libunicode](https://github.com/contour-terminal/libunicode/): a
|
||||||
|
modern C++17 Unicode library
|
||||||
|
- [MariaDB](https://mariadb.org/): relational database management
|
||||||
|
system
|
||||||
|
- [Microsoft Verona](https://github.com/microsoft/verona): research
|
||||||
|
programming language for concurrent ownership
|
||||||
|
- [MongoDB](https://mongodb.com/): distributed document database
|
||||||
|
- [MongoDB Smasher](https://github.com/duckie/mongo_smasher): a small
|
||||||
|
tool to generate randomized datasets
|
||||||
|
- [OpenSpace](https://openspaceproject.com/): an open-source
|
||||||
|
astrovisualization framework
|
||||||
|
- [PenUltima Online (POL)](https://www.polserver.com/): an MMO server,
|
||||||
|
compatible with most Ultima Online clients
|
||||||
|
- [PyTorch](https://github.com/pytorch/pytorch): an open-source
|
||||||
|
machine learning library
|
||||||
|
- [quasardb](https://www.quasardb.net/): a distributed,
|
||||||
|
high-performance, associative database
|
||||||
|
- [Quill](https://github.com/odygrd/quill): asynchronous low-latency
|
||||||
|
logging library
|
||||||
|
- [QKW](https://github.com/ravijanjam/qkw): generalizing aliasing to
|
||||||
|
simplify navigation, and execute complex multi-line terminal
|
||||||
|
command sequences
|
||||||
|
- [redis-cerberus](https://github.com/HunanTV/redis-cerberus): a Redis
|
||||||
|
cluster proxy
|
||||||
|
- [redpanda](https://vectorized.io/redpanda): a 10x faster Kafka®
|
||||||
|
replacement for mission-critical systems written in C++
|
||||||
|
- [rpclib](http://rpclib.net/): a modern C++ msgpack-RPC server and
|
||||||
|
client library
|
||||||
|
- [Salesforce Analytics
|
||||||
|
Cloud](https://www.salesforce.com/analytics-cloud/overview/):
|
||||||
|
business intelligence software
|
||||||
|
- [Scylla](https://www.scylladb.com/): a Cassandra-compatible NoSQL
|
||||||
|
data store that can handle 1 million transactions per second on a
|
||||||
|
single server
|
||||||
|
- [Seastar](http://www.seastar-project.org/): an advanced, open-source
|
||||||
|
C++ framework for high-performance server applications on modern
|
||||||
|
hardware
|
||||||
|
- [spdlog](https://github.com/gabime/spdlog): super fast C++ logging
|
||||||
|
library
|
||||||
|
- [Stellar](https://www.stellar.org/): financial platform
|
||||||
|
- [Touch Surgery](https://www.touchsurgery.com/): surgery simulator
|
||||||
|
- [TrinityCore](https://github.com/TrinityCore/TrinityCore):
|
||||||
|
open-source MMORPG framework
|
||||||
|
- [🐙 userver framework](https://userver.tech/): open-source
|
||||||
|
asynchronous framework with a rich set of abstractions and database
|
||||||
|
drivers
|
||||||
|
- [Windows Terminal](https://github.com/microsoft/terminal): the new
|
||||||
|
Windows terminal
|
||||||
|
|
||||||
|
[More\...](https://github.com/search?q=fmtlib&type=Code)
|
||||||
|
|
||||||
|
If you are aware of other projects using this library, please let me
|
||||||
|
know by [email](mailto:victor.zverovich@gmail.com) or by submitting an
|
||||||
|
[issue](https://github.com/fmtlib/fmt/issues).
|
||||||
|
|
||||||
|
# Motivation
|
||||||
|
|
||||||
|
So why yet another formatting library?
|
||||||
|
|
||||||
|
There are plenty of methods for doing this task, from standard ones like
|
||||||
|
the printf family of function and iostreams to Boost Format and
|
||||||
|
FastFormat libraries. The reason for creating a new library is that
|
||||||
|
every existing solution that I found either had serious issues or
|
||||||
|
didn\'t provide all the features I needed.
|
||||||
|
|
||||||
|
## printf
|
||||||
|
|
||||||
|
The good thing about `printf` is that it is pretty fast and readily
|
||||||
|
available being a part of the C standard library. The main drawback is
|
||||||
|
that it doesn\'t support user-defined types. `printf` also has safety
|
||||||
|
issues although they are somewhat mitigated with [\_\_attribute\_\_
|
||||||
|
((format (printf,
|
||||||
|
\...))](https://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html) in
|
||||||
|
GCC. There is a POSIX extension that adds positional arguments required
|
||||||
|
for
|
||||||
|
[i18n](https://en.wikipedia.org/wiki/Internationalization_and_localization)
|
||||||
|
to `printf` but it is not a part of C99 and may not be available on some
|
||||||
|
platforms.
|
||||||
|
|
||||||
|
## iostreams
|
||||||
|
|
||||||
|
The main issue with iostreams is best illustrated with an example:
|
||||||
|
|
||||||
|
``` c++
|
||||||
|
std::cout << std::setprecision(2) << std::fixed << 1.23456 << "\n";
|
||||||
|
```
|
||||||
|
|
||||||
|
which is a lot of typing compared to printf:
|
||||||
|
|
||||||
|
``` c++
|
||||||
|
printf("%.2f\n", 1.23456);
|
||||||
|
```
|
||||||
|
|
||||||
|
Matthew Wilson, the author of FastFormat, called this \"chevron hell\".
|
||||||
|
iostreams don\'t support positional arguments by design.
|
||||||
|
|
||||||
|
The good part is that iostreams support user-defined types and are safe
|
||||||
|
although error handling is awkward.
|
||||||
|
|
||||||
|
## Boost Format
|
||||||
|
|
||||||
|
This is a very powerful library that supports both `printf`-like format
|
||||||
|
strings and positional arguments. Its main drawback is performance.
|
||||||
|
According to various benchmarks, it is much slower than other methods
|
||||||
|
considered here. Boost Format also has excessive build times and severe
|
||||||
|
code bloat issues (see [Benchmarks](#benchmarks)).
|
||||||
|
|
||||||
|
## FastFormat
|
||||||
|
|
||||||
|
This is an interesting library that is fast, safe and has positional
|
||||||
|
arguments. However, it has significant limitations, citing its author:
|
||||||
|
|
||||||
|
> Three features that have no hope of being accommodated within the
|
||||||
|
> current design are:
|
||||||
|
>
|
||||||
|
> - Leading zeros (or any other non-space padding)
|
||||||
|
> - Octal/hexadecimal encoding
|
||||||
|
> - Runtime width/alignment specification
|
||||||
|
|
||||||
|
It is also quite big and has a heavy dependency, on STLSoft, which might be
|
||||||
|
too restrictive for use in some projects.
|
||||||
|
|
||||||
|
## Boost Spirit.Karma
|
||||||
|
|
||||||
|
This is not a formatting library but I decided to include it here for
|
||||||
|
completeness. As iostreams, it suffers from the problem of mixing
|
||||||
|
verbatim text with arguments. The library is pretty fast, but slower on
|
||||||
|
integer formatting than `fmt::format_to` with format string compilation
|
||||||
|
on Karma\'s own benchmark, see [Converting a hundred million integers to
|
||||||
|
strings per
|
||||||
|
second](http://www.zverovich.net/2020/06/13/fast-int-to-string-revisited.html).
|
||||||
|
|
||||||
|
# License
|
||||||
|
|
||||||
|
{fmt} is distributed under the MIT
|
||||||
|
[license](https://github.com/fmtlib/fmt/blob/master/LICENSE).
|
||||||
|
|
||||||
|
# Documentation License
|
||||||
|
|
||||||
|
The [Format String Syntax](https://fmt.dev/latest/syntax/) section
|
||||||
|
in the documentation is based on the one from Python [string module
|
||||||
|
documentation](https://docs.python.org/3/library/string.html#module-string).
|
||||||
|
For this reason, the documentation is distributed under the Python
|
||||||
|
Software Foundation license available in
|
||||||
|
[doc/python-license.txt](https://raw.github.com/fmtlib/fmt/master/doc/python-license.txt).
|
||||||
|
It only applies if you distribute the documentation of {fmt}.
|
||||||
|
|
||||||
|
# Maintainers
|
||||||
|
|
||||||
|
The {fmt} library is maintained by Victor Zverovich
|
||||||
|
([vitaut](https://github.com/vitaut)) with contributions from many other
|
||||||
|
people. See
|
||||||
|
[Contributors](https://github.com/fmtlib/fmt/graphs/contributors) and
|
||||||
|
[Releases](https://github.com/fmtlib/fmt/releases) for some of the
|
||||||
|
names. Let us know if your contribution is not listed or mentioned
|
||||||
|
incorrectly and we\'ll make it right.
|
||||||
|
|
||||||
|
# Security Policy
|
||||||
|
|
||||||
|
To report a security issue, please disclose it at [security
|
||||||
|
advisory](https://github.com/fmtlib/fmt/security/advisories/new).
|
||||||
|
|
||||||
|
This project is maintained by a team of volunteers on a
|
||||||
|
reasonable-effort basis. As such, please give us at least *90* days to
|
||||||
|
work on a fix before public exposure.
|
|
@ -1,545 +0,0 @@
|
||||||
.. image:: https://user-images.githubusercontent.com/
|
|
||||||
576385/156254208-f5b743a9-88cf-439d-b0c0-923d53e8d551.png
|
|
||||||
:width: 25%
|
|
||||||
:alt: {fmt}
|
|
||||||
|
|
||||||
.. image:: https://github.com/fmtlib/fmt/workflows/linux/badge.svg
|
|
||||||
:target: https://github.com/fmtlib/fmt/actions?query=workflow%3Alinux
|
|
||||||
|
|
||||||
.. image:: https://github.com/fmtlib/fmt/workflows/macos/badge.svg
|
|
||||||
:target: https://github.com/fmtlib/fmt/actions?query=workflow%3Amacos
|
|
||||||
|
|
||||||
.. image:: https://github.com/fmtlib/fmt/workflows/windows/badge.svg
|
|
||||||
:target: https://github.com/fmtlib/fmt/actions?query=workflow%3Awindows
|
|
||||||
|
|
||||||
.. image:: https://oss-fuzz-build-logs.storage.googleapis.com/badges/fmt.svg
|
|
||||||
:alt: fmt is continuously fuzzed at oss-fuzz
|
|
||||||
:target: https://bugs.chromium.org/p/oss-fuzz/issues/list?\
|
|
||||||
colspec=ID%20Type%20Component%20Status%20Proj%20Reported%20Owner%20\
|
|
||||||
Summary&q=proj%3Dfmt&can=1
|
|
||||||
|
|
||||||
.. image:: https://img.shields.io/badge/stackoverflow-fmt-blue.svg
|
|
||||||
:alt: Ask questions at StackOverflow with the tag fmt
|
|
||||||
:target: https://stackoverflow.com/questions/tagged/fmt
|
|
||||||
|
|
||||||
.. image:: https://api.securityscorecards.dev/projects/github.com/fmtlib/fmt/badge
|
|
||||||
:target: https://securityscorecards.dev/viewer/?uri=github.com/fmtlib/fmt
|
|
||||||
|
|
||||||
**{fmt}** is an open-source formatting library providing a fast and safe
|
|
||||||
alternative to C stdio and C++ iostreams.
|
|
||||||
|
|
||||||
If you like this project, please consider donating to one of the funds that
|
|
||||||
help victims of the war in Ukraine: https://www.stopputin.net/.
|
|
||||||
|
|
||||||
`Documentation <https://fmt.dev>`__
|
|
||||||
|
|
||||||
`Cheat Sheets <https://hackingcpp.com/cpp/libs/fmt.html>`__
|
|
||||||
|
|
||||||
Q&A: ask questions on `StackOverflow with the tag fmt
|
|
||||||
<https://stackoverflow.com/questions/tagged/fmt>`_.
|
|
||||||
|
|
||||||
Try {fmt} in `Compiler Explorer <https://godbolt.org/z/Eq5763>`_.
|
|
||||||
|
|
||||||
Features
|
|
||||||
--------
|
|
||||||
|
|
||||||
* Simple `format API <https://fmt.dev/latest/api.html>`_ with positional arguments
|
|
||||||
for localization
|
|
||||||
* Implementation of `C++20 std::format
|
|
||||||
<https://en.cppreference.com/w/cpp/utility/format>`__
|
|
||||||
* `Format string syntax <https://fmt.dev/latest/syntax.html>`_ similar to Python's
|
|
||||||
`format <https://docs.python.org/3/library/stdtypes.html#str.format>`_
|
|
||||||
* Fast IEEE 754 floating-point formatter with correct rounding, shortness and
|
|
||||||
round-trip guarantees using the `Dragonbox <https://github.com/jk-jeon/dragonbox>`_
|
|
||||||
algorithm
|
|
||||||
* Portable Unicode support
|
|
||||||
* Safe `printf implementation
|
|
||||||
<https://fmt.dev/latest/api.html#printf-formatting>`_ including the POSIX
|
|
||||||
extension for positional arguments
|
|
||||||
* Extensibility: `support for user-defined types
|
|
||||||
<https://fmt.dev/latest/api.html#formatting-user-defined-types>`_
|
|
||||||
* High performance: faster than common standard library implementations of
|
|
||||||
``(s)printf``, iostreams, ``to_string`` and ``to_chars``, see `Speed tests`_
|
|
||||||
and `Converting a hundred million integers to strings per second
|
|
||||||
<http://www.zverovich.net/2020/06/13/fast-int-to-string-revisited.html>`_
|
|
||||||
* Small code size both in terms of source code with the minimum configuration
|
|
||||||
consisting of just three files, ``core.h``, ``format.h`` and ``format-inl.h``,
|
|
||||||
and compiled code; see `Compile time and code bloat`_
|
|
||||||
* Reliability: the library has an extensive set of `tests
|
|
||||||
<https://github.com/fmtlib/fmt/tree/master/test>`_ and is `continuously fuzzed
|
|
||||||
<https://bugs.chromium.org/p/oss-fuzz/issues/list?colspec=ID%20Type%20
|
|
||||||
Component%20Status%20Proj%20Reported%20Owner%20Summary&q=proj%3Dfmt&can=1>`_
|
|
||||||
* Safety: the library is fully type-safe, errors in format strings can be
|
|
||||||
reported at compile time, automatic memory management prevents buffer overflow
|
|
||||||
errors
|
|
||||||
* Ease of use: small self-contained code base, no external dependencies,
|
|
||||||
permissive MIT `license
|
|
||||||
<https://github.com/fmtlib/fmt/blob/master/LICENSE.rst>`_
|
|
||||||
* `Portability <https://fmt.dev/latest/index.html#portability>`_ with
|
|
||||||
consistent output across platforms and support for older compilers
|
|
||||||
* Clean warning-free codebase even on high warning levels such as
|
|
||||||
``-Wall -Wextra -pedantic``
|
|
||||||
* Locale independence by default
|
|
||||||
* Optional header-only configuration enabled with the ``FMT_HEADER_ONLY`` macro
|
|
||||||
|
|
||||||
See the `documentation <https://fmt.dev>`_ for more details.
|
|
||||||
|
|
||||||
Examples
|
|
||||||
--------
|
|
||||||
|
|
||||||
**Print to stdout** (`run <https://godbolt.org/z/Tevcjh>`_)
|
|
||||||
|
|
||||||
.. code:: c++
|
|
||||||
|
|
||||||
#include <fmt/core.h>
|
|
||||||
|
|
||||||
int main() {
|
|
||||||
fmt::print("Hello, world!\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
**Format a string** (`run <https://godbolt.org/z/oK8h33>`_)
|
|
||||||
|
|
||||||
.. code:: c++
|
|
||||||
|
|
||||||
std::string s = fmt::format("The answer is {}.", 42);
|
|
||||||
// s == "The answer is 42."
|
|
||||||
|
|
||||||
**Format a string using positional arguments** (`run <https://godbolt.org/z/Yn7Txe>`_)
|
|
||||||
|
|
||||||
.. code:: c++
|
|
||||||
|
|
||||||
std::string s = fmt::format("I'd rather be {1} than {0}.", "right", "happy");
|
|
||||||
// s == "I'd rather be happy than right."
|
|
||||||
|
|
||||||
**Print chrono durations** (`run <https://godbolt.org/z/K8s4Mc>`_)
|
|
||||||
|
|
||||||
.. code:: c++
|
|
||||||
|
|
||||||
#include <fmt/chrono.h>
|
|
||||||
|
|
||||||
int main() {
|
|
||||||
using namespace std::literals::chrono_literals;
|
|
||||||
fmt::print("Default format: {} {}\n", 42s, 100ms);
|
|
||||||
fmt::print("strftime-like format: {:%H:%M:%S}\n", 3h + 15min + 30s);
|
|
||||||
}
|
|
||||||
|
|
||||||
Output::
|
|
||||||
|
|
||||||
Default format: 42s 100ms
|
|
||||||
strftime-like format: 03:15:30
|
|
||||||
|
|
||||||
**Print a container** (`run <https://godbolt.org/z/MxM1YqjE7>`_)
|
|
||||||
|
|
||||||
.. code:: c++
|
|
||||||
|
|
||||||
#include <vector>
|
|
||||||
#include <fmt/ranges.h>
|
|
||||||
|
|
||||||
int main() {
|
|
||||||
std::vector<int> v = {1, 2, 3};
|
|
||||||
fmt::print("{}\n", v);
|
|
||||||
}
|
|
||||||
|
|
||||||
Output::
|
|
||||||
|
|
||||||
[1, 2, 3]
|
|
||||||
|
|
||||||
**Check a format string at compile time**
|
|
||||||
|
|
||||||
.. code:: c++
|
|
||||||
|
|
||||||
std::string s = fmt::format("{:d}", "I am not a number");
|
|
||||||
|
|
||||||
This gives a compile-time error in C++20 because ``d`` is an invalid format
|
|
||||||
specifier for a string.
|
|
||||||
|
|
||||||
**Write a file from a single thread**
|
|
||||||
|
|
||||||
.. code:: c++
|
|
||||||
|
|
||||||
#include <fmt/os.h>
|
|
||||||
|
|
||||||
int main() {
|
|
||||||
auto out = fmt::output_file("guide.txt");
|
|
||||||
out.print("Don't {}", "Panic");
|
|
||||||
}
|
|
||||||
|
|
||||||
This can be `5 to 9 times faster than fprintf
|
|
||||||
<http://www.zverovich.net/2020/08/04/optimal-file-buffer-size.html>`_.
|
|
||||||
|
|
||||||
**Print with colors and text styles**
|
|
||||||
|
|
||||||
.. code:: c++
|
|
||||||
|
|
||||||
#include <fmt/color.h>
|
|
||||||
|
|
||||||
int main() {
|
|
||||||
fmt::print(fg(fmt::color::crimson) | fmt::emphasis::bold,
|
|
||||||
"Hello, {}!\n", "world");
|
|
||||||
fmt::print(fg(fmt::color::floral_white) | bg(fmt::color::slate_gray) |
|
|
||||||
fmt::emphasis::underline, "Hello, {}!\n", "мир");
|
|
||||||
fmt::print(fg(fmt::color::steel_blue) | fmt::emphasis::italic,
|
|
||||||
"Hello, {}!\n", "世界");
|
|
||||||
}
|
|
||||||
|
|
||||||
Output on a modern terminal:
|
|
||||||
|
|
||||||
.. image:: https://user-images.githubusercontent.com/
|
|
||||||
576385/88485597-d312f600-cf2b-11ea-9cbe-61f535a86e28.png
|
|
||||||
|
|
||||||
Benchmarks
|
|
||||||
----------
|
|
||||||
|
|
||||||
Speed tests
|
|
||||||
~~~~~~~~~~~
|
|
||||||
|
|
||||||
================= ============= ===========
|
|
||||||
Library Method Run Time, s
|
|
||||||
================= ============= ===========
|
|
||||||
libc printf 0.91
|
|
||||||
libc++ std::ostream 2.49
|
|
||||||
{fmt} 9.1 fmt::print 0.74
|
|
||||||
Boost Format 1.80 boost::format 6.26
|
|
||||||
Folly Format folly::format 1.87
|
|
||||||
================= ============= ===========
|
|
||||||
|
|
||||||
{fmt} is the fastest of the benchmarked methods, ~20% faster than ``printf``.
|
|
||||||
|
|
||||||
The above results were generated by building ``tinyformat_test.cpp`` on macOS
|
|
||||||
12.6.1 with ``clang++ -O3 -DNDEBUG -DSPEED_TEST -DHAVE_FORMAT``, and taking the
|
|
||||||
best of three runs. In the test, the format string ``"%0.10f:%04d:%+g:%s:%p:%c:%%\n"``
|
|
||||||
or equivalent is filled 2,000,000 times with output sent to ``/dev/null``; for
|
|
||||||
further details refer to the `source
|
|
||||||
<https://github.com/fmtlib/format-benchmark/blob/master/src/tinyformat-test.cc>`_.
|
|
||||||
|
|
||||||
{fmt} is up to 20-30x faster than ``std::ostringstream`` and ``sprintf`` on
|
|
||||||
IEEE754 ``float`` and ``double`` formatting (`dtoa-benchmark <https://github.com/fmtlib/dtoa-benchmark>`_)
|
|
||||||
and faster than `double-conversion <https://github.com/google/double-conversion>`_ and
|
|
||||||
`ryu <https://github.com/ulfjack/ryu>`_:
|
|
||||||
|
|
||||||
.. image:: https://user-images.githubusercontent.com/576385/
|
|
||||||
95684665-11719600-0ba8-11eb-8e5b-972ff4e49428.png
|
|
||||||
:target: https://fmt.dev/unknown_mac64_clang12.0.html
|
|
||||||
|
|
||||||
Compile time and code bloat
|
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
The script `bloat-test.py
|
|
||||||
<https://github.com/fmtlib/format-benchmark/blob/master/bloat-test.py>`_
|
|
||||||
from `format-benchmark <https://github.com/fmtlib/format-benchmark>`_
|
|
||||||
tests compile time and code bloat for nontrivial projects.
|
|
||||||
It generates 100 translation units and uses ``printf()`` or its alternative
|
|
||||||
five times in each to simulate a medium-sized project. The resulting
|
|
||||||
executable size and compile time (Apple LLVM version 8.1.0 (clang-802.0.42),
|
|
||||||
macOS Sierra, best of three) is shown in the following tables.
|
|
||||||
|
|
||||||
**Optimized build (-O3)**
|
|
||||||
|
|
||||||
============= =============== ==================== ==================
|
|
||||||
Method Compile Time, s Executable size, KiB Stripped size, KiB
|
|
||||||
============= =============== ==================== ==================
|
|
||||||
printf 2.6 29 26
|
|
||||||
printf+string 16.4 29 26
|
|
||||||
iostreams 31.1 59 55
|
|
||||||
{fmt} 19.0 37 34
|
|
||||||
Boost Format 91.9 226 203
|
|
||||||
Folly Format 115.7 101 88
|
|
||||||
============= =============== ==================== ==================
|
|
||||||
|
|
||||||
As you can see, {fmt} has 60% less overhead in terms of resulting binary code
|
|
||||||
size compared to iostreams and comes pretty close to ``printf``. Boost Format
|
|
||||||
and Folly Format have the largest overheads.
|
|
||||||
|
|
||||||
``printf+string`` is the same as ``printf`` but with an extra ``<string>``
|
|
||||||
include to measure the overhead of the latter.
|
|
||||||
|
|
||||||
**Non-optimized build**
|
|
||||||
|
|
||||||
============= =============== ==================== ==================
|
|
||||||
Method Compile Time, s Executable size, KiB Stripped size, KiB
|
|
||||||
============= =============== ==================== ==================
|
|
||||||
printf 2.2 33 30
|
|
||||||
printf+string 16.0 33 30
|
|
||||||
iostreams 28.3 56 52
|
|
||||||
{fmt} 18.2 59 50
|
|
||||||
Boost Format 54.1 365 303
|
|
||||||
Folly Format 79.9 445 430
|
|
||||||
============= =============== ==================== ==================
|
|
||||||
|
|
||||||
``libc``, ``lib(std)c++``, and ``libfmt`` are all linked as shared libraries to
|
|
||||||
compare formatting function overhead only. Boost Format is a
|
|
||||||
header-only library so it doesn't provide any linkage options.
|
|
||||||
|
|
||||||
Running the tests
|
|
||||||
~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
Please refer to `Building the library`__ for instructions on how to build
|
|
||||||
the library and run the unit tests.
|
|
||||||
|
|
||||||
__ https://fmt.dev/latest/usage.html#building-the-library
|
|
||||||
|
|
||||||
Benchmarks reside in a separate repository,
|
|
||||||
`format-benchmarks <https://github.com/fmtlib/format-benchmark>`_,
|
|
||||||
so to run the benchmarks you first need to clone this repository and
|
|
||||||
generate Makefiles with CMake::
|
|
||||||
|
|
||||||
$ git clone --recursive https://github.com/fmtlib/format-benchmark.git
|
|
||||||
$ cd format-benchmark
|
|
||||||
$ cmake .
|
|
||||||
|
|
||||||
Then you can run the speed test::
|
|
||||||
|
|
||||||
$ make speed-test
|
|
||||||
|
|
||||||
or the bloat test::
|
|
||||||
|
|
||||||
$ make bloat-test
|
|
||||||
|
|
||||||
Migrating code
|
|
||||||
--------------
|
|
||||||
|
|
||||||
`clang-tidy <https://clang.llvm.org/extra/clang-tidy/>`_ v17 (not yet
|
|
||||||
released) provides the `modernize-use-std-print
|
|
||||||
<https://clang.llvm.org/extra/clang-tidy/checks/modernize/use-std-print.html>`_
|
|
||||||
check that is capable of converting occurrences of ``printf`` and
|
|
||||||
``fprintf`` to ``fmt::print`` if configured to do so. (By default it
|
|
||||||
converts to ``std::print``.)
|
|
||||||
|
|
||||||
Projects using this library
|
|
||||||
---------------------------
|
|
||||||
|
|
||||||
* `0 A.D. <https://play0ad.com/>`_: a free, open-source, cross-platform
|
|
||||||
real-time strategy game
|
|
||||||
|
|
||||||
* `AMPL/MP <https://github.com/ampl/mp>`_:
|
|
||||||
an open-source library for mathematical programming
|
|
||||||
|
|
||||||
* `Aseprite <https://github.com/aseprite/aseprite>`_:
|
|
||||||
animated sprite editor & pixel art tool
|
|
||||||
|
|
||||||
* `AvioBook <https://www.aviobook.aero/en>`_: a comprehensive aircraft
|
|
||||||
operations suite
|
|
||||||
|
|
||||||
* `Blizzard Battle.net <https://battle.net/>`_: an online gaming platform
|
|
||||||
|
|
||||||
* `Celestia <https://celestia.space/>`_: real-time 3D visualization of space
|
|
||||||
|
|
||||||
* `Ceph <https://ceph.com/>`_: a scalable distributed storage system
|
|
||||||
|
|
||||||
* `ccache <https://ccache.dev/>`_: a compiler cache
|
|
||||||
|
|
||||||
* `ClickHouse <https://github.com/ClickHouse/ClickHouse>`_: an analytical database
|
|
||||||
management system
|
|
||||||
|
|
||||||
* `Contour <https://github.com/contour-terminal/contour/>`_: a modern terminal emulator
|
|
||||||
|
|
||||||
* `CUAUV <https://cuauv.org/>`_: Cornell University's autonomous underwater
|
|
||||||
vehicle
|
|
||||||
|
|
||||||
* `Drake <https://drake.mit.edu/>`_: a planning, control, and analysis toolbox
|
|
||||||
for nonlinear dynamical systems (MIT)
|
|
||||||
|
|
||||||
* `Envoy <https://lyft.github.io/envoy/>`_: C++ L7 proxy and communication bus
|
|
||||||
(Lyft)
|
|
||||||
|
|
||||||
* `FiveM <https://fivem.net/>`_: a modification framework for GTA V
|
|
||||||
|
|
||||||
* `fmtlog <https://github.com/MengRao/fmtlog>`_: a performant fmtlib-style
|
|
||||||
logging library with latency in nanoseconds
|
|
||||||
|
|
||||||
* `Folly <https://github.com/facebook/folly>`_: Facebook open-source library
|
|
||||||
|
|
||||||
* `GemRB <https://gemrb.org/>`_: a portable open-source implementation of
|
|
||||||
Bioware’s Infinity Engine
|
|
||||||
|
|
||||||
* `Grand Mountain Adventure
|
|
||||||
<https://store.steampowered.com/app/1247360/Grand_Mountain_Adventure/>`_:
|
|
||||||
a beautiful open-world ski & snowboarding game
|
|
||||||
|
|
||||||
* `HarpyWar/pvpgn <https://github.com/pvpgn/pvpgn-server>`_:
|
|
||||||
Player vs Player Gaming Network with tweaks
|
|
||||||
|
|
||||||
* `KBEngine <https://github.com/kbengine/kbengine>`_: an open-source MMOG server
|
|
||||||
engine
|
|
||||||
|
|
||||||
* `Keypirinha <https://keypirinha.com/>`_: a semantic launcher for Windows
|
|
||||||
|
|
||||||
* `Kodi <https://kodi.tv/>`_ (formerly xbmc): home theater software
|
|
||||||
|
|
||||||
* `Knuth <https://kth.cash/>`_: high-performance Bitcoin full-node
|
|
||||||
|
|
||||||
* `libunicode <https://github.com/contour-terminal/libunicode/>`_: a modern C++17 Unicode library
|
|
||||||
|
|
||||||
* `MariaDB <https://mariadb.org/>`_: relational database management system
|
|
||||||
|
|
||||||
* `Microsoft Verona <https://github.com/microsoft/verona>`_:
|
|
||||||
research programming language for concurrent ownership
|
|
||||||
|
|
||||||
* `MongoDB <https://mongodb.com/>`_: distributed document database
|
|
||||||
|
|
||||||
* `MongoDB Smasher <https://github.com/duckie/mongo_smasher>`_: a small tool to
|
|
||||||
generate randomized datasets
|
|
||||||
|
|
||||||
* `OpenSpace <https://openspaceproject.com/>`_: an open-source
|
|
||||||
astrovisualization framework
|
|
||||||
|
|
||||||
* `PenUltima Online (POL) <https://www.polserver.com/>`_:
|
|
||||||
an MMO server, compatible with most Ultima Online clients
|
|
||||||
|
|
||||||
* `PyTorch <https://github.com/pytorch/pytorch>`_: an open-source machine
|
|
||||||
learning library
|
|
||||||
|
|
||||||
* `quasardb <https://www.quasardb.net/>`_: a distributed, high-performance,
|
|
||||||
associative database
|
|
||||||
|
|
||||||
* `Quill <https://github.com/odygrd/quill>`_: asynchronous low-latency logging library
|
|
||||||
|
|
||||||
* `QKW <https://github.com/ravijanjam/qkw>`_: generalizing aliasing to simplify
|
|
||||||
navigation, and executing complex multi-line terminal command sequences
|
|
||||||
|
|
||||||
* `redis-cerberus <https://github.com/HunanTV/redis-cerberus>`_: a Redis cluster
|
|
||||||
proxy
|
|
||||||
|
|
||||||
* `redpanda <https://vectorized.io/redpanda>`_: a 10x faster Kafka® replacement
|
|
||||||
for mission-critical systems written in C++
|
|
||||||
|
|
||||||
* `rpclib <http://rpclib.net/>`_: a modern C++ msgpack-RPC server and client
|
|
||||||
library
|
|
||||||
|
|
||||||
* `Salesforce Analytics Cloud
|
|
||||||
<https://www.salesforce.com/analytics-cloud/overview/>`_:
|
|
||||||
business intelligence software
|
|
||||||
|
|
||||||
* `Scylla <https://www.scylladb.com/>`_: a Cassandra-compatible NoSQL data store
|
|
||||||
that can handle 1 million transactions per second on a single server
|
|
||||||
|
|
||||||
* `Seastar <http://www.seastar-project.org/>`_: an advanced, open-source C++
|
|
||||||
framework for high-performance server applications on modern hardware
|
|
||||||
|
|
||||||
* `spdlog <https://github.com/gabime/spdlog>`_: super fast C++ logging library
|
|
||||||
|
|
||||||
* `Stellar <https://www.stellar.org/>`_: financial platform
|
|
||||||
|
|
||||||
* `Touch Surgery <https://www.touchsurgery.com/>`_: surgery simulator
|
|
||||||
|
|
||||||
* `TrinityCore <https://github.com/TrinityCore/TrinityCore>`_: open-source
|
|
||||||
MMORPG framework
|
|
||||||
|
|
||||||
* `🐙 userver framework <https://userver.tech/>`_: open-source asynchronous
|
|
||||||
framework with a rich set of abstractions and database drivers
|
|
||||||
|
|
||||||
* `Windows Terminal <https://github.com/microsoft/terminal>`_: the new Windows
|
|
||||||
terminal
|
|
||||||
|
|
||||||
`More... <https://github.com/search?q=fmtlib&type=Code>`_
|
|
||||||
|
|
||||||
If you are aware of other projects using this library, please let me know
|
|
||||||
by `email <mailto:victor.zverovich@gmail.com>`_ or by submitting an
|
|
||||||
`issue <https://github.com/fmtlib/fmt/issues>`_.
|
|
||||||
|
|
||||||
Motivation
|
|
||||||
----------
|
|
||||||
|
|
||||||
So why yet another formatting library?
|
|
||||||
|
|
||||||
There are plenty of methods for doing this task, from standard ones like
|
|
||||||
the printf family of function and iostreams to Boost Format and FastFormat
|
|
||||||
libraries. The reason for creating a new library is that every existing
|
|
||||||
solution that I found either had serious issues or didn't provide
|
|
||||||
all the features I needed.
|
|
||||||
|
|
||||||
printf
|
|
||||||
~~~~~~
|
|
||||||
|
|
||||||
The good thing about ``printf`` is that it is pretty fast and readily available
|
|
||||||
being a part of the C standard library. The main drawback is that it
|
|
||||||
doesn't support user-defined types. ``printf`` also has safety issues although
|
|
||||||
they are somewhat mitigated with `__attribute__ ((format (printf, ...))
|
|
||||||
<https://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html>`_ in GCC.
|
|
||||||
There is a POSIX extension that adds positional arguments required for
|
|
||||||
`i18n <https://en.wikipedia.org/wiki/Internationalization_and_localization>`_
|
|
||||||
to ``printf`` but it is not a part of C99 and may not be available on some
|
|
||||||
platforms.
|
|
||||||
|
|
||||||
iostreams
|
|
||||||
~~~~~~~~~
|
|
||||||
|
|
||||||
The main issue with iostreams is best illustrated with an example:
|
|
||||||
|
|
||||||
.. code:: c++
|
|
||||||
|
|
||||||
std::cout << std::setprecision(2) << std::fixed << 1.23456 << "\n";
|
|
||||||
|
|
||||||
which is a lot of typing compared to printf:
|
|
||||||
|
|
||||||
.. code:: c++
|
|
||||||
|
|
||||||
printf("%.2f\n", 1.23456);
|
|
||||||
|
|
||||||
Matthew Wilson, the author of FastFormat, called this "chevron hell". iostreams
|
|
||||||
don't support positional arguments by design.
|
|
||||||
|
|
||||||
The good part is that iostreams support user-defined types and are safe although
|
|
||||||
error handling is awkward.
|
|
||||||
|
|
||||||
Boost Format
|
|
||||||
~~~~~~~~~~~~
|
|
||||||
|
|
||||||
This is a very powerful library that supports both ``printf``-like format
|
|
||||||
strings and positional arguments. Its main drawback is performance. According to
|
|
||||||
various benchmarks, it is much slower than other methods considered here. Boost
|
|
||||||
Format also has excessive build times and severe code bloat issues (see
|
|
||||||
`Benchmarks`_).
|
|
||||||
|
|
||||||
FastFormat
|
|
||||||
~~~~~~~~~~
|
|
||||||
|
|
||||||
This is an interesting library that is fast, safe, and has positional arguments.
|
|
||||||
However, it has significant limitations, citing its author:
|
|
||||||
|
|
||||||
Three features that have no hope of being accommodated within the
|
|
||||||
current design are:
|
|
||||||
|
|
||||||
* Leading zeros (or any other non-space padding)
|
|
||||||
* Octal/hexadecimal encoding
|
|
||||||
* Runtime width/alignment specification
|
|
||||||
|
|
||||||
It is also quite big and has a heavy dependency, STLSoft, which might be too
|
|
||||||
restrictive for using it in some projects.
|
|
||||||
|
|
||||||
Boost Spirit.Karma
|
|
||||||
~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
This is not a formatting library but I decided to include it here for
|
|
||||||
completeness. As iostreams, it suffers from the problem of mixing verbatim text
|
|
||||||
with arguments. The library is pretty fast, but slower on integer formatting
|
|
||||||
than ``fmt::format_to`` with format string compilation on Karma's own benchmark,
|
|
||||||
see `Converting a hundred million integers to strings per second
|
|
||||||
<http://www.zverovich.net/2020/06/13/fast-int-to-string-revisited.html>`_.
|
|
||||||
|
|
||||||
License
|
|
||||||
-------
|
|
||||||
|
|
||||||
{fmt} is distributed under the MIT `license
|
|
||||||
<https://github.com/fmtlib/fmt/blob/master/LICENSE.rst>`_.
|
|
||||||
|
|
||||||
Documentation License
|
|
||||||
---------------------
|
|
||||||
|
|
||||||
The `Format String Syntax <https://fmt.dev/latest/syntax.html>`_
|
|
||||||
section in the documentation is based on the one from Python `string module
|
|
||||||
documentation <https://docs.python.org/3/library/string.html#module-string>`_.
|
|
||||||
For this reason, the documentation is distributed under the Python Software
|
|
||||||
Foundation license available in `doc/python-license.txt
|
|
||||||
<https://raw.github.com/fmtlib/fmt/master/doc/python-license.txt>`_.
|
|
||||||
It only applies if you distribute the documentation of {fmt}.
|
|
||||||
|
|
||||||
Maintainers
|
|
||||||
-----------
|
|
||||||
|
|
||||||
The {fmt} library is maintained by Victor Zverovich (`vitaut
|
|
||||||
<https://github.com/vitaut>`_) with contributions from many other people.
|
|
||||||
See `Contributors <https://github.com/fmtlib/fmt/graphs/contributors>`_ and
|
|
||||||
`Releases <https://github.com/fmtlib/fmt/releases>`_ for some of the names.
|
|
||||||
Let us know if your contribution is not listed or mentioned incorrectly and
|
|
||||||
we'll make it right.
|
|
|
@ -10,6 +10,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="include\fmt\args.h" />
|
<ClInclude Include="include\fmt\args.h" />
|
||||||
|
<ClInclude Include="include\fmt\base.h" />
|
||||||
<ClInclude Include="include\fmt\chrono.h" />
|
<ClInclude Include="include\fmt\chrono.h" />
|
||||||
<ClInclude Include="include\fmt\color.h" />
|
<ClInclude Include="include\fmt\color.h" />
|
||||||
<ClInclude Include="include\fmt\compile.h" />
|
<ClInclude Include="include\fmt\compile.h" />
|
||||||
|
|
|
@ -18,5 +18,6 @@
|
||||||
<ClInclude Include="include\fmt\args.h" />
|
<ClInclude Include="include\fmt\args.h" />
|
||||||
<ClInclude Include="include\fmt\chrono.h" />
|
<ClInclude Include="include\fmt\chrono.h" />
|
||||||
<ClInclude Include="include\fmt\color.h" />
|
<ClInclude Include="include\fmt\color.h" />
|
||||||
|
<ClInclude Include="include\fmt\base.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
|
@ -8,11 +8,13 @@
|
||||||
#ifndef FMT_ARGS_H_
|
#ifndef FMT_ARGS_H_
|
||||||
#define FMT_ARGS_H_
|
#define FMT_ARGS_H_
|
||||||
|
|
||||||
#include <functional> // std::reference_wrapper
|
#ifndef FMT_MODULE
|
||||||
#include <memory> // std::unique_ptr
|
# include <functional> // std::reference_wrapper
|
||||||
#include <vector>
|
# include <memory> // std::unique_ptr
|
||||||
|
# include <vector>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "core.h"
|
#include "format.h" // std_string_view
|
||||||
|
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
@ -22,20 +24,24 @@ template <typename T> struct is_reference_wrapper : std::false_type {};
|
||||||
template <typename T>
|
template <typename T>
|
||||||
struct is_reference_wrapper<std::reference_wrapper<T>> : std::true_type {};
|
struct is_reference_wrapper<std::reference_wrapper<T>> : std::true_type {};
|
||||||
|
|
||||||
template <typename T> const T& unwrap(const T& v) { return v; }
|
template <typename T> auto unwrap(const T& v) -> const T& { return v; }
|
||||||
template <typename T> const T& unwrap(const std::reference_wrapper<T>& v) {
|
template <typename T>
|
||||||
|
auto unwrap(const std::reference_wrapper<T>& v) -> const T& {
|
||||||
return static_cast<const T&>(v);
|
return static_cast<const T&>(v);
|
||||||
}
|
}
|
||||||
|
|
||||||
class dynamic_arg_list {
|
// node is defined outside dynamic_arg_list to workaround a C2504 bug in MSVC
|
||||||
// Workaround for clang's -Wweak-vtables. Unlike for regular classes, for
|
// 2022 (v17.10.0).
|
||||||
// templates it doesn't complain about inability to deduce single translation
|
//
|
||||||
// unit for placing vtable. So storage_node_base is made a fake template.
|
// Workaround for clang's -Wweak-vtables. Unlike for regular classes, for
|
||||||
template <typename = void> struct node {
|
// templates it doesn't complain about inability to deduce single translation
|
||||||
virtual ~node() = default;
|
// unit for placing vtable. So node is made a fake template.
|
||||||
std::unique_ptr<node<>> next;
|
template <typename = void> struct node {
|
||||||
};
|
virtual ~node() = default;
|
||||||
|
std::unique_ptr<node<>> next;
|
||||||
|
};
|
||||||
|
|
||||||
|
class dynamic_arg_list {
|
||||||
template <typename T> struct typed_node : node<> {
|
template <typename T> struct typed_node : node<> {
|
||||||
T value;
|
T value;
|
||||||
|
|
||||||
|
@ -50,7 +56,7 @@ class dynamic_arg_list {
|
||||||
std::unique_ptr<node<>> head_;
|
std::unique_ptr<node<>> head_;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
template <typename T, typename Arg> const T& push(const Arg& arg) {
|
template <typename T, typename Arg> auto push(const Arg& arg) -> const T& {
|
||||||
auto new_node = std::unique_ptr<typed_node<T>>(new typed_node<T>(arg));
|
auto new_node = std::unique_ptr<typed_node<T>>(new typed_node<T>(arg));
|
||||||
auto& value = new_node->value;
|
auto& value = new_node->value;
|
||||||
new_node->next = std::move(head_);
|
new_node->next = std::move(head_);
|
||||||
|
@ -61,14 +67,10 @@ class dynamic_arg_list {
|
||||||
} // namespace detail
|
} // namespace detail
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* A dynamic list of formatting arguments with storage.
|
||||||
A dynamic version of `fmt::format_arg_store`.
|
*
|
||||||
It's equipped with a storage to potentially temporary objects which lifetimes
|
* It can be implicitly converted into `fmt::basic_format_args` for passing
|
||||||
could be shorter than the format arguments object.
|
* into type-erased formatting functions such as `fmt::vformat`.
|
||||||
|
|
||||||
It can be implicitly converted into `~fmt::basic_format_args` for passing
|
|
||||||
into type-erased formatting functions such as `~fmt::vformat`.
|
|
||||||
\endrst
|
|
||||||
*/
|
*/
|
||||||
template <typename Context>
|
template <typename Context>
|
||||||
class dynamic_format_arg_store
|
class dynamic_format_arg_store
|
||||||
|
@ -110,14 +112,14 @@ class dynamic_format_arg_store
|
||||||
|
|
||||||
friend class basic_format_args<Context>;
|
friend class basic_format_args<Context>;
|
||||||
|
|
||||||
unsigned long long get_types() const {
|
auto get_types() const -> unsigned long long {
|
||||||
return detail::is_unpacked_bit | data_.size() |
|
return detail::is_unpacked_bit | data_.size() |
|
||||||
(named_info_.empty()
|
(named_info_.empty()
|
||||||
? 0ULL
|
? 0ULL
|
||||||
: static_cast<unsigned long long>(detail::has_named_args_bit));
|
: static_cast<unsigned long long>(detail::has_named_args_bit));
|
||||||
}
|
}
|
||||||
|
|
||||||
const basic_format_arg<Context>* data() const {
|
auto data() const -> const basic_format_arg<Context>* {
|
||||||
return named_info_.empty() ? data_.data() : data_.data() + 1;
|
return named_info_.empty() ? data_.data() : data_.data() + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -146,22 +148,20 @@ class dynamic_format_arg_store
|
||||||
constexpr dynamic_format_arg_store() = default;
|
constexpr dynamic_format_arg_store() = default;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Adds an argument into the dynamic store for later passing to a formatting
|
||||||
Adds an argument into the dynamic store for later passing to a formatting
|
* function.
|
||||||
function.
|
*
|
||||||
|
* Note that custom types and string types (but not string views) are copied
|
||||||
Note that custom types and string types (but not string views) are copied
|
* into the store dynamically allocating memory if necessary.
|
||||||
into the store dynamically allocating memory if necessary.
|
*
|
||||||
|
* **Example**:
|
||||||
**Example**::
|
*
|
||||||
|
* fmt::dynamic_format_arg_store<fmt::format_context> store;
|
||||||
fmt::dynamic_format_arg_store<fmt::format_context> store;
|
* store.push_back(42);
|
||||||
store.push_back(42);
|
* store.push_back("abc");
|
||||||
store.push_back("abc");
|
* store.push_back(1.5f);
|
||||||
store.push_back(1.5f);
|
* std::string result = fmt::vformat("{} and {} and {}", store);
|
||||||
std::string result = fmt::vformat("{} and {} and {}", store);
|
*/
|
||||||
\endrst
|
|
||||||
*/
|
|
||||||
template <typename T> void push_back(const T& arg) {
|
template <typename T> void push_back(const T& arg) {
|
||||||
if (detail::const_check(need_copy<T>::value))
|
if (detail::const_check(need_copy<T>::value))
|
||||||
emplace_arg(dynamic_args_.push<stored_type<T>>(arg));
|
emplace_arg(dynamic_args_.push<stored_type<T>>(arg));
|
||||||
|
@ -170,20 +170,18 @@ class dynamic_format_arg_store
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Adds a reference to the argument into the dynamic store for later passing
|
||||||
Adds a reference to the argument into the dynamic store for later passing to
|
* to a formatting function.
|
||||||
a formatting function.
|
*
|
||||||
|
* **Example**:
|
||||||
**Example**::
|
*
|
||||||
|
* fmt::dynamic_format_arg_store<fmt::format_context> store;
|
||||||
fmt::dynamic_format_arg_store<fmt::format_context> store;
|
* char band[] = "Rolling Stones";
|
||||||
char band[] = "Rolling Stones";
|
* store.push_back(std::cref(band));
|
||||||
store.push_back(std::cref(band));
|
* band[9] = 'c'; // Changing str affects the output.
|
||||||
band[9] = 'c'; // Changing str affects the output.
|
* std::string result = fmt::vformat("{}", store);
|
||||||
std::string result = fmt::vformat("{}", store);
|
* // result == "Rolling Scones"
|
||||||
// result == "Rolling Scones"
|
*/
|
||||||
\endrst
|
|
||||||
*/
|
|
||||||
template <typename T> void push_back(std::reference_wrapper<T> arg) {
|
template <typename T> void push_back(std::reference_wrapper<T> arg) {
|
||||||
static_assert(
|
static_assert(
|
||||||
need_copy<T>::value,
|
need_copy<T>::value,
|
||||||
|
@ -192,10 +190,10 @@ class dynamic_format_arg_store
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Adds named argument into the dynamic store for later passing to a formatting
|
* Adds named argument into the dynamic store for later passing to a
|
||||||
function. ``std::reference_wrapper`` is supported to avoid copying of the
|
* formatting function. `std::reference_wrapper` is supported to avoid
|
||||||
argument. The name is always copied into the store.
|
* copying of the argument. The name is always copied into the store.
|
||||||
*/
|
*/
|
||||||
template <typename T>
|
template <typename T>
|
||||||
void push_back(const detail::named_arg<char_type, T>& arg) {
|
void push_back(const detail::named_arg<char_type, T>& arg) {
|
||||||
const char_type* arg_name =
|
const char_type* arg_name =
|
||||||
|
@ -208,19 +206,15 @@ class dynamic_format_arg_store
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Erase all elements from the store */
|
/// Erase all elements from the store.
|
||||||
void clear() {
|
void clear() {
|
||||||
data_.clear();
|
data_.clear();
|
||||||
named_info_.clear();
|
named_info_.clear();
|
||||||
dynamic_args_ = detail::dynamic_arg_list();
|
dynamic_args_ = detail::dynamic_arg_list();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/// Reserves space to store at least `new_cap` arguments including
|
||||||
\rst
|
/// `new_cap_named` named arguments.
|
||||||
Reserves space to store at least *new_cap* arguments including
|
|
||||||
*new_cap_named* named arguments.
|
|
||||||
\endrst
|
|
||||||
*/
|
|
||||||
void reserve(size_t new_cap, size_t new_cap_named) {
|
void reserve(size_t new_cap, size_t new_cap_named) {
|
||||||
FMT_ASSERT(new_cap >= new_cap_named,
|
FMT_ASSERT(new_cap >= new_cap_named,
|
||||||
"Set of arguments includes set of named arguments");
|
"Set of arguments includes set of named arguments");
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -227,19 +227,19 @@ struct color_type {
|
||||||
};
|
};
|
||||||
} // namespace detail
|
} // namespace detail
|
||||||
|
|
||||||
/** A text style consisting of foreground and background colors and emphasis. */
|
/// A text style consisting of foreground and background colors and emphasis.
|
||||||
class text_style {
|
class text_style {
|
||||||
public:
|
public:
|
||||||
FMT_CONSTEXPR text_style(emphasis em = emphasis()) noexcept
|
FMT_CONSTEXPR text_style(emphasis em = emphasis()) noexcept
|
||||||
: set_foreground_color(), set_background_color(), ems(em) {}
|
: set_foreground_color(), set_background_color(), ems(em) {}
|
||||||
|
|
||||||
FMT_CONSTEXPR text_style& operator|=(const text_style& rhs) {
|
FMT_CONSTEXPR auto operator|=(const text_style& rhs) -> text_style& {
|
||||||
if (!set_foreground_color) {
|
if (!set_foreground_color) {
|
||||||
set_foreground_color = rhs.set_foreground_color;
|
set_foreground_color = rhs.set_foreground_color;
|
||||||
foreground_color = rhs.foreground_color;
|
foreground_color = rhs.foreground_color;
|
||||||
} else if (rhs.set_foreground_color) {
|
} else if (rhs.set_foreground_color) {
|
||||||
if (!foreground_color.is_rgb || !rhs.foreground_color.is_rgb)
|
if (!foreground_color.is_rgb || !rhs.foreground_color.is_rgb)
|
||||||
FMT_THROW(format_error("can't OR a terminal color"));
|
report_error("can't OR a terminal color");
|
||||||
foreground_color.value.rgb_color |= rhs.foreground_color.value.rgb_color;
|
foreground_color.value.rgb_color |= rhs.foreground_color.value.rgb_color;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -248,7 +248,7 @@ class text_style {
|
||||||
background_color = rhs.background_color;
|
background_color = rhs.background_color;
|
||||||
} else if (rhs.set_background_color) {
|
} else if (rhs.set_background_color) {
|
||||||
if (!background_color.is_rgb || !rhs.background_color.is_rgb)
|
if (!background_color.is_rgb || !rhs.background_color.is_rgb)
|
||||||
FMT_THROW(format_error("can't OR a terminal color"));
|
report_error("can't OR a terminal color");
|
||||||
background_color.value.rgb_color |= rhs.background_color.value.rgb_color;
|
background_color.value.rgb_color |= rhs.background_color.value.rgb_color;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -257,29 +257,29 @@ class text_style {
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
friend FMT_CONSTEXPR text_style operator|(text_style lhs,
|
friend FMT_CONSTEXPR auto operator|(text_style lhs, const text_style& rhs)
|
||||||
const text_style& rhs) {
|
-> text_style {
|
||||||
return lhs |= rhs;
|
return lhs |= rhs;
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_CONSTEXPR bool has_foreground() const noexcept {
|
FMT_CONSTEXPR auto has_foreground() const noexcept -> bool {
|
||||||
return set_foreground_color;
|
return set_foreground_color;
|
||||||
}
|
}
|
||||||
FMT_CONSTEXPR bool has_background() const noexcept {
|
FMT_CONSTEXPR auto has_background() const noexcept -> bool {
|
||||||
return set_background_color;
|
return set_background_color;
|
||||||
}
|
}
|
||||||
FMT_CONSTEXPR bool has_emphasis() const noexcept {
|
FMT_CONSTEXPR auto has_emphasis() const noexcept -> bool {
|
||||||
return static_cast<uint8_t>(ems) != 0;
|
return static_cast<uint8_t>(ems) != 0;
|
||||||
}
|
}
|
||||||
FMT_CONSTEXPR detail::color_type get_foreground() const noexcept {
|
FMT_CONSTEXPR auto get_foreground() const noexcept -> detail::color_type {
|
||||||
FMT_ASSERT(has_foreground(), "no foreground specified for this style");
|
FMT_ASSERT(has_foreground(), "no foreground specified for this style");
|
||||||
return foreground_color;
|
return foreground_color;
|
||||||
}
|
}
|
||||||
FMT_CONSTEXPR detail::color_type get_background() const noexcept {
|
FMT_CONSTEXPR auto get_background() const noexcept -> detail::color_type {
|
||||||
FMT_ASSERT(has_background(), "no background specified for this style");
|
FMT_ASSERT(has_background(), "no background specified for this style");
|
||||||
return background_color;
|
return background_color;
|
||||||
}
|
}
|
||||||
FMT_CONSTEXPR emphasis get_emphasis() const noexcept {
|
FMT_CONSTEXPR auto get_emphasis() const noexcept -> emphasis {
|
||||||
FMT_ASSERT(has_emphasis(), "no emphasis specified for this style");
|
FMT_ASSERT(has_emphasis(), "no emphasis specified for this style");
|
||||||
return ems;
|
return ems;
|
||||||
}
|
}
|
||||||
|
@ -297,9 +297,11 @@ class text_style {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
friend FMT_CONSTEXPR text_style fg(detail::color_type foreground) noexcept;
|
friend FMT_CONSTEXPR auto fg(detail::color_type foreground) noexcept
|
||||||
|
-> text_style;
|
||||||
|
|
||||||
friend FMT_CONSTEXPR text_style bg(detail::color_type background) noexcept;
|
friend FMT_CONSTEXPR auto bg(detail::color_type background) noexcept
|
||||||
|
-> text_style;
|
||||||
|
|
||||||
detail::color_type foreground_color;
|
detail::color_type foreground_color;
|
||||||
detail::color_type background_color;
|
detail::color_type background_color;
|
||||||
|
@ -308,17 +310,20 @@ class text_style {
|
||||||
emphasis ems;
|
emphasis ems;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Creates a text style from the foreground (text) color. */
|
/// Creates a text style from the foreground (text) color.
|
||||||
FMT_CONSTEXPR inline text_style fg(detail::color_type foreground) noexcept {
|
FMT_CONSTEXPR inline auto fg(detail::color_type foreground) noexcept
|
||||||
|
-> text_style {
|
||||||
return text_style(true, foreground);
|
return text_style(true, foreground);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Creates a text style from the background color. */
|
/// Creates a text style from the background color.
|
||||||
FMT_CONSTEXPR inline text_style bg(detail::color_type background) noexcept {
|
FMT_CONSTEXPR inline auto bg(detail::color_type background) noexcept
|
||||||
|
-> text_style {
|
||||||
return text_style(false, background);
|
return text_style(false, background);
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_CONSTEXPR inline text_style operator|(emphasis lhs, emphasis rhs) noexcept {
|
FMT_CONSTEXPR inline auto operator|(emphasis lhs, emphasis rhs) noexcept
|
||||||
|
-> text_style {
|
||||||
return text_style(lhs) | rhs;
|
return text_style(lhs) | rhs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -384,9 +389,9 @@ template <typename Char> struct ansi_color_escape {
|
||||||
}
|
}
|
||||||
FMT_CONSTEXPR operator const Char*() const noexcept { return buffer; }
|
FMT_CONSTEXPR operator const Char*() const noexcept { return buffer; }
|
||||||
|
|
||||||
FMT_CONSTEXPR const Char* begin() const noexcept { return buffer; }
|
FMT_CONSTEXPR auto begin() const noexcept -> const Char* { return buffer; }
|
||||||
FMT_CONSTEXPR_CHAR_TRAITS const Char* end() const noexcept {
|
FMT_CONSTEXPR20 auto end() const noexcept -> const Char* {
|
||||||
return buffer + std::char_traits<Char>::length(buffer);
|
return buffer + basic_string_view<Char>(buffer).size();
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -400,25 +405,27 @@ template <typename Char> struct ansi_color_escape {
|
||||||
out[2] = static_cast<Char>('0' + c % 10);
|
out[2] = static_cast<Char>('0' + c % 10);
|
||||||
out[3] = static_cast<Char>(delimiter);
|
out[3] = static_cast<Char>(delimiter);
|
||||||
}
|
}
|
||||||
static FMT_CONSTEXPR bool has_emphasis(emphasis em, emphasis mask) noexcept {
|
static FMT_CONSTEXPR auto has_emphasis(emphasis em, emphasis mask) noexcept
|
||||||
|
-> bool {
|
||||||
return static_cast<uint8_t>(em) & static_cast<uint8_t>(mask);
|
return static_cast<uint8_t>(em) & static_cast<uint8_t>(mask);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
FMT_CONSTEXPR ansi_color_escape<Char> make_foreground_color(
|
FMT_CONSTEXPR auto make_foreground_color(detail::color_type foreground) noexcept
|
||||||
detail::color_type foreground) noexcept {
|
-> ansi_color_escape<Char> {
|
||||||
return ansi_color_escape<Char>(foreground, "\x1b[38;2;");
|
return ansi_color_escape<Char>(foreground, "\x1b[38;2;");
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
FMT_CONSTEXPR ansi_color_escape<Char> make_background_color(
|
FMT_CONSTEXPR auto make_background_color(detail::color_type background) noexcept
|
||||||
detail::color_type background) noexcept {
|
-> ansi_color_escape<Char> {
|
||||||
return ansi_color_escape<Char>(background, "\x1b[48;2;");
|
return ansi_color_escape<Char>(background, "\x1b[48;2;");
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
FMT_CONSTEXPR ansi_color_escape<Char> make_emphasis(emphasis em) noexcept {
|
FMT_CONSTEXPR auto make_emphasis(emphasis em) noexcept
|
||||||
|
-> ansi_color_escape<Char> {
|
||||||
return ansi_color_escape<Char>(em);
|
return ansi_color_escape<Char>(em);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -427,15 +434,16 @@ template <typename Char> inline void reset_color(buffer<Char>& buffer) {
|
||||||
buffer.append(reset_color.begin(), reset_color.end());
|
buffer.append(reset_color.begin(), reset_color.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T> struct styled_arg {
|
template <typename T> struct styled_arg : detail::view {
|
||||||
const T& value;
|
const T& value;
|
||||||
text_style style;
|
text_style style;
|
||||||
|
styled_arg(const T& v, text_style s) : value(v), style(s) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
void vformat_to(buffer<Char>& buf, const text_style& ts,
|
void vformat_to(
|
||||||
basic_string_view<Char> format_str,
|
buffer<Char>& buf, const text_style& ts, basic_string_view<Char> format_str,
|
||||||
basic_format_args<buffer_context<type_identity_t<Char>>> args) {
|
basic_format_args<buffered_context<type_identity_t<Char>>> args) {
|
||||||
bool has_style = false;
|
bool has_style = false;
|
||||||
if (ts.has_emphasis()) {
|
if (ts.has_emphasis()) {
|
||||||
has_style = true;
|
has_style = true;
|
||||||
|
@ -458,118 +466,92 @@ void vformat_to(buffer<Char>& buf, const text_style& ts,
|
||||||
|
|
||||||
} // namespace detail
|
} // namespace detail
|
||||||
|
|
||||||
inline void vprint(std::FILE* f, const text_style& ts, string_view fmt,
|
inline void vprint(FILE* f, const text_style& ts, string_view fmt,
|
||||||
format_args args) {
|
format_args args) {
|
||||||
// Legacy wide streams are not supported.
|
|
||||||
auto buf = memory_buffer();
|
auto buf = memory_buffer();
|
||||||
detail::vformat_to(buf, ts, fmt, args);
|
detail::vformat_to(buf, ts, fmt, args);
|
||||||
if (detail::is_utf8()) {
|
print(f, FMT_STRING("{}"), string_view(buf.begin(), buf.size()));
|
||||||
detail::print(f, string_view(buf.begin(), buf.size()));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
buf.push_back('\0');
|
|
||||||
int result = std::fputs(buf.data(), f);
|
|
||||||
if (result < 0)
|
|
||||||
FMT_THROW(system_error(errno, FMT_STRING("cannot write to file")));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Formats a string and prints it to the specified file stream using ANSI
|
||||||
Formats a string and prints it to the specified file stream using ANSI
|
* escape sequences to specify text formatting.
|
||||||
escape sequences to specify text formatting.
|
*
|
||||||
|
* **Example**:
|
||||||
**Example**::
|
*
|
||||||
|
* fmt::print(fmt::emphasis::bold | fg(fmt::color::red),
|
||||||
fmt::print(fmt::emphasis::bold | fg(fmt::color::red),
|
* "Elapsed time: {0:.2f} seconds", 1.23);
|
||||||
"Elapsed time: {0:.2f} seconds", 1.23);
|
|
||||||
\endrst
|
|
||||||
*/
|
*/
|
||||||
template <typename S, typename... Args,
|
template <typename... T>
|
||||||
FMT_ENABLE_IF(detail::is_string<S>::value)>
|
void print(FILE* f, const text_style& ts, format_string<T...> fmt,
|
||||||
void print(std::FILE* f, const text_style& ts, const S& format_str,
|
T&&... args) {
|
||||||
const Args&... args) {
|
vprint(f, ts, fmt, fmt::make_format_args(args...));
|
||||||
vprint(f, ts, format_str,
|
|
||||||
fmt::make_format_args<buffer_context<char_t<S>>>(args...));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Formats a string and prints it to stdout using ANSI escape sequences to
|
||||||
Formats a string and prints it to stdout using ANSI escape sequences to
|
* specify text formatting.
|
||||||
specify text formatting.
|
*
|
||||||
|
* **Example**:
|
||||||
**Example**::
|
*
|
||||||
|
* fmt::print(fmt::emphasis::bold | fg(fmt::color::red),
|
||||||
fmt::print(fmt::emphasis::bold | fg(fmt::color::red),
|
* "Elapsed time: {0:.2f} seconds", 1.23);
|
||||||
"Elapsed time: {0:.2f} seconds", 1.23);
|
|
||||||
\endrst
|
|
||||||
*/
|
*/
|
||||||
template <typename S, typename... Args,
|
template <typename... T>
|
||||||
FMT_ENABLE_IF(detail::is_string<S>::value)>
|
void print(const text_style& ts, format_string<T...> fmt, T&&... args) {
|
||||||
void print(const text_style& ts, const S& format_str, const Args&... args) {
|
return print(stdout, ts, fmt, std::forward<T>(args)...);
|
||||||
return print(stdout, ts, format_str, args...);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename S, typename Char = char_t<S>>
|
inline auto vformat(const text_style& ts, string_view fmt, format_args args)
|
||||||
inline std::basic_string<Char> vformat(
|
-> std::string {
|
||||||
const text_style& ts, const S& format_str,
|
auto buf = memory_buffer();
|
||||||
basic_format_args<buffer_context<type_identity_t<Char>>> args) {
|
detail::vformat_to(buf, ts, fmt, args);
|
||||||
basic_memory_buffer<Char> buf;
|
|
||||||
detail::vformat_to(buf, ts, detail::to_string_view(format_str), args);
|
|
||||||
return fmt::to_string(buf);
|
return fmt::to_string(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Formats arguments and returns the result as a string using ANSI escape
|
||||||
Formats arguments and returns the result as a string using ANSI
|
* sequences to specify text formatting.
|
||||||
escape sequences to specify text formatting.
|
*
|
||||||
|
* **Example**:
|
||||||
**Example**::
|
*
|
||||||
|
* ```
|
||||||
#include <fmt/color.h>
|
* #include <fmt/color.h>
|
||||||
std::string message = fmt::format(fmt::emphasis::bold | fg(fmt::color::red),
|
* std::string message = fmt::format(fmt::emphasis::bold | fg(fmt::color::red),
|
||||||
"The answer is {}", 42);
|
* "The answer is {}", 42);
|
||||||
\endrst
|
* ```
|
||||||
*/
|
*/
|
||||||
template <typename S, typename... Args, typename Char = char_t<S>>
|
template <typename... T>
|
||||||
inline std::basic_string<Char> format(const text_style& ts, const S& format_str,
|
inline auto format(const text_style& ts, format_string<T...> fmt, T&&... args)
|
||||||
const Args&... args) {
|
-> std::string {
|
||||||
return fmt::vformat(ts, detail::to_string_view(format_str),
|
return fmt::vformat(ts, fmt, fmt::make_format_args(args...));
|
||||||
fmt::make_format_args<buffer_context<Char>>(args...));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/// Formats a string with the given text_style and writes the output to `out`.
|
||||||
Formats a string with the given text_style and writes the output to ``out``.
|
template <typename OutputIt,
|
||||||
*/
|
FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value)>
|
||||||
template <typename OutputIt, typename Char,
|
auto vformat_to(OutputIt out, const text_style& ts, string_view fmt,
|
||||||
FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value)>
|
format_args args) -> OutputIt {
|
||||||
OutputIt vformat_to(
|
auto&& buf = detail::get_buffer<char>(out);
|
||||||
OutputIt out, const text_style& ts, basic_string_view<Char> format_str,
|
detail::vformat_to(buf, ts, fmt, args);
|
||||||
basic_format_args<buffer_context<type_identity_t<Char>>> args) {
|
|
||||||
auto&& buf = detail::get_buffer<Char>(out);
|
|
||||||
detail::vformat_to(buf, ts, format_str, args);
|
|
||||||
return detail::get_iterator(buf, out);
|
return detail::get_iterator(buf, out);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Formats arguments with the given text style, writes the result to the output
|
||||||
Formats arguments with the given text_style, writes the result to the output
|
* iterator `out` and returns the iterator past the end of the output range.
|
||||||
iterator ``out`` and returns the iterator past the end of the output range.
|
*
|
||||||
|
* **Example**:
|
||||||
**Example**::
|
*
|
||||||
|
* std::vector<char> out;
|
||||||
std::vector<char> out;
|
* fmt::format_to(std::back_inserter(out),
|
||||||
fmt::format_to(std::back_inserter(out),
|
* fmt::emphasis::bold | fg(fmt::color::red), "{}", 42);
|
||||||
fmt::emphasis::bold | fg(fmt::color::red), "{}", 42);
|
*/
|
||||||
\endrst
|
template <typename OutputIt, typename... T,
|
||||||
*/
|
FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, char>::value)>
|
||||||
template <typename OutputIt, typename S, typename... Args,
|
inline auto format_to(OutputIt out, const text_style& ts,
|
||||||
bool enable = detail::is_output_iterator<OutputIt, char_t<S>>::value&&
|
format_string<T...> fmt, T&&... args) -> OutputIt {
|
||||||
detail::is_string<S>::value>
|
return vformat_to(out, ts, fmt, fmt::make_format_args(args...));
|
||||||
inline auto format_to(OutputIt out, const text_style& ts, const S& format_str,
|
|
||||||
Args&&... args) ->
|
|
||||||
typename std::enable_if<enable, OutputIt>::type {
|
|
||||||
return vformat_to(out, ts, detail::to_string_view(format_str),
|
|
||||||
fmt::make_format_args<buffer_context<char_t<S>>>(args...));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T, typename Char>
|
template <typename T, typename Char>
|
||||||
|
@ -609,16 +591,14 @@ struct formatter<detail::styled_arg<T>, Char> : formatter<T, Char> {
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Returns an argument that will be formatted using ANSI escape sequences,
|
||||||
Returns an argument that will be formatted using ANSI escape sequences,
|
* to be used in a formatting function.
|
||||||
to be used in a formatting function.
|
*
|
||||||
|
* **Example**:
|
||||||
**Example**::
|
*
|
||||||
|
* fmt::print("Elapsed time: {0:.2f} seconds",
|
||||||
fmt::print("Elapsed time: {0:.2f} seconds",
|
* fmt::styled(1.23, fmt::fg(fmt::color::green) |
|
||||||
fmt::styled(1.23, fmt::fg(fmt::color::green) |
|
* fmt::bg(fmt::color::blue)));
|
||||||
fmt::bg(fmt::color::blue)));
|
|
||||||
\endrst
|
|
||||||
*/
|
*/
|
||||||
template <typename T>
|
template <typename T>
|
||||||
FMT_CONSTEXPR auto styled(const T& value, text_style ts)
|
FMT_CONSTEXPR auto styled(const T& value, text_style ts)
|
||||||
|
|
|
@ -8,39 +8,41 @@
|
||||||
#ifndef FMT_COMPILE_H_
|
#ifndef FMT_COMPILE_H_
|
||||||
#define FMT_COMPILE_H_
|
#define FMT_COMPILE_H_
|
||||||
|
|
||||||
|
#ifndef FMT_MODULE
|
||||||
|
# include <iterator> // std::back_inserter
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "format.h"
|
#include "format.h"
|
||||||
|
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
namespace detail {
|
|
||||||
|
|
||||||
template <typename Char, typename InputIt>
|
|
||||||
FMT_CONSTEXPR inline counting_iterator copy_str(InputIt begin, InputIt end,
|
|
||||||
counting_iterator it) {
|
|
||||||
return it + (end - begin);
|
|
||||||
}
|
|
||||||
|
|
||||||
// A compile-time string which is compiled into fast formatting code.
|
// A compile-time string which is compiled into fast formatting code.
|
||||||
class compiled_string {};
|
FMT_EXPORT class compiled_string {};
|
||||||
|
|
||||||
|
namespace detail {
|
||||||
|
|
||||||
|
template <typename T, typename InputIt>
|
||||||
|
FMT_CONSTEXPR inline auto copy(InputIt begin, InputIt end, counting_iterator it)
|
||||||
|
-> counting_iterator {
|
||||||
|
return it + (end - begin);
|
||||||
|
}
|
||||||
|
|
||||||
template <typename S>
|
template <typename S>
|
||||||
struct is_compiled_string : std::is_base_of<compiled_string, S> {};
|
struct is_compiled_string : std::is_base_of<compiled_string, S> {};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Converts a string literal `s` into a format string that will be parsed at
|
||||||
Converts a string literal *s* into a format string that will be parsed at
|
* compile time and converted into efficient formatting code. Requires C++17
|
||||||
compile time and converted into efficient formatting code. Requires C++17
|
* `constexpr if` compiler support.
|
||||||
``constexpr if`` compiler support.
|
*
|
||||||
|
* **Example**:
|
||||||
**Example**::
|
*
|
||||||
|
* // Converts 42 into std::string using the most efficient method and no
|
||||||
// Converts 42 into std::string using the most efficient method and no
|
* // runtime format string processing.
|
||||||
// runtime format string processing.
|
* std::string s = fmt::format(FMT_COMPILE("{}"), 42);
|
||||||
std::string s = fmt::format(FMT_COMPILE("{}"), 42);
|
|
||||||
\endrst
|
|
||||||
*/
|
*/
|
||||||
#if defined(__cpp_if_constexpr) && defined(__cpp_return_type_deduction)
|
#if defined(__cpp_if_constexpr) && defined(__cpp_return_type_deduction)
|
||||||
# define FMT_COMPILE(s) \
|
# define FMT_COMPILE(s) FMT_STRING_IMPL(s, fmt::compiled_string, explicit)
|
||||||
FMT_STRING_IMPL(s, fmt::detail::compiled_string, explicit)
|
|
||||||
#else
|
#else
|
||||||
# define FMT_COMPILE(s) FMT_STRING(s)
|
# define FMT_COMPILE(s) FMT_STRING(s)
|
||||||
#endif
|
#endif
|
||||||
|
@ -57,7 +59,7 @@ struct udl_compiled_string : compiled_string {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
template <typename T, typename... Tail>
|
template <typename T, typename... Tail>
|
||||||
const T& first(const T& value, const Tail&...) {
|
auto first(const T& value, const Tail&...) -> const T& {
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -144,9 +146,9 @@ template <typename Char, typename T, int N> struct field {
|
||||||
template <typename OutputIt, typename... Args>
|
template <typename OutputIt, typename... Args>
|
||||||
constexpr OutputIt format(OutputIt out, const Args&... args) const {
|
constexpr OutputIt format(OutputIt out, const Args&... args) const {
|
||||||
const T& arg = get_arg_checked<T, N>(args...);
|
const T& arg = get_arg_checked<T, N>(args...);
|
||||||
if constexpr (std::is_convertible_v<T, basic_string_view<Char>>) {
|
if constexpr (std::is_convertible<T, basic_string_view<Char>>::value) {
|
||||||
auto s = basic_string_view<Char>(arg);
|
auto s = basic_string_view<Char>(arg);
|
||||||
return copy_str<Char>(s.begin(), s.end(), out);
|
return copy<Char>(s.begin(), s.end(), out);
|
||||||
}
|
}
|
||||||
return write<Char>(out, arg);
|
return write<Char>(out, arg);
|
||||||
}
|
}
|
||||||
|
@ -236,13 +238,12 @@ constexpr size_t parse_text(basic_string_view<Char> str, size_t pos) {
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Args, size_t POS, int ID, typename S>
|
template <typename Args, size_t POS, int ID, typename S>
|
||||||
constexpr auto compile_format_string(S format_str);
|
constexpr auto compile_format_string(S fmt);
|
||||||
|
|
||||||
template <typename Args, size_t POS, int ID, typename T, typename S>
|
template <typename Args, size_t POS, int ID, typename T, typename S>
|
||||||
constexpr auto parse_tail(T head, S format_str) {
|
constexpr auto parse_tail(T head, S fmt) {
|
||||||
if constexpr (POS !=
|
if constexpr (POS != basic_string_view<typename S::char_type>(fmt).size()) {
|
||||||
basic_string_view<typename S::char_type>(format_str).size()) {
|
constexpr auto tail = compile_format_string<Args, POS, ID>(fmt);
|
||||||
constexpr auto tail = compile_format_string<Args, POS, ID>(format_str);
|
|
||||||
if constexpr (std::is_same<remove_cvref_t<decltype(tail)>,
|
if constexpr (std::is_same<remove_cvref_t<decltype(tail)>,
|
||||||
unknown_format>())
|
unknown_format>())
|
||||||
return tail;
|
return tail;
|
||||||
|
@ -313,14 +314,13 @@ struct field_type<T, enable_if_t<detail::is_named_arg<T>::value>> {
|
||||||
|
|
||||||
template <typename T, typename Args, size_t END_POS, int ARG_INDEX, int NEXT_ID,
|
template <typename T, typename Args, size_t END_POS, int ARG_INDEX, int NEXT_ID,
|
||||||
typename S>
|
typename S>
|
||||||
constexpr auto parse_replacement_field_then_tail(S format_str) {
|
constexpr auto parse_replacement_field_then_tail(S fmt) {
|
||||||
using char_type = typename S::char_type;
|
using char_type = typename S::char_type;
|
||||||
constexpr auto str = basic_string_view<char_type>(format_str);
|
constexpr auto str = basic_string_view<char_type>(fmt);
|
||||||
constexpr char_type c = END_POS != str.size() ? str[END_POS] : char_type();
|
constexpr char_type c = END_POS != str.size() ? str[END_POS] : char_type();
|
||||||
if constexpr (c == '}') {
|
if constexpr (c == '}') {
|
||||||
return parse_tail<Args, END_POS + 1, NEXT_ID>(
|
return parse_tail<Args, END_POS + 1, NEXT_ID>(
|
||||||
field<char_type, typename field_type<T>::type, ARG_INDEX>(),
|
field<char_type, typename field_type<T>::type, ARG_INDEX>(), fmt);
|
||||||
format_str);
|
|
||||||
} else if constexpr (c != ':') {
|
} else if constexpr (c != ':') {
|
||||||
FMT_THROW(format_error("expected ':'"));
|
FMT_THROW(format_error("expected ':'"));
|
||||||
} else {
|
} else {
|
||||||
|
@ -333,7 +333,7 @@ constexpr auto parse_replacement_field_then_tail(S format_str) {
|
||||||
return parse_tail<Args, result.end + 1, result.next_arg_id>(
|
return parse_tail<Args, result.end + 1, result.next_arg_id>(
|
||||||
spec_field<char_type, typename field_type<T>::type, ARG_INDEX>{
|
spec_field<char_type, typename field_type<T>::type, ARG_INDEX>{
|
||||||
result.fmt},
|
result.fmt},
|
||||||
format_str);
|
fmt);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -341,22 +341,21 @@ constexpr auto parse_replacement_field_then_tail(S format_str) {
|
||||||
// Compiles a non-empty format string and returns the compiled representation
|
// Compiles a non-empty format string and returns the compiled representation
|
||||||
// or unknown_format() on unrecognized input.
|
// or unknown_format() on unrecognized input.
|
||||||
template <typename Args, size_t POS, int ID, typename S>
|
template <typename Args, size_t POS, int ID, typename S>
|
||||||
constexpr auto compile_format_string(S format_str) {
|
constexpr auto compile_format_string(S fmt) {
|
||||||
using char_type = typename S::char_type;
|
using char_type = typename S::char_type;
|
||||||
constexpr auto str = basic_string_view<char_type>(format_str);
|
constexpr auto str = basic_string_view<char_type>(fmt);
|
||||||
if constexpr (str[POS] == '{') {
|
if constexpr (str[POS] == '{') {
|
||||||
if constexpr (POS + 1 == str.size())
|
if constexpr (POS + 1 == str.size())
|
||||||
FMT_THROW(format_error("unmatched '{' in format string"));
|
FMT_THROW(format_error("unmatched '{' in format string"));
|
||||||
if constexpr (str[POS + 1] == '{') {
|
if constexpr (str[POS + 1] == '{') {
|
||||||
return parse_tail<Args, POS + 2, ID>(make_text(str, POS, 1), format_str);
|
return parse_tail<Args, POS + 2, ID>(make_text(str, POS, 1), fmt);
|
||||||
} else if constexpr (str[POS + 1] == '}' || str[POS + 1] == ':') {
|
} else if constexpr (str[POS + 1] == '}' || str[POS + 1] == ':') {
|
||||||
static_assert(ID != manual_indexing_id,
|
static_assert(ID != manual_indexing_id,
|
||||||
"cannot switch from manual to automatic argument indexing");
|
"cannot switch from manual to automatic argument indexing");
|
||||||
constexpr auto next_id =
|
constexpr auto next_id =
|
||||||
ID != manual_indexing_id ? ID + 1 : manual_indexing_id;
|
ID != manual_indexing_id ? ID + 1 : manual_indexing_id;
|
||||||
return parse_replacement_field_then_tail<get_type<ID, Args>, Args,
|
return parse_replacement_field_then_tail<get_type<ID, Args>, Args,
|
||||||
POS + 1, ID, next_id>(
|
POS + 1, ID, next_id>(fmt);
|
||||||
format_str);
|
|
||||||
} else {
|
} else {
|
||||||
constexpr auto arg_id_result =
|
constexpr auto arg_id_result =
|
||||||
parse_arg_id<ID>(str.data() + POS + 1, str.data() + str.size());
|
parse_arg_id<ID>(str.data() + POS + 1, str.data() + str.size());
|
||||||
|
@ -372,7 +371,7 @@ constexpr auto compile_format_string(S format_str) {
|
||||||
return parse_replacement_field_then_tail<get_type<arg_index, Args>,
|
return parse_replacement_field_then_tail<get_type<arg_index, Args>,
|
||||||
Args, arg_id_end_pos,
|
Args, arg_id_end_pos,
|
||||||
arg_index, manual_indexing_id>(
|
arg_index, manual_indexing_id>(
|
||||||
format_str);
|
fmt);
|
||||||
} else if constexpr (arg_id_result.arg_id.kind == arg_id_kind::name) {
|
} else if constexpr (arg_id_result.arg_id.kind == arg_id_kind::name) {
|
||||||
constexpr auto arg_index =
|
constexpr auto arg_index =
|
||||||
get_arg_index_by_name(arg_id_result.arg_id.val.name, Args{});
|
get_arg_index_by_name(arg_id_result.arg_id.val.name, Args{});
|
||||||
|
@ -381,11 +380,11 @@ constexpr auto compile_format_string(S format_str) {
|
||||||
ID != manual_indexing_id ? ID + 1 : manual_indexing_id;
|
ID != manual_indexing_id ? ID + 1 : manual_indexing_id;
|
||||||
return parse_replacement_field_then_tail<
|
return parse_replacement_field_then_tail<
|
||||||
decltype(get_type<arg_index, Args>::value), Args, arg_id_end_pos,
|
decltype(get_type<arg_index, Args>::value), Args, arg_id_end_pos,
|
||||||
arg_index, next_id>(format_str);
|
arg_index, next_id>(fmt);
|
||||||
} else if constexpr (c == '}') {
|
} else if constexpr (c == '}') {
|
||||||
return parse_tail<Args, arg_id_end_pos + 1, ID>(
|
return parse_tail<Args, arg_id_end_pos + 1, ID>(
|
||||||
runtime_named_field<char_type>{arg_id_result.arg_id.val.name},
|
runtime_named_field<char_type>{arg_id_result.arg_id.val.name},
|
||||||
format_str);
|
fmt);
|
||||||
} else if constexpr (c == ':') {
|
} else if constexpr (c == ':') {
|
||||||
return unknown_format(); // no type info for specs parsing
|
return unknown_format(); // no type info for specs parsing
|
||||||
}
|
}
|
||||||
|
@ -394,29 +393,26 @@ constexpr auto compile_format_string(S format_str) {
|
||||||
} else if constexpr (str[POS] == '}') {
|
} else if constexpr (str[POS] == '}') {
|
||||||
if constexpr (POS + 1 == str.size())
|
if constexpr (POS + 1 == str.size())
|
||||||
FMT_THROW(format_error("unmatched '}' in format string"));
|
FMT_THROW(format_error("unmatched '}' in format string"));
|
||||||
return parse_tail<Args, POS + 2, ID>(make_text(str, POS, 1), format_str);
|
return parse_tail<Args, POS + 2, ID>(make_text(str, POS, 1), fmt);
|
||||||
} else {
|
} else {
|
||||||
constexpr auto end = parse_text(str, POS + 1);
|
constexpr auto end = parse_text(str, POS + 1);
|
||||||
if constexpr (end - POS > 1) {
|
if constexpr (end - POS > 1) {
|
||||||
return parse_tail<Args, end, ID>(make_text(str, POS, end - POS),
|
return parse_tail<Args, end, ID>(make_text(str, POS, end - POS), fmt);
|
||||||
format_str);
|
|
||||||
} else {
|
} else {
|
||||||
return parse_tail<Args, end, ID>(code_unit<char_type>{str[POS]},
|
return parse_tail<Args, end, ID>(code_unit<char_type>{str[POS]}, fmt);
|
||||||
format_str);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename... Args, typename S,
|
template <typename... Args, typename S,
|
||||||
FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
|
FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
|
||||||
constexpr auto compile(S format_str) {
|
constexpr auto compile(S fmt) {
|
||||||
constexpr auto str = basic_string_view<typename S::char_type>(format_str);
|
constexpr auto str = basic_string_view<typename S::char_type>(fmt);
|
||||||
if constexpr (str.size() == 0) {
|
if constexpr (str.size() == 0) {
|
||||||
return detail::make_text(str, 0, 0);
|
return detail::make_text(str, 0, 0);
|
||||||
} else {
|
} else {
|
||||||
constexpr auto result =
|
constexpr auto result =
|
||||||
detail::compile_format_string<detail::type_list<Args...>, 0, 0>(
|
detail::compile_format_string<detail::type_list<Args...>, 0, 0>(fmt);
|
||||||
format_str);
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -488,34 +484,33 @@ FMT_CONSTEXPR OutputIt format_to(OutputIt out, const S&, Args&&... args) {
|
||||||
|
|
||||||
template <typename OutputIt, typename S, typename... Args,
|
template <typename OutputIt, typename S, typename... Args,
|
||||||
FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
|
FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
|
||||||
format_to_n_result<OutputIt> format_to_n(OutputIt out, size_t n,
|
auto format_to_n(OutputIt out, size_t n, const S& fmt, Args&&... args)
|
||||||
const S& format_str, Args&&... args) {
|
-> format_to_n_result<OutputIt> {
|
||||||
using traits = detail::fixed_buffer_traits;
|
using traits = detail::fixed_buffer_traits;
|
||||||
auto buf = detail::iterator_buffer<OutputIt, char, traits>(out, n);
|
auto buf = detail::iterator_buffer<OutputIt, char, traits>(out, n);
|
||||||
format_to(std::back_inserter(buf), format_str, std::forward<Args>(args)...);
|
fmt::format_to(std::back_inserter(buf), fmt, std::forward<Args>(args)...);
|
||||||
return {buf.out(), buf.count()};
|
return {buf.out(), buf.count()};
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename S, typename... Args,
|
template <typename S, typename... Args,
|
||||||
FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
|
FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
|
||||||
FMT_CONSTEXPR20 size_t formatted_size(const S& format_str,
|
FMT_CONSTEXPR20 auto formatted_size(const S& fmt, const Args&... args)
|
||||||
const Args&... args) {
|
-> size_t {
|
||||||
return fmt::format_to(detail::counting_iterator(), format_str, args...)
|
return fmt::format_to(detail::counting_iterator(), fmt, args...).count();
|
||||||
.count();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename S, typename... Args,
|
template <typename S, typename... Args,
|
||||||
FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
|
FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
|
||||||
void print(std::FILE* f, const S& format_str, const Args&... args) {
|
void print(std::FILE* f, const S& fmt, const Args&... args) {
|
||||||
memory_buffer buffer;
|
memory_buffer buffer;
|
||||||
fmt::format_to(std::back_inserter(buffer), format_str, args...);
|
fmt::format_to(std::back_inserter(buffer), fmt, args...);
|
||||||
detail::print(f, {buffer.data(), buffer.size()});
|
detail::print(f, {buffer.data(), buffer.size()});
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename S, typename... Args,
|
template <typename S, typename... Args,
|
||||||
FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
|
FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
|
||||||
void print(const S& format_str, const Args&... args) {
|
void print(const S& fmt, const Args&... args) {
|
||||||
print(stdout, format_str, args...);
|
print(stdout, fmt, args...);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if FMT_USE_NONTYPE_TEMPLATE_ARGS
|
#if FMT_USE_NONTYPE_TEMPLATE_ARGS
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -8,17 +8,19 @@
|
||||||
#ifndef FMT_FORMAT_INL_H_
|
#ifndef FMT_FORMAT_INL_H_
|
||||||
#define FMT_FORMAT_INL_H_
|
#define FMT_FORMAT_INL_H_
|
||||||
|
|
||||||
#include <algorithm>
|
#ifndef FMT_MODULE
|
||||||
#include <cerrno> // errno
|
# include <algorithm>
|
||||||
#include <climits>
|
# include <cerrno> // errno
|
||||||
#include <cmath>
|
# include <climits>
|
||||||
#include <exception>
|
# include <cmath>
|
||||||
|
# include <exception>
|
||||||
|
|
||||||
#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
|
# if !defined(FMT_STATIC_THOUSANDS_SEPARATOR)
|
||||||
# include <locale>
|
# include <locale>
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _WIN32
|
#if defined(_WIN32) && !defined(FMT_USE_WRITE_CONSOLE)
|
||||||
# include <io.h> // _isatty
|
# include <io.h> // _isatty
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -36,10 +38,6 @@ FMT_FUNC void assert_fail(const char* file, int line, const char* message) {
|
||||||
std::terminate();
|
std::terminate();
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_FUNC void throw_format_error(const char* message) {
|
|
||||||
FMT_THROW(format_error(message));
|
|
||||||
}
|
|
||||||
|
|
||||||
FMT_FUNC void format_error_code(detail::buffer<char>& out, int error_code,
|
FMT_FUNC void format_error_code(detail::buffer<char>& out, int error_code,
|
||||||
string_view message) noexcept {
|
string_view message) noexcept {
|
||||||
// Report error code making sure that the output fits into
|
// Report error code making sure that the output fits into
|
||||||
|
@ -56,10 +54,10 @@ FMT_FUNC void format_error_code(detail::buffer<char>& out, int error_code,
|
||||||
++error_code_size;
|
++error_code_size;
|
||||||
}
|
}
|
||||||
error_code_size += detail::to_unsigned(detail::count_digits(abs_value));
|
error_code_size += detail::to_unsigned(detail::count_digits(abs_value));
|
||||||
auto it = buffer_appender<char>(out);
|
auto it = appender(out);
|
||||||
if (message.size() <= inline_buffer_size - error_code_size)
|
if (message.size() <= inline_buffer_size - error_code_size)
|
||||||
format_to(it, FMT_STRING("{}{}"), message, SEP);
|
fmt::format_to(it, FMT_STRING("{}{}"), message, SEP);
|
||||||
format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code);
|
fmt::format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code);
|
||||||
FMT_ASSERT(out.size() <= inline_buffer_size, "");
|
FMT_ASSERT(out.size() <= inline_buffer_size, "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,9 +71,8 @@ FMT_FUNC void report_error(format_func func, int error_code,
|
||||||
}
|
}
|
||||||
|
|
||||||
// A wrapper around fwrite that throws on error.
|
// A wrapper around fwrite that throws on error.
|
||||||
inline void fwrite_fully(const void* ptr, size_t size, size_t count,
|
inline void fwrite_fully(const void* ptr, size_t count, FILE* stream) {
|
||||||
FILE* stream) {
|
size_t written = std::fwrite(ptr, 1, count, stream);
|
||||||
size_t written = std::fwrite(ptr, size, count, stream);
|
|
||||||
if (written < count)
|
if (written < count)
|
||||||
FMT_THROW(system_error(errno, FMT_STRING("cannot write to file")));
|
FMT_THROW(system_error(errno, FMT_STRING("cannot write to file")));
|
||||||
}
|
}
|
||||||
|
@ -86,7 +83,7 @@ locale_ref::locale_ref(const Locale& loc) : locale_(&loc) {
|
||||||
static_assert(std::is_same<Locale, std::locale>::value, "");
|
static_assert(std::is_same<Locale, std::locale>::value, "");
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Locale> Locale locale_ref::get() const {
|
template <typename Locale> auto locale_ref::get() const -> Locale {
|
||||||
static_assert(std::is_same<Locale, std::locale>::value, "");
|
static_assert(std::is_same<Locale, std::locale>::value, "");
|
||||||
return locale_ ? *static_cast<const std::locale*>(locale_) : std::locale();
|
return locale_ ? *static_cast<const std::locale*>(locale_) : std::locale();
|
||||||
}
|
}
|
||||||
|
@ -98,7 +95,8 @@ FMT_FUNC auto thousands_sep_impl(locale_ref loc) -> thousands_sep_result<Char> {
|
||||||
auto thousands_sep = grouping.empty() ? Char() : facet.thousands_sep();
|
auto thousands_sep = grouping.empty() ? Char() : facet.thousands_sep();
|
||||||
return {std::move(grouping), thousands_sep};
|
return {std::move(grouping), thousands_sep};
|
||||||
}
|
}
|
||||||
template <typename Char> FMT_FUNC Char decimal_point_impl(locale_ref loc) {
|
template <typename Char>
|
||||||
|
FMT_FUNC auto decimal_point_impl(locale_ref loc) -> Char {
|
||||||
return std::use_facet<std::numpunct<Char>>(loc.get<std::locale>())
|
return std::use_facet<std::numpunct<Char>>(loc.get<std::locale>())
|
||||||
.decimal_point();
|
.decimal_point();
|
||||||
}
|
}
|
||||||
|
@ -113,8 +111,12 @@ template <typename Char> FMT_FUNC Char decimal_point_impl(locale_ref) {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
FMT_FUNC auto write_loc(appender out, loc_value value,
|
FMT_FUNC auto write_loc(appender out, loc_value value,
|
||||||
const format_specs<>& specs, locale_ref loc) -> bool {
|
const format_specs& specs, locale_ref loc) -> bool {
|
||||||
#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
|
#ifdef FMT_STATIC_THOUSANDS_SEPARATOR
|
||||||
|
value.visit(loc_writer<>{
|
||||||
|
out, specs, std::string(1, FMT_STATIC_THOUSANDS_SEPARATOR), "\3", "."});
|
||||||
|
return true;
|
||||||
|
#else
|
||||||
auto locale = loc.get<std::locale>();
|
auto locale = loc.get<std::locale>();
|
||||||
// We cannot use the num_put<char> facet because it may produce output in
|
// We cannot use the num_put<char> facet because it may produce output in
|
||||||
// a wrong encoding.
|
// a wrong encoding.
|
||||||
|
@ -123,10 +125,13 @@ FMT_FUNC auto write_loc(appender out, loc_value value,
|
||||||
return std::use_facet<facet>(locale).put(out, value, specs);
|
return std::use_facet<facet>(locale).put(out, value, specs);
|
||||||
return facet(locale).put(out, value, specs);
|
return facet(locale).put(out, value, specs);
|
||||||
#endif
|
#endif
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
} // namespace detail
|
} // namespace detail
|
||||||
|
|
||||||
|
FMT_FUNC void report_error(const char* message) {
|
||||||
|
FMT_THROW(format_error(message));
|
||||||
|
}
|
||||||
|
|
||||||
template <typename Locale> typename Locale::id format_facet<Locale>::id;
|
template <typename Locale> typename Locale::id format_facet<Locale>::id;
|
||||||
|
|
||||||
#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
|
#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
|
||||||
|
@ -138,30 +143,31 @@ template <typename Locale> format_facet<Locale>::format_facet(Locale& loc) {
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
FMT_API FMT_FUNC auto format_facet<std::locale>::do_put(
|
FMT_API FMT_FUNC auto format_facet<std::locale>::do_put(
|
||||||
appender out, loc_value val, const format_specs<>& specs) const -> bool {
|
appender out, loc_value val, const format_specs& specs) const -> bool {
|
||||||
return val.visit(
|
return val.visit(
|
||||||
detail::loc_writer<>{out, specs, separator_, grouping_, decimal_point_});
|
detail::loc_writer<>{out, specs, separator_, grouping_, decimal_point_});
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
FMT_FUNC std::system_error vsystem_error(int error_code, string_view fmt,
|
FMT_FUNC auto vsystem_error(int error_code, string_view fmt, format_args args)
|
||||||
format_args args) {
|
-> std::system_error {
|
||||||
auto ec = std::error_code(error_code, std::generic_category());
|
auto ec = std::error_code(error_code, std::generic_category());
|
||||||
return std::system_error(ec, vformat(fmt, args));
|
return std::system_error(ec, vformat(fmt, args));
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace detail {
|
namespace detail {
|
||||||
|
|
||||||
template <typename F> inline bool operator==(basic_fp<F> x, basic_fp<F> y) {
|
template <typename F>
|
||||||
|
inline auto operator==(basic_fp<F> x, basic_fp<F> y) -> bool {
|
||||||
return x.f == y.f && x.e == y.e;
|
return x.f == y.f && x.e == y.e;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Compilers should be able to optimize this into the ror instruction.
|
// Compilers should be able to optimize this into the ror instruction.
|
||||||
FMT_CONSTEXPR inline uint32_t rotr(uint32_t n, uint32_t r) noexcept {
|
FMT_CONSTEXPR inline auto rotr(uint32_t n, uint32_t r) noexcept -> uint32_t {
|
||||||
r &= 31;
|
r &= 31;
|
||||||
return (n >> r) | (n << (32 - r));
|
return (n >> r) | (n << (32 - r));
|
||||||
}
|
}
|
||||||
FMT_CONSTEXPR inline uint64_t rotr(uint64_t n, uint32_t r) noexcept {
|
FMT_CONSTEXPR inline auto rotr(uint64_t n, uint32_t r) noexcept -> uint64_t {
|
||||||
r &= 63;
|
r &= 63;
|
||||||
return (n >> r) | (n << (64 - r));
|
return (n >> r) | (n << (64 - r));
|
||||||
}
|
}
|
||||||
|
@ -170,14 +176,14 @@ FMT_CONSTEXPR inline uint64_t rotr(uint64_t n, uint32_t r) noexcept {
|
||||||
namespace dragonbox {
|
namespace dragonbox {
|
||||||
// Computes upper 64 bits of multiplication of a 32-bit unsigned integer and a
|
// Computes upper 64 bits of multiplication of a 32-bit unsigned integer and a
|
||||||
// 64-bit unsigned integer.
|
// 64-bit unsigned integer.
|
||||||
inline uint64_t umul96_upper64(uint32_t x, uint64_t y) noexcept {
|
inline auto umul96_upper64(uint32_t x, uint64_t y) noexcept -> uint64_t {
|
||||||
return umul128_upper64(static_cast<uint64_t>(x) << 32, y);
|
return umul128_upper64(static_cast<uint64_t>(x) << 32, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Computes lower 128 bits of multiplication of a 64-bit unsigned integer and a
|
// Computes lower 128 bits of multiplication of a 64-bit unsigned integer and a
|
||||||
// 128-bit unsigned integer.
|
// 128-bit unsigned integer.
|
||||||
inline uint128_fallback umul192_lower128(uint64_t x,
|
inline auto umul192_lower128(uint64_t x, uint128_fallback y) noexcept
|
||||||
uint128_fallback y) noexcept {
|
-> uint128_fallback {
|
||||||
uint64_t high = x * y.high();
|
uint64_t high = x * y.high();
|
||||||
uint128_fallback high_low = umul128(x, y.low());
|
uint128_fallback high_low = umul128(x, y.low());
|
||||||
return {high + high_low.high(), high_low.low()};
|
return {high + high_low.high(), high_low.low()};
|
||||||
|
@ -185,12 +191,12 @@ inline uint128_fallback umul192_lower128(uint64_t x,
|
||||||
|
|
||||||
// Computes lower 64 bits of multiplication of a 32-bit unsigned integer and a
|
// Computes lower 64 bits of multiplication of a 32-bit unsigned integer and a
|
||||||
// 64-bit unsigned integer.
|
// 64-bit unsigned integer.
|
||||||
inline uint64_t umul96_lower64(uint32_t x, uint64_t y) noexcept {
|
inline auto umul96_lower64(uint32_t x, uint64_t y) noexcept -> uint64_t {
|
||||||
return x * y;
|
return x * y;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Various fast log computations.
|
// Various fast log computations.
|
||||||
inline int floor_log10_pow2_minus_log10_4_over_3(int e) noexcept {
|
inline auto floor_log10_pow2_minus_log10_4_over_3(int e) noexcept -> int {
|
||||||
FMT_ASSERT(e <= 2936 && e >= -2985, "too large exponent");
|
FMT_ASSERT(e <= 2936 && e >= -2985, "too large exponent");
|
||||||
return (e * 631305 - 261663) >> 21;
|
return (e * 631305 - 261663) >> 21;
|
||||||
}
|
}
|
||||||
|
@ -204,7 +210,7 @@ FMT_INLINE_VARIABLE constexpr struct {
|
||||||
// divisible by pow(10, N).
|
// divisible by pow(10, N).
|
||||||
// Precondition: n <= pow(10, N + 1).
|
// Precondition: n <= pow(10, N + 1).
|
||||||
template <int N>
|
template <int N>
|
||||||
bool check_divisibility_and_divide_by_pow10(uint32_t& n) noexcept {
|
auto check_divisibility_and_divide_by_pow10(uint32_t& n) noexcept -> bool {
|
||||||
// The numbers below are chosen such that:
|
// The numbers below are chosen such that:
|
||||||
// 1. floor(n/d) = floor(nm / 2^k) where d=10 or d=100,
|
// 1. floor(n/d) = floor(nm / 2^k) where d=10 or d=100,
|
||||||
// 2. nm mod 2^k < m if and only if n is divisible by d,
|
// 2. nm mod 2^k < m if and only if n is divisible by d,
|
||||||
|
@ -229,7 +235,7 @@ bool check_divisibility_and_divide_by_pow10(uint32_t& n) noexcept {
|
||||||
|
|
||||||
// Computes floor(n / pow(10, N)) for small n and N.
|
// Computes floor(n / pow(10, N)) for small n and N.
|
||||||
// Precondition: n <= pow(10, N + 1).
|
// Precondition: n <= pow(10, N + 1).
|
||||||
template <int N> uint32_t small_division_by_pow10(uint32_t n) noexcept {
|
template <int N> auto small_division_by_pow10(uint32_t n) noexcept -> uint32_t {
|
||||||
constexpr auto info = div_small_pow10_infos[N - 1];
|
constexpr auto info = div_small_pow10_infos[N - 1];
|
||||||
FMT_ASSERT(n <= info.divisor * 10, "n is too large");
|
FMT_ASSERT(n <= info.divisor * 10, "n is too large");
|
||||||
constexpr uint32_t magic_number =
|
constexpr uint32_t magic_number =
|
||||||
|
@ -238,12 +244,12 @@ template <int N> uint32_t small_division_by_pow10(uint32_t n) noexcept {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Computes floor(n / 10^(kappa + 1)) (float)
|
// Computes floor(n / 10^(kappa + 1)) (float)
|
||||||
inline uint32_t divide_by_10_to_kappa_plus_1(uint32_t n) noexcept {
|
inline auto divide_by_10_to_kappa_plus_1(uint32_t n) noexcept -> uint32_t {
|
||||||
// 1374389535 = ceil(2^37/100)
|
// 1374389535 = ceil(2^37/100)
|
||||||
return static_cast<uint32_t>((static_cast<uint64_t>(n) * 1374389535) >> 37);
|
return static_cast<uint32_t>((static_cast<uint64_t>(n) * 1374389535) >> 37);
|
||||||
}
|
}
|
||||||
// Computes floor(n / 10^(kappa + 1)) (double)
|
// Computes floor(n / 10^(kappa + 1)) (double)
|
||||||
inline uint64_t divide_by_10_to_kappa_plus_1(uint64_t n) noexcept {
|
inline auto divide_by_10_to_kappa_plus_1(uint64_t n) noexcept -> uint64_t {
|
||||||
// 2361183241434822607 = ceil(2^(64+7)/1000)
|
// 2361183241434822607 = ceil(2^(64+7)/1000)
|
||||||
return umul128_upper64(n, 2361183241434822607ull) >> 7;
|
return umul128_upper64(n, 2361183241434822607ull) >> 7;
|
||||||
}
|
}
|
||||||
|
@ -255,7 +261,7 @@ template <> struct cache_accessor<float> {
|
||||||
using carrier_uint = float_info<float>::carrier_uint;
|
using carrier_uint = float_info<float>::carrier_uint;
|
||||||
using cache_entry_type = uint64_t;
|
using cache_entry_type = uint64_t;
|
||||||
|
|
||||||
static uint64_t get_cached_power(int k) noexcept {
|
static auto get_cached_power(int k) noexcept -> uint64_t {
|
||||||
FMT_ASSERT(k >= float_info<float>::min_k && k <= float_info<float>::max_k,
|
FMT_ASSERT(k >= float_info<float>::min_k && k <= float_info<float>::max_k,
|
||||||
"k is out of range");
|
"k is out of range");
|
||||||
static constexpr const uint64_t pow10_significands[] = {
|
static constexpr const uint64_t pow10_significands[] = {
|
||||||
|
@ -297,20 +303,23 @@ template <> struct cache_accessor<float> {
|
||||||
bool is_integer;
|
bool is_integer;
|
||||||
};
|
};
|
||||||
|
|
||||||
static compute_mul_result compute_mul(
|
static auto compute_mul(carrier_uint u,
|
||||||
carrier_uint u, const cache_entry_type& cache) noexcept {
|
const cache_entry_type& cache) noexcept
|
||||||
|
-> compute_mul_result {
|
||||||
auto r = umul96_upper64(u, cache);
|
auto r = umul96_upper64(u, cache);
|
||||||
return {static_cast<carrier_uint>(r >> 32),
|
return {static_cast<carrier_uint>(r >> 32),
|
||||||
static_cast<carrier_uint>(r) == 0};
|
static_cast<carrier_uint>(r) == 0};
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t compute_delta(const cache_entry_type& cache,
|
static auto compute_delta(const cache_entry_type& cache, int beta) noexcept
|
||||||
int beta) noexcept {
|
-> uint32_t {
|
||||||
return static_cast<uint32_t>(cache >> (64 - 1 - beta));
|
return static_cast<uint32_t>(cache >> (64 - 1 - beta));
|
||||||
}
|
}
|
||||||
|
|
||||||
static compute_mul_parity_result compute_mul_parity(
|
static auto compute_mul_parity(carrier_uint two_f,
|
||||||
carrier_uint two_f, const cache_entry_type& cache, int beta) noexcept {
|
const cache_entry_type& cache,
|
||||||
|
int beta) noexcept
|
||||||
|
-> compute_mul_parity_result {
|
||||||
FMT_ASSERT(beta >= 1, "");
|
FMT_ASSERT(beta >= 1, "");
|
||||||
FMT_ASSERT(beta < 64, "");
|
FMT_ASSERT(beta < 64, "");
|
||||||
|
|
||||||
|
@ -319,22 +328,22 @@ template <> struct cache_accessor<float> {
|
||||||
static_cast<uint32_t>(r >> (32 - beta)) == 0};
|
static_cast<uint32_t>(r >> (32 - beta)) == 0};
|
||||||
}
|
}
|
||||||
|
|
||||||
static carrier_uint compute_left_endpoint_for_shorter_interval_case(
|
static auto compute_left_endpoint_for_shorter_interval_case(
|
||||||
const cache_entry_type& cache, int beta) noexcept {
|
const cache_entry_type& cache, int beta) noexcept -> carrier_uint {
|
||||||
return static_cast<carrier_uint>(
|
return static_cast<carrier_uint>(
|
||||||
(cache - (cache >> (num_significand_bits<float>() + 2))) >>
|
(cache - (cache >> (num_significand_bits<float>() + 2))) >>
|
||||||
(64 - num_significand_bits<float>() - 1 - beta));
|
(64 - num_significand_bits<float>() - 1 - beta));
|
||||||
}
|
}
|
||||||
|
|
||||||
static carrier_uint compute_right_endpoint_for_shorter_interval_case(
|
static auto compute_right_endpoint_for_shorter_interval_case(
|
||||||
const cache_entry_type& cache, int beta) noexcept {
|
const cache_entry_type& cache, int beta) noexcept -> carrier_uint {
|
||||||
return static_cast<carrier_uint>(
|
return static_cast<carrier_uint>(
|
||||||
(cache + (cache >> (num_significand_bits<float>() + 1))) >>
|
(cache + (cache >> (num_significand_bits<float>() + 1))) >>
|
||||||
(64 - num_significand_bits<float>() - 1 - beta));
|
(64 - num_significand_bits<float>() - 1 - beta));
|
||||||
}
|
}
|
||||||
|
|
||||||
static carrier_uint compute_round_up_for_shorter_interval_case(
|
static auto compute_round_up_for_shorter_interval_case(
|
||||||
const cache_entry_type& cache, int beta) noexcept {
|
const cache_entry_type& cache, int beta) noexcept -> carrier_uint {
|
||||||
return (static_cast<carrier_uint>(
|
return (static_cast<carrier_uint>(
|
||||||
cache >> (64 - num_significand_bits<float>() - 2 - beta)) +
|
cache >> (64 - num_significand_bits<float>() - 2 - beta)) +
|
||||||
1) /
|
1) /
|
||||||
|
@ -346,7 +355,7 @@ template <> struct cache_accessor<double> {
|
||||||
using carrier_uint = float_info<double>::carrier_uint;
|
using carrier_uint = float_info<double>::carrier_uint;
|
||||||
using cache_entry_type = uint128_fallback;
|
using cache_entry_type = uint128_fallback;
|
||||||
|
|
||||||
static uint128_fallback get_cached_power(int k) noexcept {
|
static auto get_cached_power(int k) noexcept -> uint128_fallback {
|
||||||
FMT_ASSERT(k >= float_info<double>::min_k && k <= float_info<double>::max_k,
|
FMT_ASSERT(k >= float_info<double>::min_k && k <= float_info<double>::max_k,
|
||||||
"k is out of range");
|
"k is out of range");
|
||||||
|
|
||||||
|
@ -985,8 +994,7 @@ template <> struct cache_accessor<double> {
|
||||||
{0xe0accfa875af45a7, 0x93eb1b80a33b8606},
|
{0xe0accfa875af45a7, 0x93eb1b80a33b8606},
|
||||||
{0x8c6c01c9498d8b88, 0xbc72f130660533c4},
|
{0x8c6c01c9498d8b88, 0xbc72f130660533c4},
|
||||||
{0xaf87023b9bf0ee6a, 0xeb8fad7c7f8680b5},
|
{0xaf87023b9bf0ee6a, 0xeb8fad7c7f8680b5},
|
||||||
{ 0xdb68c2ca82ed2a05,
|
{0xdb68c2ca82ed2a05, 0xa67398db9f6820e2},
|
||||||
0xa67398db9f6820e2 }
|
|
||||||
#else
|
#else
|
||||||
{0xff77b1fcbebcdc4f, 0x25e8e89c13bb0f7b},
|
{0xff77b1fcbebcdc4f, 0x25e8e89c13bb0f7b},
|
||||||
{0xce5d73ff402d98e3, 0xfb0a3d212dc81290},
|
{0xce5d73ff402d98e3, 0xfb0a3d212dc81290},
|
||||||
|
@ -1071,19 +1079,22 @@ template <> struct cache_accessor<double> {
|
||||||
bool is_integer;
|
bool is_integer;
|
||||||
};
|
};
|
||||||
|
|
||||||
static compute_mul_result compute_mul(
|
static auto compute_mul(carrier_uint u,
|
||||||
carrier_uint u, const cache_entry_type& cache) noexcept {
|
const cache_entry_type& cache) noexcept
|
||||||
|
-> compute_mul_result {
|
||||||
auto r = umul192_upper128(u, cache);
|
auto r = umul192_upper128(u, cache);
|
||||||
return {r.high(), r.low() == 0};
|
return {r.high(), r.low() == 0};
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t compute_delta(cache_entry_type const& cache,
|
static auto compute_delta(cache_entry_type const& cache, int beta) noexcept
|
||||||
int beta) noexcept {
|
-> uint32_t {
|
||||||
return static_cast<uint32_t>(cache.high() >> (64 - 1 - beta));
|
return static_cast<uint32_t>(cache.high() >> (64 - 1 - beta));
|
||||||
}
|
}
|
||||||
|
|
||||||
static compute_mul_parity_result compute_mul_parity(
|
static auto compute_mul_parity(carrier_uint two_f,
|
||||||
carrier_uint two_f, const cache_entry_type& cache, int beta) noexcept {
|
const cache_entry_type& cache,
|
||||||
|
int beta) noexcept
|
||||||
|
-> compute_mul_parity_result {
|
||||||
FMT_ASSERT(beta >= 1, "");
|
FMT_ASSERT(beta >= 1, "");
|
||||||
FMT_ASSERT(beta < 64, "");
|
FMT_ASSERT(beta < 64, "");
|
||||||
|
|
||||||
|
@ -1092,35 +1103,35 @@ template <> struct cache_accessor<double> {
|
||||||
((r.high() << beta) | (r.low() >> (64 - beta))) == 0};
|
((r.high() << beta) | (r.low() >> (64 - beta))) == 0};
|
||||||
}
|
}
|
||||||
|
|
||||||
static carrier_uint compute_left_endpoint_for_shorter_interval_case(
|
static auto compute_left_endpoint_for_shorter_interval_case(
|
||||||
const cache_entry_type& cache, int beta) noexcept {
|
const cache_entry_type& cache, int beta) noexcept -> carrier_uint {
|
||||||
return (cache.high() -
|
return (cache.high() -
|
||||||
(cache.high() >> (num_significand_bits<double>() + 2))) >>
|
(cache.high() >> (num_significand_bits<double>() + 2))) >>
|
||||||
(64 - num_significand_bits<double>() - 1 - beta);
|
(64 - num_significand_bits<double>() - 1 - beta);
|
||||||
}
|
}
|
||||||
|
|
||||||
static carrier_uint compute_right_endpoint_for_shorter_interval_case(
|
static auto compute_right_endpoint_for_shorter_interval_case(
|
||||||
const cache_entry_type& cache, int beta) noexcept {
|
const cache_entry_type& cache, int beta) noexcept -> carrier_uint {
|
||||||
return (cache.high() +
|
return (cache.high() +
|
||||||
(cache.high() >> (num_significand_bits<double>() + 1))) >>
|
(cache.high() >> (num_significand_bits<double>() + 1))) >>
|
||||||
(64 - num_significand_bits<double>() - 1 - beta);
|
(64 - num_significand_bits<double>() - 1 - beta);
|
||||||
}
|
}
|
||||||
|
|
||||||
static carrier_uint compute_round_up_for_shorter_interval_case(
|
static auto compute_round_up_for_shorter_interval_case(
|
||||||
const cache_entry_type& cache, int beta) noexcept {
|
const cache_entry_type& cache, int beta) noexcept -> carrier_uint {
|
||||||
return ((cache.high() >> (64 - num_significand_bits<double>() - 2 - beta)) +
|
return ((cache.high() >> (64 - num_significand_bits<double>() - 2 - beta)) +
|
||||||
1) /
|
1) /
|
||||||
2;
|
2;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
FMT_FUNC uint128_fallback get_cached_power(int k) noexcept {
|
FMT_FUNC auto get_cached_power(int k) noexcept -> uint128_fallback {
|
||||||
return cache_accessor<double>::get_cached_power(k);
|
return cache_accessor<double>::get_cached_power(k);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Various integer checks
|
// Various integer checks
|
||||||
template <typename T>
|
template <typename T>
|
||||||
bool is_left_endpoint_integer_shorter_interval(int exponent) noexcept {
|
auto is_left_endpoint_integer_shorter_interval(int exponent) noexcept -> bool {
|
||||||
const int case_shorter_interval_left_endpoint_lower_threshold = 2;
|
const int case_shorter_interval_left_endpoint_lower_threshold = 2;
|
||||||
const int case_shorter_interval_left_endpoint_upper_threshold = 3;
|
const int case_shorter_interval_left_endpoint_upper_threshold = 3;
|
||||||
return exponent >= case_shorter_interval_left_endpoint_lower_threshold &&
|
return exponent >= case_shorter_interval_left_endpoint_lower_threshold &&
|
||||||
|
@ -1132,7 +1143,7 @@ FMT_INLINE int remove_trailing_zeros(uint32_t& n, int s = 0) noexcept {
|
||||||
FMT_ASSERT(n != 0, "");
|
FMT_ASSERT(n != 0, "");
|
||||||
// Modular inverse of 5 (mod 2^32): (mod_inv_5 * 5) mod 2^32 = 1.
|
// Modular inverse of 5 (mod 2^32): (mod_inv_5 * 5) mod 2^32 = 1.
|
||||||
constexpr uint32_t mod_inv_5 = 0xcccccccd;
|
constexpr uint32_t mod_inv_5 = 0xcccccccd;
|
||||||
constexpr uint32_t mod_inv_25 = 0xc28f5c29; // = mod_inv_5 * mod_inv_5
|
constexpr uint32_t mod_inv_25 = 0xc28f5c29; // = mod_inv_5 * mod_inv_5
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
auto q = rotr(n * mod_inv_25, 2);
|
auto q = rotr(n * mod_inv_25, 2);
|
||||||
|
@ -1168,7 +1179,7 @@ FMT_INLINE int remove_trailing_zeros(uint64_t& n) noexcept {
|
||||||
|
|
||||||
// If n is not divisible by 10^8, work with n itself.
|
// If n is not divisible by 10^8, work with n itself.
|
||||||
constexpr uint64_t mod_inv_5 = 0xcccccccccccccccd;
|
constexpr uint64_t mod_inv_5 = 0xcccccccccccccccd;
|
||||||
constexpr uint64_t mod_inv_25 = 0x8f5c28f5c28f5c29; // = mod_inv_5 * mod_inv_5
|
constexpr uint64_t mod_inv_25 = 0x8f5c28f5c28f5c29; // mod_inv_5 * mod_inv_5
|
||||||
|
|
||||||
int s = 0;
|
int s = 0;
|
||||||
while (true) {
|
while (true) {
|
||||||
|
@ -1234,7 +1245,7 @@ FMT_INLINE decimal_fp<T> shorter_interval_case(int exponent) noexcept {
|
||||||
return ret_value;
|
return ret_value;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T> decimal_fp<T> to_decimal(T x) noexcept {
|
template <typename T> auto to_decimal(T x) noexcept -> decimal_fp<T> {
|
||||||
// Step 1: integer promotion & Schubfach multiplier calculation.
|
// Step 1: integer promotion & Schubfach multiplier calculation.
|
||||||
|
|
||||||
using carrier_uint = typename float_info<T>::carrier_uint;
|
using carrier_uint = typename float_info<T>::carrier_uint;
|
||||||
|
@ -1373,15 +1384,15 @@ template <> struct formatter<detail::bigint> {
|
||||||
for (auto i = n.bigits_.size(); i > 0; --i) {
|
for (auto i = n.bigits_.size(); i > 0; --i) {
|
||||||
auto value = n.bigits_[i - 1u];
|
auto value = n.bigits_[i - 1u];
|
||||||
if (first) {
|
if (first) {
|
||||||
out = format_to(out, FMT_STRING("{:x}"), value);
|
out = fmt::format_to(out, FMT_STRING("{:x}"), value);
|
||||||
first = false;
|
first = false;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
out = format_to(out, FMT_STRING("{:08x}"), value);
|
out = fmt::format_to(out, FMT_STRING("{:08x}"), value);
|
||||||
}
|
}
|
||||||
if (n.exp_ > 0)
|
if (n.exp_ > 0)
|
||||||
out = format_to(out, FMT_STRING("p{}"),
|
out = fmt::format_to(out, FMT_STRING("p{}"),
|
||||||
n.exp_ * detail::bigint::bigit_bits);
|
n.exp_ * detail::bigint::bigit_bits);
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -1405,7 +1416,7 @@ FMT_FUNC void format_system_error(detail::buffer<char>& out, int error_code,
|
||||||
const char* message) noexcept {
|
const char* message) noexcept {
|
||||||
FMT_TRY {
|
FMT_TRY {
|
||||||
auto ec = std::error_code(error_code, std::generic_category());
|
auto ec = std::error_code(error_code, std::generic_category());
|
||||||
write(std::back_inserter(out), std::system_error(ec, message).what());
|
detail::write(appender(out), std::system_error(ec, message).what());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
FMT_CATCH(...) {}
|
FMT_CATCH(...) {}
|
||||||
|
@ -1417,7 +1428,7 @@ FMT_FUNC void report_system_error(int error_code,
|
||||||
report_error(format_system_error, error_code, message);
|
report_error(format_system_error, error_code, message);
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_FUNC std::string vformat(string_view fmt, format_args args) {
|
FMT_FUNC auto vformat(string_view fmt, format_args args) -> std::string {
|
||||||
// Don't optimize the "{}" case to keep the binary size small and because it
|
// Don't optimize the "{}" case to keep the binary size small and because it
|
||||||
// can be better optimized in fmt::format anyway.
|
// can be better optimized in fmt::format anyway.
|
||||||
auto buffer = memory_buffer();
|
auto buffer = memory_buffer();
|
||||||
|
@ -1426,42 +1437,297 @@ FMT_FUNC std::string vformat(string_view fmt, format_args args) {
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace detail {
|
namespace detail {
|
||||||
#ifndef _WIN32
|
|
||||||
FMT_FUNC bool write_console(std::FILE*, string_view) { return false; }
|
template <typename T> struct span {
|
||||||
|
T* data;
|
||||||
|
size_t size;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename F> auto flockfile(F* f) -> decltype(_lock_file(f)) {
|
||||||
|
_lock_file(f);
|
||||||
|
}
|
||||||
|
template <typename F> auto funlockfile(F* f) -> decltype(_unlock_file(f)) {
|
||||||
|
_unlock_file(f);
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifndef getc_unlocked
|
||||||
|
template <typename F> auto getc_unlocked(F* f) -> decltype(_fgetc_nolock(f)) {
|
||||||
|
return _fgetc_nolock(f);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
template <typename F = FILE, typename Enable = void>
|
||||||
|
struct has_flockfile : std::false_type {};
|
||||||
|
|
||||||
|
template <typename F>
|
||||||
|
struct has_flockfile<F, void_t<decltype(flockfile(&std::declval<F&>()))>>
|
||||||
|
: std::true_type {};
|
||||||
|
|
||||||
|
// A FILE wrapper. F is FILE defined as a template parameter to make system API
|
||||||
|
// detection work.
|
||||||
|
template <typename F> class file_base {
|
||||||
|
public:
|
||||||
|
F* file_;
|
||||||
|
|
||||||
|
public:
|
||||||
|
file_base(F* file) : file_(file) {}
|
||||||
|
operator F*() const { return file_; }
|
||||||
|
|
||||||
|
// Reads a code unit from the stream.
|
||||||
|
auto get() -> int {
|
||||||
|
int result = getc_unlocked(file_);
|
||||||
|
if (result == EOF && ferror(file_) != 0)
|
||||||
|
FMT_THROW(system_error(errno, FMT_STRING("getc failed")));
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Puts the code unit back into the stream buffer.
|
||||||
|
void unget(char c) {
|
||||||
|
if (ungetc(c, file_) == EOF)
|
||||||
|
FMT_THROW(system_error(errno, FMT_STRING("ungetc failed")));
|
||||||
|
}
|
||||||
|
|
||||||
|
void flush() { fflush(this->file_); }
|
||||||
|
};
|
||||||
|
|
||||||
|
// A FILE wrapper for glibc.
|
||||||
|
template <typename F> class glibc_file : public file_base<F> {
|
||||||
|
private:
|
||||||
|
enum {
|
||||||
|
line_buffered = 0x200, // _IO_LINE_BUF
|
||||||
|
unbuffered = 2 // _IO_UNBUFFERED
|
||||||
|
};
|
||||||
|
|
||||||
|
public:
|
||||||
|
using file_base<F>::file_base;
|
||||||
|
|
||||||
|
auto is_buffered() const -> bool {
|
||||||
|
return (this->file_->_flags & unbuffered) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void init_buffer() {
|
||||||
|
if (this->file_->_IO_write_ptr) return;
|
||||||
|
// Force buffer initialization by placing and removing a char in a buffer.
|
||||||
|
putc_unlocked(0, this->file_);
|
||||||
|
--this->file_->_IO_write_ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Returns the file's read buffer.
|
||||||
|
auto get_read_buffer() const -> span<const char> {
|
||||||
|
auto ptr = this->file_->_IO_read_ptr;
|
||||||
|
return {ptr, to_unsigned(this->file_->_IO_read_end - ptr)};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Returns the file's write buffer.
|
||||||
|
auto get_write_buffer() const -> span<char> {
|
||||||
|
auto ptr = this->file_->_IO_write_ptr;
|
||||||
|
return {ptr, to_unsigned(this->file_->_IO_buf_end - ptr)};
|
||||||
|
}
|
||||||
|
|
||||||
|
void advance_write_buffer(size_t size) { this->file_->_IO_write_ptr += size; }
|
||||||
|
|
||||||
|
bool needs_flush() const {
|
||||||
|
if ((this->file_->_flags & line_buffered) == 0) return false;
|
||||||
|
char* end = this->file_->_IO_write_end;
|
||||||
|
return memchr(end, '\n', to_unsigned(this->file_->_IO_write_ptr - end));
|
||||||
|
}
|
||||||
|
|
||||||
|
void flush() { fflush_unlocked(this->file_); }
|
||||||
|
};
|
||||||
|
|
||||||
|
// A FILE wrapper for Apple's libc.
|
||||||
|
template <typename F> class apple_file : public file_base<F> {
|
||||||
|
private:
|
||||||
|
enum {
|
||||||
|
line_buffered = 1, // __SNBF
|
||||||
|
unbuffered = 2 // __SLBF
|
||||||
|
};
|
||||||
|
|
||||||
|
public:
|
||||||
|
using file_base<F>::file_base;
|
||||||
|
|
||||||
|
auto is_buffered() const -> bool {
|
||||||
|
return (this->file_->_flags & unbuffered) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void init_buffer() {
|
||||||
|
if (this->file_->_p) return;
|
||||||
|
// Force buffer initialization by placing and removing a char in a buffer.
|
||||||
|
putc_unlocked(0, this->file_);
|
||||||
|
--this->file_->_p;
|
||||||
|
++this->file_->_w;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto get_read_buffer() const -> span<const char> {
|
||||||
|
return {reinterpret_cast<char*>(this->file_->_p),
|
||||||
|
to_unsigned(this->file_->_r)};
|
||||||
|
}
|
||||||
|
|
||||||
|
auto get_write_buffer() const -> span<char> {
|
||||||
|
return {reinterpret_cast<char*>(this->file_->_p),
|
||||||
|
to_unsigned(this->file_->_bf._base + this->file_->_bf._size -
|
||||||
|
this->file_->_p)};
|
||||||
|
}
|
||||||
|
|
||||||
|
void advance_write_buffer(size_t size) {
|
||||||
|
this->file_->_p += size;
|
||||||
|
this->file_->_w -= size;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool needs_flush() const {
|
||||||
|
if ((this->file_->_flags & line_buffered) == 0) return false;
|
||||||
|
return memchr(this->file_->_p + this->file_->_w, '\n',
|
||||||
|
to_unsigned(-this->file_->_w));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// A fallback FILE wrapper.
|
||||||
|
template <typename F> class fallback_file : public file_base<F> {
|
||||||
|
private:
|
||||||
|
char next_; // The next unconsumed character in the buffer.
|
||||||
|
bool has_next_ = false;
|
||||||
|
|
||||||
|
public:
|
||||||
|
using file_base<F>::file_base;
|
||||||
|
|
||||||
|
auto is_buffered() const -> bool { return false; }
|
||||||
|
auto needs_flush() const -> bool { return false; }
|
||||||
|
void init_buffer() {}
|
||||||
|
|
||||||
|
auto get_read_buffer() const -> span<const char> {
|
||||||
|
return {&next_, has_next_ ? 1u : 0u};
|
||||||
|
}
|
||||||
|
|
||||||
|
auto get_write_buffer() const -> span<char> { return {nullptr, 0}; }
|
||||||
|
|
||||||
|
void advance_write_buffer(size_t) {}
|
||||||
|
|
||||||
|
auto get() -> int {
|
||||||
|
has_next_ = false;
|
||||||
|
return file_base<F>::get();
|
||||||
|
}
|
||||||
|
|
||||||
|
void unget(char c) {
|
||||||
|
file_base<F>::unget(c);
|
||||||
|
next_ = c;
|
||||||
|
has_next_ = true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifndef FMT_USE_FALLBACK_FILE
|
||||||
|
# define FMT_USE_FALLBACK_FILE 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
template <typename F,
|
||||||
|
FMT_ENABLE_IF(sizeof(F::_p) != 0 && !FMT_USE_FALLBACK_FILE)>
|
||||||
|
auto get_file(F* f, int) -> apple_file<F> {
|
||||||
|
return f;
|
||||||
|
}
|
||||||
|
template <typename F,
|
||||||
|
FMT_ENABLE_IF(sizeof(F::_IO_read_ptr) != 0 && !FMT_USE_FALLBACK_FILE)>
|
||||||
|
inline auto get_file(F* f, int) -> glibc_file<F> {
|
||||||
|
return f;
|
||||||
|
}
|
||||||
|
|
||||||
|
inline auto get_file(FILE* f, ...) -> fallback_file<FILE> { return f; }
|
||||||
|
|
||||||
|
using file_ref = decltype(get_file(static_cast<FILE*>(nullptr), 0));
|
||||||
|
|
||||||
|
template <typename F = FILE, typename Enable = void>
|
||||||
|
class file_print_buffer : public buffer<char> {
|
||||||
|
public:
|
||||||
|
explicit file_print_buffer(F*) : buffer(nullptr, size_t()) {}
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename F>
|
||||||
|
class file_print_buffer<F, enable_if_t<has_flockfile<F>::value>>
|
||||||
|
: public buffer<char> {
|
||||||
|
private:
|
||||||
|
file_ref file_;
|
||||||
|
|
||||||
|
static void grow(buffer<char>& base, size_t) {
|
||||||
|
auto& self = static_cast<file_print_buffer&>(base);
|
||||||
|
self.file_.advance_write_buffer(self.size());
|
||||||
|
if (self.file_.get_write_buffer().size == 0) self.file_.flush();
|
||||||
|
auto buf = self.file_.get_write_buffer();
|
||||||
|
FMT_ASSERT(buf.size > 0, "");
|
||||||
|
self.set(buf.data, buf.size);
|
||||||
|
self.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit file_print_buffer(F* f) : buffer(grow, size_t()), file_(f) {
|
||||||
|
flockfile(f);
|
||||||
|
file_.init_buffer();
|
||||||
|
auto buf = file_.get_write_buffer();
|
||||||
|
set(buf.data, buf.size);
|
||||||
|
}
|
||||||
|
~file_print_buffer() {
|
||||||
|
file_.advance_write_buffer(size());
|
||||||
|
bool flush = file_.needs_flush();
|
||||||
|
F* f = file_; // Make funlockfile depend on the template parameter F
|
||||||
|
funlockfile(f); // for the system API detection to work.
|
||||||
|
if (flush) fflush(file_);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
#if !defined(_WIN32) || defined(FMT_USE_WRITE_CONSOLE)
|
||||||
|
FMT_FUNC auto write_console(int, string_view) -> bool { return false; }
|
||||||
#else
|
#else
|
||||||
using dword = conditional_t<sizeof(long) == 4, unsigned long, unsigned>;
|
using dword = conditional_t<sizeof(long) == 4, unsigned long, unsigned>;
|
||||||
extern "C" __declspec(dllimport) int __stdcall WriteConsoleW( //
|
extern "C" __declspec(dllimport) int __stdcall WriteConsoleW( //
|
||||||
void*, const void*, dword, dword*, void*);
|
void*, const void*, dword, dword*, void*);
|
||||||
|
|
||||||
FMT_FUNC bool write_console(std::FILE* f, string_view text) {
|
FMT_FUNC bool write_console(int fd, string_view text) {
|
||||||
auto fd = _fileno(f);
|
|
||||||
if (!_isatty(fd)) return false;
|
|
||||||
auto u16 = utf8_to_utf16(text);
|
auto u16 = utf8_to_utf16(text);
|
||||||
auto written = dword();
|
|
||||||
return WriteConsoleW(reinterpret_cast<void*>(_get_osfhandle(fd)), u16.c_str(),
|
return WriteConsoleW(reinterpret_cast<void*>(_get_osfhandle(fd)), u16.c_str(),
|
||||||
static_cast<uint32_t>(u16.size()), &written, nullptr) != 0;
|
static_cast<dword>(u16.size()), nullptr, nullptr) != 0;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
// Print assuming legacy (non-Unicode) encoding.
|
// Print assuming legacy (non-Unicode) encoding.
|
||||||
FMT_FUNC void vprint_mojibake(std::FILE* f, string_view fmt, format_args args) {
|
FMT_FUNC void vprint_mojibake(std::FILE* f, string_view fmt, format_args args,
|
||||||
|
bool newline) {
|
||||||
auto buffer = memory_buffer();
|
auto buffer = memory_buffer();
|
||||||
detail::vformat_to(buffer, fmt,
|
detail::vformat_to(buffer, fmt, args);
|
||||||
basic_format_args<buffer_context<char>>(args));
|
if (newline) buffer.push_back('\n');
|
||||||
fwrite_fully(buffer.data(), 1, buffer.size(), f);
|
fwrite_fully(buffer.data(), buffer.size(), f);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
FMT_FUNC void print(std::FILE* f, string_view text) {
|
FMT_FUNC void print(std::FILE* f, string_view text) {
|
||||||
if (!write_console(f, text)) fwrite_fully(text.data(), 1, text.size(), f);
|
#if defined(_WIN32) && !defined(FMT_USE_WRITE_CONSOLE)
|
||||||
|
int fd = _fileno(f);
|
||||||
|
if (_isatty(fd)) {
|
||||||
|
std::fflush(f);
|
||||||
|
if (write_console(fd, text)) return;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
fwrite_fully(text.data(), text.size(), f);
|
||||||
}
|
}
|
||||||
} // namespace detail
|
} // namespace detail
|
||||||
|
|
||||||
FMT_FUNC void vprint(std::FILE* f, string_view fmt, format_args args) {
|
FMT_FUNC void vprint_buffered(std::FILE* f, string_view fmt, format_args args) {
|
||||||
auto buffer = memory_buffer();
|
auto buffer = memory_buffer();
|
||||||
detail::vformat_to(buffer, fmt, args);
|
detail::vformat_to(buffer, fmt, args);
|
||||||
detail::print(f, {buffer.data(), buffer.size()});
|
detail::print(f, {buffer.data(), buffer.size()});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
FMT_FUNC void vprint(std::FILE* f, string_view fmt, format_args args) {
|
||||||
|
if (!detail::file_ref(f).is_buffered() || !detail::has_flockfile<>())
|
||||||
|
return vprint_buffered(f, fmt, args);
|
||||||
|
auto&& buffer = detail::file_print_buffer<>(f);
|
||||||
|
return detail::vformat_to(buffer, fmt, args);
|
||||||
|
}
|
||||||
|
|
||||||
|
FMT_FUNC void vprintln(std::FILE* f, string_view fmt, format_args args) {
|
||||||
|
auto buffer = memory_buffer();
|
||||||
|
detail::vformat_to(buffer, fmt, args);
|
||||||
|
buffer.push_back('\n');
|
||||||
|
detail::print(f, {buffer.data(), buffer.size()});
|
||||||
|
}
|
||||||
|
|
||||||
FMT_FUNC void vprint(string_view fmt, format_args args) {
|
FMT_FUNC void vprint(string_view fmt, format_args args) {
|
||||||
vprint(stdout, fmt, args);
|
vprint(stdout, fmt, args);
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -8,17 +8,19 @@
|
||||||
#ifndef FMT_OS_H_
|
#ifndef FMT_OS_H_
|
||||||
#define FMT_OS_H_
|
#define FMT_OS_H_
|
||||||
|
|
||||||
#include <cerrno>
|
|
||||||
#include <cstddef>
|
|
||||||
#include <cstdio>
|
|
||||||
#include <system_error> // std::system_error
|
|
||||||
|
|
||||||
#if defined __APPLE__ || defined(__FreeBSD__)
|
|
||||||
# include <xlocale.h> // for LC_NUMERIC_MASK on OS X
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "format.h"
|
#include "format.h"
|
||||||
|
|
||||||
|
#ifndef FMT_MODULE
|
||||||
|
# include <cerrno>
|
||||||
|
# include <cstddef>
|
||||||
|
# include <cstdio>
|
||||||
|
# include <system_error> // std::system_error
|
||||||
|
|
||||||
|
# if FMT_HAS_INCLUDE(<xlocale.h>)
|
||||||
|
# include <xlocale.h> // LC_NUMERIC_MASK on macOS
|
||||||
|
# endif
|
||||||
|
#endif // FMT_MODULE
|
||||||
|
|
||||||
#ifndef FMT_USE_FCNTL
|
#ifndef FMT_USE_FCNTL
|
||||||
// UWP doesn't provide _pipe.
|
// UWP doesn't provide _pipe.
|
||||||
# if FMT_HAS_INCLUDE("winapifamily.h")
|
# if FMT_HAS_INCLUDE("winapifamily.h")
|
||||||
|
@ -46,6 +48,7 @@
|
||||||
|
|
||||||
// Calls to system functions are wrapped in FMT_SYSTEM for testability.
|
// Calls to system functions are wrapped in FMT_SYSTEM for testability.
|
||||||
#ifdef FMT_SYSTEM
|
#ifdef FMT_SYSTEM
|
||||||
|
# define FMT_HAS_SYSTEM
|
||||||
# define FMT_POSIX_CALL(call) FMT_SYSTEM(call)
|
# define FMT_POSIX_CALL(call) FMT_SYSTEM(call)
|
||||||
#else
|
#else
|
||||||
# define FMT_SYSTEM(call) ::call
|
# define FMT_SYSTEM(call) ::call
|
||||||
|
@ -74,47 +77,34 @@ FMT_BEGIN_NAMESPACE
|
||||||
FMT_BEGIN_EXPORT
|
FMT_BEGIN_EXPORT
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* A reference to a null-terminated string. It can be constructed from a C
|
||||||
A reference to a null-terminated string. It can be constructed from a C
|
* string or `std::string`.
|
||||||
string or ``std::string``.
|
*
|
||||||
|
* You can use one of the following type aliases for common character types:
|
||||||
You can use one of the following type aliases for common character types:
|
*
|
||||||
|
* +---------------+-----------------------------+
|
||||||
+---------------+-----------------------------+
|
* | Type | Definition |
|
||||||
| Type | Definition |
|
* +===============+=============================+
|
||||||
+===============+=============================+
|
* | cstring_view | basic_cstring_view<char> |
|
||||||
| cstring_view | basic_cstring_view<char> |
|
* +---------------+-----------------------------+
|
||||||
+---------------+-----------------------------+
|
* | wcstring_view | basic_cstring_view<wchar_t> |
|
||||||
| wcstring_view | basic_cstring_view<wchar_t> |
|
* +---------------+-----------------------------+
|
||||||
+---------------+-----------------------------+
|
*
|
||||||
|
* This class is most useful as a parameter type for functions that wrap C APIs.
|
||||||
This class is most useful as a parameter type to allow passing
|
|
||||||
different types of strings to a function, for example::
|
|
||||||
|
|
||||||
template <typename... Args>
|
|
||||||
std::string format(cstring_view format_str, const Args & ... args);
|
|
||||||
|
|
||||||
format("{}", 42);
|
|
||||||
format(std::string("{}"), 42);
|
|
||||||
\endrst
|
|
||||||
*/
|
*/
|
||||||
template <typename Char> class basic_cstring_view {
|
template <typename Char> class basic_cstring_view {
|
||||||
private:
|
private:
|
||||||
const Char* data_;
|
const Char* data_;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/** Constructs a string reference object from a C string. */
|
/// Constructs a string reference object from a C string.
|
||||||
basic_cstring_view(const Char* s) : data_(s) {}
|
basic_cstring_view(const Char* s) : data_(s) {}
|
||||||
|
|
||||||
/**
|
/// Constructs a string reference from an `std::string` object.
|
||||||
\rst
|
|
||||||
Constructs a string reference from an ``std::string`` object.
|
|
||||||
\endrst
|
|
||||||
*/
|
|
||||||
basic_cstring_view(const std::basic_string<Char>& s) : data_(s.c_str()) {}
|
basic_cstring_view(const std::basic_string<Char>& s) : data_(s.c_str()) {}
|
||||||
|
|
||||||
/** Returns the pointer to a C string. */
|
/// Returns the pointer to a C string.
|
||||||
const Char* c_str() const { return data_; }
|
auto c_str() const -> const Char* { return data_; }
|
||||||
};
|
};
|
||||||
|
|
||||||
using cstring_view = basic_cstring_view<char>;
|
using cstring_view = basic_cstring_view<char>;
|
||||||
|
@ -132,33 +122,30 @@ FMT_API std::system_error vwindows_error(int error_code, string_view format_str,
|
||||||
format_args args);
|
format_args args);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Constructs a `std::system_error` object with the description of the form
|
||||||
Constructs a :class:`std::system_error` object with the description
|
*
|
||||||
of the form
|
* <message>: <system-message>
|
||||||
|
*
|
||||||
.. parsed-literal::
|
* where `<message>` is the formatted message and `<system-message>` is the
|
||||||
*<message>*: *<system-message>*
|
* system message corresponding to the error code.
|
||||||
|
* `error_code` is a Windows error code as given by `GetLastError`.
|
||||||
where *<message>* is the formatted message and *<system-message>* is the
|
* If `error_code` is not a valid error code such as -1, the system message
|
||||||
system message corresponding to the error code.
|
* will look like "error -1".
|
||||||
*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
|
* **Example**:
|
||||||
will look like "error -1".
|
*
|
||||||
|
* // This throws a system_error with the description
|
||||||
**Example**::
|
* // cannot open file 'madeup': The system cannot find the file
|
||||||
|
* specified.
|
||||||
// This throws a system_error with the description
|
* // or similar (system message may vary).
|
||||||
// cannot open file 'madeup': The system cannot find the file specified.
|
* const char *filename = "madeup";
|
||||||
// or similar (system message may vary).
|
* LPOFSTRUCT of = LPOFSTRUCT();
|
||||||
const char *filename = "madeup";
|
* HFILE file = OpenFile(filename, &of, OF_READ);
|
||||||
LPOFSTRUCT of = LPOFSTRUCT();
|
* if (file == HFILE_ERROR) {
|
||||||
HFILE file = OpenFile(filename, &of, OF_READ);
|
* throw fmt::windows_error(GetLastError(),
|
||||||
if (file == HFILE_ERROR) {
|
* "cannot open file '{}'", filename);
|
||||||
throw fmt::windows_error(GetLastError(),
|
* }
|
||||||
"cannot open file '{}'", filename);
|
*/
|
||||||
}
|
|
||||||
\endrst
|
|
||||||
*/
|
|
||||||
template <typename... Args>
|
template <typename... Args>
|
||||||
std::system_error windows_error(int error_code, string_view message,
|
std::system_error windows_error(int error_code, string_view message,
|
||||||
const Args&... args) {
|
const Args&... args) {
|
||||||
|
@ -169,7 +156,7 @@ std::system_error windows_error(int error_code, string_view message,
|
||||||
// Can be used to report errors from destructors.
|
// Can be used to report errors from destructors.
|
||||||
FMT_API void report_windows_error(int error_code, const char* message) noexcept;
|
FMT_API void report_windows_error(int error_code, const char* message) noexcept;
|
||||||
#else
|
#else
|
||||||
inline const std::error_category& system_category() noexcept {
|
inline auto system_category() noexcept -> const std::error_category& {
|
||||||
return std::system_category();
|
return std::system_category();
|
||||||
}
|
}
|
||||||
#endif // _WIN32
|
#endif // _WIN32
|
||||||
|
@ -206,7 +193,7 @@ class buffered_file {
|
||||||
other.file_ = nullptr;
|
other.file_ = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
buffered_file& operator=(buffered_file&& other) {
|
auto operator=(buffered_file&& other) -> buffered_file& {
|
||||||
close();
|
close();
|
||||||
file_ = other.file_;
|
file_ = other.file_;
|
||||||
other.file_ = nullptr;
|
other.file_ = nullptr;
|
||||||
|
@ -220,21 +207,20 @@ class buffered_file {
|
||||||
FMT_API void close();
|
FMT_API void close();
|
||||||
|
|
||||||
// Returns the pointer to a FILE object representing this file.
|
// Returns the pointer to a FILE object representing this file.
|
||||||
FILE* get() const noexcept { return file_; }
|
auto get() const noexcept -> FILE* { return file_; }
|
||||||
|
|
||||||
FMT_API int descriptor() const;
|
FMT_API auto descriptor() const -> int;
|
||||||
|
|
||||||
void vprint(string_view format_str, format_args args) {
|
template <typename... T>
|
||||||
fmt::vprint(file_, format_str, args);
|
inline void print(string_view fmt, const T&... args) {
|
||||||
}
|
const auto& vargs = fmt::make_format_args(args...);
|
||||||
|
detail::is_locking<T...>() ? fmt::vprint_buffered(file_, fmt, vargs)
|
||||||
template <typename... Args>
|
: fmt::vprint(file_, fmt, vargs);
|
||||||
inline void print(string_view format_str, const Args&... args) {
|
|
||||||
vprint(format_str, fmt::make_format_args(args...));
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
#if FMT_USE_FCNTL
|
#if FMT_USE_FCNTL
|
||||||
|
|
||||||
// A file. Closed file is represented by a file object with descriptor -1.
|
// A file. Closed file is represented by a file object with descriptor -1.
|
||||||
// Methods that are not declared with noexcept may throw
|
// Methods that are not declared with noexcept may throw
|
||||||
// fmt::system_error in case of failure. Note that some errors such as
|
// fmt::system_error in case of failure. Note that some errors such as
|
||||||
|
@ -248,6 +234,8 @@ class FMT_API file {
|
||||||
// Constructs a file object with a given descriptor.
|
// Constructs a file object with a given descriptor.
|
||||||
explicit file(int fd) : fd_(fd) {}
|
explicit file(int fd) : fd_(fd) {}
|
||||||
|
|
||||||
|
friend struct pipe;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// Possible values for the oflag argument to the constructor.
|
// Possible values for the oflag argument to the constructor.
|
||||||
enum {
|
enum {
|
||||||
|
@ -272,7 +260,7 @@ class FMT_API file {
|
||||||
file(file&& other) noexcept : fd_(other.fd_) { other.fd_ = -1; }
|
file(file&& other) noexcept : fd_(other.fd_) { other.fd_ = -1; }
|
||||||
|
|
||||||
// Move assignment is not noexcept because close may throw.
|
// Move assignment is not noexcept because close may throw.
|
||||||
file& operator=(file&& other) {
|
auto operator=(file&& other) -> file& {
|
||||||
close();
|
close();
|
||||||
fd_ = other.fd_;
|
fd_ = other.fd_;
|
||||||
other.fd_ = -1;
|
other.fd_ = -1;
|
||||||
|
@ -283,24 +271,24 @@ class FMT_API file {
|
||||||
~file() noexcept;
|
~file() noexcept;
|
||||||
|
|
||||||
// Returns the file descriptor.
|
// Returns the file descriptor.
|
||||||
int descriptor() const noexcept { return fd_; }
|
auto descriptor() const noexcept -> int { return fd_; }
|
||||||
|
|
||||||
// Closes the file.
|
// Closes the file.
|
||||||
void close();
|
void close();
|
||||||
|
|
||||||
// Returns the file size. The size has signed type for consistency with
|
// Returns the file size. The size has signed type for consistency with
|
||||||
// stat::st_size.
|
// stat::st_size.
|
||||||
long long size() const;
|
auto size() const -> long long;
|
||||||
|
|
||||||
// Attempts to read count bytes from the file into the specified buffer.
|
// Attempts to read count bytes from the file into the specified buffer.
|
||||||
size_t read(void* buffer, size_t count);
|
auto read(void* buffer, size_t count) -> size_t;
|
||||||
|
|
||||||
// Attempts to write count bytes from the specified buffer to the file.
|
// Attempts to write count bytes from the specified buffer to the file.
|
||||||
size_t write(const void* buffer, size_t count);
|
auto write(const void* buffer, size_t count) -> size_t;
|
||||||
|
|
||||||
// Duplicates a file descriptor with the dup function and returns
|
// Duplicates a file descriptor with the dup function and returns
|
||||||
// the duplicate as a file object.
|
// the duplicate as a file object.
|
||||||
static file dup(int fd);
|
static auto dup(int fd) -> file;
|
||||||
|
|
||||||
// Makes fd be the copy of this file descriptor, closing fd first if
|
// Makes fd be the copy of this file descriptor, closing fd first if
|
||||||
// necessary.
|
// necessary.
|
||||||
|
@ -310,13 +298,9 @@ class FMT_API file {
|
||||||
// necessary.
|
// necessary.
|
||||||
void dup2(int fd, std::error_code& ec) noexcept;
|
void dup2(int fd, std::error_code& ec) noexcept;
|
||||||
|
|
||||||
// Creates a pipe setting up read_end and write_end file objects for reading
|
|
||||||
// and writing respectively.
|
|
||||||
static void pipe(file& read_end, file& write_end);
|
|
||||||
|
|
||||||
// Creates a buffered_file object associated with this file and detaches
|
// Creates a buffered_file object associated with this file and detaches
|
||||||
// this file object from the file.
|
// this file object from the file.
|
||||||
buffered_file fdopen(const char* mode);
|
auto fdopen(const char* mode) -> buffered_file;
|
||||||
|
|
||||||
# if defined(_WIN32) && !defined(__MINGW32__)
|
# if defined(_WIN32) && !defined(__MINGW32__)
|
||||||
// Opens a file and constructs a file object representing this file by
|
// Opens a file and constructs a file object representing this file by
|
||||||
|
@ -325,15 +309,24 @@ class FMT_API file {
|
||||||
# endif
|
# endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct FMT_API pipe {
|
||||||
|
file read_end;
|
||||||
|
file write_end;
|
||||||
|
|
||||||
|
// Creates a pipe setting up read_end and write_end file objects for reading
|
||||||
|
// and writing respectively.
|
||||||
|
pipe();
|
||||||
|
};
|
||||||
|
|
||||||
// Returns the memory page size.
|
// Returns the memory page size.
|
||||||
long getpagesize();
|
auto getpagesize() -> long;
|
||||||
|
|
||||||
namespace detail {
|
namespace detail {
|
||||||
|
|
||||||
struct buffer_size {
|
struct buffer_size {
|
||||||
buffer_size() = default;
|
buffer_size() = default;
|
||||||
size_t value = 0;
|
size_t value = 0;
|
||||||
buffer_size operator=(size_t val) const {
|
auto operator=(size_t val) const -> buffer_size {
|
||||||
auto bs = buffer_size();
|
auto bs = buffer_size();
|
||||||
bs.value = val;
|
bs.value = val;
|
||||||
return bs;
|
return bs;
|
||||||
|
@ -366,13 +359,14 @@ struct ostream_params {
|
||||||
};
|
};
|
||||||
|
|
||||||
class file_buffer final : public buffer<char> {
|
class file_buffer final : public buffer<char> {
|
||||||
|
private:
|
||||||
file file_;
|
file file_;
|
||||||
|
|
||||||
FMT_API void grow(size_t) override;
|
FMT_API static void grow(buffer<char>& buf, size_t);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
FMT_API file_buffer(cstring_view path, const ostream_params& params);
|
FMT_API file_buffer(cstring_view path, const ostream_params& params);
|
||||||
FMT_API file_buffer(file_buffer&& other);
|
FMT_API file_buffer(file_buffer&& other) noexcept;
|
||||||
FMT_API ~file_buffer();
|
FMT_API ~file_buffer();
|
||||||
|
|
||||||
void flush() {
|
void flush() {
|
||||||
|
@ -389,11 +383,10 @@ class file_buffer final : public buffer<char> {
|
||||||
|
|
||||||
} // namespace detail
|
} // namespace detail
|
||||||
|
|
||||||
// Added {} below to work around default constructor error known to
|
constexpr auto buffer_size = detail::buffer_size();
|
||||||
// occur in Xcode versions 7.2.1 and 8.2.1.
|
|
||||||
constexpr detail::buffer_size buffer_size{};
|
|
||||||
|
|
||||||
/** A fast output stream which is not thread-safe. */
|
/// A fast output stream for writing from a single thread. Writing from
|
||||||
|
/// multiple threads without external synchronization may result in a data race.
|
||||||
class FMT_API ostream {
|
class FMT_API ostream {
|
||||||
private:
|
private:
|
||||||
FMT_MSC_WARNING(suppress : 4251)
|
FMT_MSC_WARNING(suppress : 4251)
|
||||||
|
@ -410,37 +403,32 @@ class FMT_API ostream {
|
||||||
void flush() { buffer_.flush(); }
|
void flush() { buffer_.flush(); }
|
||||||
|
|
||||||
template <typename... T>
|
template <typename... T>
|
||||||
friend ostream output_file(cstring_view path, T... params);
|
friend auto output_file(cstring_view path, T... params) -> ostream;
|
||||||
|
|
||||||
void close() { buffer_.close(); }
|
void close() { buffer_.close(); }
|
||||||
|
|
||||||
/**
|
/// Formats `args` according to specifications in `fmt` and writes the
|
||||||
Formats ``args`` according to specifications in ``fmt`` and writes the
|
/// output to the file.
|
||||||
output to the file.
|
|
||||||
*/
|
|
||||||
template <typename... T> void print(format_string<T...> fmt, T&&... args) {
|
template <typename... T> void print(format_string<T...> fmt, T&&... args) {
|
||||||
vformat_to(detail::buffer_appender<char>(buffer_), fmt,
|
vformat_to(appender(buffer_), fmt, fmt::make_format_args(args...));
|
||||||
fmt::make_format_args(args...));
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Opens a file for writing. Supported parameters passed in `params`:
|
||||||
Opens a file for writing. Supported parameters passed in *params*:
|
*
|
||||||
|
* - `<integer>`: Flags passed to [open](
|
||||||
* ``<integer>``: Flags passed to `open
|
* https://pubs.opengroup.org/onlinepubs/007904875/functions/open.html)
|
||||||
<https://pubs.opengroup.org/onlinepubs/007904875/functions/open.html>`_
|
* (`file::WRONLY | file::CREATE | file::TRUNC` by default)
|
||||||
(``file::WRONLY | file::CREATE | file::TRUNC`` by default)
|
* - `buffer_size=<integer>`: Output buffer size
|
||||||
* ``buffer_size=<integer>``: Output buffer size
|
*
|
||||||
|
* **Example**:
|
||||||
**Example**::
|
*
|
||||||
|
* auto out = fmt::output_file("guide.txt");
|
||||||
auto out = fmt::output_file("guide.txt");
|
* out.print("Don't {}", "Panic");
|
||||||
out.print("Don't {}", "Panic");
|
|
||||||
\endrst
|
|
||||||
*/
|
*/
|
||||||
template <typename... T>
|
template <typename... T>
|
||||||
inline ostream output_file(cstring_view path, T... params) {
|
inline auto output_file(cstring_view path, T... params) -> ostream {
|
||||||
return {path, detail::ostream_params(params...)};
|
return {path, detail::ostream_params(params...)};
|
||||||
}
|
}
|
||||||
#endif // FMT_USE_FCNTL
|
#endif // FMT_USE_FCNTL
|
||||||
|
|
|
@ -8,19 +8,21 @@
|
||||||
#ifndef FMT_OSTREAM_H_
|
#ifndef FMT_OSTREAM_H_
|
||||||
#define FMT_OSTREAM_H_
|
#define FMT_OSTREAM_H_
|
||||||
|
|
||||||
#include <fstream> // std::filebuf
|
#ifndef FMT_MODULE
|
||||||
|
# include <fstream> // std::filebuf
|
||||||
#if defined(_WIN32) && defined(__GLIBCXX__)
|
|
||||||
# include <ext/stdio_filebuf.h>
|
|
||||||
# include <ext/stdio_sync_filebuf.h>
|
|
||||||
#elif defined(_WIN32) && defined(_LIBCPP_VERSION)
|
|
||||||
# include <__std_stream>
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "format.h"
|
#ifdef _WIN32
|
||||||
|
# ifdef __GLIBCXX__
|
||||||
|
# include <ext/stdio_filebuf.h>
|
||||||
|
# include <ext/stdio_sync_filebuf.h>
|
||||||
|
# endif
|
||||||
|
# include <io.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "chrono.h" // formatbuf
|
||||||
|
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
namespace detail {
|
namespace detail {
|
||||||
|
|
||||||
// Generate a unique explicit instantion in every translation unit using a tag
|
// Generate a unique explicit instantion in every translation unit using a tag
|
||||||
|
@ -37,36 +39,40 @@ class file_access {
|
||||||
template class file_access<file_access_tag, std::filebuf,
|
template class file_access<file_access_tag, std::filebuf,
|
||||||
&std::filebuf::_Myfile>;
|
&std::filebuf::_Myfile>;
|
||||||
auto get_file(std::filebuf&) -> FILE*;
|
auto get_file(std::filebuf&) -> FILE*;
|
||||||
#elif defined(_WIN32) && defined(_LIBCPP_VERSION)
|
|
||||||
template class file_access<file_access_tag, std::__stdoutbuf<char>,
|
|
||||||
&std::__stdoutbuf<char>::__file_>;
|
|
||||||
auto get_file(std::__stdoutbuf<char>&) -> FILE*;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
inline bool write_ostream_unicode(std::ostream& os, fmt::string_view data) {
|
inline auto write_ostream_unicode(std::ostream& os, fmt::string_view data)
|
||||||
#if FMT_MSC_VERSION
|
-> bool {
|
||||||
|
FILE* f = nullptr;
|
||||||
|
#if FMT_MSC_VERSION && FMT_USE_RTTI
|
||||||
if (auto* buf = dynamic_cast<std::filebuf*>(os.rdbuf()))
|
if (auto* buf = dynamic_cast<std::filebuf*>(os.rdbuf()))
|
||||||
if (FILE* f = get_file(*buf)) return write_console(f, data);
|
f = get_file(*buf);
|
||||||
#elif defined(_WIN32) && defined(__GLIBCXX__)
|
else
|
||||||
auto* rdbuf = os.rdbuf();
|
return false;
|
||||||
FILE* c_file;
|
#elif defined(_WIN32) && defined(__GLIBCXX__) && FMT_USE_RTTI
|
||||||
if (auto* sfbuf = dynamic_cast<__gnu_cxx::stdio_sync_filebuf<char>*>(rdbuf))
|
auto* rdbuf = os.rdbuf();
|
||||||
c_file = sfbuf->file();
|
if (auto* sfbuf = dynamic_cast<__gnu_cxx::stdio_sync_filebuf<char>*>(rdbuf))
|
||||||
else if (auto* fbuf = dynamic_cast<__gnu_cxx::stdio_filebuf<char>*>(rdbuf))
|
f = sfbuf->file();
|
||||||
c_file = fbuf->file();
|
else if (auto* fbuf = dynamic_cast<__gnu_cxx::stdio_filebuf<char>*>(rdbuf))
|
||||||
|
f = fbuf->file();
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
if (c_file) return write_console(c_file, data);
|
|
||||||
#elif defined(_WIN32) && defined(_LIBCPP_VERSION)
|
|
||||||
if (auto* buf = dynamic_cast<std::__stdoutbuf<char>*>(os.rdbuf()))
|
|
||||||
if (FILE* f = get_file(*buf)) return write_console(f, data);
|
|
||||||
#else
|
#else
|
||||||
ignore_unused(os, data);
|
ignore_unused(os, data, f);
|
||||||
|
#endif
|
||||||
|
#ifdef _WIN32
|
||||||
|
if (f) {
|
||||||
|
int fd = _fileno(f);
|
||||||
|
if (_isatty(fd)) {
|
||||||
|
os.flush();
|
||||||
|
return write_console(fd, data);
|
||||||
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
inline bool write_ostream_unicode(std::wostream&,
|
inline auto write_ostream_unicode(std::wostream&,
|
||||||
fmt::basic_string_view<wchar_t>) {
|
fmt::basic_string_view<wchar_t>) -> bool {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -87,18 +93,19 @@ void write_buffer(std::basic_ostream<Char>& os, buffer<Char>& buf) {
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Char, typename T>
|
template <typename Char, typename T>
|
||||||
void format_value(buffer<Char>& buf, const T& value,
|
void format_value(buffer<Char>& buf, const T& value) {
|
||||||
locale_ref loc = locale_ref()) {
|
|
||||||
auto&& format_buf = formatbuf<std::basic_streambuf<Char>>(buf);
|
auto&& format_buf = formatbuf<std::basic_streambuf<Char>>(buf);
|
||||||
auto&& output = std::basic_ostream<Char>(&format_buf);
|
auto&& output = std::basic_ostream<Char>(&format_buf);
|
||||||
#if !defined(FMT_STATIC_THOUSANDS_SEPARATOR)
|
#if !defined(FMT_STATIC_THOUSANDS_SEPARATOR)
|
||||||
if (loc) output.imbue(loc.get<std::locale>());
|
output.imbue(std::locale::classic()); // The default is always unlocalized.
|
||||||
#endif
|
#endif
|
||||||
output << value;
|
output << value;
|
||||||
output.exceptions(std::ios_base::failbit | std::ios_base::badbit);
|
output.exceptions(std::ios_base::failbit | std::ios_base::badbit);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T> struct streamed_view { const T& value; };
|
template <typename T> struct streamed_view {
|
||||||
|
const T& value;
|
||||||
|
};
|
||||||
|
|
||||||
} // namespace detail
|
} // namespace detail
|
||||||
|
|
||||||
|
@ -107,11 +114,10 @@ template <typename Char>
|
||||||
struct basic_ostream_formatter : formatter<basic_string_view<Char>, Char> {
|
struct basic_ostream_formatter : formatter<basic_string_view<Char>, Char> {
|
||||||
void set_debug_format() = delete;
|
void set_debug_format() = delete;
|
||||||
|
|
||||||
template <typename T, typename OutputIt>
|
template <typename T, typename Context>
|
||||||
auto format(const T& value, basic_format_context<OutputIt, Char>& ctx) const
|
auto format(const T& value, Context& ctx) const -> decltype(ctx.out()) {
|
||||||
-> OutputIt {
|
|
||||||
auto buffer = basic_memory_buffer<Char>();
|
auto buffer = basic_memory_buffer<Char>();
|
||||||
detail::format_value(buffer, value, ctx.locale());
|
detail::format_value(buffer, value);
|
||||||
return formatter<basic_string_view<Char>, Char>::format(
|
return formatter<basic_string_view<Char>, Char>::format(
|
||||||
{buffer.data(), buffer.size()}, ctx);
|
{buffer.data(), buffer.size()}, ctx);
|
||||||
}
|
}
|
||||||
|
@ -122,25 +128,23 @@ using ostream_formatter = basic_ostream_formatter<char>;
|
||||||
template <typename T, typename Char>
|
template <typename T, typename Char>
|
||||||
struct formatter<detail::streamed_view<T>, Char>
|
struct formatter<detail::streamed_view<T>, Char>
|
||||||
: basic_ostream_formatter<Char> {
|
: basic_ostream_formatter<Char> {
|
||||||
template <typename OutputIt>
|
template <typename Context>
|
||||||
auto format(detail::streamed_view<T> view,
|
auto format(detail::streamed_view<T> view, Context& ctx) const
|
||||||
basic_format_context<OutputIt, Char>& ctx) const -> OutputIt {
|
-> decltype(ctx.out()) {
|
||||||
return basic_ostream_formatter<Char>::format(view.value, ctx);
|
return basic_ostream_formatter<Char>::format(view.value, ctx);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Returns a view that formats `value` via an ostream `operator<<`.
|
||||||
Returns a view that formats `value` via an ostream ``operator<<``.
|
*
|
||||||
|
* **Example**:
|
||||||
**Example**::
|
*
|
||||||
|
* fmt::print("Current thread id: {}\n",
|
||||||
fmt::print("Current thread id: {}\n",
|
* fmt::streamed(std::this_thread::get_id()));
|
||||||
fmt::streamed(std::this_thread::get_id()));
|
|
||||||
\endrst
|
|
||||||
*/
|
*/
|
||||||
template <typename T>
|
template <typename T>
|
||||||
auto streamed(const T& value) -> detail::streamed_view<T> {
|
constexpr auto streamed(const T& value) -> detail::streamed_view<T> {
|
||||||
return {value};
|
return {value};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -158,7 +162,7 @@ inline void vprint_directly(std::ostream& os, string_view format_str,
|
||||||
FMT_EXPORT template <typename Char>
|
FMT_EXPORT template <typename Char>
|
||||||
void vprint(std::basic_ostream<Char>& os,
|
void vprint(std::basic_ostream<Char>& os,
|
||||||
basic_string_view<type_identity_t<Char>> format_str,
|
basic_string_view<type_identity_t<Char>> format_str,
|
||||||
basic_format_args<buffer_context<type_identity_t<Char>>> args) {
|
typename detail::vformat_args<Char>::type args) {
|
||||||
auto buffer = basic_memory_buffer<Char>();
|
auto buffer = basic_memory_buffer<Char>();
|
||||||
detail::vformat_to(buffer, format_str, args);
|
detail::vformat_to(buffer, format_str, args);
|
||||||
if (detail::write_ostream_unicode(os, {buffer.data(), buffer.size()})) return;
|
if (detail::write_ostream_unicode(os, {buffer.data(), buffer.size()})) return;
|
||||||
|
@ -166,18 +170,16 @@ void vprint(std::basic_ostream<Char>& os,
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Prints formatted data to the stream `os`.
|
||||||
Prints formatted data to the stream *os*.
|
*
|
||||||
|
* **Example**:
|
||||||
**Example**::
|
*
|
||||||
|
* fmt::print(cerr, "Don't {}!", "panic");
|
||||||
fmt::print(cerr, "Don't {}!", "panic");
|
|
||||||
\endrst
|
|
||||||
*/
|
*/
|
||||||
FMT_EXPORT template <typename... T>
|
FMT_EXPORT template <typename... T>
|
||||||
void print(std::ostream& os, format_string<T...> fmt, T&&... args) {
|
void print(std::ostream& os, format_string<T...> fmt, T&&... args) {
|
||||||
const auto& vargs = fmt::make_format_args(args...);
|
const auto& vargs = fmt::make_format_args(args...);
|
||||||
if (detail::is_utf8())
|
if (detail::use_utf8())
|
||||||
vprint(os, fmt, vargs);
|
vprint(os, fmt, vargs);
|
||||||
else
|
else
|
||||||
detail::vprint_directly(os, fmt, vargs);
|
detail::vprint_directly(os, fmt, vargs);
|
||||||
|
@ -188,7 +190,7 @@ template <typename... Args>
|
||||||
void print(std::wostream& os,
|
void print(std::wostream& os,
|
||||||
basic_format_string<wchar_t, type_identity_t<Args>...> fmt,
|
basic_format_string<wchar_t, type_identity_t<Args>...> fmt,
|
||||||
Args&&... args) {
|
Args&&... args) {
|
||||||
vprint(os, fmt, fmt::make_format_args<buffer_context<wchar_t>>(args...));
|
vprint(os, fmt, fmt::make_format_args<buffered_context<wchar_t>>(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_EXPORT template <typename... T>
|
FMT_EXPORT template <typename... T>
|
||||||
|
|
|
@ -8,48 +8,48 @@
|
||||||
#ifndef FMT_PRINTF_H_
|
#ifndef FMT_PRINTF_H_
|
||||||
#define FMT_PRINTF_H_
|
#define FMT_PRINTF_H_
|
||||||
|
|
||||||
#include <algorithm> // std::max
|
#ifndef FMT_MODULE
|
||||||
#include <limits> // std::numeric_limits
|
# include <algorithm> // std::max
|
||||||
|
# include <limits> // std::numeric_limits
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "format.h"
|
#include "format.h"
|
||||||
|
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
FMT_BEGIN_EXPORT
|
FMT_BEGIN_EXPORT
|
||||||
|
|
||||||
template <typename T> struct printf_formatter { printf_formatter() = delete; };
|
template <typename T> struct printf_formatter {
|
||||||
|
printf_formatter() = delete;
|
||||||
|
};
|
||||||
|
|
||||||
template <typename Char> class basic_printf_context {
|
template <typename Char> class basic_printf_context {
|
||||||
private:
|
private:
|
||||||
detail::buffer_appender<Char> out_;
|
basic_appender<Char> out_;
|
||||||
basic_format_args<basic_printf_context> args_;
|
basic_format_args<basic_printf_context> args_;
|
||||||
|
|
||||||
|
static_assert(std::is_same<Char, char>::value ||
|
||||||
|
std::is_same<Char, wchar_t>::value,
|
||||||
|
"Unsupported code unit type.");
|
||||||
|
|
||||||
public:
|
public:
|
||||||
using char_type = Char;
|
using char_type = Char;
|
||||||
using parse_context_type = basic_format_parse_context<Char>;
|
using parse_context_type = basic_format_parse_context<Char>;
|
||||||
template <typename T> using formatter_type = printf_formatter<T>;
|
template <typename T> using formatter_type = printf_formatter<T>;
|
||||||
|
|
||||||
/**
|
/// Constructs a `printf_context` object. References to the arguments are
|
||||||
\rst
|
/// stored in the context object so make sure they have appropriate lifetimes.
|
||||||
Constructs a ``printf_context`` object. References to the arguments are
|
basic_printf_context(basic_appender<Char> out,
|
||||||
stored in the context object so make sure they have appropriate lifetimes.
|
|
||||||
\endrst
|
|
||||||
*/
|
|
||||||
basic_printf_context(detail::buffer_appender<Char> out,
|
|
||||||
basic_format_args<basic_printf_context> args)
|
basic_format_args<basic_printf_context> args)
|
||||||
: out_(out), args_(args) {}
|
: out_(out), args_(args) {}
|
||||||
|
|
||||||
auto out() -> detail::buffer_appender<Char> { return out_; }
|
auto out() -> basic_appender<Char> { return out_; }
|
||||||
void advance_to(detail::buffer_appender<Char>) {}
|
void advance_to(basic_appender<Char>) {}
|
||||||
|
|
||||||
auto locale() -> detail::locale_ref { return {}; }
|
auto locale() -> detail::locale_ref { return {}; }
|
||||||
|
|
||||||
auto arg(int id) const -> basic_format_arg<basic_printf_context> {
|
auto arg(int id) const -> basic_format_arg<basic_printf_context> {
|
||||||
return args_.get(id);
|
return args_.get(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_CONSTEXPR void on_error(const char* message) {
|
|
||||||
detail::error_handler().on_error(message);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
namespace detail {
|
namespace detail {
|
||||||
|
@ -58,7 +58,7 @@ namespace detail {
|
||||||
// signed and unsigned integers.
|
// signed and unsigned integers.
|
||||||
template <bool IsSigned> struct int_checker {
|
template <bool IsSigned> struct int_checker {
|
||||||
template <typename T> static auto fits_in_int(T value) -> bool {
|
template <typename T> static auto fits_in_int(T value) -> bool {
|
||||||
unsigned max = max_value<int>();
|
unsigned max = to_unsigned(max_value<int>());
|
||||||
return value <= max;
|
return value <= max;
|
||||||
}
|
}
|
||||||
static auto fits_in_int(bool) -> bool { return true; }
|
static auto fits_in_int(bool) -> bool { return true; }
|
||||||
|
@ -76,13 +76,13 @@ struct printf_precision_handler {
|
||||||
template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
|
template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
|
||||||
auto operator()(T value) -> int {
|
auto operator()(T value) -> int {
|
||||||
if (!int_checker<std::numeric_limits<T>::is_signed>::fits_in_int(value))
|
if (!int_checker<std::numeric_limits<T>::is_signed>::fits_in_int(value))
|
||||||
throw_format_error("number is too big");
|
report_error("number is too big");
|
||||||
return (std::max)(static_cast<int>(value), 0);
|
return (std::max)(static_cast<int>(value), 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
|
template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
|
||||||
auto operator()(T) -> int {
|
auto operator()(T) -> int {
|
||||||
throw_format_error("precision is not integer");
|
report_error("precision is not integer");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -102,7 +102,9 @@ struct is_zero_int {
|
||||||
|
|
||||||
template <typename T> struct make_unsigned_or_bool : std::make_unsigned<T> {};
|
template <typename T> struct make_unsigned_or_bool : std::make_unsigned<T> {};
|
||||||
|
|
||||||
template <> struct make_unsigned_or_bool<bool> { using type = bool; };
|
template <> struct make_unsigned_or_bool<bool> {
|
||||||
|
using type = bool;
|
||||||
|
};
|
||||||
|
|
||||||
template <typename T, typename Context> class arg_converter {
|
template <typename T, typename Context> class arg_converter {
|
||||||
private:
|
private:
|
||||||
|
@ -157,7 +159,7 @@ template <typename T, typename Context> class arg_converter {
|
||||||
// unsigned).
|
// unsigned).
|
||||||
template <typename T, typename Context, typename Char>
|
template <typename T, typename Context, typename Char>
|
||||||
void convert_arg(basic_format_arg<Context>& arg, Char type) {
|
void convert_arg(basic_format_arg<Context>& arg, Char type) {
|
||||||
visit_format_arg(arg_converter<T, Context>(arg, type), arg);
|
arg.visit(arg_converter<T, Context>(arg, type));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Converts an integer argument to char for printf.
|
// Converts an integer argument to char for printf.
|
||||||
|
@ -187,12 +189,12 @@ template <typename Char> struct get_cstring {
|
||||||
|
|
||||||
// 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.
|
||||||
template <typename Char> class printf_width_handler {
|
class printf_width_handler {
|
||||||
private:
|
private:
|
||||||
format_specs<Char>& specs_;
|
format_specs& specs_;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit printf_width_handler(format_specs<Char>& specs) : specs_(specs) {}
|
explicit printf_width_handler(format_specs& specs) : specs_(specs) {}
|
||||||
|
|
||||||
template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
|
template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
|
||||||
auto operator()(T value) -> unsigned {
|
auto operator()(T value) -> unsigned {
|
||||||
|
@ -201,14 +203,14 @@ template <typename Char> class printf_width_handler {
|
||||||
specs_.align = align::left;
|
specs_.align = align::left;
|
||||||
width = 0 - width;
|
width = 0 - width;
|
||||||
}
|
}
|
||||||
unsigned int_max = max_value<int>();
|
unsigned int_max = to_unsigned(max_value<int>());
|
||||||
if (width > int_max) throw_format_error("number is too big");
|
if (width > int_max) report_error("number is too big");
|
||||||
return static_cast<unsigned>(width);
|
return static_cast<unsigned>(width);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
|
template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
|
||||||
auto operator()(T) -> unsigned {
|
auto operator()(T) -> unsigned {
|
||||||
throw_format_error("width is not integer");
|
report_error("width is not integer");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -216,12 +218,12 @@ template <typename Char> class printf_width_handler {
|
||||||
// Workaround for a bug with the XL compiler when initializing
|
// Workaround for a bug with the XL compiler when initializing
|
||||||
// printf_arg_formatter's base class.
|
// printf_arg_formatter's base class.
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
auto make_arg_formatter(buffer_appender<Char> iter, format_specs<Char>& s)
|
auto make_arg_formatter(basic_appender<Char> iter, format_specs& s)
|
||||||
-> arg_formatter<Char> {
|
-> arg_formatter<Char> {
|
||||||
return {iter, s, locale_ref()};
|
return {iter, s, locale_ref()};
|
||||||
}
|
}
|
||||||
|
|
||||||
// The ``printf`` argument formatter.
|
// The `printf` argument formatter.
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
class printf_arg_formatter : public arg_formatter<Char> {
|
class printf_arg_formatter : public arg_formatter<Char> {
|
||||||
private:
|
private:
|
||||||
|
@ -233,11 +235,11 @@ class printf_arg_formatter : public arg_formatter<Char> {
|
||||||
void write_null_pointer(bool is_string = false) {
|
void write_null_pointer(bool is_string = false) {
|
||||||
auto s = this->specs;
|
auto s = this->specs;
|
||||||
s.type = presentation_type::none;
|
s.type = presentation_type::none;
|
||||||
write_bytes(this->out, is_string ? "(null)" : "(nil)", s);
|
write_bytes<Char>(this->out, is_string ? "(null)" : "(nil)", s);
|
||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
printf_arg_formatter(buffer_appender<Char> iter, format_specs<Char>& s,
|
printf_arg_formatter(basic_appender<Char> iter, format_specs& s,
|
||||||
context_type& ctx)
|
context_type& ctx)
|
||||||
: base(make_arg_formatter(iter, s)), context_(ctx) {}
|
: base(make_arg_formatter(iter, s)), context_(ctx) {}
|
||||||
|
|
||||||
|
@ -251,19 +253,18 @@ class printf_arg_formatter : public arg_formatter<Char> {
|
||||||
base::operator()(value);
|
base::operator()(value);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
format_specs<Char> fmt_specs = this->specs;
|
format_specs s = this->specs;
|
||||||
if (fmt_specs.type != presentation_type::none &&
|
if (s.type != presentation_type::none && s.type != presentation_type::chr) {
|
||||||
fmt_specs.type != presentation_type::chr) {
|
|
||||||
return (*this)(static_cast<int>(value));
|
return (*this)(static_cast<int>(value));
|
||||||
}
|
}
|
||||||
fmt_specs.sign = sign::none;
|
s.sign = sign::none;
|
||||||
fmt_specs.alt = false;
|
s.alt = false;
|
||||||
fmt_specs.fill[0] = ' '; // Ignore '0' flag for char types.
|
s.fill = ' '; // Ignore '0' flag for char types.
|
||||||
// align::numeric needs to be overwritten here since the '0' flag is
|
// align::numeric needs to be overwritten here since the '0' flag is
|
||||||
// ignored for non-numeric types
|
// ignored for non-numeric types
|
||||||
if (fmt_specs.align == align::none || fmt_specs.align == align::numeric)
|
if (s.align == align::none || s.align == align::numeric)
|
||||||
fmt_specs.align = align::right;
|
s.align = align::right;
|
||||||
write<Char>(this->out, static_cast<Char>(value), fmt_specs);
|
write<Char>(this->out, static_cast<Char>(value), s);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value)>
|
template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value)>
|
||||||
|
@ -271,7 +272,6 @@ class printf_arg_formatter : public arg_formatter<Char> {
|
||||||
base::operator()(value);
|
base::operator()(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Formats a null-terminated C string. */
|
|
||||||
void operator()(const char* value) {
|
void operator()(const char* value) {
|
||||||
if (value)
|
if (value)
|
||||||
base::operator()(value);
|
base::operator()(value);
|
||||||
|
@ -279,7 +279,6 @@ class printf_arg_formatter : public arg_formatter<Char> {
|
||||||
write_null_pointer(this->specs.type != presentation_type::pointer);
|
write_null_pointer(this->specs.type != presentation_type::pointer);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Formats a null-terminated wide C string. */
|
|
||||||
void operator()(const wchar_t* value) {
|
void operator()(const wchar_t* value) {
|
||||||
if (value)
|
if (value)
|
||||||
base::operator()(value);
|
base::operator()(value);
|
||||||
|
@ -289,7 +288,6 @@ class printf_arg_formatter : public arg_formatter<Char> {
|
||||||
|
|
||||||
void operator()(basic_string_view<Char> value) { base::operator()(value); }
|
void operator()(basic_string_view<Char> value) { base::operator()(value); }
|
||||||
|
|
||||||
/** Formats a pointer. */
|
|
||||||
void operator()(const void* value) {
|
void operator()(const void* value) {
|
||||||
if (value)
|
if (value)
|
||||||
base::operator()(value);
|
base::operator()(value);
|
||||||
|
@ -297,7 +295,6 @@ class printf_arg_formatter : public arg_formatter<Char> {
|
||||||
write_null_pointer();
|
write_null_pointer();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Formats an argument of a custom (user-defined) type. */
|
|
||||||
void operator()(typename basic_format_arg<context_type>::handle handle) {
|
void operator()(typename basic_format_arg<context_type>::handle handle) {
|
||||||
auto parse_ctx = basic_format_parse_context<Char>({});
|
auto parse_ctx = basic_format_parse_context<Char>({});
|
||||||
handle.format(parse_ctx, context_);
|
handle.format(parse_ctx, context_);
|
||||||
|
@ -305,7 +302,7 @@ class printf_arg_formatter : public arg_formatter<Char> {
|
||||||
};
|
};
|
||||||
|
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
void parse_flags(format_specs<Char>& specs, const Char*& it, const Char* end) {
|
void parse_flags(format_specs& specs, const Char*& it, const Char* end) {
|
||||||
for (; it != end; ++it) {
|
for (; it != end; ++it) {
|
||||||
switch (*it) {
|
switch (*it) {
|
||||||
case '-':
|
case '-':
|
||||||
|
@ -315,7 +312,7 @@ void parse_flags(format_specs<Char>& specs, const Char*& it, const Char* end) {
|
||||||
specs.sign = sign::plus;
|
specs.sign = sign::plus;
|
||||||
break;
|
break;
|
||||||
case '0':
|
case '0':
|
||||||
specs.fill[0] = '0';
|
specs.fill = '0';
|
||||||
break;
|
break;
|
||||||
case ' ':
|
case ' ':
|
||||||
if (specs.sign != sign::plus) specs.sign = sign::space;
|
if (specs.sign != sign::plus) specs.sign = sign::space;
|
||||||
|
@ -330,7 +327,7 @@ void parse_flags(format_specs<Char>& specs, const Char*& it, const Char* end) {
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Char, typename GetArg>
|
template <typename Char, typename GetArg>
|
||||||
auto parse_header(const Char*& it, const Char* end, format_specs<Char>& specs,
|
auto parse_header(const Char*& it, const Char* end, format_specs& specs,
|
||||||
GetArg get_arg) -> int {
|
GetArg get_arg) -> int {
|
||||||
int arg_index = -1;
|
int arg_index = -1;
|
||||||
Char c = *it;
|
Char c = *it;
|
||||||
|
@ -342,11 +339,11 @@ auto parse_header(const Char*& it, const Char* end, format_specs<Char>& specs,
|
||||||
++it;
|
++it;
|
||||||
arg_index = value != -1 ? value : max_value<int>();
|
arg_index = value != -1 ? value : max_value<int>();
|
||||||
} else {
|
} else {
|
||||||
if (c == '0') specs.fill[0] = '0';
|
if (c == '0') specs.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.
|
||||||
if (value == -1) throw_format_error("number is too big");
|
if (value == -1) report_error("number is too big");
|
||||||
specs.width = value;
|
specs.width = value;
|
||||||
return arg_index;
|
return arg_index;
|
||||||
}
|
}
|
||||||
|
@ -357,17 +354,17 @@ auto parse_header(const Char*& it, const Char* end, format_specs<Char>& specs,
|
||||||
if (it != end) {
|
if (it != end) {
|
||||||
if (*it >= '0' && *it <= '9') {
|
if (*it >= '0' && *it <= '9') {
|
||||||
specs.width = parse_nonnegative_int(it, end, -1);
|
specs.width = parse_nonnegative_int(it, end, -1);
|
||||||
if (specs.width == -1) throw_format_error("number is too big");
|
if (specs.width == -1) report_error("number is too big");
|
||||||
} else if (*it == '*') {
|
} else if (*it == '*') {
|
||||||
++it;
|
++it;
|
||||||
specs.width = static_cast<int>(visit_format_arg(
|
specs.width = static_cast<int>(
|
||||||
detail::printf_width_handler<Char>(specs), get_arg(-1)));
|
get_arg(-1).visit(detail::printf_width_handler(specs)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return arg_index;
|
return arg_index;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline auto parse_printf_presentation_type(char c, type t)
|
inline auto parse_printf_presentation_type(char c, type t, bool& upper)
|
||||||
-> presentation_type {
|
-> presentation_type {
|
||||||
using pt = presentation_type;
|
using pt = presentation_type;
|
||||||
constexpr auto integral_set = sint_set | uint_set | bool_set | char_set;
|
constexpr auto integral_set = sint_set | uint_set | bool_set | char_set;
|
||||||
|
@ -376,26 +373,31 @@ inline auto parse_printf_presentation_type(char c, type t)
|
||||||
return in(t, integral_set) ? pt::dec : pt::none;
|
return in(t, integral_set) ? pt::dec : pt::none;
|
||||||
case 'o':
|
case 'o':
|
||||||
return in(t, integral_set) ? pt::oct : pt::none;
|
return in(t, integral_set) ? pt::oct : pt::none;
|
||||||
case 'x':
|
|
||||||
return in(t, integral_set) ? pt::hex_lower : pt::none;
|
|
||||||
case 'X':
|
case 'X':
|
||||||
return in(t, integral_set) ? pt::hex_upper : pt::none;
|
upper = true;
|
||||||
case 'a':
|
FMT_FALLTHROUGH;
|
||||||
return in(t, float_set) ? pt::hexfloat_lower : pt::none;
|
case 'x':
|
||||||
case 'A':
|
return in(t, integral_set) ? pt::hex : pt::none;
|
||||||
return in(t, float_set) ? pt::hexfloat_upper : pt::none;
|
|
||||||
case 'e':
|
|
||||||
return in(t, float_set) ? pt::exp_lower : pt::none;
|
|
||||||
case 'E':
|
case 'E':
|
||||||
return in(t, float_set) ? pt::exp_upper : pt::none;
|
upper = true;
|
||||||
case 'f':
|
FMT_FALLTHROUGH;
|
||||||
return in(t, float_set) ? pt::fixed_lower : pt::none;
|
case 'e':
|
||||||
|
return in(t, float_set) ? pt::exp : pt::none;
|
||||||
case 'F':
|
case 'F':
|
||||||
return in(t, float_set) ? pt::fixed_upper : pt::none;
|
upper = true;
|
||||||
case 'g':
|
FMT_FALLTHROUGH;
|
||||||
return in(t, float_set) ? pt::general_lower : pt::none;
|
case 'f':
|
||||||
|
return in(t, float_set) ? pt::fixed : pt::none;
|
||||||
case 'G':
|
case 'G':
|
||||||
return in(t, float_set) ? pt::general_upper : pt::none;
|
upper = true;
|
||||||
|
FMT_FALLTHROUGH;
|
||||||
|
case 'g':
|
||||||
|
return in(t, float_set) ? pt::general : pt::none;
|
||||||
|
case 'A':
|
||||||
|
upper = true;
|
||||||
|
FMT_FALLTHROUGH;
|
||||||
|
case 'a':
|
||||||
|
return in(t, float_set) ? pt::hexfloat : pt::none;
|
||||||
case 'c':
|
case 'c':
|
||||||
return in(t, integral_set) ? pt::chr : pt::none;
|
return in(t, integral_set) ? pt::chr : pt::none;
|
||||||
case 's':
|
case 's':
|
||||||
|
@ -410,7 +412,7 @@ inline auto parse_printf_presentation_type(char c, type t)
|
||||||
template <typename Char, typename Context>
|
template <typename Char, typename Context>
|
||||||
void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
|
void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
|
||||||
basic_format_args<Context> args) {
|
basic_format_args<Context> args) {
|
||||||
using iterator = buffer_appender<Char>;
|
using iterator = basic_appender<Char>;
|
||||||
auto out = iterator(buf);
|
auto out = iterator(buf);
|
||||||
auto context = basic_printf_context<Char>(out, args);
|
auto context = basic_printf_context<Char>(out, args);
|
||||||
auto parse_ctx = basic_format_parse_context<Char>(format);
|
auto parse_ctx = basic_format_parse_context<Char>(format);
|
||||||
|
@ -441,12 +443,12 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
|
||||||
}
|
}
|
||||||
write(out, basic_string_view<Char>(start, to_unsigned(it - 1 - start)));
|
write(out, basic_string_view<Char>(start, to_unsigned(it - 1 - start)));
|
||||||
|
|
||||||
auto specs = format_specs<Char>();
|
auto specs = format_specs();
|
||||||
specs.align = align::right;
|
specs.align = align::right;
|
||||||
|
|
||||||
// Parse argument index, flags and width.
|
// Parse argument index, flags and width.
|
||||||
int arg_index = parse_header(it, end, specs, get_arg);
|
int arg_index = parse_header(it, end, specs, get_arg);
|
||||||
if (arg_index == 0) throw_format_error("argument not found");
|
if (arg_index == 0) report_error("argument not found");
|
||||||
|
|
||||||
// Parse precision.
|
// Parse precision.
|
||||||
if (it != end && *it == '.') {
|
if (it != end && *it == '.') {
|
||||||
|
@ -456,8 +458,8 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
|
||||||
specs.precision = parse_nonnegative_int(it, end, 0);
|
specs.precision = parse_nonnegative_int(it, end, 0);
|
||||||
} else if (c == '*') {
|
} else if (c == '*') {
|
||||||
++it;
|
++it;
|
||||||
specs.precision = static_cast<int>(
|
specs.precision =
|
||||||
visit_format_arg(printf_precision_handler(), get_arg(-1)));
|
static_cast<int>(get_arg(-1).visit(printf_precision_handler()));
|
||||||
} else {
|
} else {
|
||||||
specs.precision = 0;
|
specs.precision = 0;
|
||||||
}
|
}
|
||||||
|
@ -468,23 +470,23 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
|
||||||
// specified, the '0' flag is ignored
|
// specified, the '0' flag is ignored
|
||||||
if (specs.precision >= 0 && arg.is_integral()) {
|
if (specs.precision >= 0 && arg.is_integral()) {
|
||||||
// Ignore '0' for non-numeric types or if '-' present.
|
// Ignore '0' for non-numeric types or if '-' present.
|
||||||
specs.fill[0] = ' ';
|
specs.fill = ' ';
|
||||||
}
|
}
|
||||||
if (specs.precision >= 0 && arg.type() == type::cstring_type) {
|
if (specs.precision >= 0 && arg.type() == type::cstring_type) {
|
||||||
auto str = visit_format_arg(get_cstring<Char>(), arg);
|
auto str = arg.visit(get_cstring<Char>());
|
||||||
auto str_end = str + specs.precision;
|
auto str_end = str + specs.precision;
|
||||||
auto nul = std::find(str, str_end, Char());
|
auto nul = std::find(str, str_end, Char());
|
||||||
auto sv = basic_string_view<Char>(
|
auto sv = basic_string_view<Char>(
|
||||||
str, to_unsigned(nul != str_end ? nul - str : specs.precision));
|
str, to_unsigned(nul != str_end ? nul - str : specs.precision));
|
||||||
arg = make_arg<basic_printf_context<Char>>(sv);
|
arg = make_arg<basic_printf_context<Char>>(sv);
|
||||||
}
|
}
|
||||||
if (specs.alt && visit_format_arg(is_zero_int(), arg)) specs.alt = false;
|
if (specs.alt && arg.visit(is_zero_int())) specs.alt = false;
|
||||||
if (specs.fill[0] == '0') {
|
if (specs.fill.template get<Char>() == '0') {
|
||||||
if (arg.is_arithmetic() && specs.align != align::left)
|
if (arg.is_arithmetic() && specs.align != align::left)
|
||||||
specs.align = align::numeric;
|
specs.align = align::numeric;
|
||||||
else
|
else
|
||||||
specs.fill[0] = ' '; // Ignore '0' flag for non-numeric types or if '-'
|
specs.fill = ' '; // Ignore '0' flag for non-numeric types or if '-'
|
||||||
// flag is also present.
|
// flag is also present.
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse length and convert the argument to the required type.
|
// Parse length and convert the argument to the required type.
|
||||||
|
@ -528,7 +530,7 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse type.
|
// Parse type.
|
||||||
if (it == end) throw_format_error("invalid format string");
|
if (it == end) report_error("invalid format string");
|
||||||
char type = static_cast<char>(*it++);
|
char type = static_cast<char>(*it++);
|
||||||
if (arg.is_integral()) {
|
if (arg.is_integral()) {
|
||||||
// Normalize type.
|
// Normalize type.
|
||||||
|
@ -538,18 +540,20 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
|
||||||
type = 'd';
|
type = 'd';
|
||||||
break;
|
break;
|
||||||
case 'c':
|
case 'c':
|
||||||
visit_format_arg(char_converter<basic_printf_context<Char>>(arg), arg);
|
arg.visit(char_converter<basic_printf_context<Char>>(arg));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
specs.type = parse_printf_presentation_type(type, arg.type());
|
bool upper = false;
|
||||||
|
specs.type = parse_printf_presentation_type(type, arg.type(), upper);
|
||||||
if (specs.type == presentation_type::none)
|
if (specs.type == presentation_type::none)
|
||||||
throw_format_error("invalid format specifier");
|
report_error("invalid format specifier");
|
||||||
|
specs.upper = upper;
|
||||||
|
|
||||||
start = it;
|
start = it;
|
||||||
|
|
||||||
// Format argument.
|
// Format argument.
|
||||||
visit_format_arg(printf_arg_formatter<Char>(out, specs, context), arg);
|
arg.visit(printf_arg_formatter<Char>(out, specs, context));
|
||||||
}
|
}
|
||||||
write(out, basic_string_view<Char>(start, to_unsigned(it - start)));
|
write(out, basic_string_view<Char>(start, to_unsigned(it - start)));
|
||||||
}
|
}
|
||||||
|
@ -561,29 +565,21 @@ using wprintf_context = basic_printf_context<wchar_t>;
|
||||||
using printf_args = basic_format_args<printf_context>;
|
using printf_args = basic_format_args<printf_context>;
|
||||||
using wprintf_args = basic_format_args<wprintf_context>;
|
using wprintf_args = basic_format_args<wprintf_context>;
|
||||||
|
|
||||||
/**
|
/// Constructs an `format_arg_store` object that contains references to
|
||||||
\rst
|
/// arguments and can be implicitly converted to `printf_args`.
|
||||||
Constructs an `~fmt::format_arg_store` object that contains references to
|
template <typename Char = char, typename... T>
|
||||||
arguments and can be implicitly converted to `~fmt::printf_args`.
|
inline auto make_printf_args(T&... args)
|
||||||
\endrst
|
-> decltype(fmt::make_format_args<basic_printf_context<Char>>(args...)) {
|
||||||
*/
|
return fmt::make_format_args<basic_printf_context<Char>>(args...);
|
||||||
template <typename... T>
|
|
||||||
inline auto make_printf_args(const T&... args)
|
|
||||||
-> format_arg_store<printf_context, T...> {
|
|
||||||
return {args...};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DEPRECATED!
|
template <typename Char> struct vprintf_args {
|
||||||
template <typename... T>
|
using type = basic_format_args<basic_printf_context<Char>>;
|
||||||
inline auto make_wprintf_args(const T&... args)
|
};
|
||||||
-> format_arg_store<wprintf_context, T...> {
|
|
||||||
return {args...};
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
inline auto vsprintf(
|
inline auto vsprintf(basic_string_view<Char> fmt,
|
||||||
basic_string_view<Char> fmt,
|
typename vprintf_args<Char>::type args)
|
||||||
basic_format_args<basic_printf_context<type_identity_t<Char>>> args)
|
|
||||||
-> std::basic_string<Char> {
|
-> std::basic_string<Char> {
|
||||||
auto buf = basic_memory_buffer<Char>();
|
auto buf = basic_memory_buffer<Char>();
|
||||||
detail::vprintf(buf, fmt, args);
|
detail::vprintf(buf, fmt, args);
|
||||||
|
@ -591,26 +587,22 @@ inline auto vsprintf(
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Formats `args` according to specifications in `fmt` and returns the result
|
||||||
Formats arguments and returns the result as a string.
|
* as as string.
|
||||||
|
*
|
||||||
**Example**::
|
* **Example**:
|
||||||
|
*
|
||||||
std::string message = fmt::sprintf("The answer is %d", 42);
|
* std::string message = fmt::sprintf("The answer is %d", 42);
|
||||||
\endrst
|
*/
|
||||||
*/
|
template <typename S, typename... T, typename Char = char_t<S>>
|
||||||
template <typename S, typename... T,
|
|
||||||
typename Char = enable_if_t<detail::is_string<S>::value, char_t<S>>>
|
|
||||||
inline auto sprintf(const S& fmt, const T&... args) -> std::basic_string<Char> {
|
inline auto sprintf(const S& fmt, const T&... args) -> std::basic_string<Char> {
|
||||||
return vsprintf(detail::to_string_view(fmt),
|
return vsprintf(detail::to_string_view(fmt),
|
||||||
fmt::make_format_args<basic_printf_context<Char>>(args...));
|
fmt::make_format_args<basic_printf_context<Char>>(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
inline auto vfprintf(
|
inline auto vfprintf(std::FILE* f, basic_string_view<Char> fmt,
|
||||||
std::FILE* f, basic_string_view<Char> fmt,
|
typename vprintf_args<Char>::type args) -> int {
|
||||||
basic_format_args<basic_printf_context<type_identity_t<Char>>> args)
|
|
||||||
-> int {
|
|
||||||
auto buf = basic_memory_buffer<Char>();
|
auto buf = basic_memory_buffer<Char>();
|
||||||
detail::vprintf(buf, fmt, args);
|
detail::vprintf(buf, fmt, args);
|
||||||
size_t size = buf.size();
|
size_t size = buf.size();
|
||||||
|
@ -620,36 +612,33 @@ inline auto vfprintf(
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Formats `args` according to specifications in `fmt` and writes the output
|
||||||
Prints formatted data to the file *f*.
|
* to `f`.
|
||||||
|
*
|
||||||
**Example**::
|
* **Example**:
|
||||||
|
*
|
||||||
fmt::fprintf(stderr, "Don't %s!", "panic");
|
* fmt::fprintf(stderr, "Don't %s!", "panic");
|
||||||
\endrst
|
|
||||||
*/
|
*/
|
||||||
template <typename S, typename... T, typename Char = char_t<S>>
|
template <typename S, typename... T, typename Char = char_t<S>>
|
||||||
inline auto fprintf(std::FILE* f, const S& fmt, const T&... args) -> int {
|
inline auto fprintf(std::FILE* f, const S& fmt, const T&... args) -> int {
|
||||||
return vfprintf(f, detail::to_string_view(fmt),
|
return vfprintf(f, detail::to_string_view(fmt),
|
||||||
fmt::make_format_args<basic_printf_context<Char>>(args...));
|
make_printf_args<Char>(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
FMT_DEPRECATED inline auto vprintf(
|
FMT_DEPRECATED inline auto vprintf(basic_string_view<Char> fmt,
|
||||||
basic_string_view<Char> fmt,
|
typename vprintf_args<Char>::type args)
|
||||||
basic_format_args<basic_printf_context<type_identity_t<Char>>> args)
|
|
||||||
-> int {
|
-> int {
|
||||||
return vfprintf(stdout, fmt, args);
|
return vfprintf(stdout, fmt, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Formats `args` according to specifications in `fmt` and writes the output
|
||||||
Prints formatted data to ``stdout``.
|
* to `stdout`.
|
||||||
|
*
|
||||||
**Example**::
|
* **Example**:
|
||||||
|
*
|
||||||
fmt::printf("Elapsed time: %.2f seconds", 1.23);
|
* fmt::printf("Elapsed time: %.2f seconds", 1.23);
|
||||||
\endrst
|
|
||||||
*/
|
*/
|
||||||
template <typename... T>
|
template <typename... T>
|
||||||
inline auto printf(string_view fmt, const T&... args) -> int {
|
inline auto printf(string_view fmt, const T&... args) -> int {
|
||||||
|
@ -658,7 +647,7 @@ inline auto printf(string_view fmt, const T&... args) -> int {
|
||||||
template <typename... T>
|
template <typename... T>
|
||||||
FMT_DEPRECATED inline auto printf(basic_string_view<wchar_t> fmt,
|
FMT_DEPRECATED inline auto printf(basic_string_view<wchar_t> fmt,
|
||||||
const T&... args) -> int {
|
const T&... args) -> int {
|
||||||
return vfprintf(stdout, fmt, make_wprintf_args(args...));
|
return vfprintf(stdout, fmt, make_printf_args<wchar_t>(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
FMT_END_EXPORT
|
FMT_END_EXPORT
|
||||||
|
|
|
@ -1,78 +1,38 @@
|
||||||
// Formatting library for C++ - experimental range support
|
// Formatting library for C++ - range and tuple support
|
||||||
//
|
//
|
||||||
// Copyright (c) 2012 - present, Victor Zverovich
|
// Copyright (c) 2012 - present, Victor Zverovich and {fmt} contributors
|
||||||
// All rights reserved.
|
// All rights reserved.
|
||||||
//
|
//
|
||||||
// For the license information refer to format.h.
|
// For the license information refer to format.h.
|
||||||
//
|
|
||||||
// Copyright (c) 2018 - present, Remotion (Igor Schulz)
|
|
||||||
// All Rights Reserved
|
|
||||||
// {fmt} support for ranges, containers and types tuple interface.
|
|
||||||
|
|
||||||
#ifndef FMT_RANGES_H_
|
#ifndef FMT_RANGES_H_
|
||||||
#define FMT_RANGES_H_
|
#define FMT_RANGES_H_
|
||||||
|
|
||||||
#include <initializer_list>
|
#ifndef FMT_MODULE
|
||||||
#include <tuple>
|
# include <initializer_list>
|
||||||
#include <type_traits>
|
# include <iterator>
|
||||||
|
# include <string>
|
||||||
|
# include <tuple>
|
||||||
|
# include <type_traits>
|
||||||
|
# include <utility>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "format.h"
|
#include "format.h"
|
||||||
|
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
FMT_EXPORT
|
||||||
|
enum class range_format { disabled, map, set, sequence, string, debug_string };
|
||||||
|
|
||||||
namespace detail {
|
namespace detail {
|
||||||
|
|
||||||
template <typename Range, typename OutputIt>
|
|
||||||
auto copy(const Range& range, OutputIt out) -> OutputIt {
|
|
||||||
for (auto it = range.begin(), end = range.end(); it != end; ++it)
|
|
||||||
*out++ = *it;
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename OutputIt>
|
|
||||||
auto copy(const char* str, OutputIt out) -> OutputIt {
|
|
||||||
while (*str) *out++ = *str++;
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename OutputIt> auto copy(char ch, OutputIt out) -> OutputIt {
|
|
||||||
*out++ = ch;
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename OutputIt> auto copy(wchar_t ch, OutputIt out) -> OutputIt {
|
|
||||||
*out++ = ch;
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns true if T has a std::string-like interface, like std::string_view.
|
|
||||||
template <typename T> class is_std_string_like {
|
|
||||||
template <typename U>
|
|
||||||
static auto check(U* p)
|
|
||||||
-> decltype((void)p->find('a'), p->length(), (void)p->data(), int());
|
|
||||||
template <typename> static void check(...);
|
|
||||||
|
|
||||||
public:
|
|
||||||
static constexpr const bool value =
|
|
||||||
is_string<T>::value ||
|
|
||||||
std::is_convertible<T, std_string_view<char>>::value ||
|
|
||||||
!std::is_void<decltype(check<T>(nullptr))>::value;
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename Char>
|
|
||||||
struct is_std_string_like<fmt::basic_string_view<Char>> : std::true_type {};
|
|
||||||
|
|
||||||
template <typename T> class is_map {
|
template <typename T> class is_map {
|
||||||
template <typename U> static auto check(U*) -> typename U::mapped_type;
|
template <typename U> static auto check(U*) -> typename U::mapped_type;
|
||||||
template <typename> static void check(...);
|
template <typename> static void check(...);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
#ifdef FMT_FORMAT_MAP_AS_LIST // DEPRECATED!
|
|
||||||
static constexpr const bool value = false;
|
|
||||||
#else
|
|
||||||
static constexpr const bool value =
|
static constexpr const bool value =
|
||||||
!std::is_void<decltype(check<T>(nullptr))>::value;
|
!std::is_void<decltype(check<T>(nullptr))>::value;
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
template <typename T> class is_set {
|
template <typename T> class is_set {
|
||||||
|
@ -80,12 +40,8 @@ template <typename T> class is_set {
|
||||||
template <typename> static void check(...);
|
template <typename> static void check(...);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
#ifdef FMT_FORMAT_SET_AS_LIST // DEPRECATED!
|
|
||||||
static constexpr const bool value = false;
|
|
||||||
#else
|
|
||||||
static constexpr const bool value =
|
static constexpr const bool value =
|
||||||
!std::is_void<decltype(check<T>(nullptr))>::value && !is_map<T>::value;
|
!std::is_void<decltype(check<T>(nullptr))>::value && !is_map<T>::value;
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
template <typename... Ts> struct conditional_helper {};
|
template <typename... Ts> struct conditional_helper {};
|
||||||
|
@ -114,17 +70,17 @@ template <typename T, typename Enable = void>
|
||||||
struct has_member_fn_begin_end_t : std::false_type {};
|
struct has_member_fn_begin_end_t : std::false_type {};
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
struct has_member_fn_begin_end_t<T, void_t<decltype(std::declval<T>().begin()),
|
struct has_member_fn_begin_end_t<T, void_t<decltype(*std::declval<T>().begin()),
|
||||||
decltype(std::declval<T>().end())>>
|
decltype(std::declval<T>().end())>>
|
||||||
: std::true_type {};
|
: std::true_type {};
|
||||||
|
|
||||||
// Member function overload
|
// Member function overloads.
|
||||||
template <typename T>
|
template <typename T>
|
||||||
auto range_begin(T&& rng) FMT_DECLTYPE_RETURN(static_cast<T&&>(rng).begin());
|
auto range_begin(T&& rng) FMT_DECLTYPE_RETURN(static_cast<T&&>(rng).begin());
|
||||||
template <typename T>
|
template <typename T>
|
||||||
auto range_end(T&& rng) FMT_DECLTYPE_RETURN(static_cast<T&&>(rng).end());
|
auto range_end(T&& rng) FMT_DECLTYPE_RETURN(static_cast<T&&>(rng).end());
|
||||||
|
|
||||||
// ADL overload. Only participates in overload resolution if member functions
|
// ADL overloads. Only participate in overload resolution if member functions
|
||||||
// are not found.
|
// are not found.
|
||||||
template <typename T>
|
template <typename T>
|
||||||
auto range_begin(T&& rng)
|
auto range_begin(T&& rng)
|
||||||
|
@ -145,16 +101,16 @@ struct has_mutable_begin_end : std::false_type {};
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
struct has_const_begin_end<
|
struct has_const_begin_end<
|
||||||
T,
|
T, void_t<decltype(*detail::range_begin(
|
||||||
void_t<
|
std::declval<const remove_cvref_t<T>&>())),
|
||||||
decltype(detail::range_begin(std::declval<const remove_cvref_t<T>&>())),
|
decltype(detail::range_end(
|
||||||
decltype(detail::range_end(std::declval<const remove_cvref_t<T>&>()))>>
|
std::declval<const remove_cvref_t<T>&>()))>>
|
||||||
: std::true_type {};
|
: std::true_type {};
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
struct has_mutable_begin_end<
|
struct has_mutable_begin_end<
|
||||||
T, void_t<decltype(detail::range_begin(std::declval<T>())),
|
T, void_t<decltype(*detail::range_begin(std::declval<T&>())),
|
||||||
decltype(detail::range_end(std::declval<T>())),
|
decltype(detail::range_end(std::declval<T&>())),
|
||||||
// the extra int here is because older versions of MSVC don't
|
// the extra int here is because older versions of MSVC don't
|
||||||
// SFINAE properly unless there are distinct types
|
// SFINAE properly unless there are distinct types
|
||||||
int>> : std::true_type {};
|
int>> : std::true_type {};
|
||||||
|
@ -187,7 +143,7 @@ template <size_t N> using make_index_sequence = std::make_index_sequence<N>;
|
||||||
template <typename T, T... N> struct integer_sequence {
|
template <typename T, T... N> struct integer_sequence {
|
||||||
using value_type = T;
|
using value_type = T;
|
||||||
|
|
||||||
static FMT_CONSTEXPR size_t size() { return sizeof...(N); }
|
static FMT_CONSTEXPR auto size() -> size_t { return sizeof...(N); }
|
||||||
};
|
};
|
||||||
|
|
||||||
template <size_t... N> using index_sequence = integer_sequence<size_t, N...>;
|
template <size_t... N> using index_sequence = integer_sequence<size_t, N...>;
|
||||||
|
@ -210,16 +166,17 @@ class is_tuple_formattable_ {
|
||||||
static constexpr const bool value = false;
|
static constexpr const bool value = false;
|
||||||
};
|
};
|
||||||
template <typename T, typename C> class is_tuple_formattable_<T, C, true> {
|
template <typename T, typename C> class is_tuple_formattable_<T, C, true> {
|
||||||
template <std::size_t... Is>
|
template <size_t... Is>
|
||||||
static std::true_type check2(index_sequence<Is...>,
|
static auto all_true(index_sequence<Is...>,
|
||||||
integer_sequence<bool, (Is == Is)...>);
|
integer_sequence<bool, (Is >= 0)...>) -> std::true_type;
|
||||||
static std::false_type check2(...);
|
static auto all_true(...) -> std::false_type;
|
||||||
template <std::size_t... Is>
|
|
||||||
static decltype(check2(
|
template <size_t... Is>
|
||||||
|
static auto check(index_sequence<Is...>) -> decltype(all_true(
|
||||||
index_sequence<Is...>{},
|
index_sequence<Is...>{},
|
||||||
integer_sequence<
|
integer_sequence<bool,
|
||||||
bool, (is_formattable<typename std::tuple_element<Is, T>::type,
|
(is_formattable<typename std::tuple_element<Is, T>::type,
|
||||||
C>::value)...>{})) check(index_sequence<Is...>);
|
C>::value)...>{}));
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static constexpr const bool value =
|
static constexpr const bool value =
|
||||||
|
@ -296,6 +253,18 @@ FMT_CONSTEXPR auto maybe_set_debug_format(Formatter& f, bool set)
|
||||||
template <typename Formatter>
|
template <typename Formatter>
|
||||||
FMT_CONSTEXPR void maybe_set_debug_format(Formatter&, ...) {}
|
FMT_CONSTEXPR void maybe_set_debug_format(Formatter&, ...) {}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
struct range_format_kind_
|
||||||
|
: std::integral_constant<range_format,
|
||||||
|
std::is_same<uncvref_type<T>, T>::value
|
||||||
|
? range_format::disabled
|
||||||
|
: is_map<T>::value ? range_format::map
|
||||||
|
: is_set<T>::value ? range_format::set
|
||||||
|
: range_format::sequence> {};
|
||||||
|
|
||||||
|
template <range_format K>
|
||||||
|
using range_format_constant = std::integral_constant<range_format, K>;
|
||||||
|
|
||||||
// These are not generic lambdas for compatibility with C++11.
|
// These are not generic lambdas for compatibility with C++11.
|
||||||
template <typename ParseContext> struct parse_empty_specs {
|
template <typename ParseContext> struct parse_empty_specs {
|
||||||
template <typename Formatter> FMT_CONSTEXPR void operator()(Formatter& f) {
|
template <typename Formatter> FMT_CONSTEXPR void operator()(Formatter& f) {
|
||||||
|
@ -309,8 +278,7 @@ template <typename FormatContext> struct format_tuple_element {
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
void operator()(const formatter<T, char_type>& f, const T& v) {
|
void operator()(const formatter<T, char_type>& f, const T& v) {
|
||||||
if (i > 0)
|
if (i > 0) ctx.advance_to(detail::copy<char_type>(separator, ctx.out()));
|
||||||
ctx.advance_to(detail::copy_str<char_type>(separator, ctx.out()));
|
|
||||||
ctx.advance_to(f.format(v, ctx));
|
ctx.advance_to(f.format(v, ctx));
|
||||||
++i;
|
++i;
|
||||||
}
|
}
|
||||||
|
@ -362,8 +330,7 @@ struct formatter<Tuple, Char,
|
||||||
template <typename ParseContext>
|
template <typename ParseContext>
|
||||||
FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
|
FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
|
||||||
auto it = ctx.begin();
|
auto it = ctx.begin();
|
||||||
if (it != ctx.end() && *it != '}')
|
if (it != ctx.end() && *it != '}') report_error("invalid format specifier");
|
||||||
FMT_THROW(format_error("invalid format specifier"));
|
|
||||||
detail::for_each(formatters_, detail::parse_empty_specs<ParseContext>{ctx});
|
detail::for_each(formatters_, detail::parse_empty_specs<ParseContext>{ctx});
|
||||||
return it;
|
return it;
|
||||||
}
|
}
|
||||||
|
@ -371,19 +338,17 @@ struct formatter<Tuple, Char,
|
||||||
template <typename FormatContext>
|
template <typename FormatContext>
|
||||||
auto format(const Tuple& value, FormatContext& ctx) const
|
auto format(const Tuple& value, FormatContext& ctx) const
|
||||||
-> decltype(ctx.out()) {
|
-> decltype(ctx.out()) {
|
||||||
ctx.advance_to(detail::copy_str<Char>(opening_bracket_, ctx.out()));
|
ctx.advance_to(detail::copy<Char>(opening_bracket_, ctx.out()));
|
||||||
detail::for_each2(
|
detail::for_each2(
|
||||||
formatters_, value,
|
formatters_, value,
|
||||||
detail::format_tuple_element<FormatContext>{0, ctx, separator_});
|
detail::format_tuple_element<FormatContext>{0, ctx, separator_});
|
||||||
return detail::copy_str<Char>(closing_bracket_, ctx.out());
|
return detail::copy<Char>(closing_bracket_, ctx.out());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
template <typename T, typename Char> struct is_range {
|
template <typename T, typename Char> struct is_range {
|
||||||
static constexpr const bool value =
|
static constexpr const bool value =
|
||||||
detail::is_range_<T>::value && !detail::is_std_string_like<T>::value &&
|
detail::is_range_<T>::value && !detail::has_to_string_view<T>::value;
|
||||||
!std::is_convertible<T, std::basic_string<Char>>::value &&
|
|
||||||
!std::is_convertible<T, detail::std_string_view<Char>>::value;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
namespace detail {
|
namespace detail {
|
||||||
|
@ -405,8 +370,8 @@ template <typename Context> struct range_mapper {
|
||||||
|
|
||||||
template <typename Char, typename Element>
|
template <typename Char, typename Element>
|
||||||
using range_formatter_type =
|
using range_formatter_type =
|
||||||
formatter<remove_cvref_t<decltype(range_mapper<buffer_context<Char>>{}.map(
|
formatter<remove_cvref_t<decltype(range_mapper<buffered_context<Char>>{}
|
||||||
std::declval<Element>()))>,
|
.map(std::declval<Element>()))>,
|
||||||
Char>;
|
Char>;
|
||||||
|
|
||||||
template <typename R>
|
template <typename R>
|
||||||
|
@ -421,6 +386,12 @@ struct is_formattable_delayed
|
||||||
#endif
|
#endif
|
||||||
} // namespace detail
|
} // namespace detail
|
||||||
|
|
||||||
|
template <typename...> struct conjunction : std::true_type {};
|
||||||
|
template <typename P> struct conjunction<P> : P {};
|
||||||
|
template <typename P1, typename... Pn>
|
||||||
|
struct conjunction<P1, Pn...>
|
||||||
|
: conditional_t<bool(P1::value), conjunction<Pn...>, P1> {};
|
||||||
|
|
||||||
template <typename T, typename Char, typename Enable = void>
|
template <typename T, typename Char, typename Enable = void>
|
||||||
struct range_formatter;
|
struct range_formatter;
|
||||||
|
|
||||||
|
@ -436,6 +407,24 @@ struct range_formatter<
|
||||||
detail::string_literal<Char, '['>{};
|
detail::string_literal<Char, '['>{};
|
||||||
basic_string_view<Char> closing_bracket_ =
|
basic_string_view<Char> closing_bracket_ =
|
||||||
detail::string_literal<Char, ']'>{};
|
detail::string_literal<Char, ']'>{};
|
||||||
|
bool is_debug = false;
|
||||||
|
|
||||||
|
template <typename Output, typename It, typename Sentinel, typename U = T,
|
||||||
|
FMT_ENABLE_IF(std::is_same<U, Char>::value)>
|
||||||
|
auto write_debug_string(Output& out, It it, Sentinel end) const -> Output {
|
||||||
|
auto buf = basic_memory_buffer<Char>();
|
||||||
|
for (; it != end; ++it) buf.push_back(*it);
|
||||||
|
auto specs = format_specs();
|
||||||
|
specs.type = presentation_type::debug;
|
||||||
|
return detail::write<Char>(
|
||||||
|
out, basic_string_view<Char>(buf.data(), buf.size()), specs);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename Output, typename It, typename Sentinel, typename U = T,
|
||||||
|
FMT_ENABLE_IF(!std::is_same<U, Char>::value)>
|
||||||
|
auto write_debug_string(Output& out, It, Sentinel) const -> Output {
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
FMT_CONSTEXPR range_formatter() {}
|
FMT_CONSTEXPR range_formatter() {}
|
||||||
|
@ -458,17 +447,37 @@ struct range_formatter<
|
||||||
FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
|
FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
|
||||||
auto it = ctx.begin();
|
auto it = ctx.begin();
|
||||||
auto end = ctx.end();
|
auto end = ctx.end();
|
||||||
|
detail::maybe_set_debug_format(underlying_, true);
|
||||||
|
if (it == end) return underlying_.parse(ctx);
|
||||||
|
|
||||||
if (it != end && *it == 'n') {
|
switch (detail::to_ascii(*it)) {
|
||||||
|
case 'n':
|
||||||
set_brackets({}, {});
|
set_brackets({}, {});
|
||||||
++it;
|
++it;
|
||||||
|
break;
|
||||||
|
case '?':
|
||||||
|
is_debug = true;
|
||||||
|
set_brackets({}, {});
|
||||||
|
++it;
|
||||||
|
if (it == end || *it != 's') report_error("invalid format specifier");
|
||||||
|
FMT_FALLTHROUGH;
|
||||||
|
case 's':
|
||||||
|
if (!std::is_same<T, Char>::value)
|
||||||
|
report_error("invalid format specifier");
|
||||||
|
if (!is_debug) {
|
||||||
|
set_brackets(detail::string_literal<Char, '"'>{},
|
||||||
|
detail::string_literal<Char, '"'>{});
|
||||||
|
set_separator({});
|
||||||
|
detail::maybe_set_debug_format(underlying_, false);
|
||||||
|
}
|
||||||
|
++it;
|
||||||
|
return it;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (it != end && *it != '}') {
|
if (it != end && *it != '}') {
|
||||||
if (*it != ':') FMT_THROW(format_error("invalid format specifier"));
|
if (*it != ':') report_error("invalid format specifier");
|
||||||
|
detail::maybe_set_debug_format(underlying_, false);
|
||||||
++it;
|
++it;
|
||||||
} else {
|
|
||||||
detail::maybe_set_debug_format(underlying_, true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.advance_to(it);
|
ctx.advance_to(it);
|
||||||
|
@ -477,79 +486,27 @@ struct range_formatter<
|
||||||
|
|
||||||
template <typename R, typename FormatContext>
|
template <typename R, typename FormatContext>
|
||||||
auto format(R&& range, FormatContext& ctx) const -> decltype(ctx.out()) {
|
auto format(R&& range, FormatContext& ctx) const -> decltype(ctx.out()) {
|
||||||
detail::range_mapper<buffer_context<Char>> mapper;
|
auto mapper = detail::range_mapper<buffered_context<Char>>();
|
||||||
auto out = ctx.out();
|
auto out = ctx.out();
|
||||||
out = detail::copy_str<Char>(opening_bracket_, out);
|
|
||||||
int i = 0;
|
|
||||||
auto it = detail::range_begin(range);
|
auto it = detail::range_begin(range);
|
||||||
auto end = detail::range_end(range);
|
auto end = detail::range_end(range);
|
||||||
|
if (is_debug) return write_debug_string(out, std::move(it), end);
|
||||||
|
|
||||||
|
out = detail::copy<Char>(opening_bracket_, out);
|
||||||
|
int i = 0;
|
||||||
for (; it != end; ++it) {
|
for (; it != end; ++it) {
|
||||||
if (i > 0) out = detail::copy_str<Char>(separator_, out);
|
if (i > 0) out = detail::copy<Char>(separator_, out);
|
||||||
ctx.advance_to(out);
|
ctx.advance_to(out);
|
||||||
out = underlying_.format(mapper.map(*it), ctx);
|
auto&& item = *it; // Need an lvalue
|
||||||
|
out = underlying_.format(mapper.map(item), ctx);
|
||||||
++i;
|
++i;
|
||||||
}
|
}
|
||||||
out = detail::copy_str<Char>(closing_bracket_, out);
|
out = detail::copy<Char>(closing_bracket_, out);
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class range_format { disabled, map, set, sequence, string, debug_string };
|
FMT_EXPORT
|
||||||
|
|
||||||
namespace detail {
|
|
||||||
template <typename T>
|
|
||||||
struct range_format_kind_
|
|
||||||
: std::integral_constant<range_format,
|
|
||||||
std::is_same<uncvref_type<T>, T>::value
|
|
||||||
? range_format::disabled
|
|
||||||
: is_map<T>::value ? range_format::map
|
|
||||||
: is_set<T>::value ? range_format::set
|
|
||||||
: range_format::sequence> {};
|
|
||||||
|
|
||||||
template <range_format K, typename R, typename Char, typename Enable = void>
|
|
||||||
struct range_default_formatter;
|
|
||||||
|
|
||||||
template <range_format K>
|
|
||||||
using range_format_constant = std::integral_constant<range_format, K>;
|
|
||||||
|
|
||||||
template <range_format K, typename R, typename Char>
|
|
||||||
struct range_default_formatter<
|
|
||||||
K, R, Char,
|
|
||||||
enable_if_t<(K == range_format::sequence || K == range_format::map ||
|
|
||||||
K == range_format::set)>> {
|
|
||||||
using range_type = detail::maybe_const_range<R>;
|
|
||||||
range_formatter<detail::uncvref_type<range_type>, Char> underlying_;
|
|
||||||
|
|
||||||
FMT_CONSTEXPR range_default_formatter() { init(range_format_constant<K>()); }
|
|
||||||
|
|
||||||
FMT_CONSTEXPR void init(range_format_constant<range_format::set>) {
|
|
||||||
underlying_.set_brackets(detail::string_literal<Char, '{'>{},
|
|
||||||
detail::string_literal<Char, '}'>{});
|
|
||||||
}
|
|
||||||
|
|
||||||
FMT_CONSTEXPR void init(range_format_constant<range_format::map>) {
|
|
||||||
underlying_.set_brackets(detail::string_literal<Char, '{'>{},
|
|
||||||
detail::string_literal<Char, '}'>{});
|
|
||||||
underlying_.underlying().set_brackets({}, {});
|
|
||||||
underlying_.underlying().set_separator(
|
|
||||||
detail::string_literal<Char, ':', ' '>{});
|
|
||||||
}
|
|
||||||
|
|
||||||
FMT_CONSTEXPR void init(range_format_constant<range_format::sequence>) {}
|
|
||||||
|
|
||||||
template <typename ParseContext>
|
|
||||||
FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
|
|
||||||
return underlying_.parse(ctx);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename FormatContext>
|
|
||||||
auto format(range_type& range, FormatContext& ctx) const
|
|
||||||
-> decltype(ctx.out()) {
|
|
||||||
return underlying_.format(range, ctx);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
} // namespace detail
|
|
||||||
|
|
||||||
template <typename T, typename Char, typename Enable = void>
|
template <typename T, typename Char, typename Enable = void>
|
||||||
struct range_format_kind
|
struct range_format_kind
|
||||||
: conditional_t<
|
: conditional_t<
|
||||||
|
@ -559,18 +516,221 @@ struct range_format_kind
|
||||||
template <typename R, typename Char>
|
template <typename R, typename Char>
|
||||||
struct formatter<
|
struct formatter<
|
||||||
R, Char,
|
R, Char,
|
||||||
enable_if_t<conjunction<bool_constant<range_format_kind<R, Char>::value !=
|
enable_if_t<conjunction<
|
||||||
range_format::disabled>
|
bool_constant<
|
||||||
|
range_format_kind<R, Char>::value != range_format::disabled &&
|
||||||
|
range_format_kind<R, Char>::value != range_format::map &&
|
||||||
|
range_format_kind<R, Char>::value != range_format::string &&
|
||||||
|
range_format_kind<R, Char>::value != range_format::debug_string>
|
||||||
// Workaround a bug in MSVC 2015 and earlier.
|
// Workaround a bug in MSVC 2015 and earlier.
|
||||||
#if !FMT_MSC_VERSION || FMT_MSC_VERSION >= 1910
|
#if !FMT_MSC_VERSION || FMT_MSC_VERSION >= 1910
|
||||||
,
|
,
|
||||||
detail::is_formattable_delayed<R, Char>
|
detail::is_formattable_delayed<R, Char>
|
||||||
#endif
|
#endif
|
||||||
>::value>>
|
>::value>> {
|
||||||
: detail::range_default_formatter<range_format_kind<R, Char>::value, R,
|
private:
|
||||||
Char> {
|
using range_type = detail::maybe_const_range<R>;
|
||||||
|
range_formatter<detail::uncvref_type<range_type>, Char> range_formatter_;
|
||||||
|
|
||||||
|
public:
|
||||||
|
using nonlocking = void;
|
||||||
|
|
||||||
|
FMT_CONSTEXPR formatter() {
|
||||||
|
if (detail::const_check(range_format_kind<R, Char>::value !=
|
||||||
|
range_format::set))
|
||||||
|
return;
|
||||||
|
range_formatter_.set_brackets(detail::string_literal<Char, '{'>{},
|
||||||
|
detail::string_literal<Char, '}'>{});
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename ParseContext>
|
||||||
|
FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
|
||||||
|
return range_formatter_.parse(ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename FormatContext>
|
||||||
|
auto format(range_type& range, FormatContext& ctx) const
|
||||||
|
-> decltype(ctx.out()) {
|
||||||
|
return range_formatter_.format(range, ctx);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// A map formatter.
|
||||||
|
template <typename R, typename Char>
|
||||||
|
struct formatter<
|
||||||
|
R, Char,
|
||||||
|
enable_if_t<range_format_kind<R, Char>::value == range_format::map>> {
|
||||||
|
private:
|
||||||
|
using map_type = detail::maybe_const_range<R>;
|
||||||
|
using element_type = detail::uncvref_type<map_type>;
|
||||||
|
|
||||||
|
decltype(detail::tuple::get_formatters<element_type, Char>(
|
||||||
|
detail::tuple_index_sequence<element_type>())) formatters_;
|
||||||
|
bool no_delimiters_ = false;
|
||||||
|
|
||||||
|
public:
|
||||||
|
FMT_CONSTEXPR formatter() {}
|
||||||
|
|
||||||
|
template <typename ParseContext>
|
||||||
|
FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
|
||||||
|
auto it = ctx.begin();
|
||||||
|
auto end = ctx.end();
|
||||||
|
if (it != end) {
|
||||||
|
if (detail::to_ascii(*it) == 'n') {
|
||||||
|
no_delimiters_ = true;
|
||||||
|
++it;
|
||||||
|
}
|
||||||
|
if (it != end && *it != '}') {
|
||||||
|
if (*it != ':') report_error("invalid format specifier");
|
||||||
|
++it;
|
||||||
|
}
|
||||||
|
ctx.advance_to(it);
|
||||||
|
}
|
||||||
|
detail::for_each(formatters_, detail::parse_empty_specs<ParseContext>{ctx});
|
||||||
|
return it;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename FormatContext>
|
||||||
|
auto format(map_type& map, FormatContext& ctx) const -> decltype(ctx.out()) {
|
||||||
|
auto out = ctx.out();
|
||||||
|
basic_string_view<Char> open = detail::string_literal<Char, '{'>{};
|
||||||
|
if (!no_delimiters_) out = detail::copy<Char>(open, out);
|
||||||
|
int i = 0;
|
||||||
|
auto mapper = detail::range_mapper<buffered_context<Char>>();
|
||||||
|
basic_string_view<Char> sep = detail::string_literal<Char, ',', ' '>{};
|
||||||
|
for (auto&& value : map) {
|
||||||
|
if (i > 0) out = detail::copy<Char>(sep, out);
|
||||||
|
ctx.advance_to(out);
|
||||||
|
detail::for_each2(formatters_, mapper.map(value),
|
||||||
|
detail::format_tuple_element<FormatContext>{
|
||||||
|
0, ctx, detail::string_literal<Char, ':', ' '>{}});
|
||||||
|
++i;
|
||||||
|
}
|
||||||
|
basic_string_view<Char> close = detail::string_literal<Char, '}'>{};
|
||||||
|
if (!no_delimiters_) out = detail::copy<Char>(close, out);
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// A (debug_)string formatter.
|
||||||
|
template <typename R, typename Char>
|
||||||
|
struct formatter<
|
||||||
|
R, Char,
|
||||||
|
enable_if_t<range_format_kind<R, Char>::value == range_format::string ||
|
||||||
|
range_format_kind<R, Char>::value ==
|
||||||
|
range_format::debug_string>> {
|
||||||
|
private:
|
||||||
|
using range_type = detail::maybe_const_range<R>;
|
||||||
|
using string_type =
|
||||||
|
conditional_t<std::is_constructible<
|
||||||
|
detail::std_string_view<Char>,
|
||||||
|
decltype(detail::range_begin(std::declval<R>())),
|
||||||
|
decltype(detail::range_end(std::declval<R>()))>::value,
|
||||||
|
detail::std_string_view<Char>, std::basic_string<Char>>;
|
||||||
|
|
||||||
|
formatter<string_type, Char> underlying_;
|
||||||
|
|
||||||
|
public:
|
||||||
|
template <typename ParseContext>
|
||||||
|
FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
|
||||||
|
return underlying_.parse(ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename FormatContext>
|
||||||
|
auto format(range_type& range, FormatContext& ctx) const
|
||||||
|
-> decltype(ctx.out()) {
|
||||||
|
auto out = ctx.out();
|
||||||
|
if (detail::const_check(range_format_kind<R, Char>::value ==
|
||||||
|
range_format::debug_string))
|
||||||
|
*out++ = '"';
|
||||||
|
out = underlying_.format(
|
||||||
|
string_type{detail::range_begin(range), detail::range_end(range)}, ctx);
|
||||||
|
if (detail::const_check(range_format_kind<R, Char>::value ==
|
||||||
|
range_format::debug_string))
|
||||||
|
*out++ = '"';
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename It, typename Sentinel, typename Char = char>
|
||||||
|
struct join_view : detail::view {
|
||||||
|
It begin;
|
||||||
|
Sentinel end;
|
||||||
|
basic_string_view<Char> sep;
|
||||||
|
|
||||||
|
join_view(It b, Sentinel e, basic_string_view<Char> s)
|
||||||
|
: begin(std::move(b)), end(e), sep(s) {}
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename It, typename Sentinel, typename Char>
|
||||||
|
struct formatter<join_view<It, Sentinel, Char>, Char> {
|
||||||
|
private:
|
||||||
|
using value_type =
|
||||||
|
#ifdef __cpp_lib_ranges
|
||||||
|
std::iter_value_t<It>;
|
||||||
|
#else
|
||||||
|
typename std::iterator_traits<It>::value_type;
|
||||||
|
#endif
|
||||||
|
formatter<remove_cvref_t<value_type>, Char> value_formatter_;
|
||||||
|
|
||||||
|
using view_ref = conditional_t<std::is_copy_constructible<It>::value,
|
||||||
|
const join_view<It, Sentinel, Char>&,
|
||||||
|
join_view<It, Sentinel, Char>&&>;
|
||||||
|
|
||||||
|
public:
|
||||||
|
using nonlocking = void;
|
||||||
|
|
||||||
|
template <typename ParseContext>
|
||||||
|
FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const Char* {
|
||||||
|
return value_formatter_.parse(ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename FormatContext>
|
||||||
|
auto format(view_ref& value, FormatContext& ctx) const
|
||||||
|
-> decltype(ctx.out()) {
|
||||||
|
auto it = std::forward<view_ref>(value).begin;
|
||||||
|
auto out = ctx.out();
|
||||||
|
if (it == value.end) return out;
|
||||||
|
out = value_formatter_.format(*it, ctx);
|
||||||
|
++it;
|
||||||
|
while (it != value.end) {
|
||||||
|
out = detail::copy<Char>(value.sep.begin(), value.sep.end(), out);
|
||||||
|
ctx.advance_to(out);
|
||||||
|
out = value_formatter_.format(*it, ctx);
|
||||||
|
++it;
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/// Returns a view that formats the iterator range `[begin, end)` with elements
|
||||||
|
/// separated by `sep`.
|
||||||
|
template <typename It, typename Sentinel>
|
||||||
|
auto join(It begin, Sentinel end, string_view sep) -> join_view<It, Sentinel> {
|
||||||
|
return {std::move(begin), end, sep};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a view that formats `range` with elements separated by `sep`.
|
||||||
|
*
|
||||||
|
* **Example**:
|
||||||
|
*
|
||||||
|
* auto v = std::vector<int>{1, 2, 3};
|
||||||
|
* fmt::print("{}", fmt::join(v, ", "));
|
||||||
|
* // Output: 1, 2, 3
|
||||||
|
*
|
||||||
|
* `fmt::join` applies passed format specifiers to the range elements:
|
||||||
|
*
|
||||||
|
* fmt::print("{:02}", fmt::join(v, ", "));
|
||||||
|
* // Output: 01, 02, 03
|
||||||
|
*/
|
||||||
|
template <typename Range>
|
||||||
|
auto join(Range&& r, string_view sep)
|
||||||
|
-> join_view<decltype(detail::range_begin(r)),
|
||||||
|
decltype(detail::range_end(r))> {
|
||||||
|
return {detail::range_begin(r), detail::range_end(r), sep};
|
||||||
|
}
|
||||||
|
|
||||||
template <typename Char, typename... T> struct tuple_join_view : detail::view {
|
template <typename Char, typename... T> struct tuple_join_view : detail::view {
|
||||||
const std::tuple<T...>& tuple;
|
const std::tuple<T...>& tuple;
|
||||||
basic_string_view<Char> sep;
|
basic_string_view<Char> sep;
|
||||||
|
@ -620,7 +780,7 @@ struct formatter<tuple_join_view<Char, T...>, Char> {
|
||||||
if (N > 1) {
|
if (N > 1) {
|
||||||
auto end1 = do_parse(ctx, std::integral_constant<size_t, N - 1>());
|
auto end1 = do_parse(ctx, std::integral_constant<size_t, N - 1>());
|
||||||
if (end != end1)
|
if (end != end1)
|
||||||
FMT_THROW(format_error("incompatible format specs for tuple elements"));
|
report_error("incompatible format specs for tuple elements");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
return end;
|
return end;
|
||||||
|
@ -639,12 +799,10 @@ struct formatter<tuple_join_view<Char, T...>, Char> {
|
||||||
typename FormatContext::iterator {
|
typename FormatContext::iterator {
|
||||||
auto out = std::get<sizeof...(T) - N>(formatters_)
|
auto out = std::get<sizeof...(T) - N>(formatters_)
|
||||||
.format(std::get<sizeof...(T) - N>(value.tuple), ctx);
|
.format(std::get<sizeof...(T) - N>(value.tuple), ctx);
|
||||||
if (N > 1) {
|
if (N <= 1) return out;
|
||||||
out = std::copy(value.sep.begin(), value.sep.end(), out);
|
out = detail::copy<Char>(value.sep, out);
|
||||||
ctx.advance_to(out);
|
ctx.advance_to(out);
|
||||||
return do_format(value, ctx, std::integral_constant<size_t, N - 1>());
|
return do_format(value, ctx, std::integral_constant<size_t, N - 1>());
|
||||||
}
|
|
||||||
return out;
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -689,15 +847,13 @@ struct formatter<
|
||||||
FMT_BEGIN_EXPORT
|
FMT_BEGIN_EXPORT
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Returns an object that formats `std::tuple` with elements separated by `sep`.
|
||||||
Returns an object that formats `tuple` with elements separated by `sep`.
|
*
|
||||||
|
* **Example**:
|
||||||
**Example**::
|
*
|
||||||
|
* auto t = std::tuple<int, char>{1, 'a'};
|
||||||
std::tuple<int, char> t = {1, 'a'};
|
* fmt::print("{}", fmt::join(t, ", "));
|
||||||
fmt::print("{}", fmt::join(t, ", "));
|
* // Output: 1, a
|
||||||
// Output: "1, a"
|
|
||||||
\endrst
|
|
||||||
*/
|
*/
|
||||||
template <typename... T>
|
template <typename... T>
|
||||||
FMT_CONSTEXPR auto join(const std::tuple<T...>& tuple, string_view sep)
|
FMT_CONSTEXPR auto join(const std::tuple<T...>& tuple, string_view sep)
|
||||||
|
@ -705,23 +861,14 @@ FMT_CONSTEXPR auto join(const std::tuple<T...>& tuple, string_view sep)
|
||||||
return {tuple, sep};
|
return {tuple, sep};
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename... T>
|
|
||||||
FMT_CONSTEXPR auto join(const std::tuple<T...>& tuple,
|
|
||||||
basic_string_view<wchar_t> sep)
|
|
||||||
-> tuple_join_view<wchar_t, T...> {
|
|
||||||
return {tuple, sep};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\rst
|
* Returns an object that formats `std::initializer_list` with elements
|
||||||
Returns an object that formats `initializer_list` with elements separated by
|
* separated by `sep`.
|
||||||
`sep`.
|
*
|
||||||
|
* **Example**:
|
||||||
**Example**::
|
*
|
||||||
|
* fmt::print("{}", fmt::join({1, 2, 3}, ", "));
|
||||||
fmt::print("{}", fmt::join({1, 2, 3}, ", "));
|
* // Output: "1, 2, 3"
|
||||||
// Output: "1, 2, 3"
|
|
||||||
\endrst
|
|
||||||
*/
|
*/
|
||||||
template <typename T>
|
template <typename T>
|
||||||
auto join(std::initializer_list<T> list, string_view sep)
|
auto join(std::initializer_list<T> list, string_view sep)
|
||||||
|
|
|
@ -8,35 +8,47 @@
|
||||||
#ifndef FMT_STD_H_
|
#ifndef FMT_STD_H_
|
||||||
#define FMT_STD_H_
|
#define FMT_STD_H_
|
||||||
|
|
||||||
#include <atomic>
|
|
||||||
#include <bitset>
|
|
||||||
#include <cstdlib>
|
|
||||||
#include <exception>
|
|
||||||
#include <memory>
|
|
||||||
#include <thread>
|
|
||||||
#include <type_traits>
|
|
||||||
#include <typeinfo>
|
|
||||||
#include <utility>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#include "format.h"
|
#include "format.h"
|
||||||
#include "ostream.h"
|
#include "ostream.h"
|
||||||
|
|
||||||
|
#ifndef FMT_MODULE
|
||||||
|
# include <atomic>
|
||||||
|
# include <bitset>
|
||||||
|
# include <complex>
|
||||||
|
# include <cstdlib>
|
||||||
|
# include <exception>
|
||||||
|
# include <memory>
|
||||||
|
# include <thread>
|
||||||
|
# include <type_traits>
|
||||||
|
# include <typeinfo>
|
||||||
|
# include <utility>
|
||||||
|
# include <vector>
|
||||||
|
|
||||||
|
// Check FMT_CPLUSPLUS to suppress a bogus warning in MSVC.
|
||||||
|
# if FMT_CPLUSPLUS >= 201703L
|
||||||
|
# if FMT_HAS_INCLUDE(<filesystem>)
|
||||||
|
# include <filesystem>
|
||||||
|
# endif
|
||||||
|
# if FMT_HAS_INCLUDE(<variant>)
|
||||||
|
# include <variant>
|
||||||
|
# endif
|
||||||
|
# if FMT_HAS_INCLUDE(<optional>)
|
||||||
|
# include <optional>
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
// Use > instead of >= in the version check because <source_location> may be
|
||||||
|
// available after C++17 but before C++20 is marked as implemented.
|
||||||
|
# if FMT_CPLUSPLUS > 201703L && FMT_HAS_INCLUDE(<source_location>)
|
||||||
|
# include <source_location>
|
||||||
|
# endif
|
||||||
|
# if FMT_CPLUSPLUS > 202002L && FMT_HAS_INCLUDE(<expected>)
|
||||||
|
# include <expected>
|
||||||
|
# endif
|
||||||
|
#endif // FMT_MODULE
|
||||||
|
|
||||||
#if FMT_HAS_INCLUDE(<version>)
|
#if FMT_HAS_INCLUDE(<version>)
|
||||||
# include <version>
|
# include <version>
|
||||||
#endif
|
#endif
|
||||||
// Checking FMT_CPLUSPLUS for warning suppression in MSVC.
|
|
||||||
#if FMT_CPLUSPLUS >= 201703L
|
|
||||||
# if FMT_HAS_INCLUDE(<filesystem>)
|
|
||||||
# include <filesystem>
|
|
||||||
# endif
|
|
||||||
# if FMT_HAS_INCLUDE(<variant>)
|
|
||||||
# include <variant>
|
|
||||||
# endif
|
|
||||||
# if FMT_HAS_INCLUDE(<optional>)
|
|
||||||
# include <optional>
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// GCC 4 does not support FMT_HAS_INCLUDE.
|
// GCC 4 does not support FMT_HAS_INCLUDE.
|
||||||
#if FMT_HAS_INCLUDE(<cxxabi.h>) || defined(__GLIBCXX__)
|
#if FMT_HAS_INCLUDE(<cxxabi.h>) || defined(__GLIBCXX__)
|
||||||
|
@ -48,54 +60,53 @@
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Check if typeid is available.
|
// For older Xcode versions, __cpp_lib_xxx flags are inaccurately defined.
|
||||||
#ifndef FMT_USE_TYPEID
|
#ifndef FMT_CPP_LIB_FILESYSTEM
|
||||||
// __RTTI is for EDG compilers. In MSVC typeid is available without RTTI.
|
# ifdef __cpp_lib_filesystem
|
||||||
# if defined(__GXX_RTTI) || FMT_HAS_FEATURE(cxx_rtti) || FMT_MSC_VERSION || \
|
# define FMT_CPP_LIB_FILESYSTEM __cpp_lib_filesystem
|
||||||
defined(__INTEL_RTTI__) || defined(__RTTI)
|
|
||||||
# define FMT_USE_TYPEID 1
|
|
||||||
# else
|
# else
|
||||||
# define FMT_USE_TYPEID 0
|
# define FMT_CPP_LIB_FILESYSTEM 0
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __cpp_lib_filesystem
|
#ifndef FMT_CPP_LIB_VARIANT
|
||||||
|
# ifdef __cpp_lib_variant
|
||||||
|
# define FMT_CPP_LIB_VARIANT __cpp_lib_variant
|
||||||
|
# else
|
||||||
|
# define FMT_CPP_LIB_VARIANT 0
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if FMT_CPP_LIB_FILESYSTEM
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
namespace detail {
|
namespace detail {
|
||||||
|
|
||||||
template <typename Char> auto get_path_string(const std::filesystem::path& p) {
|
template <typename Char, typename PathChar>
|
||||||
return p.string<Char>();
|
auto get_path_string(const std::filesystem::path& p,
|
||||||
|
const std::basic_string<PathChar>& native) {
|
||||||
|
if constexpr (std::is_same_v<Char, char> && std::is_same_v<PathChar, wchar_t>)
|
||||||
|
return to_utf8<wchar_t>(native, to_utf8_error_policy::replace);
|
||||||
|
else
|
||||||
|
return p.string<Char>();
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Char>
|
template <typename Char, typename PathChar>
|
||||||
void write_escaped_path(basic_memory_buffer<Char>& quoted,
|
void write_escaped_path(basic_memory_buffer<Char>& quoted,
|
||||||
const std::filesystem::path& p) {
|
const std::filesystem::path& p,
|
||||||
write_escaped_string<Char>(std::back_inserter(quoted), p.string<Char>());
|
const std::basic_string<PathChar>& native) {
|
||||||
}
|
if constexpr (std::is_same_v<Char, char> &&
|
||||||
|
std::is_same_v<PathChar, wchar_t>) {
|
||||||
# ifdef _WIN32
|
auto buf = basic_memory_buffer<wchar_t>();
|
||||||
template <>
|
write_escaped_string<wchar_t>(std::back_inserter(buf), native);
|
||||||
inline auto get_path_string<char>(const std::filesystem::path& p) {
|
bool valid = to_utf8<wchar_t>::convert(quoted, {buf.data(), buf.size()});
|
||||||
return to_utf8<wchar_t>(p.native(), to_utf8_error_policy::replace);
|
FMT_ASSERT(valid, "invalid utf16");
|
||||||
}
|
} else if constexpr (std::is_same_v<Char, PathChar>) {
|
||||||
|
write_escaped_string<std::filesystem::path::value_type>(
|
||||||
template <>
|
std::back_inserter(quoted), native);
|
||||||
inline void write_escaped_path<char>(memory_buffer& quoted,
|
} else {
|
||||||
const std::filesystem::path& p) {
|
write_escaped_string<Char>(std::back_inserter(quoted), p.string<Char>());
|
||||||
auto buf = basic_memory_buffer<wchar_t>();
|
}
|
||||||
write_escaped_string<wchar_t>(std::back_inserter(buf), p.native());
|
|
||||||
bool valid = to_utf8<wchar_t>::convert(quoted, {buf.data(), buf.size()});
|
|
||||||
FMT_ASSERT(valid, "invalid utf16");
|
|
||||||
}
|
|
||||||
# endif // _WIN32
|
|
||||||
|
|
||||||
template <>
|
|
||||||
inline void write_escaped_path<std::filesystem::path::value_type>(
|
|
||||||
basic_memory_buffer<std::filesystem::path::value_type>& quoted,
|
|
||||||
const std::filesystem::path& p) {
|
|
||||||
write_escaped_string<std::filesystem::path::value_type>(
|
|
||||||
std::back_inserter(quoted), p.native());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace detail
|
} // namespace detail
|
||||||
|
@ -103,9 +114,10 @@ inline void write_escaped_path<std::filesystem::path::value_type>(
|
||||||
FMT_EXPORT
|
FMT_EXPORT
|
||||||
template <typename Char> struct formatter<std::filesystem::path, Char> {
|
template <typename Char> struct formatter<std::filesystem::path, Char> {
|
||||||
private:
|
private:
|
||||||
format_specs<Char> specs_;
|
format_specs specs_;
|
||||||
detail::arg_ref<Char> width_ref_;
|
detail::arg_ref<Char> width_ref_;
|
||||||
bool debug_ = false;
|
bool debug_ = false;
|
||||||
|
char path_type_ = 0;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
FMT_CONSTEXPR void set_debug_format(bool set = true) { debug_ = set; }
|
FMT_CONSTEXPR void set_debug_format(bool set = true) { debug_ = set; }
|
||||||
|
@ -122,29 +134,76 @@ template <typename Char> struct formatter<std::filesystem::path, Char> {
|
||||||
debug_ = true;
|
debug_ = true;
|
||||||
++it;
|
++it;
|
||||||
}
|
}
|
||||||
|
if (it != end && (*it == 'g')) path_type_ = detail::to_ascii(*it++);
|
||||||
return it;
|
return it;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename FormatContext>
|
template <typename FormatContext>
|
||||||
auto format(const std::filesystem::path& p, FormatContext& ctx) const {
|
auto format(const std::filesystem::path& p, FormatContext& ctx) const {
|
||||||
auto specs = specs_;
|
auto specs = specs_;
|
||||||
|
auto path_string =
|
||||||
|
!path_type_ ? p.native()
|
||||||
|
: p.generic_string<std::filesystem::path::value_type>();
|
||||||
|
|
||||||
detail::handle_dynamic_spec<detail::width_checker>(specs.width, width_ref_,
|
detail::handle_dynamic_spec<detail::width_checker>(specs.width, width_ref_,
|
||||||
ctx);
|
ctx);
|
||||||
if (!debug_) {
|
if (!debug_) {
|
||||||
auto s = detail::get_path_string<Char>(p);
|
auto s = detail::get_path_string<Char>(p, path_string);
|
||||||
return detail::write(ctx.out(), basic_string_view<Char>(s), specs);
|
return detail::write(ctx.out(), basic_string_view<Char>(s), specs);
|
||||||
}
|
}
|
||||||
auto quoted = basic_memory_buffer<Char>();
|
auto quoted = basic_memory_buffer<Char>();
|
||||||
detail::write_escaped_path(quoted, p);
|
detail::write_escaped_path(quoted, p, path_string);
|
||||||
return detail::write(ctx.out(),
|
return detail::write(ctx.out(),
|
||||||
basic_string_view<Char>(quoted.data(), quoted.size()),
|
basic_string_view<Char>(quoted.data(), quoted.size()),
|
||||||
specs);
|
specs);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class path : public std::filesystem::path {
|
||||||
|
public:
|
||||||
|
auto display_string() const -> std::string {
|
||||||
|
const std::filesystem::path& base = *this;
|
||||||
|
return fmt::format(FMT_STRING("{}"), base);
|
||||||
|
}
|
||||||
|
auto system_string() const -> std::string { return string(); }
|
||||||
|
|
||||||
|
auto generic_display_string() const -> std::string {
|
||||||
|
const std::filesystem::path& base = *this;
|
||||||
|
return fmt::format(FMT_STRING("{:g}"), base);
|
||||||
|
}
|
||||||
|
auto generic_system_string() const -> std::string { return generic_string(); }
|
||||||
|
};
|
||||||
|
|
||||||
FMT_END_NAMESPACE
|
FMT_END_NAMESPACE
|
||||||
#endif
|
#endif // FMT_CPP_LIB_FILESYSTEM
|
||||||
|
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
|
FMT_EXPORT
|
||||||
|
template <std::size_t N, typename Char>
|
||||||
|
struct formatter<std::bitset<N>, Char> : nested_formatter<string_view> {
|
||||||
|
private:
|
||||||
|
// Functor because C++11 doesn't support generic lambdas.
|
||||||
|
struct writer {
|
||||||
|
const std::bitset<N>& bs;
|
||||||
|
|
||||||
|
template <typename OutputIt>
|
||||||
|
FMT_CONSTEXPR auto operator()(OutputIt out) -> OutputIt {
|
||||||
|
for (auto pos = N; pos > 0; --pos) {
|
||||||
|
out = detail::write<Char>(out, bs[pos - 1] ? Char('1') : Char('0'));
|
||||||
|
}
|
||||||
|
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public:
|
||||||
|
template <typename FormatContext>
|
||||||
|
auto format(const std::bitset<N>& bs, FormatContext& ctx) const
|
||||||
|
-> decltype(ctx.out()) {
|
||||||
|
return write_padded(ctx, writer{bs});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
FMT_EXPORT
|
FMT_EXPORT
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
struct formatter<std::thread::id, Char> : basic_ostream_formatter<Char> {};
|
struct formatter<std::thread::id, Char> : basic_ostream_formatter<Char> {};
|
||||||
|
@ -180,7 +239,7 @@ struct formatter<std::optional<T>, Char,
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename FormatContext>
|
template <typename FormatContext>
|
||||||
auto format(std::optional<T> const& opt, FormatContext& ctx) const
|
auto format(const std::optional<T>& opt, FormatContext& ctx) const
|
||||||
-> decltype(ctx.out()) {
|
-> decltype(ctx.out()) {
|
||||||
if (!opt) return detail::write<Char>(ctx.out(), none);
|
if (!opt) return detail::write<Char>(ctx.out(), none);
|
||||||
|
|
||||||
|
@ -194,7 +253,82 @@ struct formatter<std::optional<T>, Char,
|
||||||
FMT_END_NAMESPACE
|
FMT_END_NAMESPACE
|
||||||
#endif // __cpp_lib_optional
|
#endif // __cpp_lib_optional
|
||||||
|
|
||||||
#ifdef __cpp_lib_variant
|
#if defined(__cpp_lib_expected) || FMT_CPP_LIB_VARIANT
|
||||||
|
|
||||||
|
FMT_BEGIN_NAMESPACE
|
||||||
|
namespace detail {
|
||||||
|
|
||||||
|
template <typename Char, typename OutputIt, typename T>
|
||||||
|
auto write_escaped_alternative(OutputIt out, const T& v) -> OutputIt {
|
||||||
|
if constexpr (has_to_string_view<T>::value)
|
||||||
|
return write_escaped_string<Char>(out, detail::to_string_view(v));
|
||||||
|
if constexpr (std::is_same_v<T, Char>) return write_escaped_char(out, v);
|
||||||
|
return write<Char>(out, v);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace detail
|
||||||
|
|
||||||
|
FMT_END_NAMESPACE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cpp_lib_expected
|
||||||
|
FMT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
FMT_EXPORT
|
||||||
|
template <typename T, typename E, typename Char>
|
||||||
|
struct formatter<std::expected<T, E>, Char,
|
||||||
|
std::enable_if_t<is_formattable<T, Char>::value &&
|
||||||
|
is_formattable<E, Char>::value>> {
|
||||||
|
template <typename ParseContext>
|
||||||
|
FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
|
||||||
|
return ctx.begin();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename FormatContext>
|
||||||
|
auto format(const std::expected<T, E>& value, FormatContext& ctx) const
|
||||||
|
-> decltype(ctx.out()) {
|
||||||
|
auto out = ctx.out();
|
||||||
|
|
||||||
|
if (value.has_value()) {
|
||||||
|
out = detail::write<Char>(out, "expected(");
|
||||||
|
out = detail::write_escaped_alternative<Char>(out, *value);
|
||||||
|
} else {
|
||||||
|
out = detail::write<Char>(out, "unexpected(");
|
||||||
|
out = detail::write_escaped_alternative<Char>(out, value.error());
|
||||||
|
}
|
||||||
|
*out++ = ')';
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
FMT_END_NAMESPACE
|
||||||
|
#endif // __cpp_lib_expected
|
||||||
|
|
||||||
|
#ifdef __cpp_lib_source_location
|
||||||
|
FMT_BEGIN_NAMESPACE
|
||||||
|
FMT_EXPORT
|
||||||
|
template <> struct formatter<std::source_location> {
|
||||||
|
template <typename ParseContext> FMT_CONSTEXPR auto parse(ParseContext& ctx) {
|
||||||
|
return ctx.begin();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename FormatContext>
|
||||||
|
auto format(const std::source_location& loc, FormatContext& ctx) const
|
||||||
|
-> decltype(ctx.out()) {
|
||||||
|
auto out = ctx.out();
|
||||||
|
out = detail::write(out, loc.file_name());
|
||||||
|
out = detail::write(out, ':');
|
||||||
|
out = detail::write<char>(out, loc.line());
|
||||||
|
out = detail::write(out, ':');
|
||||||
|
out = detail::write<char>(out, loc.column());
|
||||||
|
out = detail::write(out, ": ");
|
||||||
|
out = detail::write(out, loc.function_name());
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
FMT_END_NAMESPACE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if FMT_CPP_LIB_VARIANT
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
namespace detail {
|
namespace detail {
|
||||||
|
|
||||||
|
@ -218,16 +352,6 @@ template <typename T, typename C> class is_variant_formattable_ {
|
||||||
decltype(check(variant_index_sequence<T>{}))::value;
|
decltype(check(variant_index_sequence<T>{}))::value;
|
||||||
};
|
};
|
||||||
|
|
||||||
template <typename Char, typename OutputIt, typename T>
|
|
||||||
auto write_variant_alternative(OutputIt out, const T& v) -> OutputIt {
|
|
||||||
if constexpr (is_string<T>::value)
|
|
||||||
return write_escaped_string<Char>(out, detail::to_string_view(v));
|
|
||||||
else if constexpr (std::is_same_v<T, Char>)
|
|
||||||
return write_escaped_char(out, v);
|
|
||||||
else
|
|
||||||
return write<Char>(out, v);
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace detail
|
} // namespace detail
|
||||||
|
|
||||||
template <typename T> struct is_variant_like {
|
template <typename T> struct is_variant_like {
|
||||||
|
@ -273,7 +397,7 @@ struct formatter<
|
||||||
FMT_TRY {
|
FMT_TRY {
|
||||||
std::visit(
|
std::visit(
|
||||||
[&](const auto& v) {
|
[&](const auto& v) {
|
||||||
out = detail::write_variant_alternative<Char>(out, v);
|
out = detail::write_escaped_alternative<Char>(out, v);
|
||||||
},
|
},
|
||||||
value);
|
value);
|
||||||
}
|
}
|
||||||
|
@ -285,7 +409,7 @@ struct formatter<
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
FMT_END_NAMESPACE
|
FMT_END_NAMESPACE
|
||||||
#endif // __cpp_lib_variant
|
#endif // FMT_CPP_LIB_VARIANT
|
||||||
|
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
FMT_EXPORT
|
FMT_EXPORT
|
||||||
|
@ -299,17 +423,106 @@ template <typename Char> struct formatter<std::error_code, Char> {
|
||||||
FMT_CONSTEXPR auto format(const std::error_code& ec, FormatContext& ctx) const
|
FMT_CONSTEXPR auto format(const std::error_code& ec, FormatContext& ctx) const
|
||||||
-> decltype(ctx.out()) {
|
-> decltype(ctx.out()) {
|
||||||
auto out = ctx.out();
|
auto out = ctx.out();
|
||||||
out = detail::write_bytes(out, ec.category().name(), format_specs<Char>());
|
out = detail::write_bytes<Char>(out, ec.category().name(), format_specs());
|
||||||
out = detail::write<Char>(out, Char(':'));
|
out = detail::write<Char>(out, Char(':'));
|
||||||
out = detail::write<Char>(out, ec.value());
|
out = detail::write<Char>(out, ec.value());
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#if FMT_USE_RTTI
|
||||||
|
namespace detail {
|
||||||
|
|
||||||
|
template <typename Char, typename OutputIt>
|
||||||
|
auto write_demangled_name(OutputIt out, const std::type_info& ti) -> OutputIt {
|
||||||
|
# ifdef FMT_HAS_ABI_CXA_DEMANGLE
|
||||||
|
int status = 0;
|
||||||
|
std::size_t size = 0;
|
||||||
|
std::unique_ptr<char, void (*)(void*)> demangled_name_ptr(
|
||||||
|
abi::__cxa_demangle(ti.name(), nullptr, &size, &status), &std::free);
|
||||||
|
|
||||||
|
string_view demangled_name_view;
|
||||||
|
if (demangled_name_ptr) {
|
||||||
|
demangled_name_view = demangled_name_ptr.get();
|
||||||
|
|
||||||
|
// Normalization of stdlib inline namespace names.
|
||||||
|
// libc++ inline namespaces.
|
||||||
|
// std::__1::* -> std::*
|
||||||
|
// std::__1::__fs::* -> std::*
|
||||||
|
// libstdc++ inline namespaces.
|
||||||
|
// std::__cxx11::* -> std::*
|
||||||
|
// std::filesystem::__cxx11::* -> std::filesystem::*
|
||||||
|
if (demangled_name_view.starts_with("std::")) {
|
||||||
|
char* begin = demangled_name_ptr.get();
|
||||||
|
char* to = begin + 5; // std::
|
||||||
|
for (char *from = to, *end = begin + demangled_name_view.size();
|
||||||
|
from < end;) {
|
||||||
|
// This is safe, because demangled_name is NUL-terminated.
|
||||||
|
if (from[0] == '_' && from[1] == '_') {
|
||||||
|
char* next = from + 1;
|
||||||
|
while (next < end && *next != ':') next++;
|
||||||
|
if (next[0] == ':' && next[1] == ':') {
|
||||||
|
from = next + 2;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*to++ = *from++;
|
||||||
|
}
|
||||||
|
demangled_name_view = {begin, detail::to_unsigned(to - begin)};
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
demangled_name_view = string_view(ti.name());
|
||||||
|
}
|
||||||
|
return detail::write_bytes<Char>(out, demangled_name_view);
|
||||||
|
# elif FMT_MSC_VERSION
|
||||||
|
const string_view demangled_name(ti.name());
|
||||||
|
for (std::size_t i = 0; i < demangled_name.size(); ++i) {
|
||||||
|
auto sub = demangled_name;
|
||||||
|
sub.remove_prefix(i);
|
||||||
|
if (sub.starts_with("enum ")) {
|
||||||
|
i += 4;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (sub.starts_with("class ") || sub.starts_with("union ")) {
|
||||||
|
i += 5;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (sub.starts_with("struct ")) {
|
||||||
|
i += 6;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (*sub.begin() != ' ') *out++ = *sub.begin();
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
# else
|
||||||
|
return detail::write_bytes<Char>(out, string_view(ti.name()));
|
||||||
|
# endif
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace detail
|
||||||
|
|
||||||
|
FMT_EXPORT
|
||||||
|
template <typename Char>
|
||||||
|
struct formatter<std::type_info, Char // DEPRECATED! Mixing code unit types.
|
||||||
|
> {
|
||||||
|
public:
|
||||||
|
FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
|
||||||
|
-> decltype(ctx.begin()) {
|
||||||
|
return ctx.begin();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename Context>
|
||||||
|
auto format(const std::type_info& ti, Context& ctx) const
|
||||||
|
-> decltype(ctx.out()) {
|
||||||
|
return detail::write_demangled_name<Char>(ctx.out(), ti);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
FMT_EXPORT
|
FMT_EXPORT
|
||||||
template <typename T, typename Char>
|
template <typename T, typename Char>
|
||||||
struct formatter<
|
struct formatter<
|
||||||
T, Char,
|
T, Char, // DEPRECATED! Mixing code unit types.
|
||||||
typename std::enable_if<std::is_base_of<std::exception, T>::value>::type> {
|
typename std::enable_if<std::is_base_of<std::exception, T>::value>::type> {
|
||||||
private:
|
private:
|
||||||
bool with_typename_ = false;
|
bool with_typename_ = false;
|
||||||
|
@ -322,74 +535,23 @@ struct formatter<
|
||||||
if (it == end || *it == '}') return it;
|
if (it == end || *it == '}') return it;
|
||||||
if (*it == 't') {
|
if (*it == 't') {
|
||||||
++it;
|
++it;
|
||||||
with_typename_ = FMT_USE_TYPEID != 0;
|
with_typename_ = FMT_USE_RTTI != 0;
|
||||||
}
|
}
|
||||||
return it;
|
return it;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename OutputIt>
|
template <typename Context>
|
||||||
auto format(const std::exception& ex,
|
auto format(const std::exception& ex, Context& ctx) const
|
||||||
basic_format_context<OutputIt, Char>& ctx) const -> OutputIt {
|
-> decltype(ctx.out()) {
|
||||||
format_specs<Char> spec;
|
|
||||||
auto out = ctx.out();
|
auto out = ctx.out();
|
||||||
if (!with_typename_)
|
#if FMT_USE_RTTI
|
||||||
return detail::write_bytes(out, string_view(ex.what()), spec);
|
if (with_typename_) {
|
||||||
|
out = detail::write_demangled_name<Char>(out, typeid(ex));
|
||||||
#if FMT_USE_TYPEID
|
*out++ = ':';
|
||||||
const std::type_info& ti = typeid(ex);
|
*out++ = ' ';
|
||||||
# ifdef FMT_HAS_ABI_CXA_DEMANGLE
|
|
||||||
int status = 0;
|
|
||||||
std::size_t size = 0;
|
|
||||||
std::unique_ptr<char, decltype(&std::free)> demangled_name_ptr(
|
|
||||||
abi::__cxa_demangle(ti.name(), nullptr, &size, &status), &std::free);
|
|
||||||
|
|
||||||
string_view demangled_name_view;
|
|
||||||
if (demangled_name_ptr) {
|
|
||||||
demangled_name_view = demangled_name_ptr.get();
|
|
||||||
|
|
||||||
// Normalization of stdlib inline namespace names.
|
|
||||||
// libc++ inline namespaces.
|
|
||||||
// std::__1::* -> std::*
|
|
||||||
// std::__1::__fs::* -> std::*
|
|
||||||
// libstdc++ inline namespaces.
|
|
||||||
// std::__cxx11::* -> std::*
|
|
||||||
// std::filesystem::__cxx11::* -> std::filesystem::*
|
|
||||||
if (demangled_name_view.starts_with("std::")) {
|
|
||||||
char* begin = demangled_name_ptr.get();
|
|
||||||
char* to = begin + 5; // std::
|
|
||||||
for (char *from = to, *end = begin + demangled_name_view.size();
|
|
||||||
from < end;) {
|
|
||||||
// This is safe, because demangled_name is NUL-terminated.
|
|
||||||
if (from[0] == '_' && from[1] == '_') {
|
|
||||||
char* next = from + 1;
|
|
||||||
while (next < end && *next != ':') next++;
|
|
||||||
if (next[0] == ':' && next[1] == ':') {
|
|
||||||
from = next + 2;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*to++ = *from++;
|
|
||||||
}
|
|
||||||
demangled_name_view = {begin, detail::to_unsigned(to - begin)};
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
demangled_name_view = string_view(ti.name());
|
|
||||||
}
|
}
|
||||||
out = detail::write_bytes(out, demangled_name_view, spec);
|
|
||||||
# elif FMT_MSC_VERSION
|
|
||||||
string_view demangled_name_view(ti.name());
|
|
||||||
if (demangled_name_view.starts_with("class "))
|
|
||||||
demangled_name_view.remove_prefix(6);
|
|
||||||
else if (demangled_name_view.starts_with("struct "))
|
|
||||||
demangled_name_view.remove_prefix(7);
|
|
||||||
out = detail::write_bytes(out, demangled_name_view, spec);
|
|
||||||
# else
|
|
||||||
out = detail::write_bytes(out, string_view(ti.name()), spec);
|
|
||||||
# endif
|
|
||||||
*out++ = ':';
|
|
||||||
*out++ = ' ';
|
|
||||||
return detail::write_bytes(out, string_view(ex.what()), spec);
|
|
||||||
#endif
|
#endif
|
||||||
|
return detail::write_bytes<Char>(out, string_view(ex.what()));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -436,6 +598,14 @@ struct formatter<BitRef, Char,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
template <typename T, typename Deleter>
|
||||||
|
auto ptr(const std::unique_ptr<T, Deleter>& p) -> const void* {
|
||||||
|
return p.get();
|
||||||
|
}
|
||||||
|
template <typename T> auto ptr(const std::shared_ptr<T>& p) -> const void* {
|
||||||
|
return p.get();
|
||||||
|
}
|
||||||
|
|
||||||
FMT_EXPORT
|
FMT_EXPORT
|
||||||
template <typename T, typename Char>
|
template <typename T, typename Char>
|
||||||
struct formatter<std::atomic<T>, Char,
|
struct formatter<std::atomic<T>, Char,
|
||||||
|
@ -451,15 +621,79 @@ struct formatter<std::atomic<T>, Char,
|
||||||
#ifdef __cpp_lib_atomic_flag_test
|
#ifdef __cpp_lib_atomic_flag_test
|
||||||
FMT_EXPORT
|
FMT_EXPORT
|
||||||
template <typename Char>
|
template <typename Char>
|
||||||
struct formatter<std::atomic_flag, Char>
|
struct formatter<std::atomic_flag, Char> : formatter<bool, Char> {
|
||||||
: formatter<bool, Char> {
|
|
||||||
template <typename FormatContext>
|
template <typename FormatContext>
|
||||||
auto format(const std::atomic_flag& v, FormatContext& ctx) const
|
auto format(const std::atomic_flag& v, FormatContext& ctx) const
|
||||||
-> decltype(ctx.out()) {
|
-> decltype(ctx.out()) {
|
||||||
return formatter<bool, Char>::format(v.test(), ctx);
|
return formatter<bool, Char>::format(v.test(), ctx);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
#endif // __cpp_lib_atomic_flag_test
|
#endif // __cpp_lib_atomic_flag_test
|
||||||
|
|
||||||
|
FMT_EXPORT
|
||||||
|
template <typename T, typename Char> struct formatter<std::complex<T>, Char> {
|
||||||
|
private:
|
||||||
|
detail::dynamic_format_specs<Char> specs_;
|
||||||
|
|
||||||
|
template <typename FormatContext, typename OutputIt>
|
||||||
|
FMT_CONSTEXPR auto do_format(const std::complex<T>& c,
|
||||||
|
detail::dynamic_format_specs<Char>& specs,
|
||||||
|
FormatContext& ctx, OutputIt out) const
|
||||||
|
-> OutputIt {
|
||||||
|
if (c.real() != 0) {
|
||||||
|
*out++ = Char('(');
|
||||||
|
out = detail::write<Char>(out, c.real(), specs, ctx.locale());
|
||||||
|
specs.sign = sign::plus;
|
||||||
|
out = detail::write<Char>(out, c.imag(), specs, ctx.locale());
|
||||||
|
if (!detail::isfinite(c.imag())) *out++ = Char(' ');
|
||||||
|
*out++ = Char('i');
|
||||||
|
*out++ = Char(')');
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
out = detail::write<Char>(out, c.imag(), specs, ctx.locale());
|
||||||
|
if (!detail::isfinite(c.imag())) *out++ = Char(' ');
|
||||||
|
*out++ = Char('i');
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
public:
|
||||||
|
FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
|
||||||
|
-> decltype(ctx.begin()) {
|
||||||
|
if (ctx.begin() == ctx.end() || *ctx.begin() == '}') return ctx.begin();
|
||||||
|
return parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx,
|
||||||
|
detail::type_constant<T, Char>::value);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename FormatContext>
|
||||||
|
auto format(const std::complex<T>& c, FormatContext& ctx) const
|
||||||
|
-> decltype(ctx.out()) {
|
||||||
|
auto specs = specs_;
|
||||||
|
if (specs.width_ref.kind != detail::arg_id_kind::none ||
|
||||||
|
specs.precision_ref.kind != detail::arg_id_kind::none) {
|
||||||
|
detail::handle_dynamic_spec<detail::width_checker>(specs.width,
|
||||||
|
specs.width_ref, ctx);
|
||||||
|
detail::handle_dynamic_spec<detail::precision_checker>(
|
||||||
|
specs.precision, specs.precision_ref, ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (specs.width == 0) return do_format(c, specs, ctx, ctx.out());
|
||||||
|
auto buf = basic_memory_buffer<Char>();
|
||||||
|
|
||||||
|
auto outer_specs = format_specs();
|
||||||
|
outer_specs.width = specs.width;
|
||||||
|
outer_specs.fill = specs.fill;
|
||||||
|
outer_specs.align = specs.align;
|
||||||
|
|
||||||
|
specs.width = 0;
|
||||||
|
specs.fill = {};
|
||||||
|
specs.align = align::none;
|
||||||
|
|
||||||
|
do_format(c, specs, ctx, basic_appender<Char>(buf));
|
||||||
|
return detail::write<Char>(ctx.out(),
|
||||||
|
basic_string_view<Char>(buf.data(), buf.size()),
|
||||||
|
outer_specs);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
FMT_END_NAMESPACE
|
FMT_END_NAMESPACE
|
||||||
#endif // FMT_STD_H_
|
#endif // FMT_STD_H_
|
||||||
|
|
|
@ -8,12 +8,15 @@
|
||||||
#ifndef FMT_XCHAR_H_
|
#ifndef FMT_XCHAR_H_
|
||||||
#define FMT_XCHAR_H_
|
#define FMT_XCHAR_H_
|
||||||
|
|
||||||
#include <cwchar>
|
#include "color.h"
|
||||||
|
|
||||||
#include "format.h"
|
#include "format.h"
|
||||||
|
#include "ranges.h"
|
||||||
|
|
||||||
#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
|
#ifndef FMT_MODULE
|
||||||
# include <locale>
|
# include <cwchar>
|
||||||
|
# if !defined(FMT_STATIC_THOUSANDS_SEPARATOR)
|
||||||
|
# include <locale>
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
|
@ -22,9 +25,24 @@ namespace detail {
|
||||||
template <typename T>
|
template <typename T>
|
||||||
using is_exotic_char = bool_constant<!std::is_same<T, char>::value>;
|
using is_exotic_char = bool_constant<!std::is_same<T, char>::value>;
|
||||||
|
|
||||||
inline auto write_loc(std::back_insert_iterator<detail::buffer<wchar_t>> out,
|
template <typename S, typename = void> struct format_string_char {};
|
||||||
loc_value value, const format_specs<wchar_t>& specs,
|
|
||||||
locale_ref loc) -> bool {
|
template <typename S>
|
||||||
|
struct format_string_char<
|
||||||
|
S, void_t<decltype(sizeof(detail::to_string_view(std::declval<S>())))>> {
|
||||||
|
using type = char_t<S>;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename S>
|
||||||
|
struct format_string_char<S, enable_if_t<is_compile_string<S>::value>> {
|
||||||
|
using type = typename S::char_type;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename S>
|
||||||
|
using format_string_char_t = typename format_string_char<S>::type;
|
||||||
|
|
||||||
|
inline auto write_loc(basic_appender<wchar_t> out, loc_value value,
|
||||||
|
const format_specs& specs, locale_ref loc) -> bool {
|
||||||
#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
|
#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
|
||||||
auto& numpunct =
|
auto& numpunct =
|
||||||
std::use_facet<std::numpunct<wchar_t>>(loc.get<std::locale>());
|
std::use_facet<std::numpunct<wchar_t>>(loc.get<std::locale>());
|
||||||
|
@ -41,7 +59,7 @@ FMT_BEGIN_EXPORT
|
||||||
|
|
||||||
using wstring_view = basic_string_view<wchar_t>;
|
using wstring_view = basic_string_view<wchar_t>;
|
||||||
using wformat_parse_context = basic_format_parse_context<wchar_t>;
|
using wformat_parse_context = basic_format_parse_context<wchar_t>;
|
||||||
using wformat_context = buffer_context<wchar_t>;
|
using wformat_context = buffered_context<wchar_t>;
|
||||||
using wformat_args = basic_format_args<wformat_context>;
|
using wformat_args = basic_format_args<wformat_context>;
|
||||||
using wmemory_buffer = basic_memory_buffer<wchar_t>;
|
using wmemory_buffer = basic_memory_buffer<wchar_t>;
|
||||||
|
|
||||||
|
@ -58,19 +76,24 @@ inline auto runtime(wstring_view s) -> runtime_format_string<wchar_t> {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
template <> struct is_char<wchar_t> : std::true_type {};
|
template <> struct is_char<wchar_t> : std::true_type {};
|
||||||
template <> struct is_char<detail::char8_type> : std::true_type {};
|
|
||||||
template <> struct is_char<char16_t> : std::true_type {};
|
template <> struct is_char<char16_t> : std::true_type {};
|
||||||
template <> struct is_char<char32_t> : std::true_type {};
|
template <> struct is_char<char32_t> : std::true_type {};
|
||||||
|
|
||||||
|
#ifdef __cpp_char8_t
|
||||||
|
template <>
|
||||||
|
struct is_char<char8_t> : bool_constant<detail::is_utf8_enabled()> {};
|
||||||
|
#endif
|
||||||
|
|
||||||
template <typename... T>
|
template <typename... T>
|
||||||
constexpr format_arg_store<wformat_context, T...> make_wformat_args(
|
constexpr auto make_wformat_args(T&... args)
|
||||||
const T&... args) {
|
-> decltype(fmt::make_format_args<wformat_context>(args...)) {
|
||||||
return {args...};
|
return fmt::make_format_args<wformat_context>(args...);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline namespace literals {
|
inline namespace literals {
|
||||||
#if FMT_USE_USER_DEFINED_LITERALS && !FMT_USE_NONTYPE_TEMPLATE_ARGS
|
#if FMT_USE_USER_DEFINED_LITERALS && !FMT_USE_NONTYPE_TEMPLATE_ARGS
|
||||||
constexpr detail::udl_arg<wchar_t> operator"" _a(const wchar_t* s, size_t) {
|
constexpr auto operator""_a(const wchar_t* s, size_t)
|
||||||
|
-> detail::udl_arg<wchar_t> {
|
||||||
return {s};
|
return {s};
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -95,9 +118,15 @@ auto join(std::initializer_list<T> list, wstring_view sep)
|
||||||
return join(std::begin(list), std::end(list), sep);
|
return join(std::begin(list), std::end(list), sep);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <typename... T>
|
||||||
|
auto join(const std::tuple<T...>& tuple, basic_string_view<wchar_t> sep)
|
||||||
|
-> tuple_join_view<wchar_t, T...> {
|
||||||
|
return {tuple, sep};
|
||||||
|
}
|
||||||
|
|
||||||
template <typename Char, FMT_ENABLE_IF(!std::is_same<Char, char>::value)>
|
template <typename Char, FMT_ENABLE_IF(!std::is_same<Char, char>::value)>
|
||||||
auto vformat(basic_string_view<Char> format_str,
|
auto vformat(basic_string_view<Char> format_str,
|
||||||
basic_format_args<buffer_context<type_identity_t<Char>>> args)
|
typename detail::vformat_args<Char>::type args)
|
||||||
-> std::basic_string<Char> {
|
-> std::basic_string<Char> {
|
||||||
auto buf = basic_memory_buffer<Char>();
|
auto buf = basic_memory_buffer<Char>();
|
||||||
detail::vformat_to(buf, format_str, args);
|
detail::vformat_to(buf, format_str, args);
|
||||||
|
@ -109,87 +138,98 @@ auto format(wformat_string<T...> fmt, T&&... args) -> std::wstring {
|
||||||
return vformat(fmt::wstring_view(fmt), fmt::make_wformat_args(args...));
|
return vformat(fmt::wstring_view(fmt), fmt::make_wformat_args(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <typename OutputIt, typename... T>
|
||||||
|
auto format_to(OutputIt out, wformat_string<T...> fmt, T&&... args)
|
||||||
|
-> OutputIt {
|
||||||
|
return vformat_to(out, fmt::wstring_view(fmt),
|
||||||
|
fmt::make_wformat_args(args...));
|
||||||
|
}
|
||||||
|
|
||||||
// Pass char_t as a default template parameter instead of using
|
// Pass char_t as a default template parameter instead of using
|
||||||
// std::basic_string<char_t<S>> to reduce the symbol size.
|
// std::basic_string<char_t<S>> to reduce the symbol size.
|
||||||
template <typename S, typename... T, typename Char = char_t<S>,
|
template <typename S, typename... T,
|
||||||
|
typename Char = detail::format_string_char_t<S>,
|
||||||
FMT_ENABLE_IF(!std::is_same<Char, char>::value &&
|
FMT_ENABLE_IF(!std::is_same<Char, char>::value &&
|
||||||
!std::is_same<Char, wchar_t>::value)>
|
!std::is_same<Char, wchar_t>::value)>
|
||||||
auto format(const S& format_str, T&&... args) -> std::basic_string<Char> {
|
auto format(const S& format_str, T&&... args) -> std::basic_string<Char> {
|
||||||
return vformat(detail::to_string_view(format_str),
|
return vformat(detail::to_string_view(format_str),
|
||||||
fmt::make_format_args<buffer_context<Char>>(args...));
|
fmt::make_format_args<buffered_context<Char>>(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Locale, typename S, typename Char = char_t<S>,
|
template <typename Locale, typename S,
|
||||||
|
typename Char = detail::format_string_char_t<S>,
|
||||||
FMT_ENABLE_IF(detail::is_locale<Locale>::value&&
|
FMT_ENABLE_IF(detail::is_locale<Locale>::value&&
|
||||||
detail::is_exotic_char<Char>::value)>
|
detail::is_exotic_char<Char>::value)>
|
||||||
inline auto vformat(
|
inline auto vformat(const Locale& loc, const S& format_str,
|
||||||
const Locale& loc, const S& format_str,
|
typename detail::vformat_args<Char>::type args)
|
||||||
basic_format_args<buffer_context<type_identity_t<Char>>> args)
|
|
||||||
-> std::basic_string<Char> {
|
-> std::basic_string<Char> {
|
||||||
return detail::vformat(loc, detail::to_string_view(format_str), args);
|
return detail::vformat(loc, detail::to_string_view(format_str), args);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Locale, typename S, typename... T, typename Char = char_t<S>,
|
template <typename Locale, typename S, typename... T,
|
||||||
|
typename Char = detail::format_string_char_t<S>,
|
||||||
FMT_ENABLE_IF(detail::is_locale<Locale>::value&&
|
FMT_ENABLE_IF(detail::is_locale<Locale>::value&&
|
||||||
detail::is_exotic_char<Char>::value)>
|
detail::is_exotic_char<Char>::value)>
|
||||||
inline auto format(const Locale& loc, const S& format_str, T&&... args)
|
inline auto format(const Locale& loc, const S& format_str, T&&... args)
|
||||||
-> std::basic_string<Char> {
|
-> std::basic_string<Char> {
|
||||||
return detail::vformat(loc, detail::to_string_view(format_str),
|
return detail::vformat(
|
||||||
fmt::make_format_args<buffer_context<Char>>(args...));
|
loc, detail::to_string_view(format_str),
|
||||||
|
fmt::make_format_args<buffered_context<Char>>(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename OutputIt, typename S, typename Char = char_t<S>,
|
template <typename OutputIt, typename S,
|
||||||
|
typename Char = detail::format_string_char_t<S>,
|
||||||
FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
|
FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
|
||||||
detail::is_exotic_char<Char>::value)>
|
detail::is_exotic_char<Char>::value)>
|
||||||
auto vformat_to(OutputIt out, const S& format_str,
|
auto vformat_to(OutputIt out, const S& format_str,
|
||||||
basic_format_args<buffer_context<type_identity_t<Char>>> args)
|
typename detail::vformat_args<Char>::type args) -> OutputIt {
|
||||||
-> OutputIt {
|
|
||||||
auto&& buf = detail::get_buffer<Char>(out);
|
auto&& buf = detail::get_buffer<Char>(out);
|
||||||
detail::vformat_to(buf, detail::to_string_view(format_str), args);
|
detail::vformat_to(buf, detail::to_string_view(format_str), args);
|
||||||
return detail::get_iterator(buf, out);
|
return detail::get_iterator(buf, out);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename OutputIt, typename S, typename... T,
|
template <typename OutputIt, typename S, typename... T,
|
||||||
typename Char = char_t<S>,
|
typename Char = detail::format_string_char_t<S>,
|
||||||
FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
|
FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value &&
|
||||||
detail::is_exotic_char<Char>::value)>
|
!std::is_same<Char, char>::value &&
|
||||||
|
!std::is_same<Char, wchar_t>::value)>
|
||||||
inline auto format_to(OutputIt out, const S& fmt, T&&... args) -> OutputIt {
|
inline auto format_to(OutputIt out, const S& fmt, T&&... args) -> OutputIt {
|
||||||
return vformat_to(out, detail::to_string_view(fmt),
|
return vformat_to(out, detail::to_string_view(fmt),
|
||||||
fmt::make_format_args<buffer_context<Char>>(args...));
|
fmt::make_format_args<buffered_context<Char>>(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename Locale, typename S, typename OutputIt, typename... Args,
|
template <typename Locale, typename S, typename OutputIt, typename... Args,
|
||||||
typename Char = char_t<S>,
|
typename Char = detail::format_string_char_t<S>,
|
||||||
FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
|
FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
|
||||||
detail::is_locale<Locale>::value&&
|
detail::is_locale<Locale>::value&&
|
||||||
detail::is_exotic_char<Char>::value)>
|
detail::is_exotic_char<Char>::value)>
|
||||||
inline auto vformat_to(
|
inline auto vformat_to(OutputIt out, const Locale& loc, const S& format_str,
|
||||||
OutputIt out, const Locale& loc, const S& format_str,
|
typename detail::vformat_args<Char>::type args)
|
||||||
basic_format_args<buffer_context<type_identity_t<Char>>> args) -> OutputIt {
|
-> OutputIt {
|
||||||
auto&& buf = detail::get_buffer<Char>(out);
|
auto&& buf = detail::get_buffer<Char>(out);
|
||||||
vformat_to(buf, detail::to_string_view(format_str), args,
|
vformat_to(buf, detail::to_string_view(format_str), args,
|
||||||
detail::locale_ref(loc));
|
detail::locale_ref(loc));
|
||||||
return detail::get_iterator(buf, out);
|
return detail::get_iterator(buf, out);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <
|
template <typename OutputIt, typename Locale, typename S, typename... T,
|
||||||
typename OutputIt, typename Locale, typename S, typename... T,
|
typename Char = detail::format_string_char_t<S>,
|
||||||
typename Char = char_t<S>,
|
bool enable = detail::is_output_iterator<OutputIt, Char>::value &&
|
||||||
bool enable = detail::is_output_iterator<OutputIt, Char>::value&&
|
detail::is_locale<Locale>::value &&
|
||||||
detail::is_locale<Locale>::value&& detail::is_exotic_char<Char>::value>
|
detail::is_exotic_char<Char>::value>
|
||||||
inline auto format_to(OutputIt out, const Locale& loc, const S& format_str,
|
inline auto format_to(OutputIt out, const Locale& loc, const S& format_str,
|
||||||
T&&... args) ->
|
T&&... args) ->
|
||||||
typename std::enable_if<enable, OutputIt>::type {
|
typename std::enable_if<enable, OutputIt>::type {
|
||||||
return vformat_to(out, loc, detail::to_string_view(format_str),
|
return vformat_to(out, loc, detail::to_string_view(format_str),
|
||||||
fmt::make_format_args<buffer_context<Char>>(args...));
|
fmt::make_format_args<buffered_context<Char>>(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename OutputIt, typename Char, typename... Args,
|
template <typename OutputIt, typename Char, typename... Args,
|
||||||
FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
|
FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
|
||||||
detail::is_exotic_char<Char>::value)>
|
detail::is_exotic_char<Char>::value)>
|
||||||
inline auto vformat_to_n(
|
inline auto vformat_to_n(OutputIt out, size_t n,
|
||||||
OutputIt out, size_t n, basic_string_view<Char> format_str,
|
basic_string_view<Char> format_str,
|
||||||
basic_format_args<buffer_context<type_identity_t<Char>>> args)
|
typename detail::vformat_args<Char>::type args)
|
||||||
-> format_to_n_result<OutputIt> {
|
-> format_to_n_result<OutputIt> {
|
||||||
using traits = detail::fixed_buffer_traits;
|
using traits = detail::fixed_buffer_traits;
|
||||||
auto buf = detail::iterator_buffer<OutputIt, Char, traits>(out, n);
|
auto buf = detail::iterator_buffer<OutputIt, Char, traits>(out, n);
|
||||||
|
@ -198,21 +238,22 @@ inline auto vformat_to_n(
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename OutputIt, typename S, typename... T,
|
template <typename OutputIt, typename S, typename... T,
|
||||||
typename Char = char_t<S>,
|
typename Char = detail::format_string_char_t<S>,
|
||||||
FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
|
FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
|
||||||
detail::is_exotic_char<Char>::value)>
|
detail::is_exotic_char<Char>::value)>
|
||||||
inline auto format_to_n(OutputIt out, size_t n, const S& fmt, T&&... args)
|
inline auto format_to_n(OutputIt out, size_t n, const S& fmt, T&&... args)
|
||||||
-> format_to_n_result<OutputIt> {
|
-> format_to_n_result<OutputIt> {
|
||||||
return vformat_to_n(out, n, detail::to_string_view(fmt),
|
return vformat_to_n(out, n, fmt::basic_string_view<Char>(fmt),
|
||||||
fmt::make_format_args<buffer_context<Char>>(args...));
|
fmt::make_format_args<buffered_context<Char>>(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename S, typename... T, typename Char = char_t<S>,
|
template <typename S, typename... T,
|
||||||
|
typename Char = detail::format_string_char_t<S>,
|
||||||
FMT_ENABLE_IF(detail::is_exotic_char<Char>::value)>
|
FMT_ENABLE_IF(detail::is_exotic_char<Char>::value)>
|
||||||
inline auto formatted_size(const S& fmt, T&&... args) -> size_t {
|
inline auto formatted_size(const S& fmt, T&&... args) -> size_t {
|
||||||
auto buf = detail::counting_buffer<Char>();
|
auto buf = detail::counting_buffer<Char>();
|
||||||
detail::vformat_to(buf, detail::to_string_view(fmt),
|
detail::vformat_to(buf, detail::to_string_view(fmt),
|
||||||
fmt::make_format_args<buffer_context<Char>>(args...));
|
fmt::make_format_args<buffered_context<Char>>(args...));
|
||||||
return buf.count();
|
return buf.count();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -246,9 +287,32 @@ template <typename... T> void println(wformat_string<T...> fmt, T&&... args) {
|
||||||
return print(L"{}\n", fmt::format(fmt, std::forward<T>(args)...));
|
return print(L"{}\n", fmt::format(fmt, std::forward<T>(args)...));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
inline auto vformat(const text_style& ts, wstring_view fmt, wformat_args args)
|
||||||
Converts *value* to ``std::wstring`` using the default format for type *T*.
|
-> std::wstring {
|
||||||
*/
|
auto buf = wmemory_buffer();
|
||||||
|
detail::vformat_to(buf, ts, fmt, args);
|
||||||
|
return fmt::to_string(buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename... T>
|
||||||
|
inline auto format(const text_style& ts, wformat_string<T...> fmt, T&&... args)
|
||||||
|
-> std::wstring {
|
||||||
|
return fmt::vformat(ts, fmt, fmt::make_wformat_args(args...));
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename... T>
|
||||||
|
FMT_DEPRECATED void print(std::FILE* f, const text_style& ts,
|
||||||
|
wformat_string<T...> fmt, const T&... args) {
|
||||||
|
vprint(f, ts, fmt, fmt::make_wformat_args(args...));
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename... T>
|
||||||
|
FMT_DEPRECATED void print(const text_style& ts, wformat_string<T...> fmt,
|
||||||
|
const T&... args) {
|
||||||
|
return print(stdout, ts, fmt, args...);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Converts `value` to `std::wstring` using the default format for type `T`.
|
||||||
template <typename T> inline auto to_wstring(const T& value) -> std::wstring {
|
template <typename T> inline auto to_wstring(const T& value) -> std::wstring {
|
||||||
return format(FMT_STRING(L"{}"), value);
|
return format(FMT_STRING(L"{}"), value);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,37 +2,48 @@ module;
|
||||||
|
|
||||||
// Put all implementation-provided headers into the global module fragment
|
// Put all implementation-provided headers into the global module fragment
|
||||||
// to prevent attachment to this module.
|
// to prevent attachment to this module.
|
||||||
#include <algorithm>
|
#ifndef FMT_IMPORT_STD
|
||||||
|
# include <algorithm>
|
||||||
|
# include <bitset>
|
||||||
|
# include <chrono>
|
||||||
|
# include <cmath>
|
||||||
|
# include <complex>
|
||||||
|
# include <cstddef>
|
||||||
|
# include <cstdint>
|
||||||
|
# include <cstdio>
|
||||||
|
# include <cstdlib>
|
||||||
|
# include <cstring>
|
||||||
|
# include <ctime>
|
||||||
|
# include <exception>
|
||||||
|
# include <expected>
|
||||||
|
# include <filesystem>
|
||||||
|
# include <fstream>
|
||||||
|
# include <functional>
|
||||||
|
# include <iterator>
|
||||||
|
# include <limits>
|
||||||
|
# include <locale>
|
||||||
|
# include <memory>
|
||||||
|
# include <optional>
|
||||||
|
# include <ostream>
|
||||||
|
# include <source_location>
|
||||||
|
# include <stdexcept>
|
||||||
|
# include <string>
|
||||||
|
# include <string_view>
|
||||||
|
# include <system_error>
|
||||||
|
# include <thread>
|
||||||
|
# include <type_traits>
|
||||||
|
# include <typeinfo>
|
||||||
|
# include <utility>
|
||||||
|
# include <variant>
|
||||||
|
# include <vector>
|
||||||
|
#else
|
||||||
|
# include <limits.h>
|
||||||
|
# include <stdint.h>
|
||||||
|
# include <stdio.h>
|
||||||
|
# include <time.h>
|
||||||
|
#endif
|
||||||
#include <cerrno>
|
#include <cerrno>
|
||||||
#include <chrono>
|
|
||||||
#include <climits>
|
#include <climits>
|
||||||
#include <cmath>
|
|
||||||
#include <cstddef>
|
|
||||||
#include <cstdint>
|
|
||||||
#include <cstdio>
|
|
||||||
#include <cstdlib>
|
|
||||||
#include <cstring>
|
|
||||||
#include <ctime>
|
|
||||||
#include <exception>
|
|
||||||
#include <filesystem>
|
|
||||||
#include <fstream>
|
|
||||||
#include <functional>
|
|
||||||
#include <iterator>
|
|
||||||
#include <limits>
|
|
||||||
#include <locale>
|
|
||||||
#include <memory>
|
|
||||||
#include <optional>
|
|
||||||
#include <ostream>
|
|
||||||
#include <stdexcept>
|
|
||||||
#include <string>
|
|
||||||
#include <string_view>
|
|
||||||
#include <system_error>
|
|
||||||
#include <thread>
|
|
||||||
#include <type_traits>
|
|
||||||
#include <typeinfo>
|
|
||||||
#include <utility>
|
|
||||||
#include <variant>
|
|
||||||
#include <vector>
|
|
||||||
#include <version>
|
#include <version>
|
||||||
|
|
||||||
#if __has_include(<cxxabi.h>)
|
#if __has_include(<cxxabi.h>)
|
||||||
|
@ -63,8 +74,6 @@ module;
|
||||||
# if defined(__GLIBCXX__)
|
# if defined(__GLIBCXX__)
|
||||||
# include <ext/stdio_filebuf.h>
|
# include <ext/stdio_filebuf.h>
|
||||||
# include <ext/stdio_sync_filebuf.h>
|
# include <ext/stdio_sync_filebuf.h>
|
||||||
# elif defined(_LIBCPP_VERSION)
|
|
||||||
# include <__std_stream>
|
|
||||||
# endif
|
# endif
|
||||||
# define WIN32_LEAN_AND_MEAN
|
# define WIN32_LEAN_AND_MEAN
|
||||||
# include <windows.h>
|
# include <windows.h>
|
||||||
|
@ -72,6 +81,10 @@ module;
|
||||||
|
|
||||||
export module fmt;
|
export module fmt;
|
||||||
|
|
||||||
|
#ifdef FMT_IMPORT_STD
|
||||||
|
import std;
|
||||||
|
#endif
|
||||||
|
|
||||||
#define FMT_EXPORT export
|
#define FMT_EXPORT export
|
||||||
#define FMT_BEGIN_EXPORT export {
|
#define FMT_BEGIN_EXPORT export {
|
||||||
#define FMT_END_EXPORT }
|
#define FMT_END_EXPORT }
|
||||||
|
@ -85,6 +98,10 @@ export module fmt;
|
||||||
extern "C++" {
|
extern "C++" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef FMT_OS
|
||||||
|
# define FMT_OS 1
|
||||||
|
#endif
|
||||||
|
|
||||||
// All library-provided declarations and definitions must be in the module
|
// All library-provided declarations and definitions must be in the module
|
||||||
// purview to be exported.
|
// purview to be exported.
|
||||||
#include "fmt/args.h"
|
#include "fmt/args.h"
|
||||||
|
@ -92,8 +109,12 @@ extern "C++" {
|
||||||
#include "fmt/color.h"
|
#include "fmt/color.h"
|
||||||
#include "fmt/compile.h"
|
#include "fmt/compile.h"
|
||||||
#include "fmt/format.h"
|
#include "fmt/format.h"
|
||||||
#include "fmt/os.h"
|
#if FMT_OS
|
||||||
|
# include "fmt/os.h"
|
||||||
|
#endif
|
||||||
|
#include "fmt/ostream.h"
|
||||||
#include "fmt/printf.h"
|
#include "fmt/printf.h"
|
||||||
|
#include "fmt/ranges.h"
|
||||||
#include "fmt/std.h"
|
#include "fmt/std.h"
|
||||||
#include "fmt/xchar.h"
|
#include "fmt/xchar.h"
|
||||||
|
|
||||||
|
@ -103,8 +124,12 @@ extern "C++" {
|
||||||
|
|
||||||
// gcc doesn't yet implement private module fragments
|
// gcc doesn't yet implement private module fragments
|
||||||
#if !FMT_GCC_VERSION
|
#if !FMT_GCC_VERSION
|
||||||
module : private;
|
module :private;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "format.cc"
|
#if FMT_HAS_INCLUDE("format.cc")
|
||||||
#include "os.cc"
|
# include "format.cc"
|
||||||
|
#endif
|
||||||
|
#if FMT_OS && FMT_HAS_INCLUDE("os.cc")
|
||||||
|
# include "os.cc"
|
||||||
|
#endif
|
||||||
|
|
|
@ -12,47 +12,51 @@
|
||||||
|
|
||||||
#include "fmt/os.h"
|
#include "fmt/os.h"
|
||||||
|
|
||||||
#include <climits>
|
#ifndef FMT_MODULE
|
||||||
|
# include <climits>
|
||||||
|
|
||||||
#if FMT_USE_FCNTL
|
# if FMT_USE_FCNTL
|
||||||
# include <sys/stat.h>
|
# include <sys/stat.h>
|
||||||
# include <sys/types.h>
|
# include <sys/types.h>
|
||||||
|
|
||||||
# ifdef _WRS_KERNEL // VxWorks7 kernel
|
# ifdef _WRS_KERNEL // VxWorks7 kernel
|
||||||
# include <ioLib.h> // getpagesize
|
# include <ioLib.h> // getpagesize
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifndef _WIN32
|
||||||
|
# include <unistd.h>
|
||||||
|
# else
|
||||||
|
# ifndef WIN32_LEAN_AND_MEAN
|
||||||
|
# define WIN32_LEAN_AND_MEAN
|
||||||
|
# endif
|
||||||
|
# include <io.h>
|
||||||
|
# endif // _WIN32
|
||||||
|
# endif // FMT_USE_FCNTL
|
||||||
|
|
||||||
|
# ifdef _WIN32
|
||||||
|
# include <windows.h>
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
# ifndef _WIN32
|
|
||||||
# include <unistd.h>
|
|
||||||
# else
|
|
||||||
# ifndef WIN32_LEAN_AND_MEAN
|
|
||||||
# define WIN32_LEAN_AND_MEAN
|
|
||||||
# endif
|
|
||||||
# include <io.h>
|
|
||||||
|
|
||||||
# ifndef S_IRUSR
|
|
||||||
# define S_IRUSR _S_IREAD
|
|
||||||
# endif
|
|
||||||
# ifndef S_IWUSR
|
|
||||||
# define S_IWUSR _S_IWRITE
|
|
||||||
# endif
|
|
||||||
# ifndef S_IRGRP
|
|
||||||
# define S_IRGRP 0
|
|
||||||
# endif
|
|
||||||
# ifndef S_IWGRP
|
|
||||||
# define S_IWGRP 0
|
|
||||||
# endif
|
|
||||||
# ifndef S_IROTH
|
|
||||||
# define S_IROTH 0
|
|
||||||
# endif
|
|
||||||
# ifndef S_IWOTH
|
|
||||||
# define S_IWOTH 0
|
|
||||||
# endif
|
|
||||||
# endif // _WIN32
|
|
||||||
#endif // FMT_USE_FCNTL
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# include <windows.h>
|
# ifndef S_IRUSR
|
||||||
|
# define S_IRUSR _S_IREAD
|
||||||
|
# endif
|
||||||
|
# ifndef S_IWUSR
|
||||||
|
# define S_IWUSR _S_IWRITE
|
||||||
|
# endif
|
||||||
|
# ifndef S_IRGRP
|
||||||
|
# define S_IRGRP 0
|
||||||
|
# endif
|
||||||
|
# ifndef S_IWGRP
|
||||||
|
# define S_IWGRP 0
|
||||||
|
# endif
|
||||||
|
# ifndef S_IROTH
|
||||||
|
# define S_IROTH 0
|
||||||
|
# endif
|
||||||
|
# ifndef S_IWOTH
|
||||||
|
# define S_IWOTH 0
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
@ -182,10 +186,16 @@ void buffered_file::close() {
|
||||||
}
|
}
|
||||||
|
|
||||||
int buffered_file::descriptor() const {
|
int buffered_file::descriptor() const {
|
||||||
#ifdef fileno // fileno is a macro on OpenBSD so we cannot use FMT_POSIX_CALL.
|
#ifdef FMT_HAS_SYSTEM
|
||||||
int fd = fileno(file_);
|
// fileno is a macro on OpenBSD.
|
||||||
#else
|
# ifdef fileno
|
||||||
|
# undef fileno
|
||||||
|
# endif
|
||||||
int fd = FMT_POSIX_CALL(fileno(file_));
|
int fd = FMT_POSIX_CALL(fileno(file_));
|
||||||
|
#elif defined(_WIN32)
|
||||||
|
int fd = _fileno(file_);
|
||||||
|
#else
|
||||||
|
int fd = fileno(file_);
|
||||||
#endif
|
#endif
|
||||||
if (fd == -1)
|
if (fd == -1)
|
||||||
FMT_THROW(system_error(errno, FMT_STRING("cannot get file descriptor")));
|
FMT_THROW(system_error(errno, FMT_STRING("cannot get file descriptor")));
|
||||||
|
@ -196,6 +206,7 @@ int buffered_file::descriptor() const {
|
||||||
# ifdef _WIN32
|
# ifdef _WIN32
|
||||||
using mode_t = int;
|
using mode_t = int;
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
constexpr mode_t default_open_mode =
|
constexpr mode_t default_open_mode =
|
||||||
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
|
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
|
||||||
|
|
||||||
|
@ -297,29 +308,6 @@ void file::dup2(int fd, std::error_code& ec) noexcept {
|
||||||
if (result == -1) ec = std::error_code(errno, std::generic_category());
|
if (result == -1) ec = std::error_code(errno, std::generic_category());
|
||||||
}
|
}
|
||||||
|
|
||||||
void file::pipe(file& read_end, file& write_end) {
|
|
||||||
// Close the descriptors first to make sure that assignments don't throw
|
|
||||||
// and there are no leaks.
|
|
||||||
read_end.close();
|
|
||||||
write_end.close();
|
|
||||||
int fds[2] = {};
|
|
||||||
# ifdef _WIN32
|
|
||||||
// Make the default pipe capacity same as on Linux 2.6.11+.
|
|
||||||
enum { DEFAULT_CAPACITY = 65536 };
|
|
||||||
int result = FMT_POSIX_CALL(pipe(fds, DEFAULT_CAPACITY, _O_BINARY));
|
|
||||||
# else
|
|
||||||
// Don't retry as the pipe function doesn't return EINTR.
|
|
||||||
// http://pubs.opengroup.org/onlinepubs/009696799/functions/pipe.html
|
|
||||||
int result = FMT_POSIX_CALL(pipe(fds));
|
|
||||||
# endif
|
|
||||||
if (result != 0)
|
|
||||||
FMT_THROW(system_error(errno, FMT_STRING("cannot create pipe")));
|
|
||||||
// The following assignments don't throw because read_fd and write_fd
|
|
||||||
// are closed.
|
|
||||||
read_end = file(fds[0]);
|
|
||||||
write_end = file(fds[1]);
|
|
||||||
}
|
|
||||||
|
|
||||||
buffered_file file::fdopen(const char* mode) {
|
buffered_file file::fdopen(const char* mode) {
|
||||||
// Don't retry as fdopen doesn't return EINTR.
|
// Don't retry as fdopen doesn't return EINTR.
|
||||||
# if defined(__MINGW32__) && defined(_POSIX_)
|
# if defined(__MINGW32__) && defined(_POSIX_)
|
||||||
|
@ -348,6 +336,24 @@ file file::open_windows_file(wcstring_view path, int oflag) {
|
||||||
}
|
}
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
pipe::pipe() {
|
||||||
|
int fds[2] = {};
|
||||||
|
# ifdef _WIN32
|
||||||
|
// Make the default pipe capacity same as on Linux 2.6.11+.
|
||||||
|
enum { DEFAULT_CAPACITY = 65536 };
|
||||||
|
int result = FMT_POSIX_CALL(pipe(fds, DEFAULT_CAPACITY, _O_BINARY));
|
||||||
|
# else
|
||||||
|
// Don't retry as the pipe function doesn't return EINTR.
|
||||||
|
// http://pubs.opengroup.org/onlinepubs/009696799/functions/pipe.html
|
||||||
|
int result = FMT_POSIX_CALL(pipe(fds));
|
||||||
|
# endif
|
||||||
|
if (result != 0)
|
||||||
|
FMT_THROW(system_error(errno, FMT_STRING("cannot create pipe")));
|
||||||
|
// The following assignments don't throw.
|
||||||
|
read_end = file(fds[0]);
|
||||||
|
write_end = file(fds[1]);
|
||||||
|
}
|
||||||
|
|
||||||
# if !defined(__MSDOS__)
|
# if !defined(__MSDOS__)
|
||||||
long getpagesize() {
|
long getpagesize() {
|
||||||
# ifdef _WIN32
|
# ifdef _WIN32
|
||||||
|
@ -370,18 +376,17 @@ long getpagesize() {
|
||||||
|
|
||||||
namespace detail {
|
namespace detail {
|
||||||
|
|
||||||
void file_buffer::grow(size_t) {
|
void file_buffer::grow(buffer<char>& buf, size_t) {
|
||||||
if (this->size() == this->capacity()) flush();
|
if (buf.size() == buf.capacity()) static_cast<file_buffer&>(buf).flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
file_buffer::file_buffer(cstring_view path,
|
file_buffer::file_buffer(cstring_view path, const ostream_params& params)
|
||||||
const detail::ostream_params& params)
|
: buffer<char>(grow), file_(path, params.oflag) {
|
||||||
: file_(path, params.oflag) {
|
|
||||||
set(new char[params.buffer_size], params.buffer_size);
|
set(new char[params.buffer_size], params.buffer_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
file_buffer::file_buffer(file_buffer&& other)
|
file_buffer::file_buffer(file_buffer&& other) noexcept
|
||||||
: detail::buffer<char>(other.data(), other.size(), other.capacity()),
|
: buffer<char>(grow, other.data(), other.size(), other.capacity()),
|
||||||
file_(std::move(other.file_)) {
|
file_(std::move(other.file_)) {
|
||||||
other.clear();
|
other.clear();
|
||||||
other.set(nullptr, 0);
|
other.set(nullptr, 0);
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
// SPDX-License-Identifier: PolyForm-Strict-1.0.0
|
// SPDX-License-Identifier: PolyForm-Strict-1.0.0
|
||||||
|
|
||||||
#include "error.h"
|
#include "error.h"
|
||||||
|
#include "small_string.h"
|
||||||
#include "string_util.h"
|
#include "string_util.h"
|
||||||
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
@ -255,6 +256,26 @@ void Error::AddSuffix(std::string_view suffix)
|
||||||
m_description.append(suffix);
|
m_description.append(suffix);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Error::SetStringFmtArgs(fmt::string_view fmt, fmt::format_args args)
|
||||||
|
{
|
||||||
|
m_type = Type::User;
|
||||||
|
m_description = fmt::vformat(fmt, std::move(args));
|
||||||
|
}
|
||||||
|
|
||||||
|
void Error::AddPrefixFmtArgs(fmt::string_view fmt, fmt::format_args args)
|
||||||
|
{
|
||||||
|
SmallString str;
|
||||||
|
str.vformat(fmt, std::move(args));
|
||||||
|
AddPrefix(str.view());
|
||||||
|
}
|
||||||
|
|
||||||
|
void Error::AddSuffixFmtArgs(fmt::string_view fmt, fmt::format_args args)
|
||||||
|
{
|
||||||
|
SmallString str;
|
||||||
|
str.vformat(fmt, std::move(args));
|
||||||
|
AddSuffix(str.view());
|
||||||
|
}
|
||||||
|
|
||||||
void Error::AddPrefix(Error* errptr, std::string_view prefix)
|
void Error::AddPrefix(Error* errptr, std::string_view prefix)
|
||||||
{
|
{
|
||||||
if (errptr)
|
if (errptr)
|
||||||
|
|
|
@ -3,10 +3,9 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "small_string.h"
|
|
||||||
#include "types.h"
|
#include "types.h"
|
||||||
|
|
||||||
#include "fmt/core.h"
|
#include "fmt/base.h"
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
|
@ -84,54 +83,52 @@ public:
|
||||||
static void SetHResult(Error* errptr, std::string_view prefix, long err);
|
static void SetHResult(Error* errptr, std::string_view prefix, long err);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
template<typename... T>
|
||||||
|
void SetStringFmt(fmt::format_string<T...> fmt, T&&... args)
|
||||||
|
{
|
||||||
|
SetStringFmtArgs(fmt, fmt::make_format_args(args...));
|
||||||
|
}
|
||||||
|
|
||||||
|
void AddPrefix(std::string_view prefix);
|
||||||
|
|
||||||
|
template<typename... T>
|
||||||
|
void AddPrefixFmt(fmt::format_string<T...> fmt, T&&... args)
|
||||||
|
{
|
||||||
|
AddPrefixFmtArgs(fmt, fmt::make_format_args(args...));
|
||||||
|
}
|
||||||
|
|
||||||
|
void AddSuffix(std::string_view suffix);
|
||||||
|
|
||||||
|
template<typename... T>
|
||||||
|
void AddSuffixFmt(fmt::format_string<T...> fmt, T&&... args)
|
||||||
|
{
|
||||||
|
AddSuffixFmtArgs(fmt, fmt::make_format_args(args...));
|
||||||
|
}
|
||||||
|
|
||||||
/// Sets a formatted message.
|
/// Sets a formatted message.
|
||||||
template<typename... T>
|
template<typename... T>
|
||||||
static void SetStringFmt(Error* errptr, fmt::format_string<T...> fmt, T&&... args)
|
static void SetStringFmt(Error* errptr, fmt::format_string<T...> fmt, T&&... args)
|
||||||
{
|
{
|
||||||
if (errptr)
|
if (errptr)
|
||||||
Error::SetString(errptr, fmt::vformat(fmt, fmt::make_format_args(args...)));
|
errptr->SetStringFmtArgs(fmt, fmt::make_format_args(args...));
|
||||||
}
|
}
|
||||||
|
|
||||||
void AddPrefix(std::string_view prefix);
|
|
||||||
void AddSuffix(std::string_view suffix);
|
|
||||||
static void AddPrefix(Error* errptr, std::string_view prefix);
|
static void AddPrefix(Error* errptr, std::string_view prefix);
|
||||||
static void AddSuffix(Error* errptr, std::string_view prefix);
|
|
||||||
|
|
||||||
template<typename... T>
|
|
||||||
void AddPrefixFmt(fmt::format_string<T...> fmt, T&&... args)
|
|
||||||
{
|
|
||||||
TinyString str;
|
|
||||||
fmt::vformat_to(std::back_inserter(str), fmt, fmt::make_format_args(args...));
|
|
||||||
AddPrefix(str.view());
|
|
||||||
}
|
|
||||||
|
|
||||||
template<typename... T>
|
|
||||||
void AddSuffixFmt(fmt::format_string<T...> fmt, T&&... args)
|
|
||||||
{
|
|
||||||
TinyString str;
|
|
||||||
fmt::vformat_to(std::back_inserter(str), fmt, fmt::make_format_args(args...));
|
|
||||||
AddSuffix(str.view());
|
|
||||||
}
|
|
||||||
|
|
||||||
template<typename... T>
|
template<typename... T>
|
||||||
static void AddPrefixFmt(Error* errptr, fmt::format_string<T...> fmt, T&&... args)
|
static void AddPrefixFmt(Error* errptr, fmt::format_string<T...> fmt, T&&... args)
|
||||||
{
|
{
|
||||||
if (errptr)
|
if (errptr)
|
||||||
{
|
errptr->AddPrefixFmtArgs(fmt, fmt::make_format_args(args...));
|
||||||
TinyString str;
|
|
||||||
fmt::vformat_to(std::back_inserter(str), fmt, fmt::make_format_args(args...));
|
|
||||||
errptr->AddPrefix(str.view());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void AddSuffix(Error* errptr, std::string_view prefix);
|
||||||
|
|
||||||
template<typename... T>
|
template<typename... T>
|
||||||
static void AddSuffixFmt(Error* errptr, fmt::format_string<T...> fmt, T&&... args)
|
static void AddSuffixFmt(Error* errptr, fmt::format_string<T...> fmt, T&&... args)
|
||||||
{
|
{
|
||||||
if (errptr)
|
if (errptr)
|
||||||
{
|
errptr->AddSuffixFmtArgs(fmt, fmt::make_format_args(args...));
|
||||||
TinyString str;
|
|
||||||
fmt::vformat_to(std::back_inserter(str), fmt, fmt::make_format_args(args...));
|
|
||||||
errptr->AddSuffix(str.view());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Error& operator=(const Error& e);
|
Error& operator=(const Error& e);
|
||||||
|
@ -140,6 +137,10 @@ public:
|
||||||
bool operator!=(const Error& e) const;
|
bool operator!=(const Error& e) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
void SetStringFmtArgs(fmt::string_view fmt, fmt::format_args args);
|
||||||
|
void AddPrefixFmtArgs(fmt::string_view fmt, fmt::format_args args);
|
||||||
|
void AddSuffixFmtArgs(fmt::string_view fmt, fmt::format_args args);
|
||||||
|
|
||||||
Type m_type = Type::None;
|
Type m_type = Type::None;
|
||||||
std::string m_description;
|
std::string m_description;
|
||||||
};
|
};
|
||||||
|
|
|
@ -9,6 +9,8 @@
|
||||||
#include "string_util.h"
|
#include "string_util.h"
|
||||||
#include "timer.h"
|
#include "timer.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
#include "types.h"
|
#include "types.h"
|
||||||
|
|
||||||
#include "fmt/core.h"
|
#include "fmt/base.h"
|
||||||
|
|
||||||
#include <cinttypes>
|
#include <cinttypes>
|
||||||
#include <cstdarg>
|
#include <cstdarg>
|
||||||
|
|
|
@ -6,8 +6,9 @@
|
||||||
#include "small_string.h"
|
#include "small_string.h"
|
||||||
#include "types.h"
|
#include "types.h"
|
||||||
|
|
||||||
#include "fmt/core.h"
|
#include "fmt/base.h"
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
class ProgressCallback
|
class ProgressCallback
|
||||||
|
|
|
@ -5,11 +5,12 @@
|
||||||
|
|
||||||
#include "types.h"
|
#include "types.h"
|
||||||
|
|
||||||
#include "fmt/core.h"
|
#include "fmt/base.h"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cstdarg>
|
#include <cstdarg>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
#include <iterator>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
|
@ -184,7 +185,7 @@ public:
|
||||||
ALWAYS_INLINE const char& front() const { return m_buffer[0]; }
|
ALWAYS_INLINE const char& front() const { return m_buffer[0]; }
|
||||||
ALWAYS_INLINE char& back() { return m_buffer[m_length - 1]; }
|
ALWAYS_INLINE char& back() { return m_buffer[m_length - 1]; }
|
||||||
ALWAYS_INLINE const char& back() const { return m_buffer[m_length - 1]; }
|
ALWAYS_INLINE const char& back() const { return m_buffer[m_length - 1]; }
|
||||||
ALWAYS_INLINE void push_back(value_type&& val) { append(val); }
|
ALWAYS_INLINE void push_back(value_type val) { append(val); }
|
||||||
ALWAYS_INLINE void pop_back() { erase(-1); }
|
ALWAYS_INLINE void pop_back() { erase(-1); }
|
||||||
|
|
||||||
// returns a string view for this string
|
// returns a string view for this string
|
||||||
|
@ -422,13 +423,13 @@ ALWAYS_INLINE void SmallStringBase::format(fmt::format_string<T...> fmt, T&&...
|
||||||
struct fmt::formatter<type> \
|
struct fmt::formatter<type> \
|
||||||
{ \
|
{ \
|
||||||
template<typename ParseContext> \
|
template<typename ParseContext> \
|
||||||
constexpr auto parse(ParseContext& ctx) \
|
constexpr auto parse(ParseContext& ctx) const \
|
||||||
{ \
|
{ \
|
||||||
return ctx.begin(); \
|
return ctx.begin(); \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
template<typename FormatContext> \
|
template<typename FormatContext> \
|
||||||
auto format(const type& str, FormatContext& ctx) \
|
auto format(const type& str, FormatContext& ctx) const \
|
||||||
{ \
|
{ \
|
||||||
return fmt::format_to(ctx.out(), "{}", str.view()); \
|
return fmt::format_to(ctx.out(), "{}", str.view()); \
|
||||||
} \
|
} \
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
|
|
||||||
#include "IconsFontAwesome5.h"
|
#include "IconsFontAwesome5.h"
|
||||||
#include "IconsPromptFont.h"
|
#include "IconsPromptFont.h"
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
|
|
||||||
#include "IconsFontAwesome5.h"
|
#include "IconsFontAwesome5.h"
|
||||||
#include "IconsPromptFont.h"
|
#include "IconsPromptFont.h"
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
Log_SetChannel(AnalogJoystick);
|
Log_SetChannel(AnalogJoystick);
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
#include "common/heap_array.h"
|
#include "common/heap_array.h"
|
||||||
#include "common/log.h"
|
#include "common/log.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
#include "imgui.h"
|
#include "imgui.h"
|
||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
|
@ -22,6 +22,8 @@
|
||||||
#include "common/file_system.h"
|
#include "common/file_system.h"
|
||||||
#include "common/log.h"
|
#include "common/log.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
|
||||||
Log_SetChannel(CPU::Core);
|
Log_SetChannel(CPU::Core);
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
|
|
||||||
#include "IconsEmoji.h"
|
#include "IconsEmoji.h"
|
||||||
#include "IconsFontAwesome5.h"
|
#include "IconsFontAwesome5.h"
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
Log_SetChannel(GameDatabase);
|
Log_SetChannel(GameDatabase);
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,8 @@
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
#include "common/timer.h"
|
#include "common/timer.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#include "common/path.h"
|
#include "common/path.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
|
||||||
#include "imgui.h"
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <cstdarg>
|
#include <cstdarg>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
#include "IconsFontAwesome5.h"
|
#include "IconsFontAwesome5.h"
|
||||||
#include "IconsEmoji.h"
|
#include "IconsEmoji.h"
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
|
||||||
#include "IconsFontAwesome5.h"
|
#include "IconsFontAwesome5.h"
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
Log_SetChannel(MemoryCard);
|
Log_SetChannel(MemoryCard);
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com> and contributors.
|
// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com> and contributors.
|
||||||
// SPDX-License-Identifier: PolyForm-Strict-1.0.0
|
// SPDX-License-Identifier: PolyForm-Strict-1.0.0
|
||||||
|
|
||||||
#include "negcon_rumble.h"
|
#include "negcon_rumble.h"
|
||||||
|
@ -19,6 +19,7 @@
|
||||||
|
|
||||||
#include "IconsFontAwesome5.h"
|
#include "IconsFontAwesome5.h"
|
||||||
#include "IconsPromptFont.h"
|
#include "IconsPromptFont.h"
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#include "common/log.h"
|
#include "common/log.h"
|
||||||
|
|
||||||
#include "IconsFontAwesome5.h"
|
#include "IconsFontAwesome5.h"
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
|
@ -18,6 +18,8 @@
|
||||||
#include "common/path.h"
|
#include "common/path.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <cctype>
|
#include <cctype>
|
||||||
|
|
|
@ -23,6 +23,8 @@
|
||||||
#include "common/log.h"
|
#include "common/log.h"
|
||||||
#include "common/path.h"
|
#include "common/path.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
Log_SetChannel(SPU);
|
Log_SetChannel(SPU);
|
||||||
|
|
|
@ -19,6 +19,8 @@
|
||||||
#include "common/path.h"
|
#include "common/path.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <QtCore/QCoreApplication>
|
#include <QtCore/QCoreApplication>
|
||||||
#include <QtCore/QFile>
|
#include <QtCore/QFile>
|
||||||
#include <QtCore/QJsonArray>
|
#include <QtCore/QJsonArray>
|
||||||
|
|
|
@ -26,6 +26,8 @@
|
||||||
#include "common/log.h"
|
#include "common/log.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <QtWidgets/QCheckBox>
|
#include <QtWidgets/QCheckBox>
|
||||||
#include <QtWidgets/QDoubleSpinBox>
|
#include <QtWidgets/QDoubleSpinBox>
|
||||||
#include <QtWidgets/QInputDialog>
|
#include <QtWidgets/QInputDialog>
|
||||||
|
|
|
@ -7,6 +7,8 @@
|
||||||
#include "qtutils.h"
|
#include "qtutils.h"
|
||||||
#include "settingwidgetbinder.h"
|
#include "settingwidgetbinder.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include "util/sdl_input_source.h"
|
#include "util/sdl_input_source.h"
|
||||||
|
|
||||||
ControllerGlobalSettingsWidget::ControllerGlobalSettingsWidget(QWidget* parent, ControllerSettingsWindow* dialog)
|
ControllerGlobalSettingsWidget::ControllerGlobalSettingsWidget(QWidget* parent, ControllerSettingsWindow* dialog)
|
||||||
|
@ -148,7 +150,7 @@ ControllerLEDSettingsDialog::~ControllerLEDSettingsDialog() = default;
|
||||||
|
|
||||||
void ControllerLEDSettingsDialog::linkButton(ColorPickerButton* button, u32 player_id)
|
void ControllerLEDSettingsDialog::linkButton(ColorPickerButton* button, u32 player_id)
|
||||||
{
|
{
|
||||||
std::string key(fmt::format("Player{}LED", player_id));
|
std::string key = fmt::format("Player{}LED", player_id);
|
||||||
const u32 current_value =
|
const u32 current_value =
|
||||||
SDLInputSource::ParseRGBForPlayerId(m_dialog->getStringValue("SDLExtra", key.c_str(), ""), player_id);
|
SDLInputSource::ParseRGBForPlayerId(m_dialog->getStringValue("SDLExtra", key.c_str(), ""), player_id);
|
||||||
button->setColor(current_value);
|
button->setColor(current_value);
|
||||||
|
|
|
@ -9,6 +9,8 @@
|
||||||
|
|
||||||
#include "common/bitutils.h"
|
#include "common/bitutils.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <QtCore/QTimer>
|
#include <QtCore/QTimer>
|
||||||
#include <QtGui/QKeyEvent>
|
#include <QtGui/QKeyEvent>
|
||||||
#include <QtGui/QMouseEvent>
|
#include <QtGui/QMouseEvent>
|
||||||
|
|
|
@ -15,6 +15,8 @@
|
||||||
#include "common/small_string.h"
|
#include "common/small_string.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <QtCore/QUrl>
|
#include <QtCore/QUrl>
|
||||||
#include <QtWidgets/QFileDialog>
|
#include <QtWidgets/QFileDialog>
|
||||||
#include <QtWidgets/QLabel>
|
#include <QtWidgets/QLabel>
|
||||||
|
|
|
@ -14,6 +14,8 @@
|
||||||
#include "common/assert.h"
|
#include "common/assert.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <QtCore/QFileInfo>
|
#include <QtCore/QFileInfo>
|
||||||
#include <QtGui/QColor>
|
#include <QtGui/QColor>
|
||||||
#include <QtWidgets/QFileDialog>
|
#include <QtWidgets/QFileDialog>
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
#include "setupwizarddialog.h"
|
#include "setupwizarddialog.h"
|
||||||
|
|
||||||
#include "core/achievements.h"
|
#include "core/achievements.h"
|
||||||
|
#include "core/bus.h"
|
||||||
#include "core/cheats.h"
|
#include "core/cheats.h"
|
||||||
#include "core/controller.h"
|
#include "core/controller.h"
|
||||||
#include "core/fullscreen_ui.h"
|
#include "core/fullscreen_ui.h"
|
||||||
|
@ -45,8 +46,7 @@
|
||||||
|
|
||||||
#include "scmversion/scmversion.h"
|
#include "scmversion/scmversion.h"
|
||||||
|
|
||||||
#include "core/bus.h"
|
#include "fmt/format.h"
|
||||||
#include "imgui.h"
|
|
||||||
|
|
||||||
#include <QtCore/QCoreApplication>
|
#include <QtCore/QCoreApplication>
|
||||||
#include <QtCore/QDateTime>
|
#include <QtCore/QDateTime>
|
||||||
|
@ -1495,7 +1495,7 @@ void EmuThread::startDumpingAudio()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//System::StartDumpingAudio();
|
// System::StartDumpingAudio();
|
||||||
}
|
}
|
||||||
|
|
||||||
void EmuThread::stopDumpingAudio()
|
void EmuThread::stopDumpingAudio()
|
||||||
|
@ -1506,7 +1506,7 @@ void EmuThread::stopDumpingAudio()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//System::StopDumpingAudio();
|
// System::StopDumpingAudio();
|
||||||
}
|
}
|
||||||
|
|
||||||
void EmuThread::singleStepCPU()
|
void EmuThread::singleStepCPU()
|
||||||
|
|
|
@ -15,6 +15,8 @@
|
||||||
|
|
||||||
#include "common/file_system.h"
|
#include "common/file_system.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <QtWidgets/QMessageBox>
|
#include <QtWidgets/QMessageBox>
|
||||||
|
|
||||||
SetupWizardDialog::SetupWizardDialog()
|
SetupWizardDialog::SetupWizardDialog()
|
||||||
|
|
|
@ -28,6 +28,8 @@
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
#include "common/timer.h"
|
#include "common/timer.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <csignal>
|
#include <csignal>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
|
||||||
|
|
|
@ -130,7 +130,7 @@ std::unique_ptr<CDImage> CDImage::Open(const char* filename, bool allow_patches,
|
||||||
{
|
{
|
||||||
image = CDImage::OverlayPPFPatch(ppf_filename.c_str(), std::move(image));
|
image = CDImage::OverlayPPFPatch(ppf_filename.c_str(), std::move(image));
|
||||||
if (!image)
|
if (!image)
|
||||||
Error::SetString(error, fmt::format("Failed to apply ppf patch from '{}'.", ppf_filename));
|
Error::SetStringFmt(error, "Failed to apply ppf patch from '{}'.", ppf_filename);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,8 @@
|
||||||
#include "common/small_string.h"
|
#include "common/small_string.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cerrno>
|
#include <cerrno>
|
||||||
#include <cinttypes>
|
#include <cinttypes>
|
||||||
|
@ -383,7 +385,7 @@ bool CDImageDeviceWin32::Open(const char* filename, Error* error)
|
||||||
if (m_tracks.empty())
|
if (m_tracks.empty())
|
||||||
{
|
{
|
||||||
ERROR_LOG("File '{}' contains no tracks", filename);
|
ERROR_LOG("File '{}' contains no tracks", filename);
|
||||||
Error::SetString(error, fmt::format("File '{}' contains no tracks", filename));
|
Error::SetStringFmt(error, "File '{}' contains no tracks", filename);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,12 +3,13 @@
|
||||||
|
|
||||||
#include "cd_image_hasher.h"
|
#include "cd_image_hasher.h"
|
||||||
#include "cd_image.h"
|
#include "cd_image.h"
|
||||||
|
#include "host.h"
|
||||||
#include "util/host.h"
|
|
||||||
|
|
||||||
#include "common/md5_digest.h"
|
#include "common/md5_digest.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
namespace CDImageHasher {
|
namespace CDImageHasher {
|
||||||
|
|
||||||
static bool ReadIndex(CDImage* image, u8 track, u8 index, MD5Digest* digest, ProgressCallback* progress_callback);
|
static bool ReadIndex(CDImage* image, u8 track, u8 index, MD5Digest* digest, ProgressCallback* progress_callback);
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
#include "common/path.h"
|
#include "common/path.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
#include "zlib.h"
|
#include "zlib.h"
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
|
@ -509,7 +510,7 @@ bool CDImagePBP::OpenDisc(u32 index, Error* error)
|
||||||
if (index >= m_disc_offsets.size())
|
if (index >= m_disc_offsets.size())
|
||||||
{
|
{
|
||||||
ERROR_LOG("File does not contain disc {}", index + 1);
|
ERROR_LOG("File does not contain disc {}", index + 1);
|
||||||
Error::SetString(error, fmt::format("File does not contain disc {}", index + 1));
|
Error::SetStringFmt(error, "File does not contain disc {}", index + 1);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -80,7 +80,7 @@ void CueParser::File::SetError(u32 line_number, Error* error, const char* format
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
|
|
||||||
ERROR_LOG("Cue parse error at line {}: {}", line_number, str.c_str());
|
ERROR_LOG("Cue parse error at line {}: {}", line_number, str.c_str());
|
||||||
Error::SetString(error, fmt::format("Cue parse error at line {}: {}", line_number, str));
|
Error::SetStringFmt(error, "Cue parse error at line {}: {}", line_number, str);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string_view CueParser::File::GetToken(const char*& line)
|
std::string_view CueParser::File::GetToken(const char*& line)
|
||||||
|
|
|
@ -2,8 +2,11 @@
|
||||||
// SPDX-License-Identifier: PolyForm-Strict-1.0.0
|
// SPDX-License-Identifier: PolyForm-Strict-1.0.0
|
||||||
|
|
||||||
#include "input_source.h"
|
#include "input_source.h"
|
||||||
|
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
InputSource::InputSource() = default;
|
InputSource::InputSource() = default;
|
||||||
|
|
||||||
InputSource::~InputSource() = default;
|
InputSource::~InputSource() = default;
|
||||||
|
|
|
@ -5,8 +5,7 @@
|
||||||
|
|
||||||
#include "common/types.h"
|
#include "common/types.h"
|
||||||
|
|
||||||
#include "fmt/core.h"
|
#include "fmt/base.h"
|
||||||
#include "fmt/format.h"
|
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
|
||||||
#include "IconsPromptFont.h"
|
#include "IconsPromptFont.h"
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
|
|
|
@ -2,12 +2,13 @@
|
||||||
// SPDX-License-Identifier: PolyForm-Strict-1.0.0
|
// SPDX-License-Identifier: PolyForm-Strict-1.0.0
|
||||||
|
|
||||||
#include "win32_raw_input_source.h"
|
#include "win32_raw_input_source.h"
|
||||||
|
#include "input_manager.h"
|
||||||
|
|
||||||
#include "common/assert.h"
|
#include "common/assert.h"
|
||||||
#include "common/log.h"
|
#include "common/log.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
#include "core/host.h"
|
|
||||||
#include "core/system.h"
|
#include "fmt/format.h"
|
||||||
#include "input_manager.h"
|
|
||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <hidsdi.h>
|
#include <hidsdi.h>
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
|
||||||
#include "IconsPromptFont.h"
|
#include "IconsPromptFont.h"
|
||||||
|
#include "fmt/format.h"
|
||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue