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
6fc52f33
Commit
6fc52f33
authored
Mar 24, 2015
by
Niels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed #47 (added erase function to remove key form object)
parent
43417c35
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
104 additions
and
0 deletions
+104
-0
src/json.hpp
src/json.hpp
+12
-0
src/json.hpp.re2c
src/json.hpp.re2c
+12
-0
test/unit.cpp
test/unit.cpp
+80
-0
No files found.
src/json.hpp
View file @
6fc52f33
...
@@ -1050,6 +1050,18 @@ class basic_json
...
@@ -1050,6 +1050,18 @@ class basic_json
return
m_value
.
object
->
operator
[](
key
);
return
m_value
.
object
->
operator
[](
key
);
}
}
/// remove element from an object given a key
inline
size_type
erase
(
const
typename
object_t
::
key_type
&
key
)
{
// at only works for objects
if
(
m_type
!=
value_t
::
object
)
{
throw
std
::
runtime_error
(
"cannot use at with "
+
type_name
());
}
return
m_value
.
object
->
erase
(
key
);
}
/// find an element in an object
/// find an element in an object
inline
iterator
find
(
typename
object_t
::
key_type
key
)
inline
iterator
find
(
typename
object_t
::
key_type
key
)
{
{
...
...
src/json.hpp.re2c
View file @
6fc52f33
...
@@ -1050,6 +1050,18 @@ class basic_json
...
@@ -1050,6 +1050,18 @@ class basic_json
return m_value.object->operator[](key);
return m_value.object->operator[](key);
}
}
/// remove element from an object given a key
inline size_type erase(const typename object_t::key_type& key)
{
// at only works for objects
if (m_type != value_t::object)
{
throw std::runtime_error("cannot use at with " + type_name());
}
return m_value.object->erase(key);
}
/// find an element in an object
/// find an element in an object
inline iterator find(typename object_t::key_type key)
inline iterator find(typename object_t::key_type key)
{
{
...
...
test/unit.cpp
View file @
6fc52f33
...
@@ -2367,6 +2367,86 @@ TEST_CASE("element access")
...
@@ -2367,6 +2367,86 @@ TEST_CASE("element access")
}
}
}
}
SECTION
(
"remove specified element"
)
{
SECTION
(
"remove element"
)
{
CHECK
(
j
.
find
(
"integer"
)
!=
j
.
end
());
CHECK
(
j
.
erase
(
"integer"
)
==
1
);
CHECK
(
j
.
find
(
"integer"
)
==
j
.
end
());
CHECK
(
j
.
erase
(
"integer"
)
==
0
);
CHECK
(
j
.
find
(
"boolean"
)
!=
j
.
end
());
CHECK
(
j
.
erase
(
"boolean"
)
==
1
);
CHECK
(
j
.
find
(
"boolean"
)
==
j
.
end
());
CHECK
(
j
.
erase
(
"boolean"
)
==
0
);
CHECK
(
j
.
find
(
"null"
)
!=
j
.
end
());
CHECK
(
j
.
erase
(
"null"
)
==
1
);
CHECK
(
j
.
find
(
"null"
)
==
j
.
end
());
CHECK
(
j
.
erase
(
"null"
)
==
0
);
CHECK
(
j
.
find
(
"string"
)
!=
j
.
end
());
CHECK
(
j
.
erase
(
"string"
)
==
1
);
CHECK
(
j
.
find
(
"string"
)
==
j
.
end
());
CHECK
(
j
.
erase
(
"string"
)
==
0
);
CHECK
(
j
.
find
(
"floating"
)
!=
j
.
end
());
CHECK
(
j
.
erase
(
"floating"
)
==
1
);
CHECK
(
j
.
find
(
"floating"
)
==
j
.
end
());
CHECK
(
j
.
erase
(
"floating"
)
==
0
);
CHECK
(
j
.
find
(
"object"
)
!=
j
.
end
());
CHECK
(
j
.
erase
(
"object"
)
==
1
);
CHECK
(
j
.
find
(
"object"
)
==
j
.
end
());
CHECK
(
j
.
erase
(
"object"
)
==
0
);
CHECK
(
j
.
find
(
"array"
)
!=
j
.
end
());
CHECK
(
j
.
erase
(
"array"
)
==
1
);
CHECK
(
j
.
find
(
"array"
)
==
j
.
end
());
CHECK
(
j
.
erase
(
"array"
)
==
0
);
}
SECTION
(
"access on non-object type"
)
{
SECTION
(
"null"
)
{
json
j_nonobject
(
json
::
value_t
::
null
);
CHECK_THROWS_AS
(
j_nonobject
.
erase
(
"foo"
),
std
::
runtime_error
);
}
SECTION
(
"boolean"
)
{
json
j_nonobject
(
json
::
value_t
::
boolean
);
CHECK_THROWS_AS
(
j_nonobject
.
erase
(
"foo"
),
std
::
runtime_error
);
}
SECTION
(
"string"
)
{
json
j_nonobject
(
json
::
value_t
::
string
);
CHECK_THROWS_AS
(
j_nonobject
.
erase
(
"foo"
),
std
::
runtime_error
);
}
SECTION
(
"array"
)
{
json
j_nonobject
(
json
::
value_t
::
array
);
CHECK_THROWS_AS
(
j_nonobject
.
erase
(
"foo"
),
std
::
runtime_error
);
}
SECTION
(
"number (integer)"
)
{
json
j_nonobject
(
json
::
value_t
::
number_integer
);
CHECK_THROWS_AS
(
j_nonobject
.
erase
(
"foo"
),
std
::
runtime_error
);
}
SECTION
(
"number (floating-point)"
)
{
json
j_nonobject
(
json
::
value_t
::
number_float
);
CHECK_THROWS_AS
(
j_nonobject
.
erase
(
"foo"
),
std
::
runtime_error
);
}
}
}
SECTION
(
"find an element in an object"
)
SECTION
(
"find an element in an object"
)
{
{
SECTION
(
"existing element"
)
SECTION
(
"existing element"
)
...
...
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