Skip to content

GitLab

T
tangled
Commit 12f4b983 authored by Avi Drissman's avatar Avi Drissman
Browse files
Options

Update legacy Tuple-using code. 

BUG=440675
TEST=no change
R=mdempsky@chromium.org, nasko@chromium.org
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/814403003

Cr-Commit-Position: refs/heads/master@{#309432}
parent afe00d04
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1580 additions and 1590 deletions
chrome/common/chrome_utility_messages.h
View file @ 12f4b983
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#ifndef CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_ #ifndef CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_
#define CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_ #define CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_
typedef std::vector<Tuple2<SkBitmap, base::FilePath> > DecodedImages; typedef std::vector<Tuple<SkBitmap, base::FilePath>> DecodedImages;
#endif // CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_ #endif // CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_
...@@ -38,9 +38,9 @@ IPC_STRUCT_TRAITS_END() ...@@ -38,9 +38,9 @@ IPC_STRUCT_TRAITS_END()
#if defined(OS_WIN) #if defined(OS_WIN)
// A vector of filters, each being a Tuple2 containing a display string (i.e. // A vector of filters, each being a Tuple containing a display string (i.e.
// "Text Files") and a filter pattern (i.e. "*.txt"). // "Text Files") and a filter pattern (i.e. "*.txt").
typedef std::vector<Tuple2<base::string16, base::string16> > typedef std::vector<Tuple<base::string16, base::string16>>
GetOpenFileNameFilter; GetOpenFileNameFilter;
IPC_STRUCT_BEGIN(ChromeUtilityMsg_GetSaveFileName_Params) IPC_STRUCT_BEGIN(ChromeUtilityMsg_GetSaveFileName_Params)
......
ipc/ipc_message_macros.h
View file @ 12f4b983
...@@ -457,7 +457,7 @@ ...@@ -457,7 +457,7 @@
void (T::*func)(P*, TA)) { \ void (T::*func)(P*, TA)) { \
Schema::Param p; \ Schema::Param p; \
if (Read(msg, &p)) { \ if (Read(msg, &p)) { \
(obj->*func)(parameter, p.a); \ (obj->*func)(parameter, get<0>(p)); \
return true; \ return true; \
} \ } \
return false; \ return false; \
...@@ -469,7 +469,7 @@ ...@@ -469,7 +469,7 @@
void (T::*func)(P*, TA, TB)) { \ void (T::*func)(P*, TA, TB)) { \
Schema::Param p; \ Schema::Param p; \
if (Read(msg, &p)) { \ if (Read(msg, &p)) { \
(obj->*func)(parameter, p.a, p.b); \ (obj->*func)(parameter, get<0>(p), get<1>(p)); \
return true; \ return true; \
} \ } \
return false; \ return false; \
...@@ -481,7 +481,7 @@ ...@@ -481,7 +481,7 @@
void (T::*func)(P*, TA, TB, TC)) { \ void (T::*func)(P*, TA, TB, TC)) { \
Schema::Param p; \ Schema::Param p; \
if (Read(msg, &p)) { \ if (Read(msg, &p)) { \
(obj->*func)(parameter, p.a, p.b, p.c); \ (obj->*func)(parameter, get<0>(p), get<1>(p), get<2>(p)); \
return true; \ return true; \
} \ } \
return false; \ return false; \
...@@ -494,7 +494,7 @@ ...@@ -494,7 +494,7 @@
void (T::*func)(P*, TA, TB, TC, TD)) { \ void (T::*func)(P*, TA, TB, TC, TD)) { \
Schema::Param p; \ Schema::Param p; \
if (Read(msg, &p)) { \ if (Read(msg, &p)) { \
(obj->*func)(parameter, p.a, p.b, p.c, p.d); \ (obj->*func)(parameter, get<0>(p), get<1>(p), get<2>(p), get<3>(p)); \
return true; \ return true; \
} \ } \
return false; \ return false; \
...@@ -507,7 +507,8 @@ ...@@ -507,7 +507,8 @@
void (T::*func)(P*, TA, TB, TC, TD, TE)) { \ void (T::*func)(P*, TA, TB, TC, TD, TE)) { \
Schema::Param p; \ Schema::Param p; \
if (Read(msg, &p)) { \ if (Read(msg, &p)) { \
(obj->*func)(parameter, p.a, p.b, p.c, p.d, p.e); \ (obj->*func)(parameter, get<0>(p), get<1>(p), get<2>(p), get<3>(p), \
get<4>(p)); \
return true; \ return true; \
} \ } \
return false; \ return false; \
...@@ -817,18 +818,18 @@ ...@@ -817,18 +818,18 @@
#define IPC_TYPE_OUT_3(t1, t2, t3) t1* arg6, t2* arg7, t3* arg8 #define IPC_TYPE_OUT_3(t1, t2, t3) t1* arg6, t2* arg7, t3* arg8
#define IPC_TYPE_OUT_4(t1, t2, t3, t4) t1* arg6, t2* arg7, t3* arg8, t4* arg9 #define IPC_TYPE_OUT_4(t1, t2, t3, t4) t1* arg6, t2* arg7, t3* arg8, t4* arg9
#define IPC_TUPLE_IN_0() Tuple0 #define IPC_TUPLE_IN_0() Tuple<>
#define IPC_TUPLE_IN_1(t1) Tuple1<t1> #define IPC_TUPLE_IN_1(t1) Tuple<t1>
#define IPC_TUPLE_IN_2(t1, t2) Tuple2<t1, t2> #define IPC_TUPLE_IN_2(t1, t2) Tuple<t1, t2>
#define IPC_TUPLE_IN_3(t1, t2, t3) Tuple3<t1, t2, t3> #define IPC_TUPLE_IN_3(t1, t2, t3) Tuple<t1, t2, t3>
#define IPC_TUPLE_IN_4(t1, t2, t3, t4) Tuple4<t1, t2, t3, t4> #define IPC_TUPLE_IN_4(t1, t2, t3, t4) Tuple<t1, t2, t3, t4>
#define IPC_TUPLE_IN_5(t1, t2, t3, t4, t5) Tuple5<t1, t2, t3, t4, t5> #define IPC_TUPLE_IN_5(t1, t2, t3, t4, t5) Tuple<t1, t2, t3, t4, t5>
#define IPC_TUPLE_OUT_0() Tuple0 #define IPC_TUPLE_OUT_0() Tuple<>
#define IPC_TUPLE_OUT_1(t1) Tuple1<t1&> #define IPC_TUPLE_OUT_1(t1) Tuple<t1&>
#define IPC_TUPLE_OUT_2(t1, t2) Tuple2<t1&, t2&> #define IPC_TUPLE_OUT_2(t1, t2) Tuple<t1&, t2&>
#define IPC_TUPLE_OUT_3(t1, t2, t3) Tuple3<t1&, t2&, t3&> #define IPC_TUPLE_OUT_3(t1, t2, t3) Tuple<t1&, t2&, t3&>
#define IPC_TUPLE_OUT_4(t1, t2, t3, t4) Tuple4<t1&, t2&, t3&, t4&> #define IPC_TUPLE_OUT_4(t1, t2, t3, t4) Tuple<t1&, t2&, t3&, t4&>
#define IPC_NAME_IN_0() MakeTuple() #define IPC_NAME_IN_0() MakeTuple()
#define IPC_NAME_IN_1(t1) MakeRefTuple(arg1) #define IPC_NAME_IN_1(t1) MakeRefTuple(arg1)
......
ipc/ipc_message_utils.h
View file @ 12f4b983
...@@ -520,8 +520,8 @@ struct IPC_EXPORT ParamTraits<base::TimeTicks> { ...@@ -520,8 +520,8 @@ struct IPC_EXPORT ParamTraits<base::TimeTicks> {
}; };
template <> template <>
struct ParamTraits<Tuple0> { struct ParamTraits<Tuple<>> {
typedef Tuple0 param_type; typedef Tuple<> param_type;
static void Write(Message* m, const param_type& p) { static void Write(Message* m, const param_type& p) {
} }
static bool Read(const Message* m, PickleIterator* iter, param_type* r) { static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
...@@ -532,112 +532,112 @@ struct ParamTraits<Tuple0> { ...@@ -532,112 +532,112 @@ struct ParamTraits<Tuple0> {
}; };
template <class A> template <class A>
struct ParamTraits< Tuple1<A> > { struct ParamTraits<Tuple<A>> {
typedef Tuple1<A> param_type; typedef Tuple<A> param_type;
static void Write(Message* m, const param_type& p) { static void Write(Message* m, const param_type& p) {
WriteParam(m, p.a); WriteParam(m, get<0>(p));
} }
static bool Read(const Message* m, PickleIterator* iter, param_type* r) { static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
return ReadParam(m, iter, &r->a); return ReadParam(m, iter, &get<0>(*r));
} }
static void Log(const param_type& p, std::string* l) { static void Log(const param_type& p, std::string* l) {
LogParam(p.a, l); LogParam(get<0>(p), l);
} }
}; };
template <class A, class B> template <class A, class B>
struct ParamTraits< Tuple2<A, B> > { struct ParamTraits< Tuple<A, B> > {
typedef Tuple2<A, B> param_type; typedef Tuple<A, B> param_type;
static void Write(Message* m, const param_type& p) { static void Write(Message* m, const param_type& p) {
WriteParam(m, p.a); WriteParam(m, get<0>(p));
WriteParam(m, p.b); WriteParam(m, get<1>(p));
} }
static bool Read(const Message* m, PickleIterator* iter, param_type* r) { static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
return (ReadParam(m, iter, &r->a) && return (ReadParam(m, iter, &get<0>(*r)) &&
ReadParam(m, iter, &r->b)); ReadParam(m, iter, &get<1>(*r)));
} }
static void Log(const param_type& p, std::string* l) { static void Log(const param_type& p, std::string* l) {
LogParam(p.a, l); LogParam(get<0>(p), l);
l->append(", "); l->append(", ");
LogParam(p.b, l); LogParam(get<1>(p), l);
} }
}; };
template <class A, class B, class C> template <class A, class B, class C>
struct ParamTraits< Tuple3<A, B, C> > { struct ParamTraits< Tuple<A, B, C> > {
typedef Tuple3<A, B, C> param_type; typedef Tuple<A, B, C> param_type;
static void Write(Message* m, const param_type& p) { static void Write(Message* m, const param_type& p) {
WriteParam(m, p.a); WriteParam(m, get<0>(p));
WriteParam(m, p.b); WriteParam(m, get<1>(p));
WriteParam(m, p.c); WriteParam(m, get<2>(p));
} }
static bool Read(const Message* m, PickleIterator* iter, param_type* r) { static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
return (ReadParam(m, iter, &r->a) && return (ReadParam(m, iter, &get<0>(*r)) &&
ReadParam(m, iter, &r->b) && ReadParam(m, iter, &get<1>(*r)) &&
ReadParam(m, iter, &r->c)); ReadParam(m, iter, &get<2>(*r)));
} }
static void Log(const param_type& p, std::string* l) { static void Log(const param_type& p, std::string* l) {
LogParam(p.a, l); LogParam(get<0>(p), l);
l->append(", "); l->append(", ");
LogParam(p.b, l); LogParam(get<1>(p), l);
l->append(", "); l->append(", ");
LogParam(p.c, l); LogParam(get<2>(p), l);
} }
}; };
template <class A, class B, class C, class D> template <class A, class B, class C, class D>
struct ParamTraits< Tuple4<A, B, C, D> > { struct ParamTraits< Tuple<A, B, C, D> > {
typedef Tuple4<A, B, C, D> param_type; typedef Tuple<A, B, C, D> param_type;
static void Write(Message* m, const param_type& p) { static void Write(Message* m, const param_type& p) {
WriteParam(m, p.a); WriteParam(m, get<0>(p));
WriteParam(m, p.b); WriteParam(m, get<1>(p));
WriteParam(m, p.c); WriteParam(m, get<2>(p));
WriteParam(m, p.d); WriteParam(m, get<3>(p));
} }
static bool Read(const Message* m, PickleIterator* iter, param_type* r) { static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
return (ReadParam(m, iter, &r->a) && return (ReadParam(m, iter, &get<0>(*r)) &&
ReadParam(m, iter, &r->b) && ReadParam(m, iter, &get<1>(*r)) &&
ReadParam(m, iter, &r->c) && ReadParam(m, iter, &get<2>(*r)) &&
ReadParam(m, iter, &r->d)); ReadParam(m, iter, &get<3>(*r)));
} }
static void Log(const param_type& p, std::string* l) { static void Log(const param_type& p, std::string* l) {
LogParam(p.a, l); LogParam(get<0>(p), l);
l->append(", "); l->append(", ");
LogParam(p.b, l); LogParam(get<1>(p), l);
l->append(", "); l->append(", ");
LogParam(p.c, l); LogParam(get<2>(p), l);
l->append(", "); l->append(", ");
LogParam(p.d, l); LogParam(get<3>(p), l);
} }
}; };
template <class A, class B, class C, class D, class E> template <class A, class B, class C, class D, class E>
struct ParamTraits< Tuple5<A, B, C, D, E> > { struct ParamTraits< Tuple<A, B, C, D, E> > {
typedef Tuple5<A, B, C, D, E> param_type; typedef Tuple<A, B, C, D, E> param_type;
static void Write(Message* m, const param_type& p) { static void Write(Message* m, const param_type& p) {
WriteParam(m, p.a); WriteParam(m, get<0>(p));
WriteParam(m, p.b); WriteParam(m, get<1>(p));
WriteParam(m, p.c); WriteParam(m, get<2>(p));
WriteParam(m, p.d); WriteParam(m, get<3>(p));
WriteParam(m, p.e); WriteParam(m, get<4>(p));
} }
static bool Read(const Message* m, PickleIterator* iter, param_type* r) { static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
return (ReadParam(m, iter, &r->a) && return (ReadParam(m, iter, &get<0>(*r)) &&
ReadParam(m, iter, &r->b) && ReadParam(m, iter, &get<1>(*r)) &&
ReadParam(m, iter, &r->c) && ReadParam(m, iter, &get<2>(*r)) &&
ReadParam(m, iter, &r->d) && ReadParam(m, iter, &get<3>(*r)) &&
ReadParam(m, iter, &r->e)); ReadParam(m, iter, &get<4>(*r)));
} }
static void Log(const param_type& p, std::string* l) { static void Log(const param_type& p, std::string* l) {
LogParam(p.a, l); LogParam(get<0>(p), l);
l->append(", "); l->append(", ");
LogParam(p.b, l); LogParam(get<1>(p), l);
l->append(", "); l->append(", ");
LogParam(p.c, l); LogParam(get<2>(p), l);
l->append(", "); l->append(", ");
LogParam(p.d, l); LogParam(get<3>(p), l);
l->append(", "); l->append(", ");
LogParam(p.e, l); LogParam(get<4>(p), l);
} }
}; };
...@@ -912,7 +912,7 @@ class SyncMessageSchema { ...@@ -912,7 +912,7 @@ class SyncMessageSchema {
Method func) { Method func) {
Message* reply = SyncMessage::GenerateReply(msg); Message* reply = SyncMessage::GenerateReply(msg);
if (ok) { if (ok) {
Tuple1<Message&> t = MakeRefTuple(*reply); Tuple<Message&> t = MakeRefTuple(*reply);
ConnectMessageAndReply(msg, reply); ConnectMessageAndReply(msg, reply);
DispatchToMethod(obj, func, send_params, &t); DispatchToMethod(obj, func, send_params, &t);
} else { } else {
......
sandbox/linux/seccomp-bpf/codegen.cc
View file @ 12f4b983
...@@ -145,14 +145,14 @@ size_t CodeGen::Offset(Node target) const { ...@@ -145,14 +145,14 @@ size_t CodeGen::Offset(Node target) const {
// TODO(mdempsky): Move into a general base::Tuple helper library. // TODO(mdempsky): Move into a general base::Tuple helper library.
bool CodeGen::MemoKeyLess::operator()(const MemoKey& lhs, bool CodeGen::MemoKeyLess::operator()(const MemoKey& lhs,
const MemoKey& rhs) const { const MemoKey& rhs) const {
if (lhs.a != rhs.a) if (get<0>(lhs) != get<0>(rhs))
return lhs.a < rhs.a; return get<0>(lhs) < get<0>(rhs);
if (lhs.b != rhs.b) if (get<1>(lhs) != get<1>(rhs))
return lhs.b < rhs.b; return get<1>(lhs) < get<1>(rhs);
if (lhs.c != rhs.c) if (get<2>(lhs) != get<2>(rhs))
return lhs.c < rhs.c; return get<2>(lhs) < get<2>(rhs);
if (lhs.d != rhs.d) if (get<3>(lhs) != get<3>(rhs))
return lhs.d < rhs.d; return get<3>(lhs) < get<3>(rhs);
return false; return false;
} }
......
sandbox/linux/seccomp-bpf/codegen.h
View file @ 12f4b983
...@@ -81,7 +81,7 @@ class SANDBOX_EXPORT CodeGen { ...@@ -81,7 +81,7 @@ class SANDBOX_EXPORT CodeGen {
void Compile(Node head, Program* program); void Compile(Node head, Program* program);
private: private:
using MemoKey = Tuple4<uint16_t, uint32_t, Node, Node>; using MemoKey = Tuple<uint16_t, uint32_t, Node, Node>;
struct MemoKeyLess { struct MemoKeyLess {
bool operator()(const MemoKey& lhs, const MemoKey& rhs) const; bool operator()(const MemoKey& lhs, const MemoKey& rhs) const;
}; };
......
testing/generate_gmock_mutant.py
View file @ 12f4b983
...@@ -56,8 +56,8 @@ HEADER = """\ ...@@ -56,8 +56,8 @@ HEADER = """\
// } // }
// //
// void QuitMessageLoop(int seconds) { // void QuitMessageLoop(int seconds) {
// MessageLoop* loop = MessageLoop::current(); // base::MessageLoop* loop = base::MessageLoop::current();
// loop->PostDelayedTask(FROM_HERE, MessageLoop::QuitClosure(), // loop->PostDelayedTask(FROM_HERE, base::MessageLoop::QuitClosure(),
// 1000 * seconds); // 1000 * seconds);
// } // }
// }; // };
...@@ -202,7 +202,7 @@ struct MutantFunctor { ...@@ -202,7 +202,7 @@ struct MutantFunctor {
} }
inline R operator()() { inline R operator()() {
return impl_->RunWithParams(Tuple0()); return impl_->RunWithParams(Tuple<>());
} }
template <typename Arg1> template <typename Arg1>
...@@ -241,8 +241,8 @@ FOOTER = """\ ...@@ -241,8 +241,8 @@ FOOTER = """\
# Templates for DispatchToMethod/DispatchToFunction functions. # Templates for DispatchToMethod/DispatchToFunction functions.
# template_params - typename P1, typename P2.. typename C1.. # template_params - typename P1, typename P2.. typename C1..
# prebound - TupleN<P1, .. PN> # prebound - Tuple<P1, .. PN>
# calltime - TupleN<C1, .. CN> # calltime - Tuple<C1, .. CN>
# args - p.a, p.b.., c.a, c.b.. # args - p.a, p.b.., c.a, c.b..
DISPATCH_TO_METHOD_TEMPLATE = """\ DISPATCH_TO_METHOD_TEMPLATE = """\
template <typename R, typename T, typename Method, %(template_params)s> template <typename R, typename T, typename Method, %(template_params)s>
...@@ -264,8 +264,8 @@ inline R DispatchToFunction(Function function, ...@@ -264,8 +264,8 @@ inline R DispatchToFunction(Function function,
# Templates for CreateFunctor functions. # Templates for CreateFunctor functions.
# template_params - typename P1, typename P2.. typename C1.. typename X1.. # template_params - typename P1, typename P2.. typename C1.. typename X1..
# prebound - TupleN<P1, .. PN> # prebound - Tuple<P1, .. PN>
# calltime - TupleN<A1, .. AN> # calltime - Tuple<A1, .. AN>
# params - X1,.. , A1, .. # params - X1,.. , A1, ..
# args - const P1& p1 .. # args - const P1& p1 ..
# call_args - p1, p2, p3.. # call_args - p1, p2, p3..
...@@ -305,7 +305,7 @@ def SplitLine(line, width): ...@@ -305,7 +305,7 @@ def SplitLine(line, width):
return (line[:n], line[n + 1:]) return (line[:n], line[n + 1:])
def Wrap(s, width, subsequent_offset=4): def Wrap(s, width, subsequent_offset):
"""Wraps a single line |s| at commas so every line is at most |width| """Wraps a single line |s| at commas so every line is at most |width|
characters long. characters long.
""" """
...@@ -324,10 +324,8 @@ def Clean(s): ...@@ -324,10 +324,8 @@ def Clean(s):
Our simple string formatting/concatenation may introduce extra commas. Our simple string formatting/concatenation may introduce extra commas.
""" """
s = s.replace("<>", "")
s = s.replace(", >", ">") s = s.replace(", >", ">")
s = s.replace(", )", ")") s = s.replace(", )", ")")
s = s.replace(">>", "> >")
return s return s
...@@ -339,23 +337,13 @@ def ExpandPattern(pattern, it): ...@@ -339,23 +337,13 @@ def ExpandPattern(pattern, it):
return [pattern.replace("%", x) for x in it] return [pattern.replace("%", x) for x in it]
def Gen(pattern, n): def Gen(pattern, n, start):
"""Expands pattern replacing '%' with sequential integers. """Expands pattern replacing '%' with sequential integers starting with start.
Expanded patterns will be joined with comma separator. Expanded patterns will be joined with comma separator.
GenAlphs("X%", 3) will return "X1, X2, X3". Gen("X%", 3, 1) will return "X1, X2, X3".
""" """
it = string.hexdigits[1:n + 1] it = string.hexdigits[start:n + start]
return ", ".join(ExpandPattern(pattern, it))
def GenAlpha(pattern, n):
"""Expands pattern replacing '%' with sequential small ASCII letters.
Expanded patterns will be joined with comma separator.
GenAlphs("X%", 3) will return "Xa, Xb, Xc".
"""
it = string.ascii_lowercase[0:n]
return ", ".join(ExpandPattern(pattern, it)) return ", ".join(ExpandPattern(pattern, it))
...@@ -364,7 +352,7 @@ def Merge(a): ...@@ -364,7 +352,7 @@ def Merge(a):
def GenTuple(pattern, n): def GenTuple(pattern, n):
return Clean("Tuple%d<%s>" % (n, Gen(pattern, n))) return Clean("Tuple<%s>" % (Gen(pattern, n, 1)))
def FixCode(s): def FixCode(s):
...@@ -378,11 +366,12 @@ def FixCode(s): ...@@ -378,11 +366,12 @@ def FixCode(s):
def GenerateDispatch(prebound, calltime): def GenerateDispatch(prebound, calltime):
print "\n// %d - %d" % (prebound, calltime) print "\n// %d - %d" % (prebound, calltime)
args = { args = {
"template_params": Merge([Gen("typename P%", prebound), "template_params": Merge([Gen("typename P%", prebound, 1),
Gen("typename C%", calltime)]), Gen("typename C%", calltime, 1)]),
"prebound": GenTuple("P%", prebound), "prebound": GenTuple("P%", prebound),
"calltime": GenTuple("C%", calltime), "calltime": GenTuple("C%", calltime),
"args": Merge([GenAlpha("p.%", prebound), GenAlpha("c.%", calltime)]), "args": Merge([Gen("get<%>(p)", prebound, 0),
Gen("get<%>(c)", calltime, 0)]),
} }
print FixCode(DISPATCH_TO_METHOD_TEMPLATE % args) print FixCode(DISPATCH_TO_METHOD_TEMPLATE % args)
...@@ -394,12 +383,12 @@ def GenerateCreateFunctor(prebound, calltime): ...@@ -394,12 +383,12 @@ def GenerateCreateFunctor(prebound, calltime):
args = { args = {
"calltime": GenTuple("A%", calltime), "calltime": GenTuple("A%", calltime),
"prebound": GenTuple("P%", prebound), "prebound": GenTuple("P%", prebound),
"params": Merge([Gen("X%", prebound), Gen("A%", calltime)]), "params": Merge([Gen("X%", prebound, 1), Gen("A%", calltime, 1)]),
"args": Gen("const P%& p%", prebound), "args": Gen("const P%& p%", prebound, 1),
"call_args": Gen("p%", prebound), "call_args": Gen("p%", prebound, 1),
"template_params": Merge([Gen("typename P%", prebound), "template_params": Merge([Gen("typename P%", prebound, 1),
Gen("typename A%", calltime), Gen("typename A%", calltime, 1),
Gen("typename X%", prebound)]) Gen("typename X%", prebound, 1)])
} }
mutant = FixCode(CREATE_METHOD_FUNCTOR_TEMPLATE % args) mutant = FixCode(CREATE_METHOD_FUNCTOR_TEMPLATE % args)
......
testing/gmock_mutant.h
View file @ 12f4b983
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment