Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
畅游知识海洋
json
提交
5e89cb0a
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,发现更多精彩内容 >>
提交
5e89cb0a
编写于
3月 26, 2015
作者:
N
Niels
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
implemented key()/value() for reverse iterators
上级
47ea1c10
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
149 addition
and
4 deletion
+149
-4
src/json.hpp
src/json.hpp
+50
-2
src/json.hpp.re2c
src/json.hpp.re2c
+50
-2
test/unit.cpp
test/unit.cpp
+49
-0
未找到文件。
src/json.hpp
浏览文件 @
5e89cb0a
...
...
@@ -96,6 +96,8 @@ class basic_json
// forward declarations
class
iterator
;
class
const_iterator
;
class
reverse_iterator
;
class
const_reverse_iterator
;
/*!
@brief the type of elements in a basic_json container
...
...
@@ -151,13 +153,13 @@ class basic_json
@brief a reverse iterator for a basic_json container
@ingroup reversiblecontainer
*/
using
reverse_iterator
=
std
::
reverse_iterator
<
iterator
>
;
using
reverse_iterator
=
basic_json
::
reverse_iterator
;
/*!
@brief a const reverse iterator for a basic_json container
@ingroup reversiblecontainer
*/
using
const_reverse_iterator
=
std
::
reverse_iterator
<
const_iterator
>
;
using
const_reverse_iterator
=
basic_json
::
const_reverse_iterator
;
/// returns the allocator associated with the container
...
...
@@ -2561,6 +2563,7 @@ class basic_json
}
}
/// return the key of an object iterator
inline
typename
object_t
::
key_type
key
()
const
{
switch
(
m_object
->
m_type
)
...
...
@@ -2577,6 +2580,7 @@ class basic_json
}
}
/// return the key of an iterator
inline
reference
value
()
{
return
operator
*
();
...
...
@@ -3096,6 +3100,7 @@ class basic_json
}
}
/// return the key of an object iterator
inline
typename
object_t
::
key_type
key
()
const
{
switch
(
m_object
->
m_type
)
...
...
@@ -3112,6 +3117,7 @@ class basic_json
}
}
/// return the value of an iterator
inline
reference
value
()
const
{
return
operator
*
();
...
...
@@ -3124,6 +3130,48 @@ class basic_json
internal_iterator
<
typename
array_t
::
const_iterator
,
typename
object_t
::
const_iterator
>
m_it
;
};
/// a reverse random access iterator for the basic_json class
class
reverse_iterator
:
private
std
::
reverse_iterator
<
basic_json
::
iterator
>
{
public:
inline
reverse_iterator
(
const
typename
std
::
reverse_iterator
<
basic_json
::
iterator
>::
iterator_type
&
it
)
:
std
::
reverse_iterator
<
basic_json
::
iterator
>
(
it
)
{}
/// return the key of an object iterator
inline
typename
object_t
::
key_type
key
()
const
{
return
this
->
base
().
key
();
}
/// return the value of an iterator
inline
reference
value
()
const
{
return
this
->
base
().
operator
*
();
}
};
/// a const reverse random access iterator for the basic_json class
class
const_reverse_iterator
:
private
std
::
reverse_iterator
<
basic_json
::
const_iterator
>
{
public:
inline
const_reverse_iterator
(
const
typename
std
::
reverse_iterator
<
basic_json
::
const_iterator
>::
iterator_type
&
it
)
:
std
::
reverse_iterator
<
basic_json
::
const_iterator
>
(
it
)
{}
/// return the key of an object iterator
inline
typename
object_t
::
key_type
key
()
const
{
return
this
->
base
().
key
();
}
/// return the value of an iterator
inline
reference
value
()
const
{
return
this
->
base
().
operator
*
();
}
};
private:
//////////////////////
...
...
src/json.hpp.re2c
浏览文件 @
5e89cb0a
...
...
@@ -96,6 +96,8 @@ class basic_json
// forward declarations
class iterator;
class const_iterator;
class reverse_iterator;
class const_reverse_iterator;
/*!
@brief the type of elements in a basic_json container
...
...
@@ -151,13 +153,13 @@ class basic_json
@brief a reverse iterator for a basic_json container
@ingroup reversiblecontainer
*/
using reverse_iterator =
std::reverse_iterator<iterator>
;
using reverse_iterator =
basic_json::reverse_iterator
;
/*!
@brief a const reverse iterator for a basic_json container
@ingroup reversiblecontainer
*/
using const_reverse_iterator =
std::reverse_iterator<const_iterator>
;
using const_reverse_iterator =
basic_json::const_reverse_iterator
;
/// returns the allocator associated with the container
...
...
@@ -2561,6 +2563,7 @@ class basic_json
}
}
/// return the key of an object iterator
inline typename object_t::key_type key() const
{
switch (m_object->m_type)
...
...
@@ -2577,6 +2580,7 @@ class basic_json
}
}
/// return the key of an iterator
inline reference value()
{
return operator*();
...
...
@@ -3096,6 +3100,7 @@ class basic_json
}
}
/// return the key of an object iterator
inline typename object_t::key_type key() const
{
switch (m_object->m_type)
...
...
@@ -3112,6 +3117,7 @@ class basic_json
}
}
/// return the value of an iterator
inline reference value() const
{
return operator*();
...
...
@@ -3124,6 +3130,48 @@ class basic_json
internal_iterator<typename array_t::const_iterator, typename object_t::const_iterator> m_it;
};
/// a reverse random access iterator for the basic_json class
class reverse_iterator : private std::reverse_iterator<basic_json::iterator>
{
public:
inline reverse_iterator(const typename std::reverse_iterator<basic_json::iterator>::iterator_type&
it)
: std::reverse_iterator<basic_json::iterator>(it) {}
/// return the key of an object iterator
inline typename object_t::key_type key() const
{
return this->base().key();
}
/// return the value of an iterator
inline reference value() const
{
return this->base().operator * ();
}
};
/// a const reverse random access iterator for the basic_json class
class const_reverse_iterator : private std::reverse_iterator<basic_json::const_iterator>
{
public:
inline const_reverse_iterator(const typename
std::reverse_iterator<basic_json::const_iterator>::iterator_type& it)
: std::reverse_iterator<basic_json::const_iterator>(it) {}
/// return the key of an object iterator
inline typename object_t::key_type key() const
{
return this->base().key();
}
/// return the value of an iterator
inline reference value() const
{
return this->base().operator * ();
}
};
private:
//////////////////////
...
...
test/unit.cpp
浏览文件 @
5e89cb0a
...
...
@@ -2810,6 +2810,13 @@ TEST_CASE("iterators")
CHECK
(
it
.
value
()
==
json
(
true
));
CHECK_THROWS_AS
(
cit
.
key
(),
std
::
domain_error
);
CHECK
(
cit
.
value
()
==
json
(
true
));
auto
rit
=
j
.
rend
();
auto
crit
=
j
.
rend
();
CHECK_THROWS_AS
(
rit
.
key
(),
std
::
domain_error
);
CHECK
(
rit
.
value
()
==
json
(
true
));
CHECK_THROWS_AS
(
crit
.
key
(),
std
::
domain_error
);
CHECK
(
crit
.
value
()
==
json
(
true
));
}
}
...
...
@@ -3001,6 +3008,13 @@ TEST_CASE("iterators")
CHECK
(
it
.
value
()
==
json
(
"hello world"
));
CHECK_THROWS_AS
(
cit
.
key
(),
std
::
domain_error
);
CHECK
(
cit
.
value
()
==
json
(
"hello world"
));
auto
rit
=
j
.
rend
();
auto
crit
=
j
.
rend
();
CHECK_THROWS_AS
(
rit
.
key
(),
std
::
domain_error
);
CHECK
(
rit
.
value
()
==
json
(
"hello world"
));
CHECK_THROWS_AS
(
crit
.
key
(),
std
::
domain_error
);
CHECK
(
crit
.
value
()
==
json
(
"hello world"
));
}
}
...
...
@@ -3185,6 +3199,13 @@ TEST_CASE("iterators")
CHECK
(
it
.
value
()
==
json
(
1
));
CHECK_THROWS_AS
(
cit
.
key
(),
std
::
domain_error
);
CHECK
(
cit
.
value
()
==
json
(
1
));
auto
rit
=
j
.
rend
();
auto
crit
=
j
.
rend
();
CHECK_THROWS_AS
(
rit
.
key
(),
std
::
domain_error
);
CHECK
(
rit
.
value
()
==
json
(
1
));
CHECK_THROWS_AS
(
crit
.
key
(),
std
::
domain_error
);
CHECK
(
crit
.
value
()
==
json
(
1
));
}
}
...
...
@@ -3369,6 +3390,13 @@ TEST_CASE("iterators")
CHECK
(
it
.
value
()
==
json
(
1
));
CHECK
(
cit
.
key
()
==
"A"
);
CHECK
(
cit
.
value
()
==
json
(
1
));
auto
rit
=
j
.
rend
();
auto
crit
=
j
.
rend
();
CHECK
(
rit
.
key
()
==
"A"
);
CHECK
(
rit
.
value
()
==
json
(
1
));
CHECK
(
crit
.
key
()
==
"A"
);
CHECK
(
crit
.
value
()
==
json
(
1
));
}
}
...
...
@@ -3560,6 +3588,13 @@ TEST_CASE("iterators")
CHECK
(
it
.
value
()
==
json
(
23
));
CHECK_THROWS_AS
(
cit
.
key
(),
std
::
domain_error
);
CHECK
(
cit
.
value
()
==
json
(
23
));
auto
rit
=
j
.
rend
();
auto
crit
=
j
.
rend
();
CHECK_THROWS_AS
(
rit
.
key
(),
std
::
domain_error
);
CHECK
(
rit
.
value
()
==
json
(
23
));
CHECK_THROWS_AS
(
crit
.
key
(),
std
::
domain_error
);
CHECK
(
crit
.
value
()
==
json
(
23
));
}
}
...
...
@@ -3751,6 +3786,13 @@ TEST_CASE("iterators")
CHECK
(
it
.
value
()
==
json
(
23.42
));
CHECK_THROWS_AS
(
cit
.
key
(),
std
::
domain_error
);
CHECK
(
cit
.
value
()
==
json
(
23.42
));
auto
rit
=
j
.
rend
();
auto
crit
=
j
.
rend
();
CHECK_THROWS_AS
(
rit
.
key
(),
std
::
domain_error
);
CHECK
(
rit
.
value
()
==
json
(
23.42
));
CHECK_THROWS_AS
(
crit
.
key
(),
std
::
domain_error
);
CHECK
(
crit
.
value
()
==
json
(
23.42
));
}
}
...
...
@@ -3812,6 +3854,13 @@ TEST_CASE("iterators")
CHECK_THROWS_AS
(
it
.
value
(),
std
::
out_of_range
);
CHECK_THROWS_AS
(
cit
.
key
(),
std
::
domain_error
);
CHECK_THROWS_AS
(
cit
.
value
(),
std
::
out_of_range
);
auto
rit
=
j
.
rend
();
auto
crit
=
j
.
rend
();
CHECK_THROWS_AS
(
rit
.
key
(),
std
::
domain_error
);
CHECK_THROWS_AS
(
rit
.
value
(),
std
::
out_of_range
);
CHECK_THROWS_AS
(
crit
.
key
(),
std
::
domain_error
);
CHECK_THROWS_AS
(
crit
.
value
(),
std
::
out_of_range
);
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录