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
4151f2d2
Unverified
Commit
4151f2d2
authored
Feb 19, 2017
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✅
added test with thousands_sep
parent
5b53f03e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
48 deletions
+20
-48
src/json.hpp
src/json.hpp
+1
-20
src/json.hpp.re2c
src/json.hpp.re2c
+1
-20
test/src/unit-regression.cpp
test/src/unit-regression.cpp
+18
-8
No files found.
src/json.hpp
View file @
4151f2d2
...
...
@@ -8298,25 +8298,7 @@ class basic_json
snprintf
(
m_buf
.
data
(),
m_buf
.
size
(),
fmt
,
x
);
#if 0
// C locales and C++ locales are similar but
// different.
//
// If working with C++ streams we'd've used
// these, but for C formatting functions we
// have to use C locales (setlocale / localeconv),
// rather than C++ locales (std::locale installed
// by std::locale::global()).
const std::locale loc;
const char thousands_sep =
std::use_facet< std::numpunct<char>>(
loc).thousands_sep();
const char decimal_point =
std::use_facet< std::numpunct<char>>(
loc).decimal_point();
#else
// read information from locale
const
auto
loc
=
localeconv
();
assert
(
loc
!=
nullptr
);
const
char
thousands_sep
=
!
loc
->
thousands_sep
?
'\0'
...
...
@@ -8324,7 +8306,6 @@ class basic_json
const
char
decimal_point
=
!
loc
->
decimal_point
?
'\0'
:
loc
->
decimal_point
[
0
];
#endif
// erase thousands separator
if
(
thousands_sep
!=
'\0'
)
...
...
src/json.hpp.re2c
View file @
4151f2d2
...
...
@@ -8298,25 +8298,7 @@ class basic_json
snprintf(m_buf.data(), m_buf.size(), fmt, x);
#if 0
// C locales and C++ locales are similar but
// different.
//
// If working with C++ streams we'd've used
// these, but for C formatting functions we
// have to use C locales (setlocale / localeconv),
// rather than C++ locales (std::locale installed
// by std::locale::global()).
const std::locale loc;
const char thousands_sep =
std::use_facet< std::numpunct<char>>(
loc).thousands_sep();
const char decimal_point =
std::use_facet< std::numpunct<char>>(
loc).decimal_point();
#else
// read information from locale
const auto loc = localeconv();
assert(loc != nullptr);
const char thousands_sep = !loc->thousands_sep ? '\0'
...
...
@@ -8324,7 +8306,6 @@ class basic_json
const char decimal_point = !loc->decimal_point ? '\0'
: loc->decimal_point[0];
#endif
// erase thousands separator
if (thousands_sep != '\0')
...
...
test/src/unit-regression.cpp
View file @
4151f2d2
...
...
@@ -361,8 +361,8 @@ TEST_CASE("regression tests")
SECTION
(
"issue #228 - double values are serialized with commas as decimal points"
)
{
json
j1a
=
23.42
;
json
j1b
=
json
::
parse
(
"23.42"
);
json
j1a
=
23
12
.42
;
json
j1b
=
json
::
parse
(
"23
12
.42"
);
json
j2a
=
2342e-2
;
//issue #230
...
...
@@ -380,23 +380,33 @@ TEST_CASE("regression tests")
{
return
','
;
}
char
do_thousands_sep
()
const
{
return
'.'
;
}
std
::
string
do_grouping
()
const
{
return
"
\03
"
;
}
};
// change locale to mess with decimal points
auto
orig_locale
=
std
::
locale
::
global
(
std
::
locale
(
std
::
locale
(),
new
CommaDecimalSeparator
));
CHECK
(
j1a
.
dump
()
==
"23.42"
);
CHECK
(
j1b
.
dump
()
==
"23.42"
);
CHECK
(
j1a
.
dump
()
==
"23
12
.42"
);
CHECK
(
j1b
.
dump
()
==
"23
12
.42"
);
// check if locale is properly reset
std
::
stringstream
ss
;
ss
.
imbue
(
std
::
locale
(
std
::
locale
(),
new
CommaDecimalSeparator
));
ss
<<
47.11
;
CHECK
(
ss
.
str
()
==
"4
7
,11"
);
ss
<<
47
12
.11
;
CHECK
(
ss
.
str
()
==
"4
.712
,11"
);
ss
<<
j1a
;
CHECK
(
ss
.
str
()
==
"4
7,1123
.42"
);
CHECK
(
ss
.
str
()
==
"4
.712,112312
.42"
);
ss
<<
47.11
;
CHECK
(
ss
.
str
()
==
"4
7,1123
.4247,11"
);
CHECK
(
ss
.
str
()
==
"4
.712,112312
.4247,11"
);
CHECK
(
j2a
.
dump
()
==
"23.42"
);
//issue #230
...
...
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