From 1baad21734d6d28a4efeb9ee3288c63487519bdb Mon Sep 17 00:00:00 2001
From: Mark Gillard <marzer_@hotmail.com>
Date: Wed, 19 May 2021 14:36:25 +0300
Subject: [PATCH] removed `<fstream>` requirement for `parse_file`

also:
- fixed false-positive char_8 support detection on older compilers
- removed extraneous `TOML_API` declarations
---
 README.md                                 |   8 +-
 docs/pages/main_page.dox                  |  18 +-
 docs/poxy.toml                            |   1 +
 examples/simple_parser.cpp                |   1 -
 examples/toml_to_json_transcoder.cpp      |   1 -
 include/toml++/toml.h                     |   1 +
 include/toml++/toml_array.hpp             |   2 -
 include/toml++/toml_common.h              |  19 +-
 include/toml++/toml_default_formatter.hpp |  10 +-
 include/toml++/toml_instantiations.hpp    |  92 +++--
 include/toml++/toml_node_view.h           |   2 +-
 include/toml++/toml_parser.h              | 165 +++------
 include/toml++/toml_parser.hpp            | 110 ++++--
 include/toml++/toml_preprocessor.h        |  10 +-
 include/toml++/toml_print_to_stream.h     |   2 +-
 include/toml++/toml_table.hpp             |   2 -
 include/toml++/toml_value.h               |  22 +-
 include/toml++/toml_version.h             |   4 +-
 meson.build                               |   4 +-
 tests/impl_toml.cpp                       |   6 +-
 tests/manipulating_values.cpp             |   2 +-
 toml.hpp                                  | 401 ++++++++++------------
 tools/requirements.txt                    |   2 +-
 23 files changed, 423 insertions(+), 462 deletions(-)

diff --git a/README.md b/README.md
index ecda7af..af5468e 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,6 @@ cpp = 17
 Reading it in C++ is easy with toml++:
 ```cpp
 #include <toml.hpp>
-#include <fstream> //required for toml::parse_file()
 
 auto config = toml::parse_file( "configuration.toml" );
 
@@ -98,14 +97,13 @@ You'll find some more code examples in the `examples` directory, and plenty more
 2. `#include <toml++/toml.h>`
 
 ### Conan
-Add `tomlplusplus/2.3.0` to your conanfile.<br>
-This adds the single-header version by default, but you can specify the regular version using `"multiple_headers": True`.
+Add `tomlplusplus/2.4.0` to your conanfile.
 
 ### DDS
 Add `tomlpp` to your `package.json5`, e.g.:
 ```
 depends: [
-    'tomlpp^2.3.0',
+    'tomlpp^2.4.0',
 ]
 ```
 > ℹ&#xFE0F; _[What is DDS?](https://dds.pizza/)_
@@ -121,7 +119,7 @@ include(FetchContent)
 FetchContent_Declare(
     tomlplusplus
     GIT_REPOSITORY https://github.com/marzer/tomlplusplus.git
-    GIT_TAG        0fcbfbe655917738c39321fcbcbdc7b048a40e33
+    GIT_TAG        v2.4.0
 )
 FetchContent_MakeAvailable(tomlplusplus)
 ```
diff --git a/docs/pages/main_page.dox b/docs/pages/main_page.dox
index e225634..d9d0382 100644
--- a/docs/pages/main_page.dox
+++ b/docs/pages/main_page.dox
@@ -34,7 +34,6 @@
 /// 
 /// \cpp
 /// #include <iostream>
-/// #include <fstream> //required for parse_file()
 /// #include <toml++/toml.h>
 /// 
 /// int main(int argc, char** argv)
@@ -56,15 +55,6 @@
 /// 
 /// \ecpp
 /// 
-/// \m_class{m-note m-warning}
-/// 
-/// \parblock
-/// <h3>Don't forget [code]\#include &lt;fstream&gt;[/code]!</h3>
-/// Not everyone who uses the library is going to work directly from files, so not everybody is forced to pay
-/// the compilation overhead of including `<fstream>`. You need to explicitly include it if you're going to be calling
-/// toml::parse_file().
-/// \endparblock
-/// 
 /// \see
 /// 	- toml::parse_file()  
 /// 	- toml::table  
@@ -144,7 +134,6 @@
 /// 
 /// \cpp
 /// #include <iostream>
-/// #include <fstream>
 /// 
 /// #define TOML_EXCEPTIONS 0 // only necessary if you've left them enabled in your compiler
 /// #include <toml++/toml.h>
@@ -437,8 +426,7 @@
 //////////////////////////////////
 ///
 /// \subsection mainpage-adding-lib-conan Conan
-/// Add `tomlplusplus/2.3.0` to your conanfile. This adds the single-header version by default, but you can specify the
-/// regular version using `"multiple_headers": True`.
+/// Add `tomlplusplus/2.4.0` to your conanfile.
 /// 
 //////////////////////////////////
 ///
@@ -446,7 +434,7 @@
 /// Add `tomlpp` to your `package.json5`, e.g.:
 /// \bash
 /// depends: [
-///		'tomlpp^2.3.0',
+///		'tomlpp^2.4.0',
 /// ]
 /// \ebash
 ///
@@ -472,7 +460,7 @@
 /// FetchContent_Declare(
 ///     tomlplusplus
 ///     GIT_REPOSITORY https://github.com/marzer/tomlplusplus.git
-///     GIT_TAG        0fcbfbe655917738c39321fcbcbdc7b048a40e33
+///     GIT_TAG        v2.4.0
 /// )
 /// FetchContent_MakeAvailable(tomlplusplus)
 /// \ebash
diff --git a/docs/poxy.toml b/docs/poxy.toml
index 32f24bd..1ba2247 100644
--- a/docs/poxy.toml
+++ b/docs/poxy.toml
@@ -2,6 +2,7 @@
 # https://github.com/marzer/poxy
 
 name              = 'toml++'
+author            = 'Mark Gillard'
 description       = 'TOML for modern C++'
 cpp               = 17
 github            = 'marzer/tomlplusplus'
diff --git a/examples/simple_parser.cpp b/examples/simple_parser.cpp
index cc5c206..67d44c5 100644
--- a/examples/simple_parser.cpp
+++ b/examples/simple_parser.cpp
@@ -9,7 +9,6 @@
 
 */
 #include <iostream>
-#include <fstream>
 #include "utf8_console.h"
 
 #define TOML_UNRELEASED_FEATURES 1
diff --git a/examples/toml_to_json_transcoder.cpp b/examples/toml_to_json_transcoder.cpp
index 51ea08c..6832d13 100644
--- a/examples/toml_to_json_transcoder.cpp
+++ b/examples/toml_to_json_transcoder.cpp
@@ -9,7 +9,6 @@
 
 */
 #include <iostream>
-#include <fstream>
 #include "utf8_console.h"
 
 #define TOML_UNRELEASED_FEATURES 1
diff --git a/include/toml++/toml.h b/include/toml++/toml.h
index b2e5e78..6e91d4e 100644
--- a/include/toml++/toml.h
+++ b/include/toml++/toml.h
@@ -93,6 +93,7 @@ TOML_POP_WARNINGS; // TOML_DISABLE_SPAM_WARNINGS
 	#undef TOML_GCC
 	#undef TOML_HAS_ATTR
 	#undef TOML_HAS_CUSTOM_OPTIONAL_TYPE
+	#undef TOML_HAS_CHAR8
 	#undef TOML_HAS_INCLUDE
 	#undef TOML_ICC
 	#undef TOML_ICC_CL
diff --git a/include/toml++/toml_array.hpp b/include/toml++/toml_array.hpp
index ef5b7dd..7c61b80 100644
--- a/include/toml++/toml_array.hpp
+++ b/include/toml++/toml_array.hpp
@@ -238,7 +238,6 @@ TOML_NAMESPACE_START
 		return index < elements.size() ? elements[index].get() : nullptr;
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	bool operator == (const array& lhs, const array& rhs) noexcept
 	{
@@ -264,7 +263,6 @@ TOML_NAMESPACE_START
 		return true;
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	bool operator != (const array& lhs, const array& rhs) noexcept
 	{
diff --git a/include/toml++/toml_common.h b/include/toml++/toml_common.h
index 28cb83a..a53f3f5 100644
--- a/include/toml++/toml_common.h
+++ b/include/toml++/toml_common.h
@@ -24,20 +24,25 @@ TOML_DISABLE_WARNINGS;
 #include <vector>
 #include <map>
 #include <iosfwd>
+#include <new>
 #if !TOML_HAS_CUSTOM_OPTIONAL_TYPE
 	#include <optional>
 #endif
-#if TOML_HAS_INCLUDE(<version>)
-	#include <version>
-#endif
 TOML_ENABLE_WARNINGS;
 
-#ifdef __cpp_lib_launder
+#if defined(__cpp_lib_launder) && __cpp_lib_launder >= 201606
 	#define TOML_LAUNDER(x)	std::launder(x)
 #else
 	#define TOML_LAUNDER(x)	x
 #endif
 
+#if defined(__cpp_char8_t)	&& __cpp_char8_t >= 201811 \
+		&& defined(__cpp_lib_char8_t) && __cpp_lib_char8_t >= 201907
+	#define TOML_HAS_CHAR8 1
+#else
+	#define TOML_HAS_CHAR8 0
+#endif
+
 //#====================================================================================================================
 //# ENVIRONMENT GROUND-TRUTHS
 //#====================================================================================================================
@@ -174,7 +179,7 @@ TOML_NAMESPACE_START // abi namespace
 		#if TOML_WINDOWS_COMPAT
 		[[nodiscard]] TOML_API std::string narrow(std::wstring_view) noexcept;
 		[[nodiscard]] TOML_API std::wstring widen(std::string_view) noexcept;
-		#ifdef __cpp_lib_char8_t
+		#if TOML_HAS_CHAR8
 		[[nodiscard]] TOML_API std::wstring widen(std::u8string_view) noexcept;
 		#endif
 		#endif // TOML_WINDOWS_COMPAT
@@ -460,7 +465,7 @@ TOML_IMPL_NAMESPACE_START
 	template <size_t N> struct value_traits<const char[N]>		: string_value_traits<const char[N]> {};
 	template <>         struct value_traits<char*>				: string_value_traits<char*> {};
 	template <size_t N> struct value_traits<char[N]>			: string_value_traits<char[N]> {};
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 	template <>         struct value_traits<std::u8string>		: string_value_traits<std::u8string> {};
 	template <>         struct value_traits<std::u8string_view>	: string_value_traits<std::u8string_view> {};
 	template <>         struct value_traits<const char8_t*>		: string_value_traits<const char8_t*> {};
@@ -795,8 +800,6 @@ TOML_NAMESPACE_START
 	/// \brief	A source document region.
 	/// 
 	/// \detail \cpp
-	/// #include <fstream>
-	/// 
 	/// auto tbl = toml::parse_file("config.toml"sv);
 	/// if (auto server = tbl.get("server"))
 	/// {
diff --git a/include/toml++/toml_default_formatter.hpp b/include/toml++/toml_default_formatter.hpp
index 5e09742..0602fd1 100644
--- a/include/toml++/toml_default_formatter.hpp
+++ b/include/toml++/toml_default_formatter.hpp
@@ -24,7 +24,6 @@ TOML_IMPL_NAMESPACE_START
 {
 	inline constexpr size_t default_formatter_line_wrap = 120_sz;
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	std::string default_formatter_make_key_segment(const std::string& str) noexcept
 	{
@@ -69,7 +68,6 @@ TOML_IMPL_NAMESPACE_START
 		}
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	size_t default_formatter_inline_columns(const node& node) noexcept
 	{
@@ -153,7 +151,6 @@ TOML_IMPL_NAMESPACE_START
 		TOML_UNREACHABLE;
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	bool default_formatter_forces_multiline(const node& node, size_t starting_column_bias) noexcept
 	{
@@ -230,7 +227,6 @@ extern "C"
 
 TOML_IMPL_NAMESPACE_START
 {
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	std::string narrow(std::wstring_view str) noexcept
 	{
@@ -249,7 +245,6 @@ TOML_IMPL_NAMESPACE_START
 		return s;
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	std::wstring widen(std::string_view str) noexcept
 	{
@@ -266,9 +261,8 @@ TOML_IMPL_NAMESPACE_START
 		return s;
 	}
 
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	std::wstring widen(std::u8string_view str) noexcept
 	{
@@ -278,7 +272,7 @@ TOML_IMPL_NAMESPACE_START
 		return widen(std::string_view{ reinterpret_cast<const char*>(str.data()), str.length() });
 	}
 
-	#endif // __cpp_lib_char8_t
+	#endif // TOML_HAS_CHAR8
 }
 TOML_IMPL_NAMESPACE_END;
 
diff --git a/include/toml++/toml_instantiations.hpp b/include/toml++/toml_instantiations.hpp
index 90fd5d8..49d95d8 100644
--- a/include/toml++/toml_instantiations.hpp
+++ b/include/toml++/toml_instantiations.hpp
@@ -17,7 +17,6 @@
 TOML_DISABLE_WARNINGS;
 #include <ostream>
 #include <istream>
-#include <fstream>
 TOML_ENABLE_WARNINGS;
 
 #include "toml_node_view.h"
@@ -31,10 +30,10 @@ TOML_ENABLE_WARNINGS;
 TOML_IMPL_NAMESPACE_START
 {
 	// formatters
-	template class TOML_API formatter<char>;
+	template class formatter<char>;
 
 	// print to stream machinery
-	template TOML_API void print_floating_point_to_stream(double, std::ostream&, bool);
+	template void print_floating_point_to_stream(double, std::ostream&, bool);
 }
 TOML_IMPL_NAMESPACE_END;
 
@@ -42,51 +41,51 @@ TOML_IMPL_NAMESPACE_END;
 TOML_NAMESPACE_START
 {
 	// value<>
-	template class TOML_API value<std::string>;
-	template class TOML_API value<int64_t>;
-	template class TOML_API value<double>;
-	template class TOML_API value<bool>;
-	template class TOML_API value<date>;
-	template class TOML_API value<time>;
-	template class TOML_API value<date_time>;
+	template class value<std::string>;
+	template class value<int64_t>;
+	template class value<double>;
+	template class value<bool>;
+	template class value<date>;
+	template class value<time>;
+	template class value<date_time>;
 
 	// node_view
-	template class TOML_API node_view<node>;
-	template class TOML_API node_view<const node>;
+	template class node_view<node>;
+	template class node_view<const node>;
 
 	// formatters
-	template class TOML_API default_formatter<char>;
-	template class TOML_API json_formatter<char>;
+	template class default_formatter<char>;
+	template class json_formatter<char>;
 
 	// various ostream operators
-	template TOML_API std::ostream& operator << (std::ostream&, const source_position&);
-	template TOML_API std::ostream& operator << (std::ostream&, const source_region&);
-	template TOML_API std::ostream& operator << (std::ostream&, const date&);
-	template TOML_API std::ostream& operator << (std::ostream&, const time&);
-	template TOML_API std::ostream& operator << (std::ostream&, const time_offset&);
-	template TOML_API std::ostream& operator << (std::ostream&, const date_time&);
-	template TOML_API std::ostream& operator << (std::ostream&, const value<std::string>&);
-	template TOML_API std::ostream& operator << (std::ostream&, const value<int64_t>&);
-	template TOML_API std::ostream& operator << (std::ostream&, const value<double>&);
-	template TOML_API std::ostream& operator << (std::ostream&, const value<bool>&);
-	template TOML_API std::ostream& operator << (std::ostream&, const value<toml::date>&);
-	template TOML_API std::ostream& operator << (std::ostream&, const value<toml::time>&);
-	template TOML_API std::ostream& operator << (std::ostream&, const value<toml::date_time>&);
-	template TOML_API std::ostream& operator << (std::ostream&, default_formatter<char>&);
-	template TOML_API std::ostream& operator << (std::ostream&, default_formatter<char>&&);
-	template TOML_API std::ostream& operator << (std::ostream&, json_formatter<char>&);
-	template TOML_API std::ostream& operator << (std::ostream&, json_formatter<char>&&);
-	template TOML_API std::ostream& operator << (std::ostream&, const table&);
-	template TOML_API std::ostream& operator << (std::ostream&, const array&);
-	template TOML_API std::ostream& operator << (std::ostream&, const node_view<node>&);
-	template TOML_API std::ostream& operator << (std::ostream&, const node_view<const node>&);
-	template TOML_API std::ostream& operator << (std::ostream&, node_type);
+	template std::ostream& operator << (std::ostream&, const source_position&);
+	template std::ostream& operator << (std::ostream&, const source_region&);
+	template std::ostream& operator << (std::ostream&, const date&);
+	template std::ostream& operator << (std::ostream&, const time&);
+	template std::ostream& operator << (std::ostream&, const time_offset&);
+	template std::ostream& operator << (std::ostream&, const date_time&);
+	template std::ostream& operator << (std::ostream&, const value<std::string>&);
+	template std::ostream& operator << (std::ostream&, const value<int64_t>&);
+	template std::ostream& operator << (std::ostream&, const value<double>&);
+	template std::ostream& operator << (std::ostream&, const value<bool>&);
+	template std::ostream& operator << (std::ostream&, const value<toml::date>&);
+	template std::ostream& operator << (std::ostream&, const value<toml::time>&);
+	template std::ostream& operator << (std::ostream&, const value<toml::date_time>&);
+	template std::ostream& operator << (std::ostream&, default_formatter<char>&);
+	template std::ostream& operator << (std::ostream&, default_formatter<char>&&);
+	template std::ostream& operator << (std::ostream&, json_formatter<char>&);
+	template std::ostream& operator << (std::ostream&, json_formatter<char>&&);
+	template std::ostream& operator << (std::ostream&, const table&);
+	template std::ostream& operator << (std::ostream&, const array&);
+	template std::ostream& operator << (std::ostream&, const node_view<node>&);
+	template std::ostream& operator << (std::ostream&, const node_view<const node>&);
+	template std::ostream& operator << (std::ostream&, node_type);
 
 	// node::value, node_view:::value etc
 	#define TOML_INSTANTIATE(name, T)														\
-		template TOML_API optional<T>		node::name<T>() const noexcept;					\
-		template TOML_API optional<T>		node_view<node>::name<T>() const noexcept;		\
-		template TOML_API optional<T>		node_view<const node>::name<T>() const noexcept
+		template optional<T>		node::name<T>() const noexcept;					\
+		template optional<T>		node_view<node>::name<T>() const noexcept;		\
+		template optional<T>		node_view<const node>::name<T>() const noexcept
 	TOML_INSTANTIATE(value_exact, std::string_view);
 	TOML_INSTANTIATE(value_exact, std::string);
 	TOML_INSTANTIATE(value_exact, const char*);
@@ -115,7 +114,7 @@ TOML_NAMESPACE_START
 	TOML_INSTANTIATE(value, time);
 	TOML_INSTANTIATE(value, date_time);
 	TOML_INSTANTIATE(value, bool);
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 	TOML_INSTANTIATE(value_exact, std::u8string_view);
 	TOML_INSTANTIATE(value_exact, std::u8string);
 	TOML_INSTANTIATE(value_exact, const char8_t*);
@@ -133,20 +132,13 @@ TOML_NAMESPACE_START
 	#if TOML_PARSER
 
 		// parse error ostream
-		template TOML_API std::ostream& operator << (std::ostream&, const parse_error&);
+		template std::ostream& operator << (std::ostream&, const parse_error&);
 
 		// parse() and parse_file()
 		TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, ex, noex);
 
-		template TOML_API parse_result parse(std::istream&, std::string_view) TOML_MAY_THROW;
-		template TOML_API parse_result parse(std::istream&, std::string&&) TOML_MAY_THROW;
-		template TOML_API parse_result parse_file(std::string_view) TOML_MAY_THROW;
-		#ifdef __cpp_lib_char8_t
-			template TOML_API parse_result parse_file(std::u8string_view) TOML_MAY_THROW;
-		#endif
-		#if TOML_WINDOWS_COMPAT
-			template TOML_API parse_result parse_file(std::wstring_view) TOML_MAY_THROW;
-		#endif
+		template parse_result parse(std::istream&, std::string_view) TOML_MAY_THROW;
+		template parse_result parse(std::istream&, std::string&&) TOML_MAY_THROW;
 
 		TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS
 
diff --git a/include/toml++/toml_node_view.h b/include/toml++/toml_node_view.h
index 3622749..ac79b9a 100644
--- a/include/toml++/toml_node_view.h
+++ b/include/toml++/toml_node_view.h
@@ -690,7 +690,7 @@ TOML_NAMESPACE_START
 	TOML_EXTERN(value, time);
 	TOML_EXTERN(value, date_time);
 	TOML_EXTERN(value, bool);
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 	TOML_EXTERN(value_exact, std::u8string_view);
 	TOML_EXTERN(value_exact, std::u8string);
 	TOML_EXTERN(value_exact, const char8_t*);
diff --git a/include/toml++/toml_parser.h b/include/toml++/toml_parser.h
index fd753dc..7837e8a 100644
--- a/include/toml++/toml_parser.h
+++ b/include/toml++/toml_parser.h
@@ -20,23 +20,15 @@ TOML_IMPL_NAMESPACE_START
 {
 	TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, ex, noex);
 	
-	[[nodiscard]] TOML_API parse_result do_parse(utf8_reader_interface&&) TOML_MAY_THROW;
+	[[nodiscard]]
+	TOML_API
+	parse_result do_parse(utf8_reader_interface&&) TOML_MAY_THROW;
 	
 	TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS
 }
 TOML_IMPL_NAMESPACE_END;
 
-#if TOML_EXCEPTIONS
-	#define TOML_THROW_PARSE_ERROR(msg, path)												\
-		throw parse_error{																	\
-			msg, source_position{}, std::make_shared<const std::string>(std::move(path))	\
-		}
-#else
-	#define TOML_THROW_PARSE_ERROR(msg, path)												\
-		return parse_result{ parse_error{													\
-			msg, source_position{}, std::make_shared<const std::string>(std::move(path))	\
-		}}
-#endif
+
 /// \endcond
 
 TOML_NAMESPACE_START
@@ -124,7 +116,7 @@ TOML_NAMESPACE_START
 
 	#endif // TOML_WINDOWS_COMPAT
 
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 
 	/// \brief	Parses a TOML document from a char8_t string view.
 	///
@@ -206,7 +198,7 @@ TOML_NAMESPACE_START
 
 	#endif // TOML_WINDOWS_COMPAT
 
-	#endif // __cpp_lib_char8_t
+	#endif // TOML_HAS_CHAR8
 
 	/// \brief	Parses a TOML document from a stream.
 	///
@@ -320,120 +312,77 @@ TOML_NAMESPACE_START
 
 	#endif // TOML_WINDOWS_COMPAT
 
-	// Q: "why are the parse_file functions templated??"
-	// A: I don't want to force users to drag in <fstream> if they're not going to do
-	//    any parsing directly from files. Keeping them templated delays their instantiation
-	//    until they're actually required, so only those users wanting to use parse_file()
-	//    are burdened by the <fstream> overhead.
-
+	#if !defined(DOXYGEN) && !TOML_HEADER_ONLY
+		extern template TOML_API parse_result parse(std::istream&, std::string_view) TOML_MAY_THROW;
+		extern template TOML_API parse_result parse(std::istream&, std::string&&) TOML_MAY_THROW;
+	#endif
 
 	/// \brief	Parses a TOML document from a file.
 	///
 	/// \detail \cpp
-	/// #include <fstream>
-	/// 
 	/// toml::parse_result get_foo_toml()
 	/// {
 	///		return toml::parse_file("foo.toml");
 	/// }
 	/// \ecpp
 	/// 
-	/// \tparam	Char			The path's character type.
 	/// \param 	file_path		The TOML document to parse. Must be valid UTF-8.
 	///
 	/// \returns	\conditional_return{With exceptions}
 	///				A toml::table.
 	/// 			\conditional_return{Without exceptions}
 	///				A toml::parse_result.
+	[[nodiscard]]
+	TOML_API
+	parse_result parse_file(std::string_view file_path) TOML_MAY_THROW;
+
+	#if TOML_HAS_CHAR8
+
+	/// \brief	Parses a TOML document from a file.
+	///
+	/// \detail \cpp
+	/// toml::parse_result get_foo_toml()
+	/// {
+	///		return toml::parse_file(u8"foo.toml");
+	/// }
+	/// \ecpp
 	/// 
-	/// \attention You must `#include <fstream>` to use this function (toml++ does not transitively include it for you).
-	template <typename Char, typename StreamChar = char>
+	/// \param 	file_path		The TOML document to parse. Must be valid UTF-8.
+	///
+	/// \returns	\conditional_return{With exceptions}
+	///				A toml::table.
+	/// 			\conditional_return{Without exceptions}
+	///				A toml::parse_result.
 	[[nodiscard]]
-	inline parse_result parse_file(std::basic_string_view<Char> file_path) TOML_MAY_THROW
-	{
-		static_assert(
-			!std::is_same_v<Char, wchar_t> || TOML_WINDOWS_COMPAT,
-			"Wide-character file paths are only supported on Windows with TOML_WINDOWS_COMPAT enabled."
-		);
-		#if TOML_WINDOWS_COMPAT
-			static_assert(
-				sizeof(Char) == 1 || std::is_same_v<Char, wchar_t>,
-				"The file path's underlying character type must be wchar_t or be 1 byte in size."
-			);
-		#else
-			static_assert(
-				sizeof(Char) == 1,
-				"The file path's underlying character type must be 1 byte in size."
-			);
-		#endif
-		static_assert(
-			std::is_same_v<StreamChar, char>,
-			"StreamChar must be 'char' (it is as an instantiation-delaying hack and is not user-configurable)."
-		);
+	TOML_API
+	parse_result parse_file(std::u8string_view file_path) TOML_MAY_THROW;
 
-		std::string file_path_str;
-		#if TOML_WINDOWS_COMPAT
-		if constexpr (std::is_same_v<Char, wchar_t>)
-			file_path_str = impl::narrow(file_path);
-		else
-		#endif
-			file_path_str = std::string_view{ reinterpret_cast<const char*>(file_path.data()), file_path.length() };
+	#endif // TOML_HAS_CHAR8
 
-		// open file with a custom-sized stack buffer
-		using ifstream = std::basic_ifstream<StreamChar>;
-		ifstream file;
-		StreamChar file_buffer[sizeof(void*) * 1024_sz];
-		file.rdbuf()->pubsetbuf(file_buffer, sizeof(file_buffer));
-		file.open(file_path_str, ifstream::in | ifstream::binary | ifstream::ate);
-		if (!file.is_open())
-			TOML_THROW_PARSE_ERROR("File could not be opened for reading", file_path_str);
+	#if TOML_WINDOWS_COMPAT
 
-		// get size
-		const auto file_size = file.tellg();
-		if (file_size == -1)
-			TOML_THROW_PARSE_ERROR("Could not determine file size", file_path_str);
-		file.seekg(0, ifstream::beg);
-
-		// read the whole file into memory first if the file isn't too large
-		constexpr auto large_file_threshold = 1024 * 1024 * static_cast<int>(sizeof(void*)) * 4; // 32 megabytes on 64-bit
-		if (file_size <= large_file_threshold)
-		{
-			std::vector<StreamChar> file_data;
-			file_data.resize(static_cast<size_t>(file_size));
-			file.read(file_data.data(), static_cast<std::streamsize>(file_size));
-			return parse(std::basic_string_view<StreamChar>{ file_data.data(), file_data.size() }, std::move(file_path_str));
-		}
-
-		// otherwise parse it using the streams
-		else
-			return parse(file, std::move(file_path_str));
-	}
-
-	#if !defined(DOXYGEN) && !TOML_HEADER_ONLY
-		extern template TOML_API parse_result parse(std::istream&, std::string_view) TOML_MAY_THROW;
-		extern template TOML_API parse_result parse(std::istream&, std::string&&) TOML_MAY_THROW;
-		extern template TOML_API parse_result parse_file(std::string_view) TOML_MAY_THROW;
-		#ifdef __cpp_lib_char8_t
-			extern template TOML_API parse_result parse_file(std::u8string_view) TOML_MAY_THROW;
-		#endif
-		#if TOML_WINDOWS_COMPAT
-			extern template TOML_API parse_result parse_file(std::wstring_view) TOML_MAY_THROW;
-		#endif
-	#endif
-
-	template <typename Char>
+	/// \brief	Parses a TOML document from a file.
+	///
+	/// \detail \cpp
+	/// toml::parse_result get_foo_toml()
+	/// {
+	///		return toml::parse_file(L"foo.toml");
+	/// }
+	/// \ecpp
+	///
+	/// \availability This overload is only available when #TOML_WINDOWS_COMPAT is enabled.
+	///
+	/// \param 	file_path		The TOML document to parse. Must be valid UTF-8.
+	///
+	/// \returns	\conditional_return{With exceptions}
+	///				A toml::table.
+	/// 			\conditional_return{Without exceptions}
+	///				A toml::parse_result.
 	[[nodiscard]]
-	inline parse_result parse_file(const std::basic_string<Char>& file_path) TOML_MAY_THROW
-	{
-		return parse_file(std::basic_string_view<Char>{ file_path });
-	}
+	TOML_API
+	parse_result parse_file(std::wstring_view file_path) TOML_MAY_THROW;
 
-	template <typename Char>
-	[[nodiscard]]
-	inline parse_result parse_file(const Char* file_path) TOML_MAY_THROW
-	{
-		return parse_file(std::basic_string_view<Char>{ file_path });
-	}
+	#endif // TOML_WINDOWS_COMPAT
 
 	TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS
 
@@ -466,7 +415,7 @@ TOML_NAMESPACE_START
 		TOML_API
 		parse_result operator"" _toml(const char* str, size_t len) TOML_MAY_THROW;
 
-		#ifdef __cpp_lib_char8_t
+		#if TOML_HAS_CHAR8
 
 		/// \brief	Parses TOML data from a UTF-8 string literal.
 		/// 
@@ -493,11 +442,9 @@ TOML_NAMESPACE_START
 		TOML_API
 		parse_result operator"" _toml(const char8_t* str, size_t len) TOML_MAY_THROW;
 
-		#endif // __cpp_lib_char8_t
+		#endif // TOML_HAS_CHAR8
 
 		TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS
 	}
 }
 TOML_NAMESPACE_END;
-
-#undef TOML_THROW_PARSE_ERROR
diff --git a/include/toml++/toml_parser.hpp b/include/toml++/toml_parser.hpp
index aa7192f..e60db37 100644
--- a/include/toml++/toml_parser.hpp
+++ b/include/toml++/toml_parser.hpp
@@ -17,6 +17,7 @@
 #include "toml_parser.h"
 TOML_DISABLE_WARNINGS;
 #include <cmath>
+#include <fstream>
 #if TOML_INT_CHARCONV || TOML_FLOAT_CHARCONV
 	#include <charconv>
 #endif
@@ -384,6 +385,7 @@ TOML_IMPL_NAMESPACE_START
 	#define is_eof()							!cp
 	#define assert_not_eof()					assert_or_assume(cp != nullptr)
 	#define return_if_eof(...)					do { if (is_eof()) return __VA_ARGS__; } while(false)
+
 	#if TOML_EXCEPTIONS
 		#define is_error()						false
 		#define return_after_error(...)			TOML_UNREACHABLE
@@ -397,13 +399,18 @@ TOML_IMPL_NAMESPACE_START
 		#define return_if_error(...)			do { if (is_error()) return __VA_ARGS__; } while(false)
 		#define return_if_error_or_eof(...)		do { if (is_eof() || is_error()) return __VA_ARGS__; } while(false)
 	#endif
+
 	#define set_error_and_return(ret, ...)		\
 		do { if (!is_error()) set_error(__VA_ARGS__); return_after_error(ret); } while(false)
+
 	#define set_error_and_return_default(...)	set_error_and_return({}, __VA_ARGS__)
+
 	#define set_error_and_return_if_eof(...)	\
 		do { if (is_eof()) set_error_and_return(__VA_ARGS__, "encountered end-of-file"sv); } while(false)
+
 	#define advance_and_return_if_error(...)	\
 		do { assert_not_eof(); advance(); return_if_error(__VA_ARGS__); } while (false)
+
 	#define advance_and_return_if_error_or_eof(...)		\
 		do {											\
 			assert_not_eof();							\
@@ -3054,13 +3061,61 @@ TOML_IMPL_NAMESPACE_START
 		return reinterpret_cast<table*>(tab.release());
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	parse_result do_parse(utf8_reader_interface&& reader) TOML_MAY_THROW
 	{
 		return impl::parser{ std::move(reader) };
 	}
 
+	[[nodiscard]]
+	TOML_INTERNAL_LINKAGE
+	parse_result do_parse_file(std::string_view file_path) TOML_MAY_THROW
+	{
+		#if TOML_EXCEPTIONS
+		#define TOML_PARSE_FILE_ERROR(msg, path)													\
+				throw parse_error{																	\
+					msg, source_position{}, std::make_shared<const std::string>(std::move(path))	\
+				}
+		#else
+		#define TOML_PARSE_FILE_ERROR(msg, path)													\
+				return parse_result{ parse_error{													\
+					msg, source_position{}, std::make_shared<const std::string>(std::move(path))	\
+				}}
+		#endif
+
+		std::string file_path_str(file_path);
+
+		// open file with a custom-sized stack buffer
+		std::ifstream file;
+		char file_buffer[sizeof(void*) * 1024_sz];
+		file.rdbuf()->pubsetbuf(file_buffer, sizeof(file_buffer));
+		file.open(file_path_str, std::ifstream::in | std::ifstream::binary | std::ifstream::ate);
+		if (!file.is_open())
+			TOML_PARSE_FILE_ERROR("File could not be opened for reading", file_path_str);
+
+		// get size
+		const auto file_size = file.tellg();
+		if (file_size == -1)
+			TOML_PARSE_FILE_ERROR("Could not determine file size", file_path_str);
+		file.seekg(0, std::ifstream::beg);
+
+		// read the whole file into memory first if the file isn't too large
+		constexpr auto large_file_threshold = 1024 * 1024 * 2; // 2 MB
+		if (file_size <= large_file_threshold)
+		{
+			std::vector<char> file_data;
+			file_data.resize(static_cast<size_t>(file_size));
+			file.read(file_data.data(), static_cast<std::streamsize>(file_size));
+			return parse(std::string_view{ file_data.data(), file_data.size() }, std::move(file_path_str));
+		}
+
+		// otherwise parse it using the streams
+		else
+			return parse(file, std::move(file_path_str));
+
+		#undef TOML_PARSE_FILE_ERROR
+	}
+
 	TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS
 
 	#undef push_parse_scope_2
@@ -3088,59 +3143,74 @@ TOML_NAMESPACE_START
 {
 	TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, ex, noex);
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	parse_result parse(std::string_view doc, std::string_view source_path) TOML_MAY_THROW
 	{
 		return impl::do_parse(impl::utf8_reader{ doc, source_path });
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	parse_result parse(std::string_view doc, std::string&& source_path) TOML_MAY_THROW
 	{
 		return impl::do_parse(impl::utf8_reader{ doc, std::move(source_path) });
 	}
 
-	#if TOML_WINDOWS_COMPAT
-
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::string_view doc, std::wstring_view source_path) TOML_MAY_THROW
+	parse_result parse_file(std::string_view file_path) TOML_MAY_THROW
 	{
-		return impl::do_parse(impl::utf8_reader{ doc, impl::narrow(source_path) });
+		return impl::do_parse_file(file_path);
 	}
 
-	#endif // TOML_WINDOWS_COMPAT
+	#if TOML_HAS_CHAR8
 
-	#ifdef __cpp_lib_char8_t
-
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	parse_result parse(std::u8string_view doc, std::string_view source_path) TOML_MAY_THROW
 	{
 		return impl::do_parse(impl::utf8_reader{ doc, source_path });
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	parse_result parse(std::u8string_view doc, std::string&& source_path) TOML_MAY_THROW
 	{
 		return impl::do_parse(impl::utf8_reader{ doc, std::move(source_path) });
 	}
 
+	TOML_EXTERNAL_LINKAGE
+	parse_result parse_file(std::u8string_view file_path) TOML_MAY_THROW
+	{
+		std::string file_path_str;
+		file_path_str.resize(file_path.length());
+		memcpy(file_path_str.data(), file_path.data(), file_path.length());
+		return impl::do_parse_file(file_path_str);
+	}
+
+	#endif // TOML_HAS_CHAR8
+
 	#if TOML_WINDOWS_COMPAT
 
-	TOML_API
+	TOML_EXTERNAL_LINKAGE
+	parse_result parse(std::string_view doc, std::wstring_view source_path) TOML_MAY_THROW
+	{
+		return impl::do_parse(impl::utf8_reader{ doc, impl::narrow(source_path) });
+	}
+
+	TOML_EXTERNAL_LINKAGE
+	parse_result parse_file(std::wstring_view file_path) TOML_MAY_THROW
+	{
+		return impl::do_parse_file(impl::narrow(file_path));
+	}
+
+	#endif // TOML_WINDOWS_COMPAT
+
+	#if TOML_HAS_CHAR8 && TOML_WINDOWS_COMPAT
+
 	TOML_EXTERNAL_LINKAGE
 	parse_result parse(std::u8string_view doc, std::wstring_view source_path) TOML_MAY_THROW
 	{
 		return impl::do_parse(impl::utf8_reader{ doc, impl::narrow(source_path) });
 	}
 
-	#endif // TOML_WINDOWS_COMPAT
-
-	#endif // __cpp_lib_char8_t
+	#endif // TOML_HAS_CHAR8 && TOML_WINDOWS_COMPAT
 
 	TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS
 
@@ -3148,23 +3218,21 @@ TOML_NAMESPACE_START
 	{
 		TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, lit_ex, lit_noex);
 
-		TOML_API
 		TOML_EXTERNAL_LINKAGE
 		parse_result operator"" _toml(const char* str, size_t len) TOML_MAY_THROW
 		{
 			return parse(std::string_view{ str, len });
 		}
 
-		#ifdef __cpp_lib_char8_t
+		#if TOML_HAS_CHAR8
 
-		TOML_API
 		TOML_EXTERNAL_LINKAGE
 		parse_result operator"" _toml(const char8_t* str, size_t len) TOML_MAY_THROW
 		{
 			return parse(std::u8string_view{ str, len });
 		}
 
-		#endif // __cpp_lib_char8_t
+		#endif // TOML_HAS_CHAR8
 
 		TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS
 	}
diff --git a/include/toml++/toml_preprocessor.h b/include/toml++/toml_preprocessor.h
index 85a34e7..bc54a58 100644
--- a/include/toml++/toml_preprocessor.h
+++ b/include/toml++/toml_preprocessor.h
@@ -547,7 +547,7 @@ is no longer necessary.
 
 #define TOML_NO_DEFAULT_CASE	default: TOML_UNREACHABLE
 
-#if defined(__cpp_consteval) \
+#if defined(__cpp_consteval) && __cpp_consteval >= 201811 \
 		&& (!defined(_MSC_FULL_VER) || _MSC_FULL_VER != 192930031)
 		// https://developercommunity.visualstudio.com/t/Erroneous-C7595-error-with-consteval-in/1404234
 	#define TOML_CONSTEVAL		consteval
@@ -562,13 +562,13 @@ is no longer necessary.
 #endif
 
 #if !defined(DOXYGEN) && !TOML_INTELLISENSE
-	#if !defined(TOML_LIKELY) && TOML_HAS_ATTR(likely)
+	#if !defined(TOML_LIKELY) && TOML_HAS_ATTR(likely) >= 201803
 		#define TOML_LIKELY(...)	(__VA_ARGS__) [[likely]]
 	#endif
-	#if !defined(TOML_UNLIKELY) && TOML_HAS_ATTR(unlikely)
+	#if !defined(TOML_UNLIKELY) && TOML_HAS_ATTR(unlikely) >= 201803
 		#define TOML_UNLIKELY(...)	(__VA_ARGS__) [[unlikely]]
 	#endif
-	#if TOML_HAS_ATTR(nodiscard) >= 201907L
+	#if TOML_HAS_ATTR(nodiscard) >= 201907
 		#define TOML_NODISCARD_CTOR [[nodiscard]]
 	#endif
 #endif
@@ -672,7 +672,7 @@ is no longer necessary.
 
 #include "toml_version.h"
 
-#define	TOML_LIB_SINGLE_HEADER 0
+#define TOML_LIB_SINGLE_HEADER 0
 
 #define TOML_MAKE_VERSION(maj, min, rev)											\
 		((maj) * 1000 + (min) * 25 + (rev))
diff --git a/include/toml++/toml_print_to_stream.h b/include/toml++/toml_print_to_stream.h
index 54d9858..a948386 100644
--- a/include/toml++/toml_print_to_stream.h
+++ b/include/toml++/toml_print_to_stream.h
@@ -66,7 +66,7 @@ TOML_IMPL_NAMESPACE_START
 		stream.write(reinterpret_cast<const Char*>(str), static_cast<std::streamsize>(len));
 	}
 
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 
 	template <typename Char>
 	inline void print_to_stream(char8_t character, std::basic_ostream<Char>& stream)
diff --git a/include/toml++/toml_table.hpp b/include/toml++/toml_table.hpp
index db44133..bc1aa73 100644
--- a/include/toml++/toml_table.hpp
+++ b/include/toml++/toml_table.hpp
@@ -315,7 +315,6 @@ TOML_NAMESPACE_START
 
 	#endif // TOML_WINDOWS_COMPAT
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	bool operator == (const table& lhs, const table& rhs) noexcept
 	{
@@ -345,7 +344,6 @@ TOML_NAMESPACE_START
 		return true;
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	bool operator != (const table& lhs, const table& rhs) noexcept
 	{
diff --git a/include/toml++/toml_value.h b/include/toml++/toml_value.h
index 2242cf3..8b1263b 100644
--- a/include/toml++/toml_value.h
+++ b/include/toml++/toml_value.h
@@ -14,7 +14,7 @@
 		#define TOML_SA_VALUE_MESSAGE_WSTRING
 	#endif
 
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 		#define TOML_SA_VALUE_MESSAGE_U8STRING_VIEW		TOML_SA_LIST_SEP "std::u8string_view"
 		#define TOML_SA_VALUE_MESSAGE_CONST_CHAR8		TOML_SA_LIST_SEP "const char8_t*"
 	#else
@@ -95,7 +95,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 	};
 
-	#if defined(__cpp_lib_char8_t) || TOML_WINDOWS_COMPAT
+	#if TOML_HAS_CHAR8 || TOML_WINDOWS_COMPAT
 
 	struct string_maker
 	{
@@ -103,12 +103,12 @@ TOML_IMPL_NAMESPACE_START
 		[[nodiscard]]
 		static std::string make(T&& arg) noexcept
 		{
-			#ifdef __cpp_lib_char8_t
+			#if TOML_HAS_CHAR8
 			if constexpr (is_one_of<std::decay_t<T>, char8_t*, const char8_t*>)
 				return std::string(reinterpret_cast<const char*>(static_cast<const char8_t*>(arg)));
 			else if constexpr (is_one_of<remove_cvref_t<T>, std::u8string, std::u8string_view>)
 				return std::string(reinterpret_cast<const char*>(static_cast<const char8_t*>(arg.data())), arg.length());
-			#endif // __cpp_lib_char8_t
+			#endif // TOML_HAS_CHAR8
 
 			#if TOML_WINDOWS_COMPAT
 			if constexpr (is_wide_string<T>)
@@ -116,12 +116,12 @@ TOML_IMPL_NAMESPACE_START
 			#endif // TOML_WINDOWS_COMPAT
 		}
 	};
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 	template <>	struct native_value_maker<std::string, char8_t*>			: string_maker {};
 	template <>	struct native_value_maker<std::string, const char8_t*>		: string_maker {};
 	template <>	struct native_value_maker<std::string, std::u8string>		: string_maker {};
 	template <>	struct native_value_maker<std::string, std::u8string_view>	: string_maker {};
-	#endif // __cpp_lib_char8_t
+	#endif // TOML_HAS_CHAR8
 	#if TOML_WINDOWS_COMPAT
 	template <>	struct native_value_maker<std::string, wchar_t*>			: string_maker {};
 	template <>	struct native_value_maker<std::string, const wchar_t*>		: string_maker {};
@@ -129,7 +129,7 @@ TOML_IMPL_NAMESPACE_START
 	template <>	struct native_value_maker<std::string, std::wstring_view>	: string_maker {};
 	#endif // TOML_WINDOWS_COMPAT
 
-	#endif // defined(__cpp_lib_char8_t) || TOML_WINDOWS_COMPAT
+	#endif // TOML_HAS_CHAR8 || TOML_WINDOWS_COMPAT
 
 	template <typename T>
 	[[nodiscard]]
@@ -663,7 +663,7 @@ TOML_NAMESPACE_START
 				#endif
 			}
 
-			#ifdef __cpp_lib_char8_t
+			#if TOML_HAS_CHAR8
 
 			// char -> char8_t (potentially unsafe - the feature is 'experimental'!)
 			else if constexpr (is_one_of<T, std::u8string, std::u8string_view>)
@@ -882,14 +882,14 @@ TOML_NAMESPACE_START
 
 				TOML_SA_LIST_NXT "A compatible view type"
 				TOML_SA_LIST_BEG "std::string_view"
-				#ifdef __cpp_lib_char8_t
+				#if TOML_HAS_CHAR8
 				TOML_SA_LIST_SEP "std::u8string_view"
 				#endif
 				#if TOML_WINDOWS_COMPAT
 				TOML_SA_LIST_SEP "std::wstring_view"
 				#endif
 				TOML_SA_LIST_SEP "const char*"
-				#ifdef __cpp_lib_char8_t
+				#if TOML_HAS_CHAR8
 				TOML_SA_LIST_SEP "const char8_t*"
 				#endif
 				#if TOML_WINDOWS_COMPAT
@@ -948,7 +948,7 @@ TOML_NAMESPACE_START
 	TOML_EXTERN(value, time);
 	TOML_EXTERN(value, date_time);
 	TOML_EXTERN(value, bool);
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 	TOML_EXTERN(value_exact, std::u8string_view);
 	TOML_EXTERN(value_exact, std::u8string);
 	TOML_EXTERN(value_exact, const char8_t*);
diff --git a/include/toml++/toml_version.h b/include/toml++/toml_version.h
index 710b2f4..187f2a5 100644
--- a/include/toml++/toml_version.h
+++ b/include/toml++/toml_version.h
@@ -6,8 +6,8 @@
 #pragma once
 
 #define TOML_LIB_MAJOR		2
-#define TOML_LIB_MINOR		3
-#define TOML_LIB_PATCH		1
+#define TOML_LIB_MINOR		4
+#define TOML_LIB_PATCH		0
 
 #define TOML_LANG_MAJOR		1
 #define TOML_LANG_MINOR		0
diff --git a/meson.build b/meson.build
index 0116061..816a93e 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
 	'tomlplusplus',
 	'cpp',
-	version : '2.3.1',
+	version : '2.4.0',
 	meson_version : '>=0.53.0',
 	license : 'MIT',
 	default_options : [ # https://mesonbuild.com/Builtin-options.html
@@ -299,7 +299,7 @@ compiler_supports_char8 = compiler_supports_cpp20 and compiler.links('''
 	#include <type_traits>
 	using namespace std::string_view_literals;
 
-	#ifndef __cpp_lib_char8_t
+	#if !defined(__cpp_char8_t)	|| __cpp_char8_t < 201811 || !defined(__cpp_lib_char8_t) || __cpp_lib_char8_t < 201907
 		#error oh noes
 	#endif
 
diff --git a/tests/impl_toml.cpp b/tests/impl_toml.cpp
index 178e6d2..3d65a62 100644
--- a/tests/impl_toml.cpp
+++ b/tests/impl_toml.cpp
@@ -91,7 +91,7 @@ namespace toml
 	CHECK_CAN_REPRESENT_NATIVE(const char*const,		true);
 	CHECK_CAN_REPRESENT_NATIVE(std::string,				true);
 	CHECK_CAN_REPRESENT_NATIVE(std::string_view,		true);
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 	CHECK_CAN_REPRESENT_NATIVE(char8_t*,				false);
 	CHECK_CAN_REPRESENT_NATIVE(char8_t*const,			false);
 	CHECK_CAN_REPRESENT_NATIVE(char8_t[2],				false);
@@ -137,7 +137,7 @@ namespace toml
 	CHECK_VALUE_EXACT(	const char*,					const char*);
 	CHECK_VALUE_EXACT(	std::string_view,				std::string_view);
 	CHECK_VALUE_EXACT(	std::string,					std::string);
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 	CHECK_VALUE_EXACT(	const char8_t*,					const char8_t*);
 	CHECK_VALUE_EXACT(	std::u8string_view,				std::u8string_view);
 	CHECK_VALUE_EXACT(	std::u8string,					std::u8string);
@@ -217,7 +217,7 @@ namespace toml
 	CHECK_VALUE_OR(		const std::string,				std::string);
 	CHECK_VALUE_OR(		const std::string&,				std::string);
 	CHECK_VALUE_OR(		const std::string&&,			std::string);
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 	CHECK_VALUE_OR(		char8_t*,						const char8_t*);
 	CHECK_VALUE_OR(		char8_t*&,						const char8_t*);
 	CHECK_VALUE_OR(		char8_t*&&,						const char8_t*);
diff --git a/tests/manipulating_values.cpp b/tests/manipulating_values.cpp
index 8dec484..01643ff 100644
--- a/tests/manipulating_values.cpp
+++ b/tests/manipulating_values.cpp
@@ -50,7 +50,7 @@ TEST_CASE("values - construction")
 	CHECK_VALUE_INIT("kek"s,					std::string);
 	CHECK_VALUE_INIT("kek"sv,					std::string);
 	CHECK_VALUE_INIT2("kek"sv.data(),			std::string,	"kek"sv);
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 	CHECK_VALUE_INIT2(u8"kek",					std::string,	"kek"sv);
 	CHECK_VALUE_INIT2(u8"kek"s,					std::string,	"kek"sv);
 	CHECK_VALUE_INIT2(u8"kek"sv,				std::string,	"kek"sv);
diff --git a/toml.hpp b/toml.hpp
index 3caa880..6e95072 100644
--- a/toml.hpp
+++ b/toml.hpp
@@ -1,6 +1,6 @@
 //----------------------------------------------------------------------------------------------------------------------
 //
-// toml++ v2.3.1
+// toml++ v2.4.0
 // https://github.com/marzer/tomlplusplus
 // SPDX-License-Identifier: MIT
 //
@@ -558,7 +558,7 @@ is no longer necessary.
 
 #define TOML_NO_DEFAULT_CASE	default: TOML_UNREACHABLE
 
-#if defined(__cpp_consteval) \
+#if defined(__cpp_consteval) && __cpp_consteval >= 201811 \
 		&& (!defined(_MSC_FULL_VER) || _MSC_FULL_VER != 192930031)
 		// https://developercommunity.visualstudio.com/t/Erroneous-C7595-error-with-consteval-in/1404234
 	#define TOML_CONSTEVAL		consteval
@@ -573,13 +573,13 @@ is no longer necessary.
 #endif
 
 #if !defined(DOXYGEN) && !TOML_INTELLISENSE
-	#if !defined(TOML_LIKELY) && TOML_HAS_ATTR(likely)
+	#if !defined(TOML_LIKELY) && TOML_HAS_ATTR(likely) >= 201803
 		#define TOML_LIKELY(...)	(__VA_ARGS__) [[likely]]
 	#endif
-	#if !defined(TOML_UNLIKELY) && TOML_HAS_ATTR(unlikely)
+	#if !defined(TOML_UNLIKELY) && TOML_HAS_ATTR(unlikely) >= 201803
 		#define TOML_UNLIKELY(...)	(__VA_ARGS__) [[unlikely]]
 	#endif
-	#if TOML_HAS_ATTR(nodiscard) >= 201907L
+	#if TOML_HAS_ATTR(nodiscard) >= 201907
 		#define TOML_NODISCARD_CTOR [[nodiscard]]
 	#endif
 #endif
@@ -674,8 +674,8 @@ is no longer necessary.
 #endif
 
 #define TOML_LIB_MAJOR		2
-#define TOML_LIB_MINOR		3
-#define TOML_LIB_PATCH		1
+#define TOML_LIB_MINOR		4
+#define TOML_LIB_PATCH		0
 
 #define TOML_LANG_MAJOR		1
 #define TOML_LANG_MINOR		0
@@ -777,20 +777,25 @@ TOML_DISABLE_WARNINGS;
 #include <vector>
 #include <map>
 #include <iosfwd>
+#include <new>
 #if !TOML_HAS_CUSTOM_OPTIONAL_TYPE
 	#include <optional>
 #endif
-#if TOML_HAS_INCLUDE(<version>)
-	#include <version>
-#endif
 TOML_ENABLE_WARNINGS;
 
-#ifdef __cpp_lib_launder
+#if defined(__cpp_lib_launder) && __cpp_lib_launder >= 201606
 	#define TOML_LAUNDER(x)	std::launder(x)
 #else
 	#define TOML_LAUNDER(x)	x
 #endif
 
+#if defined(__cpp_char8_t)	&& __cpp_char8_t >= 201811 \
+		&& defined(__cpp_lib_char8_t) && __cpp_lib_char8_t >= 201907
+	#define TOML_HAS_CHAR8 1
+#else
+	#define TOML_HAS_CHAR8 0
+#endif
+
 #ifndef TOML_DISABLE_ENVIRONMENT_CHECKS
 #define TOML_ENV_MESSAGE																							\
 	"If you're seeing this error it's because you're building toml++ for an environment that doesn't conform to "	\
@@ -916,7 +921,7 @@ TOML_NAMESPACE_START // abi namespace
 		#if TOML_WINDOWS_COMPAT
 		[[nodiscard]] TOML_API std::string narrow(std::wstring_view) noexcept;
 		[[nodiscard]] TOML_API std::wstring widen(std::string_view) noexcept;
-		#ifdef __cpp_lib_char8_t
+		#if TOML_HAS_CHAR8
 		[[nodiscard]] TOML_API std::wstring widen(std::u8string_view) noexcept;
 		#endif
 		#endif // TOML_WINDOWS_COMPAT
@@ -1150,7 +1155,7 @@ TOML_IMPL_NAMESPACE_START
 	template <size_t N> struct value_traits<const char[N]>		: string_value_traits<const char[N]> {};
 	template <>         struct value_traits<char*>				: string_value_traits<char*> {};
 	template <size_t N> struct value_traits<char[N]>			: string_value_traits<char[N]> {};
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 	template <>         struct value_traits<std::u8string>		: string_value_traits<std::u8string> {};
 	template <>         struct value_traits<std::u8string_view>	: string_value_traits<std::u8string_view> {};
 	template <>         struct value_traits<const char8_t*>		: string_value_traits<const char8_t*> {};
@@ -1898,7 +1903,7 @@ TOML_IMPL_NAMESPACE_START
 		stream.write(reinterpret_cast<const Char*>(str), static_cast<std::streamsize>(len));
 	}
 
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 
 	template <typename Char>
 	inline void print_to_stream(char8_t character, std::basic_ostream<Char>& stream)
@@ -2777,7 +2782,7 @@ TOML_NAMESPACE_END;
 		#define TOML_SA_VALUE_MESSAGE_WSTRING
 	#endif
 
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 		#define TOML_SA_VALUE_MESSAGE_U8STRING_VIEW		TOML_SA_LIST_SEP "std::u8string_view"
 		#define TOML_SA_VALUE_MESSAGE_CONST_CHAR8		TOML_SA_LIST_SEP "const char8_t*"
 	#else
@@ -2857,7 +2862,7 @@ TOML_IMPL_NAMESPACE_START
 		}
 	};
 
-	#if defined(__cpp_lib_char8_t) || TOML_WINDOWS_COMPAT
+	#if TOML_HAS_CHAR8 || TOML_WINDOWS_COMPAT
 
 	struct string_maker
 	{
@@ -2865,12 +2870,12 @@ TOML_IMPL_NAMESPACE_START
 		[[nodiscard]]
 		static std::string make(T&& arg) noexcept
 		{
-			#ifdef __cpp_lib_char8_t
+			#if TOML_HAS_CHAR8
 			if constexpr (is_one_of<std::decay_t<T>, char8_t*, const char8_t*>)
 				return std::string(reinterpret_cast<const char*>(static_cast<const char8_t*>(arg)));
 			else if constexpr (is_one_of<remove_cvref_t<T>, std::u8string, std::u8string_view>)
 				return std::string(reinterpret_cast<const char*>(static_cast<const char8_t*>(arg.data())), arg.length());
-			#endif // __cpp_lib_char8_t
+			#endif // TOML_HAS_CHAR8
 
 			#if TOML_WINDOWS_COMPAT
 			if constexpr (is_wide_string<T>)
@@ -2878,12 +2883,12 @@ TOML_IMPL_NAMESPACE_START
 			#endif // TOML_WINDOWS_COMPAT
 		}
 	};
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 	template <>	struct native_value_maker<std::string, char8_t*>			: string_maker {};
 	template <>	struct native_value_maker<std::string, const char8_t*>		: string_maker {};
 	template <>	struct native_value_maker<std::string, std::u8string>		: string_maker {};
 	template <>	struct native_value_maker<std::string, std::u8string_view>	: string_maker {};
-	#endif // __cpp_lib_char8_t
+	#endif // TOML_HAS_CHAR8
 	#if TOML_WINDOWS_COMPAT
 	template <>	struct native_value_maker<std::string, wchar_t*>			: string_maker {};
 	template <>	struct native_value_maker<std::string, const wchar_t*>		: string_maker {};
@@ -2891,7 +2896,7 @@ TOML_IMPL_NAMESPACE_START
 	template <>	struct native_value_maker<std::string, std::wstring_view>	: string_maker {};
 	#endif // TOML_WINDOWS_COMPAT
 
-	#endif // defined(__cpp_lib_char8_t) || TOML_WINDOWS_COMPAT
+	#endif // TOML_HAS_CHAR8 || TOML_WINDOWS_COMPAT
 
 	template <typename T>
 	[[nodiscard]]
@@ -3283,7 +3288,7 @@ TOML_NAMESPACE_START
 				#endif
 			}
 
-			#ifdef __cpp_lib_char8_t
+			#if TOML_HAS_CHAR8
 
 			// char -> char8_t (potentially unsafe - the feature is 'experimental'!)
 			else if constexpr (is_one_of<T, std::u8string, std::u8string_view>)
@@ -3501,14 +3506,14 @@ TOML_NAMESPACE_START
 
 				TOML_SA_LIST_NXT "A compatible view type"
 				TOML_SA_LIST_BEG "std::string_view"
-				#ifdef __cpp_lib_char8_t
+				#if TOML_HAS_CHAR8
 				TOML_SA_LIST_SEP "std::u8string_view"
 				#endif
 				#if TOML_WINDOWS_COMPAT
 				TOML_SA_LIST_SEP "std::wstring_view"
 				#endif
 				TOML_SA_LIST_SEP "const char*"
-				#ifdef __cpp_lib_char8_t
+				#if TOML_HAS_CHAR8
 				TOML_SA_LIST_SEP "const char8_t*"
 				#endif
 				#if TOML_WINDOWS_COMPAT
@@ -3567,7 +3572,7 @@ TOML_NAMESPACE_START
 	TOML_EXTERN(value, time);
 	TOML_EXTERN(value, date_time);
 	TOML_EXTERN(value, bool);
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 	TOML_EXTERN(value_exact, std::u8string_view);
 	TOML_EXTERN(value_exact, std::u8string);
 	TOML_EXTERN(value_exact, const char8_t*);
@@ -5139,7 +5144,7 @@ TOML_NAMESPACE_START
 	TOML_EXTERN(value, time);
 	TOML_EXTERN(value, date_time);
 	TOML_EXTERN(value, bool);
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 	TOML_EXTERN(value_exact, std::u8string_view);
 	TOML_EXTERN(value_exact, std::u8string);
 	TOML_EXTERN(value_exact, const char8_t*);
@@ -6852,24 +6857,14 @@ TOML_IMPL_NAMESPACE_START
 {
 	TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, ex, noex);
 
-	[[nodiscard]] TOML_API parse_result do_parse(utf8_reader_interface&&) TOML_MAY_THROW;
+	[[nodiscard]]
+	TOML_API
+	parse_result do_parse(utf8_reader_interface&&) TOML_MAY_THROW;
 
 	TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS
 }
 TOML_IMPL_NAMESPACE_END;
 
-#if TOML_EXCEPTIONS
-	#define TOML_THROW_PARSE_ERROR(msg, path)												\
-		throw parse_error{																	\
-			msg, source_position{}, std::make_shared<const std::string>(std::move(path))	\
-		}
-#else
-	#define TOML_THROW_PARSE_ERROR(msg, path)												\
-		return parse_result{ parse_error{													\
-			msg, source_position{}, std::make_shared<const std::string>(std::move(path))	\
-		}}
-#endif
-
 TOML_NAMESPACE_START
 {
 	TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, ex, noex);
@@ -6890,7 +6885,7 @@ TOML_NAMESPACE_START
 
 	#endif // TOML_WINDOWS_COMPAT
 
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 
 	[[nodiscard]]
 	TOML_API
@@ -6908,7 +6903,7 @@ TOML_NAMESPACE_START
 
 	#endif // TOML_WINDOWS_COMPAT
 
-	#endif // __cpp_lib_char8_t
+	#endif // TOML_HAS_CHAR8
 
 	template <typename Char>
 	[[nodiscard]]
@@ -6945,99 +6940,30 @@ TOML_NAMESPACE_START
 
 	#endif // TOML_WINDOWS_COMPAT
 
-	// Q: "why are the parse_file functions templated??"
-	// A: I don't want to force users to drag in <fstream> if they're not going to do
-	//    any parsing directly from files. Keeping them templated delays their instantiation
-	//    until they're actually required, so only those users wanting to use parse_file()
-	//    are burdened by the <fstream> overhead.
-
-	template <typename Char, typename StreamChar = char>
-	[[nodiscard]]
-	inline parse_result parse_file(std::basic_string_view<Char> file_path) TOML_MAY_THROW
-	{
-		static_assert(
-			!std::is_same_v<Char, wchar_t> || TOML_WINDOWS_COMPAT,
-			"Wide-character file paths are only supported on Windows with TOML_WINDOWS_COMPAT enabled."
-		);
-		#if TOML_WINDOWS_COMPAT
-			static_assert(
-				sizeof(Char) == 1 || std::is_same_v<Char, wchar_t>,
-				"The file path's underlying character type must be wchar_t or be 1 byte in size."
-			);
-		#else
-			static_assert(
-				sizeof(Char) == 1,
-				"The file path's underlying character type must be 1 byte in size."
-			);
-		#endif
-		static_assert(
-			std::is_same_v<StreamChar, char>,
-			"StreamChar must be 'char' (it is as an instantiation-delaying hack and is not user-configurable)."
-		);
-
-		std::string file_path_str;
-		#if TOML_WINDOWS_COMPAT
-		if constexpr (std::is_same_v<Char, wchar_t>)
-			file_path_str = impl::narrow(file_path);
-		else
-		#endif
-			file_path_str = std::string_view{ reinterpret_cast<const char*>(file_path.data()), file_path.length() };
-
-		// open file with a custom-sized stack buffer
-		using ifstream = std::basic_ifstream<StreamChar>;
-		ifstream file;
-		StreamChar file_buffer[sizeof(void*) * 1024_sz];
-		file.rdbuf()->pubsetbuf(file_buffer, sizeof(file_buffer));
-		file.open(file_path_str, ifstream::in | ifstream::binary | ifstream::ate);
-		if (!file.is_open())
-			TOML_THROW_PARSE_ERROR("File could not be opened for reading", file_path_str);
-
-		// get size
-		const auto file_size = file.tellg();
-		if (file_size == -1)
-			TOML_THROW_PARSE_ERROR("Could not determine file size", file_path_str);
-		file.seekg(0, ifstream::beg);
-
-		// read the whole file into memory first if the file isn't too large
-		constexpr auto large_file_threshold = 1024 * 1024 * static_cast<int>(sizeof(void*)) * 4; // 32 megabytes on 64-bit
-		if (file_size <= large_file_threshold)
-		{
-			std::vector<StreamChar> file_data;
-			file_data.resize(static_cast<size_t>(file_size));
-			file.read(file_data.data(), static_cast<std::streamsize>(file_size));
-			return parse(std::basic_string_view<StreamChar>{ file_data.data(), file_data.size() }, std::move(file_path_str));
-		}
-
-		// otherwise parse it using the streams
-		else
-			return parse(file, std::move(file_path_str));
-	}
-
 	#if !defined(DOXYGEN) && !TOML_HEADER_ONLY
 		extern template TOML_API parse_result parse(std::istream&, std::string_view) TOML_MAY_THROW;
 		extern template TOML_API parse_result parse(std::istream&, std::string&&) TOML_MAY_THROW;
-		extern template TOML_API parse_result parse_file(std::string_view) TOML_MAY_THROW;
-		#ifdef __cpp_lib_char8_t
-			extern template TOML_API parse_result parse_file(std::u8string_view) TOML_MAY_THROW;
-		#endif
-		#if TOML_WINDOWS_COMPAT
-			extern template TOML_API parse_result parse_file(std::wstring_view) TOML_MAY_THROW;
-		#endif
 	#endif
 
-	template <typename Char>
 	[[nodiscard]]
-	inline parse_result parse_file(const std::basic_string<Char>& file_path) TOML_MAY_THROW
-	{
-		return parse_file(std::basic_string_view<Char>{ file_path });
-	}
+	TOML_API
+	parse_result parse_file(std::string_view file_path) TOML_MAY_THROW;
+
+	#if TOML_HAS_CHAR8
 
-	template <typename Char>
 	[[nodiscard]]
-	inline parse_result parse_file(const Char* file_path) TOML_MAY_THROW
-	{
-		return parse_file(std::basic_string_view<Char>{ file_path });
-	}
+	TOML_API
+	parse_result parse_file(std::u8string_view file_path) TOML_MAY_THROW;
+
+	#endif // TOML_HAS_CHAR8
+
+	#if TOML_WINDOWS_COMPAT
+
+	[[nodiscard]]
+	TOML_API
+	parse_result parse_file(std::wstring_view file_path) TOML_MAY_THROW;
+
+	#endif // TOML_WINDOWS_COMPAT
 
 	TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS
 
@@ -7049,21 +6975,19 @@ TOML_NAMESPACE_START
 		TOML_API
 		parse_result operator"" _toml(const char* str, size_t len) TOML_MAY_THROW;
 
-		#ifdef __cpp_lib_char8_t
+		#if TOML_HAS_CHAR8
 
 		[[nodiscard]]
 		TOML_API
 		parse_result operator"" _toml(const char8_t* str, size_t len) TOML_MAY_THROW;
 
-		#endif // __cpp_lib_char8_t
+		#endif // TOML_HAS_CHAR8
 
 		TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS
 	}
 }
 TOML_NAMESPACE_END;
 
-#undef TOML_THROW_PARSE_ERROR
-
 #endif //----------------------------------  ↑ toml_parser.h  ----------------------------------------------------------
 
 #endif // TOML_PARSER
@@ -8162,7 +8086,6 @@ TOML_NAMESPACE_START
 		return index < elements.size() ? elements[index].get() : nullptr;
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	bool operator == (const array& lhs, const array& rhs) noexcept
 	{
@@ -8188,7 +8111,6 @@ TOML_NAMESPACE_START
 		return true;
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	bool operator != (const array& lhs, const array& rhs) noexcept
 	{
@@ -8586,7 +8508,6 @@ TOML_NAMESPACE_START
 
 	#endif // TOML_WINDOWS_COMPAT
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	bool operator == (const table& lhs, const table& rhs) noexcept
 	{
@@ -8616,7 +8537,6 @@ TOML_NAMESPACE_START
 		return true;
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	bool operator != (const table& lhs, const table& rhs) noexcept
 	{
@@ -8730,6 +8650,7 @@ TOML_IMPL_NAMESPACE_END;
 
 TOML_DISABLE_WARNINGS;
 #include <cmath>
+#include <fstream>
 #if TOML_INT_CHARCONV || TOML_FLOAT_CHARCONV
 	#include <charconv>
 #endif
@@ -9097,6 +9018,7 @@ TOML_IMPL_NAMESPACE_START
 	#define is_eof()							!cp
 	#define assert_not_eof()					assert_or_assume(cp != nullptr)
 	#define return_if_eof(...)					do { if (is_eof()) return __VA_ARGS__; } while(false)
+
 	#if TOML_EXCEPTIONS
 		#define is_error()						false
 		#define return_after_error(...)			TOML_UNREACHABLE
@@ -9110,13 +9032,18 @@ TOML_IMPL_NAMESPACE_START
 		#define return_if_error(...)			do { if (is_error()) return __VA_ARGS__; } while(false)
 		#define return_if_error_or_eof(...)		do { if (is_eof() || is_error()) return __VA_ARGS__; } while(false)
 	#endif
+
 	#define set_error_and_return(ret, ...)		\
 		do { if (!is_error()) set_error(__VA_ARGS__); return_after_error(ret); } while(false)
+
 	#define set_error_and_return_default(...)	set_error_and_return({}, __VA_ARGS__)
+
 	#define set_error_and_return_if_eof(...)	\
 		do { if (is_eof()) set_error_and_return(__VA_ARGS__, "encountered end-of-file"sv); } while(false)
+
 	#define advance_and_return_if_error(...)	\
 		do { assert_not_eof(); advance(); return_if_error(__VA_ARGS__); } while (false)
+
 	#define advance_and_return_if_error_or_eof(...)		\
 		do {											\
 			assert_not_eof();							\
@@ -11762,13 +11689,61 @@ TOML_IMPL_NAMESPACE_START
 		return reinterpret_cast<table*>(tab.release());
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	parse_result do_parse(utf8_reader_interface&& reader) TOML_MAY_THROW
 	{
 		return impl::parser{ std::move(reader) };
 	}
 
+	[[nodiscard]]
+	TOML_INTERNAL_LINKAGE
+	parse_result do_parse_file(std::string_view file_path) TOML_MAY_THROW
+	{
+		#if TOML_EXCEPTIONS
+		#define TOML_PARSE_FILE_ERROR(msg, path)													\
+				throw parse_error{																	\
+					msg, source_position{}, std::make_shared<const std::string>(std::move(path))	\
+				}
+		#else
+		#define TOML_PARSE_FILE_ERROR(msg, path)													\
+				return parse_result{ parse_error{													\
+					msg, source_position{}, std::make_shared<const std::string>(std::move(path))	\
+				}}
+		#endif
+
+		std::string file_path_str(file_path);
+
+		// open file with a custom-sized stack buffer
+		std::ifstream file;
+		char file_buffer[sizeof(void*) * 1024_sz];
+		file.rdbuf()->pubsetbuf(file_buffer, sizeof(file_buffer));
+		file.open(file_path_str, std::ifstream::in | std::ifstream::binary | std::ifstream::ate);
+		if (!file.is_open())
+			TOML_PARSE_FILE_ERROR("File could not be opened for reading", file_path_str);
+
+		// get size
+		const auto file_size = file.tellg();
+		if (file_size == -1)
+			TOML_PARSE_FILE_ERROR("Could not determine file size", file_path_str);
+		file.seekg(0, std::ifstream::beg);
+
+		// read the whole file into memory first if the file isn't too large
+		constexpr auto large_file_threshold = 1024 * 1024 * 2; // 2 MB
+		if (file_size <= large_file_threshold)
+		{
+			std::vector<char> file_data;
+			file_data.resize(static_cast<size_t>(file_size));
+			file.read(file_data.data(), static_cast<std::streamsize>(file_size));
+			return parse(std::string_view{ file_data.data(), file_data.size() }, std::move(file_path_str));
+		}
+
+		// otherwise parse it using the streams
+		else
+			return parse(file, std::move(file_path_str));
+
+		#undef TOML_PARSE_FILE_ERROR
+	}
+
 	TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS
 
 	#undef push_parse_scope_2
@@ -11796,59 +11771,74 @@ TOML_NAMESPACE_START
 {
 	TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, ex, noex);
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	parse_result parse(std::string_view doc, std::string_view source_path) TOML_MAY_THROW
 	{
 		return impl::do_parse(impl::utf8_reader{ doc, source_path });
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	parse_result parse(std::string_view doc, std::string&& source_path) TOML_MAY_THROW
 	{
 		return impl::do_parse(impl::utf8_reader{ doc, std::move(source_path) });
 	}
 
-	#if TOML_WINDOWS_COMPAT
-
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
-	parse_result parse(std::string_view doc, std::wstring_view source_path) TOML_MAY_THROW
+	parse_result parse_file(std::string_view file_path) TOML_MAY_THROW
 	{
-		return impl::do_parse(impl::utf8_reader{ doc, impl::narrow(source_path) });
+		return impl::do_parse_file(file_path);
 	}
 
-	#endif // TOML_WINDOWS_COMPAT
+	#if TOML_HAS_CHAR8
 
-	#ifdef __cpp_lib_char8_t
-
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	parse_result parse(std::u8string_view doc, std::string_view source_path) TOML_MAY_THROW
 	{
 		return impl::do_parse(impl::utf8_reader{ doc, source_path });
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	parse_result parse(std::u8string_view doc, std::string&& source_path) TOML_MAY_THROW
 	{
 		return impl::do_parse(impl::utf8_reader{ doc, std::move(source_path) });
 	}
 
+	TOML_EXTERNAL_LINKAGE
+	parse_result parse_file(std::u8string_view file_path) TOML_MAY_THROW
+	{
+		std::string file_path_str;
+		file_path_str.resize(file_path.length());
+		memcpy(file_path_str.data(), file_path.data(), file_path.length());
+		return impl::do_parse_file(file_path_str);
+	}
+
+	#endif // TOML_HAS_CHAR8
+
 	#if TOML_WINDOWS_COMPAT
 
-	TOML_API
+	TOML_EXTERNAL_LINKAGE
+	parse_result parse(std::string_view doc, std::wstring_view source_path) TOML_MAY_THROW
+	{
+		return impl::do_parse(impl::utf8_reader{ doc, impl::narrow(source_path) });
+	}
+
+	TOML_EXTERNAL_LINKAGE
+	parse_result parse_file(std::wstring_view file_path) TOML_MAY_THROW
+	{
+		return impl::do_parse_file(impl::narrow(file_path));
+	}
+
+	#endif // TOML_WINDOWS_COMPAT
+
+	#if TOML_HAS_CHAR8 && TOML_WINDOWS_COMPAT
+
 	TOML_EXTERNAL_LINKAGE
 	parse_result parse(std::u8string_view doc, std::wstring_view source_path) TOML_MAY_THROW
 	{
 		return impl::do_parse(impl::utf8_reader{ doc, impl::narrow(source_path) });
 	}
 
-	#endif // TOML_WINDOWS_COMPAT
-
-	#endif // __cpp_lib_char8_t
+	#endif // TOML_HAS_CHAR8 && TOML_WINDOWS_COMPAT
 
 	TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS
 
@@ -11856,23 +11846,21 @@ TOML_NAMESPACE_START
 	{
 		TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, lit_ex, lit_noex);
 
-		TOML_API
 		TOML_EXTERNAL_LINKAGE
 		parse_result operator"" _toml(const char* str, size_t len) TOML_MAY_THROW
 		{
 			return parse(std::string_view{ str, len });
 		}
 
-		#ifdef __cpp_lib_char8_t
+		#if TOML_HAS_CHAR8
 
-		TOML_API
 		TOML_EXTERNAL_LINKAGE
 		parse_result operator"" _toml(const char8_t* str, size_t len) TOML_MAY_THROW
 		{
 			return parse(std::u8string_view{ str, len });
 		}
 
-		#endif // __cpp_lib_char8_t
+		#endif // TOML_HAS_CHAR8
 
 		TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS
 	}
@@ -11899,7 +11887,6 @@ TOML_IMPL_NAMESPACE_START
 {
 	inline constexpr size_t default_formatter_line_wrap = 120_sz;
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	std::string default_formatter_make_key_segment(const std::string& str) noexcept
 	{
@@ -11944,7 +11931,6 @@ TOML_IMPL_NAMESPACE_START
 		}
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	size_t default_formatter_inline_columns(const node& node) noexcept
 	{
@@ -12028,7 +12014,6 @@ TOML_IMPL_NAMESPACE_START
 		TOML_UNREACHABLE;
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	bool default_formatter_forces_multiline(const node& node, size_t starting_column_bias) noexcept
 	{
@@ -12105,7 +12090,6 @@ extern "C"
 
 TOML_IMPL_NAMESPACE_START
 {
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	std::string narrow(std::wstring_view str) noexcept
 	{
@@ -12124,7 +12108,6 @@ TOML_IMPL_NAMESPACE_START
 		return s;
 	}
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	std::wstring widen(std::string_view str) noexcept
 	{
@@ -12141,9 +12124,8 @@ TOML_IMPL_NAMESPACE_START
 		return s;
 	}
 
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 
-	TOML_API
 	TOML_EXTERNAL_LINKAGE
 	std::wstring widen(std::u8string_view str) noexcept
 	{
@@ -12153,7 +12135,7 @@ TOML_IMPL_NAMESPACE_START
 		return widen(std::string_view{ reinterpret_cast<const char*>(str.data()), str.length() });
 	}
 
-	#endif // __cpp_lib_char8_t
+	#endif // TOML_HAS_CHAR8
 }
 TOML_IMPL_NAMESPACE_END;
 
@@ -12223,7 +12205,6 @@ TOML_POP_WARNINGS; // TOML_DISABLE_SWITCH_WARNINGS
 TOML_DISABLE_WARNINGS;
 #include <ostream>
 #include <istream>
-#include <fstream>
 TOML_ENABLE_WARNINGS;
 
 #if TOML_PARSER
@@ -12234,10 +12215,10 @@ TOML_ENABLE_WARNINGS;
 TOML_IMPL_NAMESPACE_START
 {
 	// formatters
-	template class TOML_API formatter<char>;
+	template class formatter<char>;
 
 	// print to stream machinery
-	template TOML_API void print_floating_point_to_stream(double, std::ostream&, bool);
+	template void print_floating_point_to_stream(double, std::ostream&, bool);
 }
 TOML_IMPL_NAMESPACE_END;
 
@@ -12245,51 +12226,51 @@ TOML_IMPL_NAMESPACE_END;
 TOML_NAMESPACE_START
 {
 	// value<>
-	template class TOML_API value<std::string>;
-	template class TOML_API value<int64_t>;
-	template class TOML_API value<double>;
-	template class TOML_API value<bool>;
-	template class TOML_API value<date>;
-	template class TOML_API value<time>;
-	template class TOML_API value<date_time>;
+	template class value<std::string>;
+	template class value<int64_t>;
+	template class value<double>;
+	template class value<bool>;
+	template class value<date>;
+	template class value<time>;
+	template class value<date_time>;
 
 	// node_view
-	template class TOML_API node_view<node>;
-	template class TOML_API node_view<const node>;
+	template class node_view<node>;
+	template class node_view<const node>;
 
 	// formatters
-	template class TOML_API default_formatter<char>;
-	template class TOML_API json_formatter<char>;
+	template class default_formatter<char>;
+	template class json_formatter<char>;
 
 	// various ostream operators
-	template TOML_API std::ostream& operator << (std::ostream&, const source_position&);
-	template TOML_API std::ostream& operator << (std::ostream&, const source_region&);
-	template TOML_API std::ostream& operator << (std::ostream&, const date&);
-	template TOML_API std::ostream& operator << (std::ostream&, const time&);
-	template TOML_API std::ostream& operator << (std::ostream&, const time_offset&);
-	template TOML_API std::ostream& operator << (std::ostream&, const date_time&);
-	template TOML_API std::ostream& operator << (std::ostream&, const value<std::string>&);
-	template TOML_API std::ostream& operator << (std::ostream&, const value<int64_t>&);
-	template TOML_API std::ostream& operator << (std::ostream&, const value<double>&);
-	template TOML_API std::ostream& operator << (std::ostream&, const value<bool>&);
-	template TOML_API std::ostream& operator << (std::ostream&, const value<toml::date>&);
-	template TOML_API std::ostream& operator << (std::ostream&, const value<toml::time>&);
-	template TOML_API std::ostream& operator << (std::ostream&, const value<toml::date_time>&);
-	template TOML_API std::ostream& operator << (std::ostream&, default_formatter<char>&);
-	template TOML_API std::ostream& operator << (std::ostream&, default_formatter<char>&&);
-	template TOML_API std::ostream& operator << (std::ostream&, json_formatter<char>&);
-	template TOML_API std::ostream& operator << (std::ostream&, json_formatter<char>&&);
-	template TOML_API std::ostream& operator << (std::ostream&, const table&);
-	template TOML_API std::ostream& operator << (std::ostream&, const array&);
-	template TOML_API std::ostream& operator << (std::ostream&, const node_view<node>&);
-	template TOML_API std::ostream& operator << (std::ostream&, const node_view<const node>&);
-	template TOML_API std::ostream& operator << (std::ostream&, node_type);
+	template std::ostream& operator << (std::ostream&, const source_position&);
+	template std::ostream& operator << (std::ostream&, const source_region&);
+	template std::ostream& operator << (std::ostream&, const date&);
+	template std::ostream& operator << (std::ostream&, const time&);
+	template std::ostream& operator << (std::ostream&, const time_offset&);
+	template std::ostream& operator << (std::ostream&, const date_time&);
+	template std::ostream& operator << (std::ostream&, const value<std::string>&);
+	template std::ostream& operator << (std::ostream&, const value<int64_t>&);
+	template std::ostream& operator << (std::ostream&, const value<double>&);
+	template std::ostream& operator << (std::ostream&, const value<bool>&);
+	template std::ostream& operator << (std::ostream&, const value<toml::date>&);
+	template std::ostream& operator << (std::ostream&, const value<toml::time>&);
+	template std::ostream& operator << (std::ostream&, const value<toml::date_time>&);
+	template std::ostream& operator << (std::ostream&, default_formatter<char>&);
+	template std::ostream& operator << (std::ostream&, default_formatter<char>&&);
+	template std::ostream& operator << (std::ostream&, json_formatter<char>&);
+	template std::ostream& operator << (std::ostream&, json_formatter<char>&&);
+	template std::ostream& operator << (std::ostream&, const table&);
+	template std::ostream& operator << (std::ostream&, const array&);
+	template std::ostream& operator << (std::ostream&, const node_view<node>&);
+	template std::ostream& operator << (std::ostream&, const node_view<const node>&);
+	template std::ostream& operator << (std::ostream&, node_type);
 
 	// node::value, node_view:::value etc
 	#define TOML_INSTANTIATE(name, T)														\
-		template TOML_API optional<T>		node::name<T>() const noexcept;					\
-		template TOML_API optional<T>		node_view<node>::name<T>() const noexcept;		\
-		template TOML_API optional<T>		node_view<const node>::name<T>() const noexcept
+		template optional<T>		node::name<T>() const noexcept;					\
+		template optional<T>		node_view<node>::name<T>() const noexcept;		\
+		template optional<T>		node_view<const node>::name<T>() const noexcept
 	TOML_INSTANTIATE(value_exact, std::string_view);
 	TOML_INSTANTIATE(value_exact, std::string);
 	TOML_INSTANTIATE(value_exact, const char*);
@@ -12318,7 +12299,7 @@ TOML_NAMESPACE_START
 	TOML_INSTANTIATE(value, time);
 	TOML_INSTANTIATE(value, date_time);
 	TOML_INSTANTIATE(value, bool);
-	#ifdef __cpp_lib_char8_t
+	#if TOML_HAS_CHAR8
 	TOML_INSTANTIATE(value_exact, std::u8string_view);
 	TOML_INSTANTIATE(value_exact, std::u8string);
 	TOML_INSTANTIATE(value_exact, const char8_t*);
@@ -12336,20 +12317,13 @@ TOML_NAMESPACE_START
 	#if TOML_PARSER
 
 		// parse error ostream
-		template TOML_API std::ostream& operator << (std::ostream&, const parse_error&);
+		template std::ostream& operator << (std::ostream&, const parse_error&);
 
 		// parse() and parse_file()
 		TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, ex, noex);
 
-		template TOML_API parse_result parse(std::istream&, std::string_view) TOML_MAY_THROW;
-		template TOML_API parse_result parse(std::istream&, std::string&&) TOML_MAY_THROW;
-		template TOML_API parse_result parse_file(std::string_view) TOML_MAY_THROW;
-		#ifdef __cpp_lib_char8_t
-			template TOML_API parse_result parse_file(std::u8string_view) TOML_MAY_THROW;
-		#endif
-		#if TOML_WINDOWS_COMPAT
-			template TOML_API parse_result parse_file(std::wstring_view) TOML_MAY_THROW;
-		#endif
+		template parse_result parse(std::istream&, std::string_view) TOML_MAY_THROW;
+		template parse_result parse(std::istream&, std::string&&) TOML_MAY_THROW;
 
 		TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS
 
@@ -12406,6 +12380,7 @@ TOML_POP_WARNINGS; // TOML_DISABLE_SPAM_WARNINGS
 	#undef TOML_GCC
 	#undef TOML_HAS_ATTR
 	#undef TOML_HAS_CUSTOM_OPTIONAL_TYPE
+	#undef TOML_HAS_CHAR8
 	#undef TOML_HAS_INCLUDE
 	#undef TOML_ICC
 	#undef TOML_ICC_CL
diff --git a/tools/requirements.txt b/tools/requirements.txt
index 5ea4eac..a020af4 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -1,4 +1,4 @@
 misk>=0.4.0
-poxy>=0.3.1
+poxy>=0.3.2
 pyyaml
 python-dateutil