Skip to content

Commit 41b5f14

Browse files
Abseil Teamsuertreus
Abseil Team
authored and
suertreus
committed
Googletest export
Get rid of gmock-generated-matchers.h and gmock-generated-matchers.h.pump. Stop using pump for MATCHER* macroses generation. PiperOrigin-RevId: 293878808
1 parent 2d6d7a0 commit 41b5f14

8 files changed

+152
-905
lines changed

‎googlemock/include/gmock/gmock-generated-matchers.h

-761
This file was deleted.

‎googlemock/include/gmock/gmock-generated-matchers.h.pump

-124
This file was deleted.

‎googlemock/include/gmock/gmock-matchers.h

+141-15
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@
270270

271271
#include "gmock/internal/gmock-internal-utils.h"
272272
#include "gmock/internal/gmock-port.h"
273+
#include "gmock/internal/gmock-pp.h"
273274
#include "gtest/gtest.h"
274275

275276
// MSVC warning C5046 is new as of VS2017 version 15.8.
@@ -4813,29 +4814,154 @@ PolymorphicMatcher<internal::variant_matcher::VariantMatcher<T> > VariantWith(
48134814
::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
48144815

48154816
// MATCHER* macroses itself are listed below.
4816-
#define MATCHER(name, description) GMOCK_INTERNAL_MATCHER(name, description)
4817+
#define MATCHER(name, description) \
4818+
class name##Matcher \
4819+
: public ::testing::internal::MatcherBaseImpl<name##Matcher> { \
4820+
public: \
4821+
template <typename arg_type> \
4822+
class gmock_Impl : public ::testing::MatcherInterface<const arg_type&> { \
4823+
public: \
4824+
gmock_Impl() {} \
4825+
bool MatchAndExplain( \
4826+
const arg_type& arg, \
4827+
::testing::MatchResultListener* result_listener) const override; \
4828+
void DescribeTo(::std::ostream* gmock_os) const override { \
4829+
*gmock_os << FormatDescription(false); \
4830+
} \
4831+
void DescribeNegationTo(::std::ostream* gmock_os) const override { \
4832+
*gmock_os << FormatDescription(true); \
4833+
} \
4834+
\
4835+
private: \
4836+
::std::string FormatDescription(bool negation) const { \
4837+
::std::string gmock_description = (description); \
4838+
if (!gmock_description.empty()) { \
4839+
return gmock_description; \
4840+
} \
4841+
return ::testing::internal::FormatMatcherDescription(negation, #name, \
4842+
{}); \
4843+
} \
4844+
}; \
4845+
}; \
4846+
GTEST_ATTRIBUTE_UNUSED_ inline name##Matcher name() { return {}; } \
4847+
template <typename arg_type> \
4848+
bool name##Matcher::gmock_Impl<arg_type>::MatchAndExplain( \
4849+
const arg_type& arg, \
4850+
::testing::MatchResultListener* result_listener GTEST_ATTRIBUTE_UNUSED_) \
4851+
const
4852+
48174853
#define MATCHER_P(name, p0, description) \
4818-
GMOCK_INTERNAL_MATCHER_P(name, description, p0)
4854+
GMOCK_INTERNAL_MATCHER(name, name##MatcherP, description, (p0))
48194855
#define MATCHER_P2(name, p0, p1, description) \
4820-
GMOCK_INTERNAL_MATCHER_P2(name, description, p0, p1)
4856+
GMOCK_INTERNAL_MATCHER(name, name##MatcherP2, description, (p0, p1))
48214857
#define MATCHER_P3(name, p0, p1, p2, description) \
4822-
GMOCK_INTERNAL_MATCHER_P3(name, description, p0, p1, p2)
4858+
GMOCK_INTERNAL_MATCHER(name, name##MatcherP3, description, (p0, p1, p2))
48234859
#define MATCHER_P4(name, p0, p1, p2, p3, description) \
4824-
GMOCK_INTERNAL_MATCHER_P4(name, description, p0, p1, p2, p3)
4825-
#define MATCHER_P5(name, p0, p1, p2, p3, p4, description) \
4826-
GMOCK_INTERNAL_MATCHER_P5(name, description, p0, p1, p2, p3, p4)
4860+
GMOCK_INTERNAL_MATCHER(name, name##MatcherP4, description, (p0, p1, p2, p3))
4861+
#define MATCHER_P5(name, p0, p1, p2, p3, p4, description) \
4862+
GMOCK_INTERNAL_MATCHER(name, name##MatcherP5, description, \
4863+
(p0, p1, p2, p3, p4))
48274864
#define MATCHER_P6(name, p0, p1, p2, p3, p4, p5, description) \
4828-
GMOCK_INTERNAL_MATCHER_P6(name, description, p0, p1, p2, p3, p4, p5)
4865+
GMOCK_INTERNAL_MATCHER(name, name##MatcherP6, description, \
4866+
(p0, p1, p2, p3, p4, p5))
48294867
#define MATCHER_P7(name, p0, p1, p2, p3, p4, p5, p6, description) \
4830-
GMOCK_INTERNAL_MATCHER_P7(name, description, p0, p1, p2, p3, p4, p5, p6)
4868+
GMOCK_INTERNAL_MATCHER(name, name##MatcherP7, description, \
4869+
(p0, p1, p2, p3, p4, p5, p6))
48314870
#define MATCHER_P8(name, p0, p1, p2, p3, p4, p5, p6, p7, description) \
4832-
GMOCK_INTERNAL_MATCHER_P8(name, description, p0, p1, p2, p3, p4, p5, p6, p7)
4833-
#define MATCHER_P9(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, description) \
4834-
GMOCK_INTERNAL_MATCHER_P9(name, description, p0, p1, p2, p3, p4, p5, p6, p7, \
4835-
p8)
4871+
GMOCK_INTERNAL_MATCHER(name, name##MatcherP8, description, \
4872+
(p0, p1, p2, p3, p4, p5, p6, p7))
4873+
#define MATCHER_P9(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, description) \
4874+
GMOCK_INTERNAL_MATCHER(name, name##MatcherP9, description, \
4875+
(p0, p1, p2, p3, p4, p5, p6, p7, p8))
48364876
#define MATCHER_P10(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, description) \
4837-
GMOCK_INTERNAL_MATCHER_P10(name, description, p0, p1, p2, p3, p4, p5, p6, \
4838-
p7, p8, p9)
4877+
GMOCK_INTERNAL_MATCHER(name, name##MatcherP10, description, \
4878+
(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9))
4879+
4880+
#define GMOCK_INTERNAL_MATCHER(name, full_name, description, args) \
4881+
template <GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args)> \
4882+
class full_name : public ::testing::internal::MatcherBaseImpl< \
4883+
full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>> { \
4884+
public: \
4885+
using full_name::MatcherBaseImpl::MatcherBaseImpl; \
4886+
template <typename arg_type> \
4887+
class gmock_Impl : public ::testing::MatcherInterface<const arg_type&> { \
4888+
public: \
4889+
explicit gmock_Impl(GMOCK_INTERNAL_MATCHER_FUNCTION_ARGS(args)) \
4890+
: GMOCK_INTERNAL_MATCHER_FORWARD_ARGS(args) {} \
4891+
bool MatchAndExplain( \
4892+
const arg_type& arg, \
4893+
::testing::MatchResultListener* result_listener) const override; \
4894+
void DescribeTo(::std::ostream* gmock_os) const override { \
4895+
*gmock_os << FormatDescription(false); \
4896+
} \
4897+
void DescribeNegationTo(::std::ostream* gmock_os) const override { \
4898+
*gmock_os << FormatDescription(true); \
4899+
} \
4900+
GMOCK_INTERNAL_MATCHER_MEMBERS(args) \
4901+
\
4902+
private: \
4903+
::std::string FormatDescription(bool negation) const { \
4904+
::std::string gmock_description = (description); \
4905+
if (!gmock_description.empty()) { \
4906+
return gmock_description; \
4907+
} \
4908+
return ::testing::internal::FormatMatcherDescription( \
4909+
negation, #name, \
4910+
::testing::internal::UniversalTersePrintTupleFieldsToStrings( \
4911+
::std::tuple<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>( \
4912+
GMOCK_INTERNAL_MATCHER_MEMBERS_USAGE(args)))); \
4913+
} \
4914+
}; \
4915+
}; \
4916+
template <GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args)> \
4917+
inline full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)> name( \
4918+
GMOCK_INTERNAL_MATCHER_FUNCTION_ARGS(args)) { \
4919+
return full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>( \
4920+
GMOCK_INTERNAL_MATCHER_ARGS_USAGE(args)); \
4921+
} \
4922+
template <GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args)> \
4923+
template <typename arg_type> \
4924+
bool full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>::gmock_Impl< \
4925+
arg_type>::MatchAndExplain(const arg_type& arg, \
4926+
::testing::MatchResultListener* \
4927+
result_listener GTEST_ATTRIBUTE_UNUSED_) \
4928+
const
4929+
4930+
#define GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAMS(args) \
4931+
GMOCK_PP_TAIL( \
4932+
GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAM, , args))
4933+
#define GMOCK_INTERNAL_MATCHER_TEMPLATE_PARAM(i_unused, data_unused, arg) \
4934+
, typename arg##_type
4935+
4936+
#define GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args) \
4937+
GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_TYPE_PARAM, , args))
4938+
#define GMOCK_INTERNAL_MATCHER_TYPE_PARAM(i_unused, data_unused, arg) \
4939+
, arg##_type
4940+
4941+
#define GMOCK_INTERNAL_MATCHER_FUNCTION_ARGS(args) \
4942+
GMOCK_PP_TAIL(dummy_first GMOCK_PP_FOR_EACH( \
4943+
GMOCK_INTERNAL_MATCHER_FUNCTION_ARG, , args))
4944+
#define GMOCK_INTERNAL_MATCHER_FUNCTION_ARG(i, data_unused, arg) \
4945+
, arg##_type gmock_p##i
4946+
4947+
#define GMOCK_INTERNAL_MATCHER_FORWARD_ARGS(args) \
4948+
GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_FORWARD_ARG, , args))
4949+
#define GMOCK_INTERNAL_MATCHER_FORWARD_ARG(i, data_unused, arg) \
4950+
, arg(::std::forward<arg##_type>(gmock_p##i))
4951+
4952+
#define GMOCK_INTERNAL_MATCHER_MEMBERS(args) \
4953+
GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_MEMBER, , args)
4954+
#define GMOCK_INTERNAL_MATCHER_MEMBER(i_unused, data_unused, arg) \
4955+
const arg##_type arg;
4956+
4957+
#define GMOCK_INTERNAL_MATCHER_MEMBERS_USAGE(args) \
4958+
GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_MEMBER_USAGE, , args))
4959+
#define GMOCK_INTERNAL_MATCHER_MEMBER_USAGE(i_unused, data_unused, arg) , arg
4960+
4961+
#define GMOCK_INTERNAL_MATCHER_ARGS_USAGE(args) \
4962+
GMOCK_PP_TAIL(GMOCK_PP_FOR_EACH(GMOCK_INTERNAL_MATCHER_ARG_USAGE, , args))
4963+
#define GMOCK_INTERNAL_MATCHER_ARG_USAGE(i, data_unused, arg_unused) \
4964+
, gmock_p##i
48394965

48404966
} // namespace testing
48414967

‎googlemock/include/gmock/gmock-more-matchers.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
// Google Mock - a framework for writing C++ mock classes.
3232
//
33-
// This file implements some matchers that depend on gmock-generated-matchers.h.
33+
// This file implements some matchers that depend on gmock-matchers.h.
3434
//
3535
// Note that tests are implemented in gmock-matchers_test.cc rather than
3636
// gmock-more-matchers-test.cc.
@@ -40,7 +40,7 @@
4040
#ifndef GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_
4141
#define GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_
4242

43-
#include "gmock/gmock-generated-matchers.h"
43+
#include "gmock/gmock-matchers.h"
4444

4545
namespace testing {
4646

‎googlemock/include/gmock/gmock.h

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
#include "gmock/gmock-cardinalities.h"
6161
#include "gmock/gmock-function-mocker.h"
6262
#include "gmock/gmock-generated-actions.h"
63-
#include "gmock/gmock-generated-matchers.h"
6463
#include "gmock/gmock-matchers.h"
6564
#include "gmock/gmock-more-actions.h"
6665
#include "gmock/gmock-more-matchers.h"

‎googlemock/include/gmock/internal/gmock-pp.h

+8
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,14 @@
8686
#define GMOCK_PP_IF(_Cond, _Then, _Else) \
8787
GMOCK_PP_CAT(GMOCK_PP_INTERNAL_IF_, _Cond)(_Then, _Else)
8888

89+
// Similar to GMOCK_PP_IF but takes _Then and _Else in parentheses.
90+
//
91+
// GMOCK_PP_GENERIC_IF(1, (a, b, c), (d, e, f)) => a, b, c
92+
// GMOCK_PP_GENERIC_IF(0, (a, b, c), (d, e, f)) => d, e, f
93+
//
94+
#define GMOCK_PP_GENERIC_IF(_Cond, _Then, _Else) \
95+
GMOCK_PP_REMOVE_PARENS(GMOCK_PP_IF(_Cond, _Then, _Else))
96+
8997
// Evaluates to the number of arguments after expansion. Identifies 'empty' as
9098
// 0.
9199
//

‎googlemock/src/gmock-matchers.cc

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
// utilities for defining matchers.
3535

3636
#include "gmock/gmock-matchers.h"
37-
#include "gmock/gmock-generated-matchers.h"
3837

3938
#include <string.h>
4039
#include <iostream>

‎googlemock/test/gmock-generated-matchers_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
# pragma warning(disable:4100)
4040
#endif
4141

42-
#include "gmock/gmock-generated-matchers.h"
42+
#include "gmock/gmock-matchers.h"
4343

4444
#include <array>
4545
#include <iterator>

0 commit comments

Comments
 (0)