Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
畅游知识海洋
json
提交
aeb4f87a
J
json
项目概览
畅游知识海洋
/
json
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
json
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
aeb4f87a
编写于
11月 28, 2016
作者:
N
Niels Lohmann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
✨
added return value for emplace (#349)
上级
6ecff31b
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
82 addition
and
20 deletion
+82
-20
doc/examples/emplace.cpp
doc/examples/emplace.cpp
+8
-1
doc/examples/emplace.link
doc/examples/emplace.link
+1
-1
doc/examples/emplace.output
doc/examples/emplace.output
+2
-0
src/json.hpp
src/json.hpp
+19
-7
src/json.hpp.re2c
src/json.hpp.re2c
+19
-7
test/src/unit-modifiers.cpp
test/src/unit-modifiers.cpp
+33
-4
未找到文件。
doc/examples/emplace.cpp
浏览文件 @
aeb4f87a
...
...
@@ -13,11 +13,18 @@ int main()
std
::
cout
<<
null
<<
'\n'
;
// add values
object
.
emplace
(
"three"
,
3
);
auto
res1
=
object
.
emplace
(
"three"
,
3
);
null
.
emplace
(
"A"
,
"a"
);
null
.
emplace
(
"B"
,
"b"
);
// the following call will not add an object, because there is already
// a value stored at key "B"
auto
res2
=
null
.
emplace
(
"B"
,
"c"
);
// print values
std
::
cout
<<
object
<<
'\n'
;
std
::
cout
<<
*
res1
.
first
<<
" "
<<
std
::
boolalpha
<<
res1
.
second
<<
'\n'
;
std
::
cout
<<
null
<<
'\n'
;
std
::
cout
<<
*
res2
.
first
<<
" "
<<
std
::
boolalpha
<<
res2
.
second
<<
'\n'
;
}
doc/examples/emplace.link
浏览文件 @
aeb4f87a
<a target="_blank" href="http://melpon.org/wandbox/permlink/Qg5Ogrh8yFrwT2GY"><b>online</b></a>
\ No newline at end of file
<a target="_blank" href="http://melpon.org/wandbox/permlink/B6ILaoysGMliouEO"><b>online</b></a>
\ No newline at end of file
doc/examples/emplace.output
浏览文件 @
aeb4f87a
{"one":1,"two":2}
null
{"one":1,"three":3,"two":2}
3 true
{"A":"a","B":"b"}
"b" false
src/json.hpp
浏览文件 @
aeb4f87a
...
...
@@ -5075,15 +5075,20 @@ class basic_json
}
/*!
@brief add an object to an object
@brief add an object to an object
if key does not exist
Creates a JSON value from the passed parameters @a args to the JSON
object. If the function is called on a JSON null value, an empty object
is created before appending the value created from @a args.
Inserts a new element into a JSON object constructed in-place with the given
@a args if there is no element with the key in the container. If the
function is called on a JSON null value, an empty object is created before
appending the value created from @a args.
@param[in] args arguments to forward to a constructor of @ref basic_json
@tparam Args compatible types to create a @ref basic_json object
@return a pair consisting of an iterator to the inserted element, or the
already-existing element if no insertion happened, and a bool
denoting whether the insertion took place.
@throw std::domain_error when called on a type other than JSON object or
null; example: `"cannot use emplace() with number"`
...
...
@@ -5091,12 +5096,13 @@ class basic_json
@liveexample{The example shows how `emplace()` can be used to add elements
to a JSON object. Note how the `null` value was silently converted to a
JSON object.,emplace}
JSON object. Further note how no value is added if there was already one
value stored with the same key.,emplace}
@since version 2.0.8
*/
template
<
class
...
Args
>
void
emplace
(
Args
&&
...
args
)
std
::
pair
<
iterator
,
bool
>
emplace
(
Args
&&
...
args
)
{
// emplace only works for null objects or arrays
if
(
not
(
is_null
()
or
is_object
()))
...
...
@@ -5113,7 +5119,13 @@ class basic_json
}
// add element to array (perfect forwarding)
m_value
.
object
->
emplace
(
std
::
forward
<
Args
>
(
args
)...);
auto
res
=
m_value
.
object
->
emplace
(
std
::
forward
<
Args
>
(
args
)...);
// create result iterator and set iterator to the result of emplace
auto
it
=
begin
();
it
.
m_it
.
object_iterator
=
res
.
first
;
// return pair of iterator and boolean
return
{
it
,
res
.
second
};
}
/*!
...
...
src/json.hpp.re2c
浏览文件 @
aeb4f87a
...
...
@@ -5075,15 +5075,20 @@ class basic_json
}
/*!
@brief add an object to an object
@brief add an object to an object
if key does not exist
Creates a JSON value from the passed parameters @a args to the JSON
object. If the function is called on a JSON null value, an empty object
is created before appending the value created from @a args.
Inserts a new element into a JSON object constructed in-place with the given
@a args if there is no element with the key in the container. If the
function is called on a JSON null value, an empty object is created before
appending the value created from @a args.
@param[in] args arguments to forward to a constructor of @ref basic_json
@tparam Args compatible types to create a @ref basic_json object
@return a pair consisting of an iterator to the inserted element, or the
already-existing element if no insertion happened, and a bool
denoting whether the insertion took place.
@throw std::domain_error when called on a type other than JSON object or
null; example: `"cannot use emplace() with number"`
...
...
@@ -5091,12 +5096,13 @@ class basic_json
@liveexample{The example shows how `emplace()` can be used to add elements
to a JSON object. Note how the `null` value was silently converted to a
JSON object.,emplace}
JSON object. Further note how no value is added if there was already one
value stored with the same key.,emplace}
@since version 2.0.8
*/
template<class... Args>
void
emplace(Args&& ... args)
std::pair<iterator, bool>
emplace(Args&& ... args)
{
// emplace only works for null objects or arrays
if (not(is_null() or is_object()))
...
...
@@ -5113,7 +5119,13 @@ class basic_json
}
// add element to array (perfect forwarding)
m_value.object->emplace(std::forward<Args>(args)...);
auto res = m_value.object->emplace(std::forward<Args>(args)...);
// create result iterator and set iterator to the result of emplace
auto it = begin();
it.m_it.object_iterator = res.first;
// return pair of iterator and boolean
return {it, res.second};
}
/*!
...
...
test/src/unit-modifiers.cpp
浏览文件 @
aeb4f87a
...
...
@@ -302,18 +302,47 @@ TEST_CASE("modifiers")
{
SECTION
(
"null"
)
{
// start with a null value
json
j
;
j
.
emplace
(
"foo"
,
"bar"
);
j
.
emplace
(
"baz"
,
"bam"
);
// add a new key
auto
res1
=
j
.
emplace
(
"foo"
,
"bar"
);
CHECK
(
res1
.
second
==
true
);
CHECK
(
*
res1
.
first
==
"bar"
);
// the null value is changed to an object
CHECK
(
j
.
type
()
==
json
::
value_t
::
object
);
// add a new key
auto
res2
=
j
.
emplace
(
"baz"
,
"bam"
);
CHECK
(
res2
.
second
==
true
);
CHECK
(
*
res2
.
first
==
"bam"
);
// we try to insert at given key - no change
auto
res3
=
j
.
emplace
(
"baz"
,
"bad"
);
CHECK
(
res3
.
second
==
false
);
CHECK
(
*
res3
.
first
==
"bam"
);
// the final object
CHECK
(
j
==
json
({{
"baz"
,
"bam"
},
{
"foo"
,
"bar"
}}));
}
SECTION
(
"object"
)
{
// start with an object
json
j
=
{{
"foo"
,
"bar"
}};
j
.
emplace
(
"baz"
,
"bam"
);
CHECK
(
j
.
type
()
==
json
::
value_t
::
object
);
// add a new key
auto
res1
=
j
.
emplace
(
"baz"
,
"bam"
);
CHECK
(
res1
.
second
==
true
);
CHECK
(
*
res1
.
first
==
"bam"
);
// add an existing key
auto
res2
=
j
.
emplace
(
"foo"
,
"bad"
);
CHECK
(
res2
.
second
==
false
);
CHECK
(
*
res2
.
first
==
"bar"
);
// check final object
CHECK
(
j
==
json
({{
"baz"
,
"bam"
},
{
"foo"
,
"bar"
}}));
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录