mirror/tomlplusplus
1
0
Fork 0
mirror of https://github.com/marzer/tomlplusplus.git synced 2024-09-15 15:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor preprocessor/doxygen cleanup

Browse Source
This commit is contained in:
Mark Gillard 2020-06-23 13:04:05 +03:00
parent 0d8f794feb
commit 00a8d14a49
10 changed files with 54 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
docs/Doxyfile
View File

@ -133,50 +133,8 @@ WARN_LOGFILE = ./doc/doxygen_warnings.log
#---------------------------------------------------------------------------
INPUT = ../include
INPUT_ENCODING = UTF-8
FILE_PATTERNS = *.c \
*.cc \
*.cxx \
*.cpp \
*.c++ \
*.java \
*.ii \
*.ixx \
*.ipp \
*.i++ \
*.inl \
*.idl \
*.ddl \
*.odl \
*.h \
*.hh \
*.hxx \
*.hpp \
*.h++ \
*.cs \
*.d \
*.php \
*.php4 \
*.php5 \
*.phtml \
*.inc \
*.m \
*.markdown \
*.md \
*.mm \
*.dox \
*.py \
*.pyw \
*.f90 \
*.f95 \
*.f03 \
*.f08 \
*.f \
*.for \
*.tcl \
*.vhd \
*.vhdl \
*.ucf \
*.qsf
FILE_PATTERNS = *.h \
*.dox
RECURSIVE = YES
EXCLUDE =
EXCLUDE_SYMLINKS = NO
@ -346,11 +304,9 @@ SEARCH_INCLUDES = NO
INCLUDE_PATH =
INCLUDE_FILE_PATTERNS =
PREDEFINED = TOML_DOXYGEN=1 \
__cplusplus=201703L \
TOML_ALWAYS_INLINE=inline \
TOML_MAY_THROW= \
TOML_NODISCARD_CTOR= \
TOML_IMPLEMENTATION=1 \
TOML_EXTERNAL_LINKAGE= \
TOML_API= \
TOML_ABI_NAMESPACE_START(x)= \
@ -365,9 +321,10 @@ PREDEFINED = TOML_DOXYGEN=1 \
TOML_DISABLE_SHADOW_WARNINGS= \
TOML_DISABLE_ALL_WARNINGS= \
TOML_POP_WARNINGS= \
TOML_ASYMMETRICAL_EQUALITY_OPS(...)= \
__cplusplus=201703L \
__has_include(x)=0 \
__has_attribute(x)=0 \
TOML_ASYMMETRICAL_EQUALITY_OPS(...)= \
__cpp_lib_char8_t=201811L
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = NO

11
include/toml++/toml_array.hpp
View File

@ -4,13 +4,14 @@
// SPDX-License-Identifier: MIT
#pragma once
#include "toml_array.h"
//# {{
#if !TOML_DOXYGEN
#if !defined(TOML_IMPLEMENTATION) || !TOML_IMPLEMENTATION
#include "toml_preprocessor.h"
#if !TOML_IMPLEMENTATION
#error This is an implementation-only header.
#endif
//# }}
#include "toml_array.h"
namespace toml
{
@ -222,7 +223,3 @@ namespace toml
}
}
}
//# {{
#endif // !TOML_DOXYGEN
//# }}

11
include/toml++/toml_default_formatter.hpp
View File

@ -4,14 +4,15 @@
// SPDX-License-Identifier: MIT
#pragma once
#include "toml_default_formatter.h"
//# {{
#if !TOML_DOXYGEN
#if !defined(TOML_IMPLEMENTATION) || !TOML_IMPLEMENTATION
#include "toml_preprocessor.h"
#if !TOML_IMPLEMENTATION
#error This is an implementation-only header.
#endif
//# }}
#include "toml_default_formatter.h"
TOML_PUSH_WARNINGS
TOML_DISABLE_SWITCH_WARNINGS
TOML_DISABLE_FLOAT_WARNINGS
@ -202,7 +203,3 @@ namespace toml
}
TOML_POP_WARNINGS // TOML_DISABLE_SWITCH_WARNINGS, TOML_DISABLE_FLOAT_WARNINGS
//# {{
#endif // !TOML_DOXYGEN
//# }}

8
include/toml++/toml_instantiations.hpp
View File

@ -6,14 +6,14 @@
#pragma once
//# {{
#include "toml_preprocessor.h"
#if !TOML_DOXYGEN
#if !defined(TOML_IMPLEMENTATION) || !TOML_IMPLEMENTATION
#if !TOML_IMPLEMENTATION
#error This is an implementation-only header.
#endif
#if TOML_ALL_INLINE
#error This header cannot not be included when TOML_ALL_INLINE is enabled.
#endif
//# }}
TOML_PUSH_WARNINGS
TOML_DISABLE_ALL_WARNINGS
#include <ostream>
@ -100,7 +100,3 @@ namespace toml
#endif // TOML_PARSER
}
//# {{
#endif // !TOML_DOXYGEN
//# }}

11
include/toml++/toml_json_formatter.hpp
View File

@ -4,14 +4,15 @@
// SPDX-License-Identifier: MIT
#pragma once
#include "toml_json_formatter.h"
//# {{
#if !TOML_DOXYGEN
#if !defined(TOML_IMPLEMENTATION) || !TOML_IMPLEMENTATION
#include "toml_preprocessor.h"
#if !TOML_IMPLEMENTATION
#error This is an implementation-only header.
#endif
//# }}
#include "toml_json_formatter.h"
TOML_PUSH_WARNINGS
TOML_DISABLE_SWITCH_WARNINGS
@ -60,7 +61,3 @@ namespace toml
}
TOML_POP_WARNINGS // TOML_DISABLE_SWITCH_WARNINGS
//# {{
#endif // !TOML_DOXYGEN
//# }}

11
include/toml++/toml_node.hpp
View File

@ -4,14 +4,15 @@
// SPDX-License-Identifier: MIT
#pragma once
#include "toml_node.h"
//# {{
#if !TOML_DOXYGEN
#if !defined(TOML_IMPLEMENTATION) || !TOML_IMPLEMENTATION
#include "toml_preprocessor.h"
#if !TOML_IMPLEMENTATION
#error This is an implementation-only header.
#endif
//# }}
#include "toml_node.h"
namespace toml
{
TOML_EXTERNAL_LINKAGE
@ -63,7 +64,3 @@ namespace toml
TOML_EXTERNAL_LINKAGE const source_region& node::source() const noexcept { return source_; }
}
//# {{
#endif // !TOML_DOXYGEN
//# }}

14
include/toml++/toml_parser.hpp
View File

@ -4,13 +4,17 @@
// SPDX-License-Identifier: MIT
#pragma once
#include "toml_parser.h"
//# {{
#if !TOML_DOXYGEN
#if !defined(TOML_IMPLEMENTATION) || !TOML_IMPLEMENTATION
#include "toml_preprocessor.h"
#if !TOML_IMPLEMENTATION
#error This is an implementation-only header.
#endif
#if !TOML_PARSER
#error This header cannot not be included when TOML_PARSER is disabled.
#endif
//# }}
#include "toml_parser.h"
TOML_PUSH_WARNINGS
TOML_DISABLE_ALL_WARNINGS
#include <cmath>
@ -2881,7 +2885,3 @@ namespace toml
}
TOML_POP_WARNINGS // TOML_DISABLE_SWITCH_WARNINGS, TOML_DISABLE_PADDING_WARNINGS
//# {{
#endif // !TOML_DOXYGEN
//# }}

16
include/toml++/toml_preprocessor.h
View File

@ -8,16 +8,25 @@
////////// CONFIGURATION
#ifndef TOML_DOXYGEN
#define TOML_DOXYGEN 0
#endif
#ifdef TOML_CONFIG_HEADER
#include TOML_CONFIG_HEADER
#endif
#if !defined(TOML_ALL_INLINE) || (defined(TOML_ALL_INLINE) && TOML_ALL_INLINE)
#if !defined(TOML_ALL_INLINE) || (defined(TOML_ALL_INLINE) && TOML_ALL_INLINE) || defined(__INTELLISENSE__)
#undef TOML_ALL_INLINE
#define TOML_ALL_INLINE 1
#endif
#if defined(TOML_IMPLEMENTATION) || TOML_ALL_INLINE || defined(__INTELLISENSE__)
#if TOML_DOXYGEN
#undef TOML_ALL_INLINE
#define TOML_ALL_INLINE 0
#endif
#if defined(TOML_IMPLEMENTATION) || TOML_ALL_INLINE
#undef TOML_IMPLEMENTATION
#define TOML_IMPLEMENTATION 1
#else
@ -50,9 +59,6 @@
////////// COMPILER & ENVIRONMENT
#ifndef TOML_DOXYGEN
#define TOML_DOXYGEN 0
#endif
#ifndef __cplusplus
#error toml++ is a C++ library.
#endif

13
include/toml++/toml_table.hpp
View File

@ -4,15 +4,16 @@
// SPDX-License-Identifier: MIT
#pragma once
#include "toml_table.h"
#include "toml_node_view.h"
//# {{
#if !TOML_DOXYGEN
#if !defined(TOML_IMPLEMENTATION) || !TOML_IMPLEMENTATION
#include "toml_preprocessor.h"
#if !TOML_IMPLEMENTATION
#error This is an implementation-only header.
#endif
//# }}
#include "toml_table.h"
#include "toml_node_view.h"
namespace toml
{
TOML_EXTERNAL_LINKAGE
@ -174,7 +175,3 @@ namespace toml
return !(lhs == rhs);
}
}
//# {{
#endif // !TOML_DOXYGEN
//# }}

14
toml.hpp
View File

@ -53,14 +53,21 @@
//-------------- ↓ toml_preprocessor.h -------------------------------------------------------------------------------
#pragma region
#ifndef TOML_DOXYGEN
#define TOML_DOXYGEN 0
#endif
#ifdef TOML_CONFIG_HEADER
#include TOML_CONFIG_HEADER
#endif
#if !defined(TOML_ALL_INLINE) || (defined(TOML_ALL_INLINE) && TOML_ALL_INLINE)
#if !defined(TOML_ALL_INLINE) || (defined(TOML_ALL_INLINE) && TOML_ALL_INLINE) || defined(__INTELLISENSE__)
#undef TOML_ALL_INLINE
#define TOML_ALL_INLINE 1
#endif
#if defined(TOML_IMPLEMENTATION) || TOML_ALL_INLINE || defined(__INTELLISENSE__)
#if TOML_DOXYGEN
#undef TOML_ALL_INLINE
#define TOML_ALL_INLINE 0
#endif
#if defined(TOML_IMPLEMENTATION) || TOML_ALL_INLINE
#undef TOML_IMPLEMENTATION
#define TOML_IMPLEMENTATION 1
#else
@ -84,9 +91,6 @@
#ifndef TOML_PARSER
#define TOML_PARSER 1
#endif
#ifndef TOML_DOXYGEN
#define TOML_DOXYGEN 0
#endif
#ifndef __cplusplus
#error toml++ is a C++ library.
#endif