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
2bc5d893
Commit
2bc5d893
authored
Jul 05, 2015
by
Niels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactored generic iterator into a new class primitive_iterator_t
parent
82a69953
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
236 additions
and
130 deletions
+236
-130
src/json.hpp
src/json.hpp
+100
-47
src/json.hpp.re2c
src/json.hpp.re2c
+100
-47
test/unit.cpp
test/unit.cpp
+36
-36
No files found.
src/json.hpp
View file @
2bc5d893
This diff is collapsed.
Click to expand it.
src/json.hpp.re2c
View file @
2bc5d893
This diff is collapsed.
Click to expand it.
test/unit.cpp
View file @
2bc5d893
...
@@ -6798,20 +6798,20 @@ TEST_CASE("iterator class")
...
@@ -6798,20 +6798,20 @@ TEST_CASE("iterator class")
{
{
json
j
(
json
::
value_t
::
null
);
json
j
(
json
::
value_t
::
null
);
json
::
iterator
it
=
j
.
begin
();
json
::
iterator
it
=
j
.
begin
();
CHECK
(
it
.
m_it
.
generic
_iterator
==
1
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
1
);
it
++
;
it
++
;
CHECK
((
it
.
m_it
.
generic_iterator
!=
0
and
it
.
m_it
.
generic
_iterator
!=
1
));
CHECK
((
it
.
m_it
.
primitive_iterator
!=
0
and
it
.
m_it
.
primitive
_iterator
!=
1
));
}
}
SECTION
(
"number"
)
SECTION
(
"number"
)
{
{
json
j
(
17
);
json
j
(
17
);
json
::
iterator
it
=
j
.
begin
();
json
::
iterator
it
=
j
.
begin
();
CHECK
(
it
.
m_it
.
generic
_iterator
==
0
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
0
);
it
++
;
it
++
;
CHECK
(
it
.
m_it
.
generic
_iterator
==
1
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
1
);
it
++
;
it
++
;
CHECK
((
it
.
m_it
.
generic_iterator
!=
0
and
it
.
m_it
.
generic
_iterator
!=
1
));
CHECK
((
it
.
m_it
.
primitive_iterator
!=
0
and
it
.
m_it
.
primitive
_iterator
!=
1
));
}
}
SECTION
(
"object"
)
SECTION
(
"object"
)
...
@@ -6849,20 +6849,20 @@ TEST_CASE("iterator class")
...
@@ -6849,20 +6849,20 @@ TEST_CASE("iterator class")
{
{
json
j
(
json
::
value_t
::
null
);
json
j
(
json
::
value_t
::
null
);
json
::
iterator
it
=
j
.
begin
();
json
::
iterator
it
=
j
.
begin
();
CHECK
(
it
.
m_it
.
generic
_iterator
==
1
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
1
);
++
it
;
++
it
;
CHECK
((
it
.
m_it
.
generic_iterator
!=
0
and
it
.
m_it
.
generic
_iterator
!=
1
));
CHECK
((
it
.
m_it
.
primitive_iterator
!=
0
and
it
.
m_it
.
primitive
_iterator
!=
1
));
}
}
SECTION
(
"number"
)
SECTION
(
"number"
)
{
{
json
j
(
17
);
json
j
(
17
);
json
::
iterator
it
=
j
.
begin
();
json
::
iterator
it
=
j
.
begin
();
CHECK
(
it
.
m_it
.
generic
_iterator
==
0
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
0
);
++
it
;
++
it
;
CHECK
(
it
.
m_it
.
generic
_iterator
==
1
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
1
);
++
it
;
++
it
;
CHECK
((
it
.
m_it
.
generic_iterator
!=
0
and
it
.
m_it
.
generic
_iterator
!=
1
));
CHECK
((
it
.
m_it
.
primitive_iterator
!=
0
and
it
.
m_it
.
primitive
_iterator
!=
1
));
}
}
SECTION
(
"object"
)
SECTION
(
"object"
)
...
@@ -6900,18 +6900,18 @@ TEST_CASE("iterator class")
...
@@ -6900,18 +6900,18 @@ TEST_CASE("iterator class")
{
{
json
j
(
json
::
value_t
::
null
);
json
j
(
json
::
value_t
::
null
);
json
::
iterator
it
=
j
.
end
();
json
::
iterator
it
=
j
.
end
();
CHECK
(
it
.
m_it
.
generic
_iterator
==
1
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
1
);
}
}
SECTION
(
"number"
)
SECTION
(
"number"
)
{
{
json
j
(
17
);
json
j
(
17
);
json
::
iterator
it
=
j
.
end
();
json
::
iterator
it
=
j
.
end
();
CHECK
(
it
.
m_it
.
generic
_iterator
==
1
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
1
);
it
--
;
it
--
;
CHECK
(
it
.
m_it
.
generic
_iterator
==
0
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
0
);
it
--
;
it
--
;
CHECK
((
it
.
m_it
.
generic_iterator
!=
0
and
it
.
m_it
.
generic
_iterator
!=
1
));
CHECK
((
it
.
m_it
.
primitive_iterator
!=
0
and
it
.
m_it
.
primitive
_iterator
!=
1
));
}
}
SECTION
(
"object"
)
SECTION
(
"object"
)
...
@@ -6949,18 +6949,18 @@ TEST_CASE("iterator class")
...
@@ -6949,18 +6949,18 @@ TEST_CASE("iterator class")
{
{
json
j
(
json
::
value_t
::
null
);
json
j
(
json
::
value_t
::
null
);
json
::
iterator
it
=
j
.
end
();
json
::
iterator
it
=
j
.
end
();
CHECK
(
it
.
m_it
.
generic
_iterator
==
1
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
1
);
}
}
SECTION
(
"number"
)
SECTION
(
"number"
)
{
{
json
j
(
17
);
json
j
(
17
);
json
::
iterator
it
=
j
.
end
();
json
::
iterator
it
=
j
.
end
();
CHECK
(
it
.
m_it
.
generic
_iterator
==
1
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
1
);
--
it
;
--
it
;
CHECK
(
it
.
m_it
.
generic
_iterator
==
0
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
0
);
--
it
;
--
it
;
CHECK
((
it
.
m_it
.
generic_iterator
!=
0
and
it
.
m_it
.
generic
_iterator
!=
1
));
CHECK
((
it
.
m_it
.
primitive_iterator
!=
0
and
it
.
m_it
.
primitive
_iterator
!=
1
));
}
}
SECTION
(
"object"
)
SECTION
(
"object"
)
...
@@ -7162,20 +7162,20 @@ TEST_CASE("const_iterator class")
...
@@ -7162,20 +7162,20 @@ TEST_CASE("const_iterator class")
{
{
json
j
(
json
::
value_t
::
null
);
json
j
(
json
::
value_t
::
null
);
json
::
const_iterator
it
=
j
.
cbegin
();
json
::
const_iterator
it
=
j
.
cbegin
();
CHECK
(
it
.
m_it
.
generic
_iterator
==
1
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
1
);
it
++
;
it
++
;
CHECK
((
it
.
m_it
.
generic_iterator
!=
0
and
it
.
m_it
.
generic
_iterator
!=
1
));
CHECK
((
it
.
m_it
.
primitive_iterator
!=
0
and
it
.
m_it
.
primitive
_iterator
!=
1
));
}
}
SECTION
(
"number"
)
SECTION
(
"number"
)
{
{
json
j
(
17
);
json
j
(
17
);
json
::
const_iterator
it
=
j
.
cbegin
();
json
::
const_iterator
it
=
j
.
cbegin
();
CHECK
(
it
.
m_it
.
generic
_iterator
==
0
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
0
);
it
++
;
it
++
;
CHECK
(
it
.
m_it
.
generic
_iterator
==
1
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
1
);
it
++
;
it
++
;
CHECK
((
it
.
m_it
.
generic_iterator
!=
0
and
it
.
m_it
.
generic
_iterator
!=
1
));
CHECK
((
it
.
m_it
.
primitive_iterator
!=
0
and
it
.
m_it
.
primitive
_iterator
!=
1
));
}
}
SECTION
(
"object"
)
SECTION
(
"object"
)
...
@@ -7213,20 +7213,20 @@ TEST_CASE("const_iterator class")
...
@@ -7213,20 +7213,20 @@ TEST_CASE("const_iterator class")
{
{
json
j
(
json
::
value_t
::
null
);
json
j
(
json
::
value_t
::
null
);
json
::
const_iterator
it
=
j
.
cbegin
();
json
::
const_iterator
it
=
j
.
cbegin
();
CHECK
(
it
.
m_it
.
generic
_iterator
==
1
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
1
);
++
it
;
++
it
;
CHECK
((
it
.
m_it
.
generic_iterator
!=
0
and
it
.
m_it
.
generic
_iterator
!=
1
));
CHECK
((
it
.
m_it
.
primitive_iterator
!=
0
and
it
.
m_it
.
primitive
_iterator
!=
1
));
}
}
SECTION
(
"number"
)
SECTION
(
"number"
)
{
{
json
j
(
17
);
json
j
(
17
);
json
::
const_iterator
it
=
j
.
cbegin
();
json
::
const_iterator
it
=
j
.
cbegin
();
CHECK
(
it
.
m_it
.
generic
_iterator
==
0
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
0
);
++
it
;
++
it
;
CHECK
(
it
.
m_it
.
generic
_iterator
==
1
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
1
);
++
it
;
++
it
;
CHECK
((
it
.
m_it
.
generic_iterator
!=
0
and
it
.
m_it
.
generic
_iterator
!=
1
));
CHECK
((
it
.
m_it
.
primitive_iterator
!=
0
and
it
.
m_it
.
primitive
_iterator
!=
1
));
}
}
SECTION
(
"object"
)
SECTION
(
"object"
)
...
@@ -7264,18 +7264,18 @@ TEST_CASE("const_iterator class")
...
@@ -7264,18 +7264,18 @@ TEST_CASE("const_iterator class")
{
{
json
j
(
json
::
value_t
::
null
);
json
j
(
json
::
value_t
::
null
);
json
::
const_iterator
it
=
j
.
cend
();
json
::
const_iterator
it
=
j
.
cend
();
CHECK
(
it
.
m_it
.
generic
_iterator
==
1
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
1
);
}
}
SECTION
(
"number"
)
SECTION
(
"number"
)
{
{
json
j
(
17
);
json
j
(
17
);
json
::
const_iterator
it
=
j
.
cend
();
json
::
const_iterator
it
=
j
.
cend
();
CHECK
(
it
.
m_it
.
generic
_iterator
==
1
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
1
);
it
--
;
it
--
;
CHECK
(
it
.
m_it
.
generic
_iterator
==
0
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
0
);
it
--
;
it
--
;
CHECK
((
it
.
m_it
.
generic_iterator
!=
0
and
it
.
m_it
.
generic
_iterator
!=
1
));
CHECK
((
it
.
m_it
.
primitive_iterator
!=
0
and
it
.
m_it
.
primitive
_iterator
!=
1
));
}
}
SECTION
(
"object"
)
SECTION
(
"object"
)
...
@@ -7313,18 +7313,18 @@ TEST_CASE("const_iterator class")
...
@@ -7313,18 +7313,18 @@ TEST_CASE("const_iterator class")
{
{
json
j
(
json
::
value_t
::
null
);
json
j
(
json
::
value_t
::
null
);
json
::
const_iterator
it
=
j
.
cend
();
json
::
const_iterator
it
=
j
.
cend
();
CHECK
(
it
.
m_it
.
generic
_iterator
==
1
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
1
);
}
}
SECTION
(
"number"
)
SECTION
(
"number"
)
{
{
json
j
(
17
);
json
j
(
17
);
json
::
const_iterator
it
=
j
.
cend
();
json
::
const_iterator
it
=
j
.
cend
();
CHECK
(
it
.
m_it
.
generic
_iterator
==
1
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
1
);
--
it
;
--
it
;
CHECK
(
it
.
m_it
.
generic
_iterator
==
0
);
CHECK
(
it
.
m_it
.
primitive
_iterator
==
0
);
--
it
;
--
it
;
CHECK
((
it
.
m_it
.
generic_iterator
!=
0
and
it
.
m_it
.
generic
_iterator
!=
1
));
CHECK
((
it
.
m_it
.
primitive_iterator
!=
0
and
it
.
m_it
.
primitive
_iterator
!=
1
));
}
}
SECTION
(
"object"
)
SECTION
(
"object"
)
...
...
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