Skip to content

Commit 8dd3301

Browse files
committed
Amalgamate & bump version
1 parent e6088bb commit 8dd3301

File tree

2 files changed

+81
-4
lines changed

2 files changed

+81
-4
lines changed

amalgamate.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
OUTPUT_PATH = "single_include/jsonh_cpp_amalgamated.hpp"
44

55
HEADER = "// JsonhCpp (JSON for Humans)
6-
// Version: 4.5
6+
// Version: 4.6
77
// Link: https://github.com/jsonh-org/JsonhCpp
88
// License: MIT"
99

single_include/jsonh_cpp_amalgamated.hpp

Lines changed: 80 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// JsonhCpp (JSON for Humans)
2-
// Version: 4.5
2+
// Version: 4.6
33
// Link: https://github.com/jsonh-org/JsonhCpp
44
// License: MIT
55

@@ -29090,18 +29090,68 @@ inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC
2909029090

2909129091
namespace jsonh_cpp {
2909229092

29093-
enum struct json_token_type {
29093+
/// <summary>
29094+
/// The types of tokens that make up a JSON document.
29095+
/// </summary>
29096+
enum struct json_token_type : char {
29097+
/// <summary>
29098+
/// Indicates that there is no value (not to be confused with <see cref="null"/>).
29099+
/// </summary>
2909429100
none = 0,
29101+
/// <summary>
29102+
/// The start of an object.<br/>
29103+
/// Example: <c>{</c>
29104+
/// </summary>
2909529105
start_object = 1,
29106+
/// <summary>
29107+
/// The end of an object.<br/>
29108+
/// Example: <c>}</c>
29109+
/// </summary>
2909629110
end_object = 2,
29111+
/// <summary>
29112+
/// The start of an array.<br/>
29113+
/// Example: <c>&#x005B;</c>
29114+
/// </summary>
2909729115
start_array = 3,
29116+
/// <summary>
29117+
/// The end of an array.<br/>
29118+
/// Example: <c>&#x005D;</c>
29119+
/// </summary>
2909829120
end_array = 4,
29121+
/// <summary>
29122+
/// A property name in an object.<br/>
29123+
/// Example: <c>"key":</c>
29124+
/// </summary>
2909929125
property_name = 5,
29126+
/// <summary>
29127+
/// A comment.<br/>
29128+
/// Example: <c>// comment</c>
29129+
/// </summary>
2910029130
comment = 6,
29131+
/// <summary>
29132+
/// A string.<br/>
29133+
/// Example: <c>"value"</c>
29134+
/// </summary>
2910129135
string = 7,
29136+
/// <summary>
29137+
/// A number.<br/>
29138+
/// Example: <c>10</c>
29139+
/// </summary>
2910229140
number = 8,
29141+
/// <summary>
29142+
/// A true boolean.<br/>
29143+
/// Example: <c>true</c>
29144+
/// </summary>
2910329145
true_bool = 9,
29146+
/// <summary>
29147+
/// A false boolean.<br/>
29148+
/// Example: <c>false</c>
29149+
/// </summary>
2910429150
false_bool = 10,
29151+
/// <summary>
29152+
/// A null value.<br/>
29153+
/// Example: <c>null</c>
29154+
/// </summary>
2910529155
null = 11,
2910629156
};
2910729157

@@ -29140,12 +29190,39 @@ struct jsonh_token {
2914029190
/*** Start of inlined file: jsonh_reader_options.hpp ***/
2914129191
#pragma once
2914229192

29193+
29194+
/*** Start of inlined file: jsonh_version.hpp ***/
29195+
#pragma once
29196+
2914329197
namespace jsonh_cpp {
2914429198

2914529199
/// <summary>
29146-
/// Options for a jsonh_reader.
29200+
/// The major versions of the JSONH specification.
29201+
/// </summary>
29202+
enum struct jsonh_version {
29203+
/// <summary>
29204+
/// Indicates that the latest version should be used (currently <see cref="v1"/>).
29205+
/// </summary>
29206+
latest = 0,
29207+
/// <summary>
29208+
/// Version 1 of the specification, released 2025/03/19.
29209+
/// </summary>
29210+
v1 = 1,
29211+
};
29212+
29213+
}
29214+
/*** End of inlined file: jsonh_version.hpp ***/
29215+
29216+
namespace jsonh_cpp {
29217+
29218+
/// <summary>
29219+
/// Options for a <see cref="jsonh_reader"/>.
2914729220
/// </summary>
2914829221
struct jsonh_reader_options {
29222+
/// <summary>
29223+
/// Specifies the major version of the JSONH specification to use.
29224+
/// </summary>
29225+
jsonh_version version = jsonh_version::latest;
2914929226
/// <summary>
2915029227
/// Enables/disables parsing unclosed inputs.
2915129228
/// <code>

0 commit comments

Comments
 (0)