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
28f64c22
Commit
28f64c22
authored
Apr 26, 2015
by
Florian Weber
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
simplify operator<
parent
a3729374
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
88 deletions
+46
-88
src/json.hpp
src/json.hpp
+23
-44
src/json.hpp.re2c
src/json.hpp.re2c
+23
-44
No files found.
src/json.hpp
View file @
28f64c22
...
...
@@ -1951,77 +1951,56 @@ class basic_json
/// comparison: less than
friend
bool
operator
<
(
const_reference
lhs
,
const_reference
rhs
)
noexcept
{
switch
(
lhs
.
type
())
const
auto
lhs_type
=
lhs
.
type
();
const
auto
rhs_type
=
rhs
.
type
();
if
(
lhs_type
==
rhs_type
)
{
case
(
value_t
:
:
array
)
:
switch
(
lhs_type
)
{
if
(
rhs
.
type
()
==
value_t
::
array
)
case
(
value_t
:
:
array
)
:
{
return
*
lhs
.
m_value
.
array
<
*
rhs
.
m_value
.
array
;
return
*
lhs
.
m_value
_
array
<
*
rhs
.
m_value
.
array
;
}
break
;
}
case
(
value_t
:
:
object
)
:
{
if
(
rhs
.
type
()
==
value_t
::
object
)
case
(
value_t
:
:
onject
)
:
{
return
*
lhs
.
m_value
.
object
<
*
rhs
.
m_value
.
object
;
}
break
;
}
case
(
value_t
:
:
null
)
:
{
if
(
rhs
.
type
()
==
value_t
::
null
)
case
(
value_t
:
:
null
)
:
{
return
false
;
}
break
;
}
case
(
value_t
:
:
string
)
:
{
if
(
rhs
.
type
()
==
value_t
::
string
)
case
(
value_t
:
:
string
)
:
{
return
*
lhs
.
m_value
.
string
<
*
rhs
.
m_value
.
string
;
}
break
;
}
case
(
value_t
:
:
boolean
)
:
{
if
(
rhs
.
type
()
==
value_t
::
boolean
)
case
(
value_t
:
:
boolean
)
:
{
return
lhs
.
m_value
.
boolean
<
rhs
.
m_value
.
boolean
;
}
break
;
}
case
(
value_t
:
:
number_integer
)
:
{
if
(
rhs
.
type
()
==
value_t
::
number_integer
)
case
(
value_t
:
:
number_integer
)
:
{
return
lhs
.
m_value
.
number_integer
<
rhs
.
m_value
.
number_integer
;
}
if
(
rhs
.
type
()
==
value_t
::
number_float
)
{
return
lhs
.
m_value
.
number_integer
<
static_cast
<
number_integer_t
>
(
rhs
.
m_value
.
number_float
);
}
break
;
}
case
(
value_t
:
:
number_float
)
:
{
if
(
rhs
.
type
()
==
value_t
::
number_integer
)
{
return
lhs
.
m_value
.
number_float
<
static_cast
<
number_float_t
>
(
rhs
.
m_value
.
number_integer
);
}
if
(
rhs
.
type
()
==
value_t
::
number_float
)
case
(
value_t
:
:
number_float
)
:
{
return
lhs
.
m_value
.
number_float
<
rhs
.
m_value
.
number_float
;
}
break
;
}
}
else
if
(
lhs_type
==
value_t
::
number_integer
and
rhs_type
==
value_t
::
number_float
)
{
return
lhs
.
m_value
.
number_integer
<
static_cast
<
number_integer_t
>
(
rhs
.
m_value
.
number_float
);
}
else
if
(
lhs_type
==
value_t
::
number_float
and
rhs_type
==
value_t
::
number_integer
)
{
return
lhs
.
m_value
.
number_float
<
static_cast
<
number_float_t
>
(
rhs
.
m_value
.
number_integer
);
}
// We only reach this line if we cannot compare values. In that case,
// we compare types.
return
lhs
.
type
()
<
rhs
.
type
()
;
return
lhs
_type
<
rhs_type
;
}
/// comparison: less than or equal
...
...
src/json.hpp.re2c
View file @
28f64c22
...
...
@@ -1951,77 +1951,56 @@ class basic_json
/// comparison: less than
friend bool operator<(const_reference lhs, const_reference rhs) noexcept
{
switch (lhs.type())
const auto lhs_type = lhs.type();
const auto rhs_type = rhs.type();
if (lhs_type == rhs_type)
{
case (value_t::array):
switch (lhs_type)
{
if (rhs.type() == value_t::array)
case (value_t::array):
{
return *lhs.m_value
.
array < *rhs.m_value.array;
return *lhs.m_value
_
array < *rhs.m_value.array;
}
break;
}
case (value_t::object):
{
if (rhs.type() == value_t::object)
case (value_t::onject):
{
return *lhs.m_value.object < *rhs.m_value.object;
}
break;
}
case (value_t::null):
{
if (rhs.type() == value_t::null)
case (value_t::null):
{
return false;
}
break;
}
case (value_t::string):
{
if (rhs.type() == value_t::string)
case (value_t::string):
{
return *lhs.m_value.string < *rhs.m_value.string;
}
break;
}
case (value_t::boolean):
{
if (rhs.type() == value_t::boolean)
case (value_t::boolean):
{
return lhs.m_value.boolean < rhs.m_value.boolean;
}
break;
}
case (value_t::number_integer):
{
if (rhs.type() == value_t::number_integer)
case (value_t::number_integer):
{
return lhs.m_value.number_integer < rhs.m_value.number_integer;
}
if (rhs.type() == value_t::number_float)
{
return lhs.m_value.number_integer < static_cast<number_integer_t>(rhs.m_value.number_float);
}
break;
}
case (value_t::number_float):
{
if (rhs.type() == value_t::number_integer)
{
return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_integer);
}
if (rhs.type() == value_t::number_float)
case (value_t::number_float):
{
return lhs.m_value.number_float < rhs.m_value.number_float;
}
break;
}
}
else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
{
return lhs.m_value.number_integer <
static_cast<number_integer_t>(rhs.m_value.number_float);
}
else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
{
return lhs.m_value.number_float <
static_cast<number_float_t>(rhs.m_value.number_integer);
}
// We only reach this line if we cannot compare values. In that case,
// we compare types.
return lhs
.type() < rhs.type()
;
return lhs
_type < rhs_type
;
}
/// comparison: less than or equal
...
...
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