Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fmt
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
fmt
Commits
b8b06e3e
Commit
b8b06e3e
authored
Nov 30, 2018
by
Victor Zverovich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix conversion warnings in Grisu
parent
322b2594
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
17 deletions
+17
-17
include/fmt/format-inl.h
include/fmt/format-inl.h
+17
-17
No files found.
include/fmt/format-inl.h
View file @
b8b06e3e
...
@@ -545,30 +545,30 @@ struct gen_digits_params {
...
@@ -545,30 +545,30 @@ struct gen_digits_params {
struct
prettify_handler
{
struct
prettify_handler
{
char
*
data
;
char
*
data
;
size
_t
size
;
ptrdiff
_t
size
;
buffer
&
buf
;
buffer
&
buf
;
explicit
prettify_handler
(
buffer
&
b
,
size
_t
n
)
explicit
prettify_handler
(
buffer
&
b
,
ptrdiff
_t
n
)
:
data
(
b
.
data
()),
size
(
n
),
buf
(
b
)
{}
:
data
(
b
.
data
()),
size
(
n
),
buf
(
b
)
{}
~
prettify_handler
()
{
~
prettify_handler
()
{
assert
(
buf
.
size
()
>=
size
);
assert
(
buf
.
size
()
>=
to_unsigned
(
size
)
);
buf
.
resize
(
size
);
buf
.
resize
(
to_unsigned
(
size
)
);
}
}
template
<
typename
F
>
template
<
typename
F
>
void
insert
(
size_t
pos
,
size
_t
n
,
F
f
)
{
void
insert
(
ptrdiff_t
pos
,
ptrdiff
_t
n
,
F
f
)
{
std
::
memmove
(
data
+
pos
+
n
,
data
+
pos
,
size
-
pos
);
std
::
memmove
(
data
+
pos
+
n
,
data
+
pos
,
to_unsigned
(
size
-
pos
)
);
f
(
data
+
pos
);
f
(
data
+
pos
);
size
+=
n
;
size
+=
n
;
}
}
void
insert
(
size
_t
pos
,
char
c
)
{
void
insert
(
ptrdiff
_t
pos
,
char
c
)
{
std
::
memmove
(
data
+
pos
+
1
,
data
+
pos
,
size
-
pos
);
std
::
memmove
(
data
+
pos
+
1
,
data
+
pos
,
to_unsigned
(
size
-
pos
)
);
data
[
pos
]
=
c
;
data
[
pos
]
=
c
;
++
size
;
++
size
;
}
}
void
append
(
size
_t
n
,
char
c
)
{
void
append
(
ptrdiff
_t
n
,
char
c
)
{
std
::
uninitialized_fill_n
(
data
+
size
,
n
,
c
);
std
::
uninitialized_fill_n
(
data
+
size
,
n
,
c
);
size
+=
n
;
size
+=
n
;
}
}
...
@@ -615,7 +615,7 @@ struct fill {
...
@@ -615,7 +615,7 @@ struct fill {
// The number is given as v = f * pow(10, exp), where f has size digits.
// The number is given as v = f * pow(10, exp), where f has size digits.
template
<
typename
Handler
>
template
<
typename
Handler
>
FMT_FUNC
void
grisu2_prettify
(
const
gen_digits_params
&
params
,
FMT_FUNC
void
grisu2_prettify
(
const
gen_digits_params
&
params
,
size
_t
size
,
int
exp
,
Handler
&&
handler
)
{
ptrdiff
_t
size
,
int
exp
,
Handler
&&
handler
)
{
if
(
!
params
.
fixed
)
{
if
(
!
params
.
fixed
)
{
// Insert a decimal point after the first digit and add an exponent.
// Insert a decimal point after the first digit and add an exponent.
handler
.
insert
(
1
,
'.'
);
handler
.
insert
(
1
,
'.'
);
...
@@ -646,7 +646,7 @@ FMT_FUNC void grisu2_prettify(const gen_digits_params ¶ms,
...
@@ -646,7 +646,7 @@ FMT_FUNC void grisu2_prettify(const gen_digits_params ¶ms,
handler
.
remove_trailing
(
'0'
);
handler
.
remove_trailing
(
'0'
);
}
else
if
(
params
.
num_digits
>
size
)
{
}
else
if
(
params
.
num_digits
>
size
)
{
// Add trailing zeros.
// Add trailing zeros.
size
_t
num_zeros
=
params
.
num_digits
-
size
;
ptrdiff
_t
num_zeros
=
params
.
num_digits
-
size
;
handler
.
append
(
num_zeros
,
'0'
);
handler
.
append
(
num_zeros
,
'0'
);
}
}
}
else
{
}
else
{
...
@@ -656,12 +656,12 @@ FMT_FUNC void grisu2_prettify(const gen_digits_params ¶ms,
...
@@ -656,12 +656,12 @@ FMT_FUNC void grisu2_prettify(const gen_digits_params ¶ms,
}
}
struct
char_counter
{
struct
char_counter
{
size
_t
size
;
ptrdiff
_t
size
;
template
<
typename
F
>
template
<
typename
F
>
void
insert
(
size_t
,
size
_t
n
,
F
)
{
size
+=
n
;
}
void
insert
(
ptrdiff_t
,
ptrdiff
_t
n
,
F
)
{
size
+=
n
;
}
void
insert
(
size
_t
,
char
)
{
++
size
;
}
void
insert
(
ptrdiff
_t
,
char
)
{
++
size
;
}
void
append
(
size
_t
n
,
char
)
{
size
+=
n
;
}
void
append
(
ptrdiff
_t
n
,
char
)
{
size
+=
n
;
}
void
append
(
char
)
{
++
size
;
}
void
append
(
char
)
{
++
size
;
}
void
remove_trailing
(
char
)
{}
void
remove_trailing
(
char
)
{}
};
};
...
@@ -704,9 +704,9 @@ FMT_FUNC gen_digits_params process_specs(const core_format_specs &specs,
...
@@ -704,9 +704,9 @@ FMT_FUNC gen_digits_params process_specs(const core_format_specs &specs,
break
;
break
;
}
}
params
.
num_digits
=
to_unsigned
(
num_digits
);
params
.
num_digits
=
to_unsigned
(
num_digits
);
char_counter
counter
{
params
.
num_digits
};
char_counter
counter
{
num_digits
};
grisu2_prettify
(
params
,
params
.
num_digits
,
exp
-
num_digits
,
counter
);
grisu2_prettify
(
params
,
params
.
num_digits
,
exp
-
num_digits
,
counter
);
buf
.
resize
(
counter
.
size
);
buf
.
resize
(
to_unsigned
(
counter
.
size
)
);
return
params
;
return
params
;
}
}
...
...
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