Export of internal Abseil changes
--
990253454819ce26ff1dda9ab4bbc145b61d01e4 by Xiaoyi Zhang <zhangxy@google.com>:
Import github PR https://github.com/abseil/abseil-cpp/pull/645
PiperOrigin-RevId: 303119797
--
5ac845cb7929b7d1eaf59a309afd811db5001175 by Abseil Team <absl-team@google.com>:
Fix internal exception spec compatibility error
PiperOrigin-RevId: 303104081
--
3290595dd866eecab3c7044e2e3ca0adb74f1bf5 by Gennadiy Rozental <rogeeff@google.com>:
Use FlagValue<T> to represent the value of a flag. Place it directly after
FlagImpl and use a computed offset refer to it.
The offset is computed based on the assumption that the `value_` data member
is placed directly after the impl_ data member in Flag<T>.
This change will allow us to migrate to `T`-specific storage in the generic case.
This change decreases the overhead for int flags by 32 bytes.
PiperOrigin-RevId: 303038099
--
f2b37722cd7a6d3a60ef9713f0d2bbff56f3ddbf by Derek Mauro <dmauro@google.com>:
Minor correctness fix for an ABSL_HAVE_BUILTIN conditional
PiperOrigin-RevId: 302980666
--
39c079a6141ae1c5728af8bf33a39c8aff9deb9f by Abseil Team <absl-team@google.com>:
Use ABSL_HARDENING_ASSERT in b-tree and SwissTable iterators.
PiperOrigin-RevId: 302970075
--
9668a044e080c789df32bcaa1ffb5100831cd9fa by Benjamin Barenblat <bbaren@google.com>:
Correct `add_subdirectory` line in CMake googletest support
Commit bcefbdcdf6 added support for building with CMake against a local googletest checkout, but I missed a line when constructing the diff. Change the `add_subdirectory` line to reference the correct directories.
PiperOrigin-RevId: 302947488
--
0a3c10fabf80a43ca69ab8b1570030e55f2be741 by Andy Soffer <asoffer@google.com>:
Remove unused distribution format traits.
PiperOrigin-RevId: 302896176
--
0478f2f6270e5ed64c0e28ec09556ca90b2d46a9 by Samuel Benzaquen <sbenza@google.com>:
Fix for CWG:2310.
PiperOrigin-RevId: 302734089
--
3cb978dda5cae5905affdc0914dcc2d27671ed11 by Samuel Benzaquen <sbenza@google.com>:
Fix the Allocate/Deallocate functions to use the same underlying allocator type.
PiperOrigin-RevId: 302721804
--
ae38d3984fb68b4e3ddc165fa8d5c24d5936be52 by Matthew Brown <matthewbr@google.com>:
Internal Change
PiperOrigin-RevId: 302717314
--
7357cf7abd03cc60b6e82b5f28a8e34935c3b4dc by Andy Getzendanner <durandal@google.com>:
Fix typo: s/ABSL_HARDENED_ASSERT/ABSL_HARDENING_ASSERT/
PiperOrigin-RevId: 302532164
GitOrigin-RevId: 990253454819ce26ff1dda9ab4bbc145b61d01e4
Change-Id: Ie595a221c16e1e7e1255ad42e029b646c5f3e11d
This commit is contained in:
parent
132d791b40
commit
79e0dc1151
29 changed files with 387 additions and 607 deletions
|
|
@ -33,20 +33,7 @@ struct DistributionCaller {
|
|||
// Call the provided distribution type. The parameters are expected
|
||||
// to be explicitly specified.
|
||||
// DistrT is the distribution type.
|
||||
// FormatT is the formatter type:
|
||||
//
|
||||
// struct FormatT {
|
||||
// using result_type = distribution_t::result_type;
|
||||
// static std::string FormatCall(
|
||||
// const distribution_t& distr,
|
||||
// absl::Span<const result_type>);
|
||||
//
|
||||
// static std::string FormatExpectation(
|
||||
// absl::string_view match_args,
|
||||
// absl::Span<const result_t> results);
|
||||
// }
|
||||
//
|
||||
template <typename DistrT, typename FormatT, typename... Args>
|
||||
template <typename DistrT, typename... Args>
|
||||
static typename DistrT::result_type Call(URBG* urbg, Args&&... args) {
|
||||
DistrT dist(std::forward<Args>(args)...);
|
||||
return dist(*urbg);
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@
|
|||
#ifndef ABSL_RANDOM_INTERNAL_MOCKING_BIT_GEN_BASE_H_
|
||||
#define ABSL_RANDOM_INTERNAL_MOCKING_BIT_GEN_BASE_H_
|
||||
|
||||
#include <atomic>
|
||||
#include <deque>
|
||||
#include <string>
|
||||
#include <typeinfo>
|
||||
|
||||
|
|
@ -28,27 +26,6 @@ namespace absl {
|
|||
ABSL_NAMESPACE_BEGIN
|
||||
namespace random_internal {
|
||||
|
||||
// MockingBitGenExpectationFormatter is invoked to format unsatisfied mocks
|
||||
// and remaining results into a description string.
|
||||
template <typename DistrT, typename FormatT>
|
||||
struct MockingBitGenExpectationFormatter {
|
||||
std::string operator()(absl::string_view args) {
|
||||
return absl::StrCat(FormatT::FunctionName(), "(", args, ")");
|
||||
}
|
||||
};
|
||||
|
||||
// MockingBitGenCallFormatter is invoked to format each distribution call
|
||||
// into a description string for the mock log.
|
||||
template <typename DistrT, typename FormatT>
|
||||
struct MockingBitGenCallFormatter {
|
||||
std::string operator()(const DistrT& dist,
|
||||
const typename DistrT::result_type& result) {
|
||||
return absl::StrCat(
|
||||
FormatT::FunctionName(), "(", FormatT::FormatArgs(dist), ") => {",
|
||||
FormatT::FormatResults(absl::MakeSpan(&result, 1)), "}");
|
||||
}
|
||||
};
|
||||
|
||||
class MockingBitGenBase {
|
||||
template <typename>
|
||||
friend struct DistributionCaller;
|
||||
|
|
@ -61,14 +38,9 @@ class MockingBitGenBase {
|
|||
static constexpr result_type(max)() { return (generator_type::max)(); }
|
||||
result_type operator()() { return gen_(); }
|
||||
|
||||
MockingBitGenBase() : gen_(), observed_call_log_() {}
|
||||
virtual ~MockingBitGenBase() = default;
|
||||
|
||||
protected:
|
||||
const std::deque<std::string>& observed_call_log() {
|
||||
return observed_call_log_;
|
||||
}
|
||||
|
||||
// CallImpl is the type-erased virtual dispatch.
|
||||
// The type of dist is always distribution<T>,
|
||||
// The type of result is always distribution<T>::result_type.
|
||||
|
|
@ -81,10 +53,9 @@ class MockingBitGenBase {
|
|||
}
|
||||
|
||||
// Call the generating distribution function.
|
||||
// Invoked by DistributionCaller<>::Call<DistT, FormatT>.
|
||||
// Invoked by DistributionCaller<>::Call<DistT>.
|
||||
// DistT is the distribution type.
|
||||
// FormatT is the distribution formatter traits type.
|
||||
template <typename DistrT, typename FormatT, typename... Args>
|
||||
template <typename DistrT, typename... Args>
|
||||
typename DistrT::result_type Call(Args&&... args) {
|
||||
using distr_result_type = typename DistrT::result_type;
|
||||
using ArgTupleT = std::tuple<absl::decay_t<Args>...>;
|
||||
|
|
@ -100,17 +71,11 @@ class MockingBitGenBase {
|
|||
result = dist(gen_);
|
||||
}
|
||||
|
||||
// TODO(asoffer): Forwarding the args through means we no longer need to
|
||||
// extract them from the from the distribution in formatter traits. We can
|
||||
// just StrJoin them.
|
||||
observed_call_log_.push_back(
|
||||
MockingBitGenCallFormatter<DistrT, FormatT>{}(dist, result));
|
||||
return result;
|
||||
}
|
||||
|
||||
private:
|
||||
generator_type gen_;
|
||||
std::deque<std::string> observed_call_log_;
|
||||
}; // namespace random_internal
|
||||
|
||||
} // namespace random_internal
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue