projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add readWithPriority to PriorityMPMCQueue
[folly.git]
/
folly
/
FormatArg.h
diff --git
a/folly/FormatArg.h
b/folly/FormatArg.h
index b6a00187001ed7fe180aa16ac79c2aa44722f0cd..a6d4fb63865eb3b7cd0cf0faec1641274f0b10f8 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,10
+14,10
@@
* 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/Conv.h>
#include <folly/Likely.h>
#include <folly/Portability.h>
@@
-26,11
+26,12
@@
namespace folly {
class BadFormatArg : public std::invalid_argument {
namespace folly {
class BadFormatArg : public std::invalid_argument {
- public:
- explicit BadFormatArg(const std::string& msg)
- : std::invalid_argument(msg) {}
+ using invalid_argument::invalid_argument;
};
};
+[[noreturn]] void throwBadFormatArg(char const* msg);
+[[noreturn]] void throwBadFormatArg(std::string const& msg);
+
/**
* Parsed format argument.
*/
/**
* Parsed format argument.
*/
@@
-48,6
+49,7
@@
struct FormatArg {
thousandsSeparator(false),
trailingDot(false),
width(kDefaultWidth),
thousandsSeparator(false),
trailingDot(false),
width(kDefaultWidth),
+ widthIndex(kNoIndex),
precision(kDefaultPrecision),
presentation(kDefaultPresentation),
nextKeyMode_(NextKeyMode::NONE) {
precision(kDefaultPrecision),
presentation(kDefaultPresentation),
nextKeyMode_(NextKeyMode::NONE) {
@@
-81,7
+83,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.
@@
-135,10
+137,13
@@
struct FormatArg {
bool trailingDot;
/**
bool trailingDot;
/**
- * Field width
+ * 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
@@
-208,8
+213,8
@@
inline std::string FormatArg::errorStr(Args&&... args) const {
}
template <typename... Args>
}
template <typename... Args>
-inline void FormatArg::error(Args&&... args) const {
- throw
BadFormatArg(errorStr(std::forward<Args>(args)...));
+
[[noreturn]]
inline void FormatArg::error(Args&&... args) const {
+ throwBadFormatArg(errorStr(std::forward<Args>(args)...));
}
template <bool emptyOk>
}
template <bool emptyOk>
@@
-240,10
+245,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);
@@
-264,13
+269,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
}
}
error("integer key required");
return 0; // unreached
}
}
-} // namespace folly
-
-#endif /* FOLLY_FORMATARG_H_ */
-
+} // namespace folly