projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable a missing test in the CMake build
[folly.git]
/
folly
/
FormatArg.h
diff --git
a/folly/FormatArg.h
b/folly/FormatArg.h
index fda872d39a901e16c3a68849299b8d21c45f2e7f..48311e3d4e7cd18a77aeacb553dd0d4c98fc7ee9 100644
(file)
--- a/
folly/FormatArg.h
+++ b/
folly/FormatArg.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
4
Facebook, Inc.
+ * Copyright 201
7
Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-14,14
+14,13
@@
* limitations under the License.
*/
* limitations under the License.
*/
-#ifndef FOLLY_FORMATARG_H_
-#define FOLLY_FORMATARG_H_
+#pragma once
#include <stdexcept>
#include <stdexcept>
-#include
"folly/Conv.h"
-#include
"folly/Likely.h"
-#include
"folly/Portability.h"
-#include
"folly/Range.h"
+#include
<folly/Conv.h>
+#include
<folly/Likely.h>
+#include
<folly/Portability.h>
+#include
<folly/Range.h>
namespace folly {
namespace folly {
@@
-46,7
+45,9
@@
struct FormatArg {
sign(Sign::DEFAULT),
basePrefix(false),
thousandsSeparator(false),
sign(Sign::DEFAULT),
basePrefix(false),
thousandsSeparator(false),
+ trailingDot(false),
width(kDefaultWidth),
width(kDefaultWidth),
+ widthIndex(kNoIndex),
precision(kDefaultPrecision),
presentation(kDefaultPresentation),
nextKeyMode_(NextKeyMode::NONE) {
precision(kDefaultPrecision),
presentation(kDefaultPresentation),
nextKeyMode_(NextKeyMode::NONE) {
@@
-80,7
+81,7
@@
struct FormatArg {
template <typename... Args>
std::string errorStr(Args&&... args) const;
template <typename... Args>
template <typename... Args>
std::string errorStr(Args&&... args) const;
template <typename... Args>
-
FOLLY_NORETURN
void error(Args&&... args) const;
+
[[noreturn]]
void error(Args&&... args) const;
/**
* Full argument string, as passed in to the constructor.
/**
* Full argument string, as passed in to the constructor.
@@
-129,10
+130,18
@@
struct FormatArg {
bool thousandsSeparator;
/**
bool thousandsSeparator;
/**
- * Field width
+ * Force a trailing decimal on doubles which could be rendered as ints
+ */
+ bool trailingDot;
+
+ /**
+ * Field width and optional argument index
*/
static constexpr int kDefaultWidth = -1;
*/
static constexpr int kDefaultWidth = -1;
+ static constexpr int kDynamicWidth = -2;
+ static constexpr int kNoIndex = -1;
int width;
int width;
+ int widthIndex;
/**
* Precision
/**
* Precision
@@
-202,7
+211,7
@@
inline std::string FormatArg::errorStr(Args&&... args) const {
}
template <typename... Args>
}
template <typename... Args>
-inline void FormatArg::error(Args&&... args) const {
+
[[noreturn]]
inline void FormatArg::error(Args&&... args) const {
throw BadFormatArg(errorStr(std::forward<Args>(args)...));
}
throw BadFormatArg(errorStr(std::forward<Args>(args)...));
}
@@
-234,10
+243,10
@@
inline StringPiece FormatArg::doSplitKey() {
const char* p;
if (e[-1] == ']') {
--e;
const char* p;
if (e[-1] == ']') {
--e;
- p = static_cast<const char*>(memchr(b, '[',
e - b
));
- enforce(p, "unmatched ']'");
+ p = static_cast<const char*>(memchr(b, '[',
size_t(e - b)
));
+ enforce(p
!= nullptr
, "unmatched ']'");
} else {
} else {
- p = static_cast<const char*>(memchr(b, '.',
e - b
));
+ p = static_cast<const char*>(memchr(b, '.',
size_t(e - b)
));
}
if (p) {
key_.assign(p + 1, e);
}
if (p) {
key_.assign(p + 1, e);
@@
-258,13
+267,10
@@
inline int FormatArg::splitIntKey() {
}
try {
return to<int>(doSplitKey<true>());
}
try {
return to<int>(doSplitKey<true>());
- } catch (const std::out_of_range&
e
) {
+ } catch (const std::out_of_range&) {
error("integer key required");
return 0; // unreached
}
}
} // namespace folly
error("integer key required");
return 0; // unreached
}
}
} // namespace folly
-
-#endif /* FOLLY_FORMATARG_H_ */
-