Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
fadccc34
Commit
fadccc34
authored
Aug 13, 2015
by
Niels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed iterator_wrapper
parent
66ec5863
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
317 additions
and
124 deletions
+317
-124
src/json.hpp
src/json.hpp
+26
-45
src/json.hpp.re2c
src/json.hpp.re2c
+26
-45
test/unit.cpp
test/unit.cpp
+265
-34
No files found.
src/json.hpp
View file @
fadccc34
...
...
@@ -5712,41 +5712,14 @@ class basic_json
json_iterator
anchor
;
/// an index for arrays
size_t
array_index
=
0
;
size_t
container_size
=
0
;
/// calculate a key for the iterator
std
::
string
calculate_key
()
{
switch
(
anchor
.
m_object
->
type
())
{
/// use integer array index as key
case
(
value_t
:
:
array
)
:
{
return
std
::
to_string
(
array_index
);
}
/// use key from the object
case
(
value_t
:
:
object
)
:
{
return
anchor
.
key
();
}
/// use an empty key for all primitive types
default:
{
return
""
;
}
}
}
public:
/// construct wrapper given an iterator
iterator_wrapper_internal
(
json_iterator
i
,
size_t
s
)
:
anchor
(
i
),
container_size
(
s
),
first
(
calculate_key
()),
second
(
*
i
)
iterator_wrapper_internal
(
json_iterator
i
)
:
anchor
(
i
)
{}
/// dereference operator (needed for range-based for)
iterator_wrapper_internal
operator
*
()
iterator_wrapper_internal
&
operator
*
()
{
return
*
this
;
}
...
...
@@ -5757,12 +5730,6 @@ class basic_json
++
anchor
;
++
array_index
;
if
(
array_index
<
container_size
)
{
first
=
calculate_key
();
second
=
*
anchor
;
}
return
*
this
;
}
...
...
@@ -5781,19 +5748,33 @@ class basic_json
/// return key of the iterator
typename
basic_json
::
string_t
key
()
const
{
return
first
;
switch
(
anchor
.
m_object
->
type
())
{
/// use integer array index as key
case
(
value_t
:
:
array
)
:
{
return
std
::
to_string
(
array_index
);
}
/// return value of the iterator
basic_json
value
()
const
/// use key from the object
case
(
value_t
:
:
object
)
:
{
return
second
;
return
anchor
.
key
()
;
}
/// public member to simulate std::map::iterator access
typename
basic_json
::
string_t
first
;
/// public member to simulate std::map::iterator access
basic_json
&
second
;
/// use an empty key for all primitive types
default:
{
return
""
;
}
}
}
/// return value of the iterator
typename
json_iterator
::
reference
value
()
const
{
return
anchor
.
value
();
}
};
public:
...
...
@@ -5805,13 +5786,13 @@ class basic_json
/// return iterator begin (needed for range-based for)
iterator_wrapper_internal
begin
()
{
return
iterator_wrapper_internal
(
container
.
begin
()
,
container
.
size
()
);
return
iterator_wrapper_internal
(
container
.
begin
());
}
/// return iterator end (needed for range-based for)
iterator_wrapper_internal
end
()
{
return
iterator_wrapper_internal
(
container
.
end
()
,
container
.
size
()
);
return
iterator_wrapper_internal
(
container
.
end
());
}
};
...
...
src/json.hpp.re2c
View file @
fadccc34
...
...
@@ -5712,41 +5712,14 @@ class basic_json
json_iterator anchor;
/// an index for arrays
size_t array_index = 0;
size_t container_size = 0;
/// calculate a key for the iterator
std::string calculate_key()
{
switch (anchor.m_object->type())
{
/// use integer array index as key
case (value_t::array):
{
return std::to_string(array_index);
}
/// use key from the object
case (value_t::object):
{
return anchor.key();
}
/// use an empty key for all primitive types
default:
{
return "";
}
}
}
public:
/// construct wrapper given an iterator
iterator_wrapper_internal(json_iterator i, size_t s)
: anchor(i), container_size(s), first(calculate_key()), second(*i)
iterator_wrapper_internal(json_iterator i) : anchor(i)
{}
/// dereference operator (needed for range-based for)
iterator_wrapper_internal operator*()
iterator_wrapper_internal
&
operator*()
{
return *this;
}
...
...
@@ -5757,12 +5730,6 @@ class basic_json
++anchor;
++array_index;
if (array_index < container_size)
{
first = calculate_key();
second = *anchor;
}
return *this;
}
...
...
@@ -5781,19 +5748,33 @@ class basic_json
/// return key of the iterator
typename basic_json::string_t key() const
{
return first;
switch (anchor.m_object->type())
{
/// use integer array index as key
case (value_t::array):
{
return std::to_string(array_index);
}
/// return value of the iterator
basic_json value() const
/// use key from the object
case (value_t::object):
{
return second
;
return anchor.key()
;
}
/// public member to simulate std::map::iterator access
typename basic_json::string_t first;
/// public member to simulate std::map::iterator access
basic_json& second;
/// use an empty key for all primitive types
default:
{
return "";
}
}
}
/// return value of the iterator
typename json_iterator::reference value() const
{
return anchor.value();
}
};
public:
...
...
@@ -5805,13 +5786,13 @@ class basic_json
/// return iterator begin (needed for range-based for)
iterator_wrapper_internal begin()
{
return iterator_wrapper_internal(container.begin()
, container.size()
);
return iterator_wrapper_internal(container.begin());
}
/// return iterator end (needed for range-based for)
iterator_wrapper_internal end()
{
return iterator_wrapper_internal(container.end()
, container.size()
);
return iterator_wrapper_internal(container.end());
}
};
...
...
test/unit.cpp
View file @
fadccc34
...
...
@@ -9260,10 +9260,11 @@ TEST_CASE("concepts")
}
}
/*
TEST_CASE
(
"iterator_wrapper"
)
{
SECTION
(
"object"
)
{
SECTION
(
"value"
)
{
json
j
=
{{
"A"
,
1
},
{
"B"
,
2
}};
int
counter
=
1
;
...
...
@@ -9276,8 +9277,6 @@ TEST_CASE("iterator_wrapper")
{
CHECK
(
i
.
key
()
==
"A"
);
CHECK
(
i
.
value
()
==
json
(
1
));
CHECK(i.first == "A");
CHECK(i.second == json(1));
break
;
}
...
...
@@ -9285,15 +9284,102 @@ TEST_CASE("iterator_wrapper")
{
CHECK
(
i
.
key
()
==
"B"
);
CHECK
(
i
.
value
()
==
json
(
2
));
CHECK(i.first == "B");
CHECK(i.second == json(2));
break
;
}
}
}
CHECK
(
counter
==
3
);
}
SECTION
(
"reference"
)
{
json
j
=
{{
"A"
,
1
},
{
"B"
,
2
}};
int
counter
=
1
;
for
(
auto
&
i
:
json
::
iterator_wrapper
(
j
))
{
switch
(
counter
++
)
{
case
1
:
{
CHECK
(
i
.
key
()
==
"A"
);
CHECK
(
i
.
value
()
==
json
(
1
));
break
;
}
case
2
:
{
CHECK
(
i
.
key
()
==
"B"
);
CHECK
(
i
.
value
()
==
json
(
2
));
break
;
}
}
}
CHECK
(
counter
==
3
);
}
SECTION
(
"const value"
)
{
json
j
=
{{
"A"
,
1
},
{
"B"
,
2
}};
int
counter
=
1
;
for
(
const
auto
i
:
json
::
iterator_wrapper
(
j
))
{
switch
(
counter
++
)
{
case
1
:
{
CHECK
(
i
.
key
()
==
"A"
);
CHECK
(
i
.
value
()
==
json
(
1
));
break
;
}
case
2
:
{
CHECK
(
i
.
key
()
==
"B"
);
CHECK
(
i
.
value
()
==
json
(
2
));
break
;
}
}
}
CHECK
(
counter
==
3
);
}
SECTION
(
"const reference"
)
{
json
j
=
{{
"A"
,
1
},
{
"B"
,
2
}};
int
counter
=
1
;
for
(
const
auto
&
i
:
json
::
iterator_wrapper
(
j
))
{
switch
(
counter
++
)
{
case
1
:
{
CHECK
(
i
.
key
()
==
"A"
);
CHECK
(
i
.
value
()
==
json
(
1
));
break
;
}
case
2
:
{
CHECK
(
i
.
key
()
==
"B"
);
CHECK
(
i
.
value
()
==
json
(
2
));
break
;
}
}
}
CHECK
(
counter
==
3
);
}
}
SECTION
(
"array"
)
{
SECTION
(
"value"
)
{
json
j
=
{
"A"
,
"B"
};
int
counter
=
1
;
...
...
@@ -9306,8 +9392,6 @@ TEST_CASE("iterator_wrapper")
{
CHECK
(
i
.
key
()
==
"0"
);
CHECK
(
i
.
value
()
==
"A"
);
CHECK(i.first == "0");
CHECK(i.second == "A");
break
;
}
...
...
@@ -9315,15 +9399,162 @@ TEST_CASE("iterator_wrapper")
{
CHECK
(
i
.
key
()
==
"1"
);
CHECK
(
i
.
value
()
==
"B"
);
CHECK(i.first == "1");
CHECK(i.second == "B");
break
;
}
}
}
CHECK
(
counter
==
3
);
}
SECTION
(
"reference"
)
{
json
j
=
{
"A"
,
"B"
};
int
counter
=
1
;
for
(
auto
&
i
:
json
::
iterator_wrapper
(
j
))
{
switch
(
counter
++
)
{
case
1
:
{
CHECK
(
i
.
key
()
==
"0"
);
CHECK
(
i
.
value
()
==
"A"
);
break
;
}
case
2
:
{
CHECK
(
i
.
key
()
==
"1"
);
CHECK
(
i
.
value
()
==
"B"
);
break
;
}
}
}
CHECK
(
counter
==
3
);
}
SECTION
(
"const value"
)
{
json
j
=
{
"A"
,
"B"
};
int
counter
=
1
;
for
(
const
auto
i
:
json
::
iterator_wrapper
(
j
))
{
switch
(
counter
++
)
{
case
1
:
{
CHECK
(
i
.
key
()
==
"0"
);
CHECK
(
i
.
value
()
==
"A"
);
break
;
}
case
2
:
{
CHECK
(
i
.
key
()
==
"1"
);
CHECK
(
i
.
value
()
==
"B"
);
break
;
}
}
}
CHECK
(
counter
==
3
);
}
SECTION
(
"const reference"
)
{
json
j
=
{
"A"
,
"B"
};
int
counter
=
1
;
for
(
const
auto
&
i
:
json
::
iterator_wrapper
(
j
))
{
switch
(
counter
++
)
{
case
1
:
{
CHECK
(
i
.
key
()
==
"0"
);
CHECK
(
i
.
value
()
==
"A"
);
break
;
}
case
2
:
{
CHECK
(
i
.
key
()
==
"1"
);
CHECK
(
i
.
value
()
==
"B"
);
break
;
}
}
}
CHECK
(
counter
==
3
);
}
}
SECTION
(
"primitive"
)
{
SECTION
(
"value"
)
{
json
j
=
1
;
int
counter
=
1
;
for
(
auto
i
:
json
::
iterator_wrapper
(
j
))
{
++
counter
;
CHECK
(
i
.
key
()
==
""
);
CHECK
(
i
.
value
()
==
json
(
1
));
}
CHECK
(
counter
==
2
);
}
SECTION
(
"reference"
)
{
json
j
=
1
;
int
counter
=
1
;
for
(
auto
&
i
:
json
::
iterator_wrapper
(
j
))
{
++
counter
;
CHECK
(
i
.
key
()
==
""
);
CHECK
(
i
.
value
()
==
json
(
1
));
}
CHECK
(
counter
==
2
);
}
SECTION
(
"const value"
)
{
json
j
=
1
;
int
counter
=
1
;
for
(
const
auto
i
:
json
::
iterator_wrapper
(
j
))
{
++
counter
;
CHECK
(
i
.
key
()
==
""
);
CHECK
(
i
.
value
()
==
json
(
1
));
}
CHECK
(
counter
==
2
);
}
SECTION
(
"reference"
)
{
json
j
=
1
;
int
counter
=
1
;
for
(
const
auto
&
i
:
json
::
iterator_wrapper
(
j
))
{
++
counter
;
CHECK
(
i
.
key
()
==
""
);
CHECK
(
i
.
value
()
==
json
(
1
));
}
CHECK
(
counter
==
2
);
}
}
}
*/
TEST_CASE
(
"compliance tests from json.org"
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment