From 4e31a0e852907dae6e1366027c816b2512e08cbd Mon Sep 17 00:00:00 2001 From: Niels Date: Sun, 19 Jun 2016 16:17:53 +0200 Subject: [PATCH] minor doc changes --- .gitignore | 3 ++- doc/Doxyfile | 2 +- src/json.hpp | 18 +++++++++--------- src/json.hpp.re2c | 18 +++++++++--------- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index c610519ef..d5bd2f7c9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ working html me.nlohmann.json.docset -android \ No newline at end of file +android +doc/xml diff --git a/doc/Doxyfile b/doc/Doxyfile index 11faf6d03..e74a8a850 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -236,7 +236,7 @@ MAN_LINKS = NO #--------------------------------------------------------------------------- # Configuration options related to the XML output #--------------------------------------------------------------------------- -GENERATE_XML = NO +GENERATE_XML = YES XML_OUTPUT = xml XML_PROGRAMLISTING = YES #--------------------------------------------------------------------------- diff --git a/src/json.hpp b/src/json.hpp index cbb9e5f05..9d6687ddc 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -7278,17 +7278,17 @@ class basic_json enum class token_type { uninitialized, ///< indicating the scanner is uninitialized - literal_true, ///< the "true" literal - literal_false, ///< the "false" literal - literal_null, ///< the "null" literal + literal_true, ///< the `true` literal + literal_false, ///< the `false` literal + literal_null, ///< the `null` literal value_string, ///< a string -- use get_string() for actual value value_number, ///< a number -- use get_number() for actual value - begin_array, ///< the character for array begin "[" - begin_object, ///< the character for object begin "{" - end_array, ///< the character for array end "]" - end_object, ///< the character for object end "}" - name_separator, ///< the name separator ":" - value_separator, ///< the value separator "," + begin_array, ///< the character for array begin `[` + begin_object, ///< the character for object begin `{` + end_array, ///< the character for array end `]` + end_object, ///< the character for object end `}` + name_separator, ///< the name separator `:` + value_separator, ///< the value separator `,` parse_error, ///< indicating a parse error end_of_input ///< indicating the end of the input buffer }; diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c index c60207f6f..9681bed2f 100644 --- a/src/json.hpp.re2c +++ b/src/json.hpp.re2c @@ -7278,17 +7278,17 @@ class basic_json enum class token_type { uninitialized, ///< indicating the scanner is uninitialized - literal_true, ///< the "true" literal - literal_false, ///< the "false" literal - literal_null, ///< the "null" literal + literal_true, ///< the `true` literal + literal_false, ///< the `false` literal + literal_null, ///< the `null` literal value_string, ///< a string -- use get_string() for actual value value_number, ///< a number -- use get_number() for actual value - begin_array, ///< the character for array begin "[" - begin_object, ///< the character for object begin "{" - end_array, ///< the character for array end "]" - end_object, ///< the character for object end "}" - name_separator, ///< the name separator ":" - value_separator, ///< the value separator "," + begin_array, ///< the character for array begin `[` + begin_object, ///< the character for object begin `{` + end_array, ///< the character for array end `]` + end_object, ///< the character for object end `}` + name_separator, ///< the name separator `:` + value_separator, ///< the value separator `,` parse_error, ///< indicating a parse error end_of_input ///< indicating the end of the input buffer };