Skip to content

Commit 662a9b8

Browse files
nlohmannnlohmann
committed
✏️ fixed more typos
1 parent 4746a4c commit 662a9b8

File tree

2 files changed

+42
-42
lines changed

2 files changed

+42
-42
lines changed

‎src/json.hpp

+21-21
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ class basic_json
11061106
/*!
11071107
@brief returns version information on the library
11081108
1109-
This function returns a JSON object with infiormation about the library,
1109+
This function returns a JSON object with information about the library,
11101110
including the version number and information on the platform and compiler.
11111111
11121112
@return JSON object holding version information
@@ -3417,7 +3417,7 @@ class basic_json
34173417
/*!
34183418
@brief get a reference value (implicit)
34193419
3420-
Implict reference access to the internally stored JSON value. No copies
3420+
Implicit reference access to the internally stored JSON value. No copies
34213421
are made.
34223422
34233423
@warning Writing data to the referee of the result yields an undefined
@@ -3492,7 +3492,7 @@ class basic_json
34923492
template < typename ValueType, typename std::enable_if <
34933493
not std::is_pointer<ValueType>::value and
34943494
not std::is_same<ValueType, typename string_t::value_type>::value
3495-
#ifndef _MSC_VER // fix for issue #167 operator<< abiguity under VS2015
3495+
#ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015
34963496
and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
34973497
#endif
34983498
, int >::type = 0 >
@@ -4285,7 +4285,7 @@ class basic_json
42854285
42864286
@complexity The complexity depends on the type:
42874287
- objects: amortized constant
4288-
- arrays: linear in distance between pos and the end of the container
4288+
- arrays: linear in distance between @a pos and the end of the container
42894289
- strings: linear in the length of the string
42904290
- other types: constant
42914291
@@ -5537,7 +5537,7 @@ class basic_json
55375537
@throw std::domain_error if @a pos is not an iterator of *this; example:
55385538
`"iterator does not fit current value"`
55395539
5540-
@complexity Constant plus linear in the distance between pos and end of
5540+
@complexity Constant plus linear in the distance between @a pos and end of
55415541
the container.
55425542
55435543
@liveexample{The example shows how `insert()` is used.,insert}
@@ -6234,7 +6234,7 @@ class basic_json
62346234
`std::setw(4)` on @a o sets the indentation level to `4` and the
62356235
serialization result is the same as calling `dump(4)`.
62366236
6237-
@note During serializaion, the locale and the precision of the output
6237+
@note During serialization, the locale and the precision of the output
62386238
stream @a o are changed. The original values are restored when the
62396239
function returns.
62406240
@@ -10624,7 +10624,7 @@ class basic_json
1062410624
if (m_stream == nullptr or m_stream->eof())
1062510625
{
1062610626
// m_start may or may not be pointing into m_line_buffer at
10627-
// this point. We trust the standand library to do the right
10627+
// this point. We trust the standard library to do the right
1062810628
// thing. See http://stackoverflow.com/q/28142011/266378
1062910629
m_line_buffer.assign(m_start, m_limit);
1063010630

@@ -10712,7 +10712,7 @@ class basic_json
1071210712
m_start + 1 + x < m_cursor - 1 must hold to loop indefinitely. This
1071310713
can be rephrased to m_cursor - m_start - 2 > x. With the
1071410714
precondition, we x <= 0, meaning that the loop condition holds
10715-
indefinitly if i is always decreased. However, observe that the value
10715+
indefinitely if i is always decreased. However, observe that the value
1071610716
of i is strictly increasing with each iteration, as it is incremented
1071710717
by 1 in the iteration expression and never decremented inside the loop
1071810718
body. Hence, the loop condition will eventually be false which
@@ -10841,12 +10841,12 @@ class basic_json
1084110841
/*!
1084210842
@brief parse floating point number
1084310843
10844-
This function (and its overloads) serves to select the most approprate
10844+
This function (and its overloads) serves to select the most appropriate
1084510845
standard floating point number parsing function based on the type
1084610846
supplied via the first parameter. Set this to @a
1084710847
static_cast<number_float_t*>(nullptr).
1084810848
10849-
@param[in,out] endptr recieves a pointer to the first character after
10849+
@param[in,out] endptr receives a pointer to the first character after
1085010850
the number
1085110851
1085210852
@return the floating point number
@@ -10859,12 +10859,12 @@ class basic_json
1085910859
/*!
1086010860
@brief parse floating point number
1086110861
10862-
This function (and its overloads) serves to select the most approprate
10862+
This function (and its overloads) serves to select the most appropriate
1086310863
standard floating point number parsing function based on the type
1086410864
supplied via the first parameter. Set this to @a
1086510865
static_cast<number_float_t*>(nullptr).
1086610866
10867-
@param[in,out] endptr recieves a pointer to the first character after
10867+
@param[in,out] endptr receives a pointer to the first character after
1086810868
the number
1086910869
1087010870
@return the floating point number
@@ -10877,12 +10877,12 @@ class basic_json
1087710877
/*!
1087810878
@brief parse floating point number
1087910879
10880-
This function (and its overloads) serves to select the most approprate
10880+
This function (and its overloads) serves to select the most appropriate
1088110881
standard floating point number parsing function based on the type
1088210882
supplied via the first parameter. Set this to @a
1088310883
static_cast<number_float_t*>(nullptr).
1088410884
10885-
@param[in,out] endptr recieves a pointer to the first character after
10885+
@param[in,out] endptr receives a pointer to the first character after
1088610886
the number
1088710887
1088810888
@return the floating point number
@@ -10925,7 +10925,7 @@ class basic_json
1092510925
// maximum absolute value of the relevant integer type
1092610926
number_unsigned_t max;
1092710927

10928-
// temporarily store the type to avoid unecessary bitfield access
10928+
// temporarily store the type to avoid unnecessary bitfield access
1092910929
value_t type;
1093010930

1093110931
// look for sign
@@ -11558,7 +11558,7 @@ class basic_json
1155811558

1155911559
if (reference_token == "-")
1156011560
{
11561-
// explicityly treat "-" as index beyond the end
11561+
// explicitly treat "-" as index beyond the end
1156211562
ptr = &ptr->operator[](ptr->m_value.array->size());
1156311563
}
1156411564
else
@@ -12065,7 +12065,7 @@ class basic_json
1206512065
primitive. The original JSON value can be restored using the @ref
1206612066
unflatten() function.
1206712067
12068-
@return an object that maps JSON pointers to primitve values
12068+
@return an object that maps JSON pointers to primitive values
1206912069
1207012070
@note Empty objects and arrays are flattened to `null` and will not be
1207112071
reconstructed correctly by the @ref unflatten() function.
@@ -12132,7 +12132,7 @@ class basic_json
1213212132
1213312133
[JSON Patch](http://jsonpatch.com) defines a JSON document structure for
1213412134
expressing a sequence of operations to apply to a JSON) document. With
12135-
this funcion, a JSON Patch is applied to the current JSON value by
12135+
this function, a JSON Patch is applied to the current JSON value by
1213612136
executing all operations from the patch.
1213712137
1213812138
@param[in] json_patch JSON patch document
@@ -12300,7 +12300,7 @@ class basic_json
1230012300
JSON_THROW(std::invalid_argument("JSON patch must be an array of objects"));
1230112301
}
1230212302

12303-
// iterate and apply th eoperations
12303+
// iterate and apply the operations
1230412304
for (const auto& val : json_patch)
1230512305
{
1230612306
// wrapper to get a value for an operation
@@ -12439,8 +12439,8 @@ class basic_json
1243912439
@note Currently, only `remove`, `add`, and `replace` operations are
1244012440
generated.
1244112441
12442-
@param[in] source JSON value to copare from
12443-
@param[in] target JSON value to copare against
12442+
@param[in] source JSON value to compare from
12443+
@param[in] target JSON value to compare against
1244412444
@param[in] path helper value to create JSON pointers
1244512445
1244612446
@return a JSON patch to convert the @a source to @a target

‎src/json.hpp.re2c

+21-21
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ class basic_json
11061106
/*!
11071107
@brief returns version information on the library
11081108

1109-
This function returns a JSON object with infiormation about the library,
1109+
This function returns a JSON object with information about the library,
11101110
including the version number and information on the platform and compiler.
11111111

11121112
@return JSON object holding version information
@@ -3417,7 +3417,7 @@ class basic_json
34173417
/*!
34183418
@brief get a reference value (implicit)
34193419

3420-
Implict reference access to the internally stored JSON value. No copies
3420+
Implicit reference access to the internally stored JSON value. No copies
34213421
are made.
34223422

34233423
@warning Writing data to the referee of the result yields an undefined
@@ -3492,7 +3492,7 @@ class basic_json
34923492
template < typename ValueType, typename std::enable_if <
34933493
not std::is_pointer<ValueType>::value and
34943494
not std::is_same<ValueType, typename string_t::value_type>::value
3495-
#ifndef _MSC_VER // fix for issue #167 operator<< abiguity under VS2015
3495+
#ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015
34963496
and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
34973497
#endif
34983498
, int >::type = 0 >
@@ -4285,7 +4285,7 @@ class basic_json
42854285

42864286
@complexity The complexity depends on the type:
42874287
- objects: amortized constant
4288-
- arrays: linear in distance between pos and the end of the container
4288+
- arrays: linear in distance between @a pos and the end of the container
42894289
- strings: linear in the length of the string
42904290
- other types: constant
42914291

@@ -5537,7 +5537,7 @@ class basic_json
55375537
@throw std::domain_error if @a pos is not an iterator of *this; example:
55385538
`"iterator does not fit current value"`
55395539

5540-
@complexity Constant plus linear in the distance between pos and end of
5540+
@complexity Constant plus linear in the distance between @a pos and end of
55415541
the container.
55425542

55435543
@liveexample{The example shows how `insert()` is used.,insert}
@@ -6234,7 +6234,7 @@ class basic_json
62346234
`std::setw(4)` on @a o sets the indentation level to `4` and the
62356235
serialization result is the same as calling `dump(4)`.
62366236

6237-
@note During serializaion, the locale and the precision of the output
6237+
@note During serialization, the locale and the precision of the output
62386238
stream @a o are changed. The original values are restored when the
62396239
function returns.
62406240

@@ -9774,7 +9774,7 @@ class basic_json
97749774
if (m_stream == nullptr or m_stream->eof())
97759775
{
97769776
// m_start may or may not be pointing into m_line_buffer at
9777-
// this point. We trust the standand library to do the right
9777+
// this point. We trust the standard library to do the right
97789778
// thing. See http://stackoverflow.com/q/28142011/266378
97799779
m_line_buffer.assign(m_start, m_limit);
97809780

@@ -9862,7 +9862,7 @@ class basic_json
98629862
m_start + 1 + x < m_cursor - 1 must hold to loop indefinitely. This
98639863
can be rephrased to m_cursor - m_start - 2 > x. With the
98649864
precondition, we x <= 0, meaning that the loop condition holds
9865-
indefinitly if i is always decreased. However, observe that the value
9865+
indefinitely if i is always decreased. However, observe that the value
98669866
of i is strictly increasing with each iteration, as it is incremented
98679867
by 1 in the iteration expression and never decremented inside the loop
98689868
body. Hence, the loop condition will eventually be false which
@@ -9991,12 +9991,12 @@ class basic_json
99919991
/*!
99929992
@brief parse floating point number
99939993

9994-
This function (and its overloads) serves to select the most approprate
9994+
This function (and its overloads) serves to select the most appropriate
99959995
standard floating point number parsing function based on the type
99969996
supplied via the first parameter. Set this to @a
99979997
static_cast<number_float_t*>(nullptr).
99989998

9999-
@param[in,out] endptr recieves a pointer to the first character after
9999+
@param[in,out] endptr receives a pointer to the first character after
1000010000
the number
1000110001

1000210002
@return the floating point number
@@ -10009,12 +10009,12 @@ class basic_json
1000910009
/*!
1001010010
@brief parse floating point number
1001110011

10012-
This function (and its overloads) serves to select the most approprate
10012+
This function (and its overloads) serves to select the most appropriate
1001310013
standard floating point number parsing function based on the type
1001410014
supplied via the first parameter. Set this to @a
1001510015
static_cast<number_float_t*>(nullptr).
1001610016

10017-
@param[in,out] endptr recieves a pointer to the first character after
10017+
@param[in,out] endptr receives a pointer to the first character after
1001810018
the number
1001910019

1002010020
@return the floating point number
@@ -10027,12 +10027,12 @@ class basic_json
1002710027
/*!
1002810028
@brief parse floating point number
1002910029

10030-
This function (and its overloads) serves to select the most approprate
10030+
This function (and its overloads) serves to select the most appropriate
1003110031
standard floating point number parsing function based on the type
1003210032
supplied via the first parameter. Set this to @a
1003310033
static_cast<number_float_t*>(nullptr).
1003410034

10035-
@param[in,out] endptr recieves a pointer to the first character after
10035+
@param[in,out] endptr receives a pointer to the first character after
1003610036
the number
1003710037

1003810038
@return the floating point number
@@ -10075,7 +10075,7 @@ class basic_json
1007510075
// maximum absolute value of the relevant integer type
1007610076
number_unsigned_t max;
1007710077

10078-
// temporarily store the type to avoid unecessary bitfield access
10078+
// temporarily store the type to avoid unnecessary bitfield access
1007910079
value_t type;
1008010080

1008110081
// look for sign
@@ -10708,7 +10708,7 @@ class basic_json
1070810708

1070910709
if (reference_token == "-")
1071010710
{
10711-
// explicityly treat "-" as index beyond the end
10711+
// explicitly treat "-" as index beyond the end
1071210712
ptr = &ptr->operator[](ptr->m_value.array->size());
1071310713
}
1071410714
else
@@ -11215,7 +11215,7 @@ class basic_json
1121511215
primitive. The original JSON value can be restored using the @ref
1121611216
unflatten() function.
1121711217

11218-
@return an object that maps JSON pointers to primitve values
11218+
@return an object that maps JSON pointers to primitive values
1121911219

1122011220
@note Empty objects and arrays are flattened to `null` and will not be
1122111221
reconstructed correctly by the @ref unflatten() function.
@@ -11282,7 +11282,7 @@ class basic_json
1128211282

1128311283
[JSON Patch](http://jsonpatch.com) defines a JSON document structure for
1128411284
expressing a sequence of operations to apply to a JSON) document. With
11285-
this funcion, a JSON Patch is applied to the current JSON value by
11285+
this function, a JSON Patch is applied to the current JSON value by
1128611286
executing all operations from the patch.
1128711287

1128811288
@param[in] json_patch JSON patch document
@@ -11450,7 +11450,7 @@ class basic_json
1145011450
JSON_THROW(std::invalid_argument("JSON patch must be an array of objects"));
1145111451
}
1145211452

11453-
// iterate and apply th eoperations
11453+
// iterate and apply the operations
1145411454
for (const auto& val : json_patch)
1145511455
{
1145611456
// wrapper to get a value for an operation
@@ -11589,8 +11589,8 @@ class basic_json
1158911589
@note Currently, only `remove`, `add`, and `replace` operations are
1159011590
generated.
1159111591

11592-
@param[in] source JSON value to copare from
11593-
@param[in] target JSON value to copare against
11592+
@param[in] source JSON value to compare from
11593+
@param[in] target JSON value to compare against
1159411594
@param[in] path helper value to create JSON pointers
1159511595

1159611596
@return a JSON patch to convert the @a source to @a target

0 commit comments

Comments
 (0)