Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
畅游知识海洋
json
提交
fcba9ec5
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,发现更多精彩内容 >>
未验证
提交
fcba9ec5
编写于
9月 10, 2017
作者:
N
Niels Lohmann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
🔨
clean up
上级
b21d7810
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
115 addition
and
27 deletion
+115
-27
src/json.hpp
src/json.hpp
+6
-26
test/src/unit-deserialization.cpp
test/src/unit-deserialization.cpp
+1
-1
test/src/unit-iterators1.cpp
test/src/unit-iterators1.cpp
+108
-0
未找到文件。
src/json.hpp
浏览文件 @
fcba9ec5
...
...
@@ -3501,23 +3501,18 @@ class primitive_iterator_t
/// return whether the iterator can be dereferenced
constexpr
bool
is_begin
()
const
noexcept
{
return
(
m_it
==
begin_value
)
;
return
m_it
==
begin_value
;
}
/// return whether the iterator is at end
constexpr
bool
is_end
()
const
noexcept
{
return
(
m_it
==
end_value
)
;
return
m_it
==
end_value
;
}
friend
constexpr
bool
operator
==
(
primitive_iterator_t
lhs
,
primitive_iterator_t
rhs
)
noexcept
{
return
(
lhs
.
m_it
==
rhs
.
m_it
);
}
friend
constexpr
bool
operator
!=
(
primitive_iterator_t
lhs
,
primitive_iterator_t
rhs
)
noexcept
{
return
not
(
lhs
==
rhs
);
return
lhs
.
m_it
==
rhs
.
m_it
;
}
friend
constexpr
bool
operator
<
(
primitive_iterator_t
lhs
,
primitive_iterator_t
rhs
)
noexcept
...
...
@@ -3525,21 +3520,6 @@ class primitive_iterator_t
return
lhs
.
m_it
<
rhs
.
m_it
;
}
friend
constexpr
bool
operator
<=
(
primitive_iterator_t
lhs
,
primitive_iterator_t
rhs
)
noexcept
{
return
lhs
.
m_it
<=
rhs
.
m_it
;
}
friend
constexpr
bool
operator
>
(
primitive_iterator_t
lhs
,
primitive_iterator_t
rhs
)
noexcept
{
return
lhs
.
m_it
>
rhs
.
m_it
;
}
friend
constexpr
bool
operator
>=
(
primitive_iterator_t
lhs
,
primitive_iterator_t
rhs
)
noexcept
{
return
lhs
.
m_it
>=
rhs
.
m_it
;
}
primitive_iterator_t
operator
+
(
difference_type
i
)
{
auto
result
=
*
this
;
...
...
@@ -3600,7 +3580,7 @@ class primitive_iterator_t
static
constexpr
difference_type
end_value
=
begin_value
+
1
;
/// iterator as signed integer type
difference_type
m_it
=
std
::
numeric_limits
<
std
::
ptrdiff_t
>::
denorm_
min
();
difference_type
m_it
=
std
::
numeric_limits
<
std
::
ptrdiff_t
>::
min
();
};
/*!
...
...
@@ -9049,7 +9029,7 @@ class basic_json
@liveexample{The following code exemplifies `type()` for all JSON
types.,type}
@sa @ref operator value_t() -- return the type of the JSON value (implicit)
@sa @ref operator value_t() -- return the type of the JSON value (implicit)
@sa @ref type_name() -- return the type as string
@since version 1.0.0
...
...
@@ -13090,7 +13070,7 @@ class basic_json
types.,type_name}
@sa @ref type() -- return the type of the JSON value
@sa @ref operator value_t() -- return the type of the JSON value (implicit)
@sa @ref operator value_t() -- return the type of the JSON value (implicit)
@since version 1.0.0, public since 2.1.0, `const char*` and `noexcept`
since 3.0.0
...
...
test/src/unit-deserialization.cpp
浏览文件 @
fcba9ec5
...
...
@@ -324,7 +324,7 @@ TEST_CASE("deserialization")
uint8_t
v
[]
=
{
'\"'
,
0x7F
,
0xDF
,
0x7F
};
CHECK_THROWS_AS
(
json
::
parse
(
std
::
begin
(
v
),
std
::
end
(
v
)),
json
::
parse_error
&
);
CHECK_THROWS_WITH
(
json
::
parse
(
std
::
begin
(
v
),
std
::
end
(
v
)),
"[json.exception.parse_error.101] parse error at 4: syntax error - invalid string: ill-formed UTF-8 byte; last read: '
\"\x7f\xdf\x7f
'"
);
"[json.exception.parse_error.101] parse error at 4: syntax error - invalid string: ill-formed UTF-8 byte; last read: '
\"\x7f\xdf\x7f
'"
);
CHECK
(
not
json
::
accept
(
std
::
begin
(
v
),
std
::
end
(
v
)));
json
j_error
;
...
...
test/src/unit-iterators1.cpp
浏览文件 @
fcba9ec5
...
...
@@ -225,6 +225,114 @@ TEST_CASE("iterators 1")
CHECK
(
*
it
==
j_const
);
}
SECTION
(
"additional tests"
)
{
SECTION
(
"!(begin != begin)"
)
{
CHECK
(
not
(
j
.
begin
()
!=
j
.
begin
()));
}
SECTION
(
"!(end != end)"
)
{
CHECK
(
not
(
j
.
end
()
!=
j
.
end
()));
}
SECTION
(
"begin < end"
)
{
CHECK
(
j
.
begin
()
<
j
.
end
());
}
SECTION
(
"begin <= end"
)
{
CHECK
(
j
.
begin
()
<=
j
.
end
());
}
SECTION
(
"end > begin"
)
{
CHECK
(
j
.
end
()
>
j
.
begin
());
}
SECTION
(
"end >= begin"
)
{
CHECK
(
j
.
end
()
>=
j
.
begin
());
}
SECTION
(
"end == end"
)
{
CHECK
(
j
.
end
()
==
j
.
end
());
}
SECTION
(
"end <= end"
)
{
CHECK
(
j
.
end
()
<=
j
.
end
());
}
SECTION
(
"begin == begin"
)
{
CHECK
(
j
.
begin
()
==
j
.
begin
());
}
SECTION
(
"begin <= begin"
)
{
CHECK
(
j
.
begin
()
<=
j
.
begin
());
}
SECTION
(
"begin >= begin"
)
{
CHECK
(
j
.
begin
()
>=
j
.
begin
());
}
SECTION
(
"!(begin == end)"
)
{
CHECK
(
not
(
j
.
begin
()
==
j
.
end
()));
}
SECTION
(
"begin != end"
)
{
CHECK
(
j
.
begin
()
!=
j
.
end
());
}
SECTION
(
"begin+1 == end"
)
{
CHECK
(
j
.
begin
()
+
1
==
j
.
end
());
}
SECTION
(
"begin == end-1"
)
{
CHECK
(
j
.
begin
()
==
j
.
end
()
-
1
);
}
SECTION
(
"begin != end+1"
)
{
CHECK
(
j
.
begin
()
!=
j
.
end
()
+
1
);
}
SECTION
(
"end != end+1"
)
{
CHECK
(
j
.
end
()
!=
j
.
end
()
+
1
);
}
SECTION
(
"begin+1 != begin+2"
)
{
CHECK
(
j
.
begin
()
+
1
!=
j
.
begin
()
+
2
);
}
SECTION
(
"begin+1 < begin+2"
)
{
CHECK
(
j
.
begin
()
+
1
<
j
.
begin
()
+
2
);
}
SECTION
(
"begin+1 <= begin+2"
)
{
CHECK
(
j
.
begin
()
+
1
<=
j
.
begin
()
+
2
);
}
SECTION
(
"end+1 != end+2"
)
{
CHECK
(
j
.
end
()
+
1
!=
j
.
end
()
+
2
);
}
}
SECTION
(
"key/value"
)
{
auto
it
=
j
.
begin
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录