j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

minor doc changes

Browse source
This commit is contained in:
Niels 2016-06-19 16:17:53 +02:00
parent 039565b9f5
commit 4e31a0e852
4 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -11,3 +11,4 @@ html
me.nlohmann.json.docset me.nlohmann.json.docset
android android
doc/xml

2
doc/Doxyfile
View file

@ -236,7 +236,7 @@ MAN_LINKS = NO
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Configuration options related to the XML output # Configuration options related to the XML output
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
GENERATE_XML = NO GENERATE_XML = YES
XML_OUTPUT = xml XML_OUTPUT = xml
XML_PROGRAMLISTING = YES XML_PROGRAMLISTING = YES
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------

18
src/json.hpp
View file

@ -7278,17 +7278,17 @@ class basic_json
enum class token_type enum class token_type
{ {
uninitialized, ///< indicating the scanner is uninitialized uninitialized, ///< indicating the scanner is uninitialized
literal_true, ///< the "true" literal literal_true, ///< the `true` literal
literal_false, ///< the "false" literal literal_false, ///< the `false` literal
literal_null, ///< the "null" literal literal_null, ///< the `null` literal
value_string, ///< a string -- use get_string() for actual value value_string, ///< a string -- use get_string() for actual value
value_number, ///< a number -- use get_number() for actual value value_number, ///< a number -- use get_number() for actual value
begin_array, ///< the character for array begin "[" begin_array, ///< the character for array begin `[`
begin_object, ///< the character for object begin "{" begin_object, ///< the character for object begin `{`
end_array, ///< the character for array end "]" end_array, ///< the character for array end `]`
end_object, ///< the character for object end "}" end_object, ///< the character for object end `}`
name_separator, ///< the name separator ":" name_separator, ///< the name separator `:`
value_separator, ///< the value separator "," value_separator, ///< the value separator `,`
parse_error, ///< indicating a parse error parse_error, ///< indicating a parse error
end_of_input ///< indicating the end of the input buffer end_of_input ///< indicating the end of the input buffer
}; };

18
src/json.hpp.re2c
View file

@ -7278,17 +7278,17 @@ class basic_json
enum class token_type enum class token_type
{ {
uninitialized, ///< indicating the scanner is uninitialized uninitialized, ///< indicating the scanner is uninitialized
literal_true, ///< the "true" literal literal_true, ///< the `true` literal
literal_false, ///< the "false" literal literal_false, ///< the `false` literal
literal_null, ///< the "null" literal literal_null, ///< the `null` literal
value_string, ///< a string -- use get_string() for actual value value_string, ///< a string -- use get_string() for actual value
value_number, ///< a number -- use get_number() for actual value value_number, ///< a number -- use get_number() for actual value
begin_array, ///< the character for array begin "[" begin_array, ///< the character for array begin `[`
begin_object, ///< the character for object begin "{" begin_object, ///< the character for object begin `{`
end_array, ///< the character for array end "]" end_array, ///< the character for array end `]`
end_object, ///< the character for object end "}" end_object, ///< the character for object end `}`
name_separator, ///< the name separator ":" name_separator, ///< the name separator `:`
value_separator, ///< the value separator "," value_separator, ///< the value separator `,`
parse_error, ///< indicating a parse error parse_error, ///< indicating a parse error
end_of_input ///< indicating the end of the input buffer end_of_input ///< indicating the end of the input buffer
}; };