Commit 33e15c8b authored by Paul's avatar Paul
Browse files

Formatting

parent 7c9c11d7
...@@ -43,17 +43,17 @@ inline std::string join_strings(Strings strings, const std::string& delim) ...@@ -43,17 +43,17 @@ inline std::string join_strings(Strings strings, const std::string& delim)
}); });
} }
template<class F> template <class F>
std::string trim(const std::string &s, F f) std::string trim(const std::string& s, F f)
{ {
auto start = std::find_if_not(s.begin(), s.end(), f); auto start = std::find_if_not(s.begin(), s.end(), f);
auto last = std::find_if_not(s.rbegin(), std::string::const_reverse_iterator(start), f).base(); auto last = std::find_if_not(s.rbegin(), std::string::const_reverse_iterator(start), f).base();
return std::string(start, last); return std::string(start, last);
} }
inline std::string trim(const std::string &s) inline std::string trim(const std::string& s)
{ {
return trim(s, [](int c){ return std::isspace(c); }); return trim(s, [](int c) { return std::isspace(c); });
} }
template <class F> template <class F>
......
...@@ -403,7 +403,7 @@ TEST_CASE(reverse_target_test) ...@@ -403,7 +403,7 @@ TEST_CASE(reverse_target_test)
auto one = p.add_literal(1); auto one = p.add_literal(1);
auto two = p.add_literal(2); auto two = p.add_literal(2);
p.add_instruction(sum_op{}, one, two); p.add_instruction(sum_op{}, one, two);
EXPECT(test::throws<migraphx::exception>([&]{ p.compile(reverse_target{}); })); EXPECT(test::throws<migraphx::exception>([&] { p.compile(reverse_target{}); }));
} }
// Check that the program doesnt modify the context directly, and only the operators modify the // Check that the program doesnt modify the context directly, and only the operators modify the
...@@ -454,23 +454,21 @@ TEST_CASE(eval_context3) ...@@ -454,23 +454,21 @@ TEST_CASE(eval_context3)
EXPECT(not is_shared(t.ctx, p.get_context())); EXPECT(not is_shared(t.ctx, p.get_context()));
} }
struct cout_redirect { struct cout_redirect
cout_redirect()=delete; {
cout_redirect(const cout_redirect&)=delete; cout_redirect() = delete;
template<class T> cout_redirect(const cout_redirect&) = delete;
cout_redirect(T& stream) template <class T>
: old(std::cout.rdbuf(stream.rdbuf())) cout_redirect(T& stream) : old(std::cout.rdbuf(stream.rdbuf()))
{}
~cout_redirect()
{ {
std::cout.rdbuf(old);
} }
~cout_redirect() { std::cout.rdbuf(old); }
private: private:
std::streambuf * old; std::streambuf* old;
}; };
template<class F> template <class F>
std::string capture_output(F f) std::string capture_output(F f)
{ {
std::stringstream ss; std::stringstream ss;
...@@ -487,11 +485,11 @@ TEST_CASE(debug_print_test) ...@@ -487,11 +485,11 @@ TEST_CASE(debug_print_test)
migraphx::program p2; migraphx::program p2;
auto one2 = p2.add_literal(1); auto one2 = p2.add_literal(1);
auto program_out = migraphx::trim(capture_output([&]{ p.debug_print(); })); auto program_out = migraphx::trim(capture_output([&] { p.debug_print(); }));
auto ins_out = migraphx::trim(capture_output([&]{ p.debug_print(one); })); auto ins_out = migraphx::trim(capture_output([&] { p.debug_print(one); }));
auto inss_out = migraphx::trim(capture_output([&]{ p.debug_print({one}); })); auto inss_out = migraphx::trim(capture_output([&] { p.debug_print({one}); }));
auto end_out = migraphx::trim(capture_output([&]{ p.debug_print(p.end()); })); auto end_out = migraphx::trim(capture_output([&] { p.debug_print(p.end()); }));
auto p2_ins_out = migraphx::trim(capture_output([&]{ p.debug_print(one2); })); auto p2_ins_out = migraphx::trim(capture_output([&] { p.debug_print(one2); }));
EXPECT(program_out == ins_out); EXPECT(program_out == ins_out);
EXPECT(inss_out == ins_out); EXPECT(inss_out == ins_out);
......
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