Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
畅游知识海洋
json
提交
068c7acd
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,发现更多精彩内容 >>
未验证
提交
068c7acd
编写于
3月 05, 2017
作者:
N
Niels Lohmann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
🔨
added user-defined exceptions 301
上级
0c40c8e3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
10 deletion
+10
-10
src/json.hpp
src/json.hpp
+4
-4
src/json.hpp.re2c
src/json.hpp.re2c
+4
-4
test/src/unit-constructor1.cpp
test/src/unit-constructor1.cpp
+2
-2
未找到文件。
src/json.hpp
浏览文件 @
068c7acd
...
...
@@ -2223,8 +2223,8 @@ class basic_json
value_t::array and @ref value_t::object are valid); when @a type_deduction
is set to `true`, this parameter has no effect
@throw
std::domain_error if @a type_deduction is `false`, @a manual_type
is
`value_t::object`, but @a init contains an element which is not a pair
@throw
type_error.301 if @a type_deduction is `false`, @a manual_type is
`value_t::object`, but @a init contains an element which is not a pair
whose first element is a string; example: `"cannot create object from
initializer list"`
...
...
@@ -2264,7 +2264,7 @@ class basic_json
// if object is wanted but impossible, throw an exception
if
(
manual_type
==
value_t
::
object
and
not
is_an_object
)
{
JSON_THROW
(
std
::
domain_error
(
"cannot create object from initializer list"
));
JSON_THROW
(
type_error
(
301
,
"cannot create object from initializer list"
));
}
}
...
...
@@ -2347,7 +2347,7 @@ class basic_json
@return JSON object value
@throw
std::domain_error
if @a init is not a pair whose first elements are
@throw
type_error.301
if @a init is not a pair whose first elements are
strings; thrown by
@ref basic_json(std::initializer_list<basic_json>, bool, value_t)
...
...
src/json.hpp.re2c
浏览文件 @
068c7acd
...
...
@@ -2223,8 +2223,8 @@ class basic_json
value_t::array and @ref value_t::object are valid); when @a type_deduction
is set to `true`, this parameter has no effect
@throw
std::domain_error if @a type_deduction is `false`, @a manual_type
is
`value_t::object`, but @a init contains an element which is not a pair
@throw
type_error.301 if @a type_deduction is `false`, @a manual_type is
`value_t::object`, but @a init contains an element which is not a pair
whose first element is a string; example: `"cannot create object from
initializer list"`
...
...
@@ -2264,7 +2264,7 @@ class basic_json
// if object is wanted but impossible, throw an exception
if (manual_type == value_t::object and not is_an_object)
{
JSON_THROW(
std::domain_error(
"cannot create object from initializer list"));
JSON_THROW(
type_error(301,
"cannot create object from initializer list"));
}
}
...
...
@@ -2347,7 +2347,7 @@ class basic_json
@return JSON object value
@throw
std::domain_error
if @a init is not a pair whose first elements are
@throw
type_error.301
if @a init is not a pair whose first elements are
strings; thrown by
@ref basic_json(std::initializer_list<basic_json>, bool, value_t)
...
...
test/src/unit-constructor1.cpp
浏览文件 @
068c7acd
...
...
@@ -943,9 +943,9 @@ TEST_CASE("constructors")
SECTION
(
"object with error"
)
{
CHECK_THROWS_AS
(
json
::
object
({
{
"one"
,
1
},
{
"two"
,
1u
},
{
"three"
,
2.2
},
{
"four"
,
false
},
13
}),
std
::
logic
_error
);
json
::
type
_error
);
CHECK_THROWS_WITH
(
json
::
object
({
{
"one"
,
1
},
{
"two"
,
1u
},
{
"three"
,
2.2
},
{
"four"
,
false
},
13
}),
"cannot create object from initializer list"
);
"
[json.exception.type_error.301]
cannot create object from initializer list"
);
}
SECTION
(
"empty array"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录