Commit bf3789fa authored by Paul's avatar Paul
Browse files

Formatting

parent d2d5fd19
......@@ -75,8 +75,7 @@ struct instruction
bool valid(instruction_ref start) const
{
return valid() &&
std::all_of(arguments.begin(), arguments.end(), [&](instruction_ref i) {
return valid() && std::all_of(arguments.begin(), arguments.end(), [&](instruction_ref i) {
auto self = std::find(i->output.begin(), i->output.end(), *this);
return self != i->output.end() &&
std::distance(start, i) < std::distance(start, *self);
......@@ -106,12 +105,10 @@ struct instruction
}
}
return result == computed &&
std::all_of(output.begin(),
output.end(),
[&](instruction_ref i) {
return std::find(i->arguments.begin(), i->arguments.end(), *this) !=
i->arguments.end();
});
std::all_of(output.begin(), output.end(), [&](instruction_ref i) {
return std::find(i->arguments.begin(), i->arguments.end(), *this) !=
i->arguments.end();
});
}
friend bool operator==(instruction_ref ref, const instruction& i) { return i == ref; }
......@@ -126,7 +123,7 @@ struct instruction
output.push_back(ins);
}
template<class T>
template <class T>
void remove_output(const T& ins)
{
migraph::erase(output, ins);
......
......@@ -55,8 +55,7 @@ struct program
instruction_ref
replace_instructions(instruction_ref ins, instruction_ref start, instruction_ref last);
instruction_ref
replace_instruction(instruction_ref ins, instruction_ref start);
instruction_ref replace_instruction(instruction_ref ins, instruction_ref start);
instruction_ref remove_instruction(instruction_ref ins);
instruction_ref remove_instructions(instruction_ref first, instruction_ref last);
......
......@@ -77,8 +77,7 @@ program::replace_instructions(instruction_ref ins, instruction_ref start, instru
return rep;
}
instruction_ref
program::replace_instruction(instruction_ref ins, instruction_ref start)
instruction_ref program::replace_instruction(instruction_ref ins, instruction_ref start)
{
assert(ins != start);
return replace_instructions(ins, start, std::next(start));
......
......@@ -122,9 +122,9 @@ void replace_ins_test()
{
migraph::program p;
auto one = p.add_literal(1);
auto two = p.add_literal(2);
auto sum = p.add_instruction(sum_op{}, one, two);
auto one = p.add_literal(1);
auto two = p.add_literal(2);
auto sum = p.add_instruction(sum_op{}, one, two);
auto minus = p.add_instruction(minus_op{}, two, one);
p.replace_instruction(sum, minus);
......
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