Add a lightweight header for the core API

CMakeLists.txt

@@ -82,8 +82,8 @@ endfunction()
 
 # Define the fmt library, its includes and the needed defines.
 # format.cc is added to FMT_HEADERS for the header-only configuration.
-add_headers(FMT_HEADERS format.h format.cc locale.h ostream.h ostream.cc
-                        printf.h printf.cc string.h time.h write.h)
+add_headers(FMT_HEADERS core.h format.h format.cc locale.h ostream.h ostream.cc
+                        printf.h printf.cc string.h time.h)
 if (HAVE_OPEN)
   add_headers(FMT_HEADERS posix.h)
   add_headers(FMT_SOURCES posix.cc)

include/fmt/format.cc

@@ -405,6 +405,10 @@ void basic_fixed_buffer<Char>::grow(std::size_t) {
   FMT_THROW(std::runtime_error("buffer overflow"));
 }
 
+void internal::error_handler::on_error(const char *message) {
+  FMT_THROW(format_error(message));
+}
+
 FMT_FUNC void report_system_error(
     int error_code, fmt::string_view message) FMT_NOEXCEPT {
   // 'fmt::' is for bcc32.

include/fmt/write.h

-/*
- Formatting library for C++
-
- Copyright (c) 2012 - 2016, Victor Zverovich
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef FMT_WRITE_H_
-#define FMT_WRITE_H_
-
-#include "fmt/format.h"
-
-namespace fmt {
-
-class fill_spec_factory {
- public:
-  constexpr fill_spec_factory() {}
-
-  template <typename Char>
-  fill_spec<Char> operator=(Char value) const {
-    return fill_spec<Char>(value);
-  }
-};
-
-template <typename FormatSpec>
-class format_spec_factory {
- public:
-  constexpr format_spec_factory() {}
-
-  FormatSpec operator=(typename FormatSpec::value_type value) const {
-    return FormatSpec(value);
-  }
-};
-
-constexpr fill_spec_factory fill;
-constexpr format_spec_factory<width_spec> width;
-constexpr format_spec_factory<type_spec> type;
-
-}  // namespace fmt
-
-#endif  // FMT_WRITE_H_

test/assert-test.cc

@@ -25,7 +25,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "fmt/format.h"
+#include "fmt/core.h"
 #include "gtest/gtest.h"
 
 #if GTEST_HAS_DEATH_TEST

test/format-test.cc

@@ -42,8 +42,7 @@
 // Test that the library compiles if None is defined to 0 as done by xlib.h.
 #define None 0
 
-#include "fmt/format.h"
-#include "fmt/write.h"
+#include "fmt/core.h"
 
 #include "util.h"
 #include "mock-allocator.h"

test/gtest-extra.h

@@ -31,7 +31,7 @@
 #include <string>
 #include <gmock/gmock.h>
 
-#include "fmt/format.h"
+#include "fmt/core.h"
 
 #ifndef FMT_USE_FILE_DESCRIPTORS
 # define FMT_USE_FILE_DESCRIPTORS 0

test/header-only-test.cc

 // Header-only configuration test
 
-#include "fmt/format.h"
+#include "fmt/core.h"

test/header-only-test2.cc

 // Additional translation unit for the header-only configuration test
 
-#include "fmt/format.h"
+#include "fmt/core.h"

test/printf-test.cc

@@ -29,8 +29,8 @@
 #include <climits>
 #include <cstring>
 
+#include "fmt/core.h"
 #include "fmt/printf.h"
-#include "fmt/format.h"
 #include "gtest-extra.h"
 #include "util.h"
 

test/util-test.cc

@@ -48,7 +48,7 @@
 # include <windows.h>
 #endif
 
-#include "fmt/format.h"
+#include "fmt/core.h"
 
 #undef min
 #undef max