commit 8340aaa1bf6fd31b4f8c5c868de3025fc0e4e5c5
parent 12f1d351f50996ad0f9713959a5b37e75b513d14
Author: [email protected] <[email protected]>
Date: Tue, 6 Sep 2016 13:28:32 +0300
Refactor string conversion functions
Now, no need to include `<kfr/io/tostring.hpp>` before other headers
Diffstat:
19 files changed, 107 insertions(+), 130 deletions(-)
diff --git a/examples/biquads.cpp b/examples/biquads.cpp
@@ -4,13 +4,9 @@
* See LICENSE.txt for details
*/
-#include <kfr/io/tostring.hpp>
-
#include <kfr/base.hpp>
#include <kfr/dsp.hpp>
-
-// plot_save()
-#include <kfr/io/python_plot.hpp>
+#include <kfr/io.hpp>
using namespace kfr;
diff --git a/examples/dft.cpp b/examples/dft.cpp
@@ -4,14 +4,10 @@
* See LICENSE.txt for details
*/
-#include <kfr/io/tostring.hpp>
-
#include <kfr/base.hpp>
#include <kfr/dft.hpp>
#include <kfr/dsp.hpp>
-
-// plot_save()
-#include <kfr/io/python_plot.hpp>
+#include <kfr/io.hpp>
using namespace kfr;
diff --git a/examples/fir.cpp b/examples/fir.cpp
@@ -4,13 +4,9 @@
* See LICENSE.txt for details
*/
-#include <kfr/io/tostring.hpp>
-
#include <kfr/base.hpp>
#include <kfr/dsp.hpp>
-
-// plot_save()
-#include <kfr/io/python_plot.hpp>
+#include <kfr/io.hpp>
using namespace kfr;
diff --git a/examples/sample_rate_conversion.cpp b/examples/sample_rate_conversion.cpp
@@ -4,18 +4,9 @@
* See LICENSE.txt for details
*/
-#include <kfr/io/tostring.hpp>
-
#include <kfr/base.hpp>
#include <kfr/dsp.hpp>
-
-// file*
-#include <kfr/io/audiofile.hpp>
-
-// plot_save()
-#include <kfr/io/python_plot.hpp>
-
-#include <iostream>
+#include <kfr/io.hpp>
using namespace kfr;
diff --git a/examples/window.cpp b/examples/window.cpp
@@ -4,13 +4,9 @@
* See LICENSE.txt for details
*/
-#include <kfr/io/tostring.hpp>
-
#include <kfr/base.hpp>
#include <kfr/dsp.hpp>
-
-// plot_save()
-#include <kfr/io/python_plot.hpp>
+#include <kfr/io.hpp>
using namespace kfr;
diff --git a/include/kfr/cometa/string.hpp b/include/kfr/cometa/string.hpp
@@ -21,29 +21,17 @@
namespace cometa
{
-template <typename... Args>
-CMT_INLINE std::string as_string(const Args&... args);
-
template <typename T>
-constexpr inline const T& repr(const T& value)
+struct representation
{
- return value;
-}
+ static constexpr const T& get(const T& value) noexcept { return value; }
+};
template <typename T>
-inline std::string repr(const named_arg<T>& value)
-{
- return std::string(value.name) + " = " + as_string(value.value);
-}
+using repr_type = decay<decltype(representation<T>::get(std::declval<T>()))>;
-template <typename T1, typename T2>
-inline std::string repr(const std::pair<T1, T2>& value)
-{
- return "(" + as_string(value.first) + "; " + as_string(value.second) + ")";
-}
-
-template <typename T>
-using repr_type = decay<decltype(repr(std::declval<T>()))>;
+template <typename... Args>
+CMT_INLINE std::string as_string(const Args&... args);
namespace details
{
@@ -158,7 +146,7 @@ CMT_INLINE const char* pack_value(ctype_t<T>)
template <typename T, char t, int width, int prec>
CMT_INLINE auto pack_value(const fmt_t<T, t, width, prec>& value)
{
- return pack_value(repr(value.value));
+ return pack_value(representation<T>::get(value.value));
}
template <size_t N1, size_t Nnew, size_t... indices>
@@ -267,7 +255,7 @@ struct format_t
return result;
result.resize(size_t(size + 1));
result.resize(size_t(std::snprintf(&result[0], size_t(size + 1), format_str.data(),
- details::pack_value(repr(args))...)));
+ details::pack_value(representation<Args>::get(args))...)));
return result;
}
};
@@ -302,21 +290,22 @@ template <typename... Args>
CMT_INLINE void printfmt(const std::string& fmt, const Args&... args)
{
const auto format_str = details::build_fmt(fmt, ctypes<repr_type<Args>...>);
- std::printf(format_str.data(), details::pack_value(repr(args))...);
+ std::printf(format_str.data(), details::pack_value(representation<Args>::get(args))...);
}
template <typename... Args>
CMT_INLINE void fprintfmt(FILE* f, const std::string& fmt, const Args&... args)
{
const auto format_str = details::build_fmt(fmt, ctypes<repr_type<Args>...>);
- std::fprintf(f, format_str.data(), details::pack_value(repr(args))...);
+ std::fprintf(f, format_str.data(), details::pack_value(representation<Args>::get(args))...);
}
template <typename... Args>
CMT_INLINE int snprintfmt(char* str, size_t size, const std::string& fmt, const Args&... args)
{
const auto format_str = details::build_fmt(fmt, ctypes<repr_type<Args>...>);
- return std::snprintf(str, size, format_str.data(), details::pack_value(repr(args))...);
+ return std::snprintf(str, size, format_str.data(),
+ details::pack_value(representation<Args>::get(args))...);
}
template <typename... Args>
@@ -324,12 +313,13 @@ CMT_INLINE std::string format(const std::string& fmt, const Args&... args)
{
std::string result;
const auto format_str = details::build_fmt(fmt, ctypes<repr_type<Args>...>);
- const int size = std::snprintf(nullptr, 0, format_str.data(), details::pack_value(repr(args))...);
+ const int size =
+ std::snprintf(nullptr, 0, format_str.data(), details::pack_value(representation<Args>::get(args))...);
if (size <= 0)
return result;
result.resize(size_t(size + 1));
- result.resize(size_t(
- std::snprintf(&result[0], size_t(size + 1), format_str.data(), details::pack_value(repr(args))...)));
+ result.resize(size_t(std::snprintf(&result[0], size_t(size + 1), format_str.data(),
+ details::pack_value(representation<Args>::get(args))...)));
return result;
}
@@ -346,14 +336,14 @@ template <typename... Args>
CMT_INLINE void print(const Args&... args)
{
constexpr auto format_str = concat_cstring(details::get_value_fmt<Args>()...);
- std::printf(format_str.data(), details::pack_value(repr(args))...);
+ std::printf(format_str.data(), details::pack_value(representation<Args>::get(args))...);
}
template <typename... Args>
CMT_INLINE void println(const Args&... args)
{
constexpr auto format_str = concat_cstring(details::get_value_fmt<Args>()..., make_cstring("\n"));
- std::printf(format_str.data(), details::pack_value(repr(args))...);
+ std::printf(format_str.data(), details::pack_value(representation<Args>::get(args))...);
}
template <typename... Args>
@@ -362,12 +352,13 @@ CMT_INLINE std::string as_string(const Args&... args)
std::string result;
constexpr auto format_str = concat_cstring(details::get_value_fmt<Args>()...);
- const int size = std::snprintf(nullptr, 0, format_str.data(), details::pack_value(repr(args))...);
+ const int size =
+ std::snprintf(nullptr, 0, format_str.data(), details::pack_value(representation<Args>::get(args))...);
if (size <= 0)
return result;
result.resize(size_t(size + 1));
- result.resize(size_t(
- std::snprintf(&result[0], size_t(size + 1), format_str.data(), details::pack_value(repr(args))...)));
+ result.resize(size_t(std::snprintf(&result[0], size_t(size + 1), format_str.data(),
+ details::pack_value(representation<Args>::get(args))...)));
return result;
}
@@ -406,6 +397,24 @@ inline std::string join(T x, U y, Ts... rest)
{
return format("{}, {}", x, join(std::forward<U>(y), std::forward<Ts>(rest)...));
}
+
+template <typename T>
+struct representation<named_arg<T>>
+{
+ static std::string get(const named_arg<T>& value)
+ {
+ return std::string(value.name) + " = " + as_string(value.value);
+ }
+};
+
+template <typename T1, typename T2>
+struct representation<std::pair<T1, T2>>
+{
+ static std::string get(const std::pair<T1, T2>& value)
+ {
+ return "(" + as_string(value.first) + "; " + as_string(value.second) + ")";
+ }
+};
}
#pragma GCC diagnostic pop
diff --git a/include/kfr/io/audiofile.hpp b/include/kfr/io/audiofile.hpp
@@ -28,6 +28,7 @@
#include "../base/basic_expressions.hpp"
#include "../base/univector.hpp"
#include "../base/vec.hpp"
+#include "../cometa/ctti.hpp"
#include "file.hpp"
namespace kfr
diff --git a/include/kfr/io/python_plot.hpp b/include/kfr/io/python_plot.hpp
@@ -45,6 +45,7 @@ namespace internal
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
+template <int = 0>
void python(const std::string& name, const std::string& code)
{
std::string filename;
@@ -68,16 +69,17 @@ void python(const std::string& name, const std::string& code)
#pragma clang diagnostic pop
}
-static std::string concat_args() { return {}; }
+inline std::string concat_args() { return {}; }
template <typename... Ts>
-static std::string concat_args(const std::string& left, const Ts&... rest)
+std::string concat_args(const std::string& left, const Ts&... rest)
{
const std::string right = concat_args(rest...);
return left.empty() ? right : right.empty() ? left : left + ", " + right;
}
-static void plot_show(const std::string& name, const std::string& wavfile, const std::string& options = "")
+template <int = 0>
+void plot_show(const std::string& name, const std::string& wavfile, const std::string& options = "")
{
print(name, "...");
std::string ss;
@@ -90,7 +92,8 @@ static void plot_show(const std::string& name, const std::string& wavfile, const
print("done\n");
}
-static void plot_show(const std::string& name, const char* x, const std::string& options = "")
+template <int = 0>
+void plot_show(const std::string& name, const char* x, const std::string& options = "")
{
plot_show(name, std::string(x), options);
}
diff --git a/include/kfr/io/tostring.hpp b/include/kfr/io/tostring.hpp
@@ -28,21 +28,6 @@
#include "../base/complex.hpp"
#include "../base/univector.hpp"
#include "../base/vec.hpp"
-
-namespace cometa
-{
-
-inline std::string repr(kfr::cpu_t v);
-
-template <typename T>
-inline std::string repr(const kfr::complex<T>& v);
-
-template <typename T, size_t N>
-inline std::string repr(kfr::vec<T, N> v);
-
-template <typename T, size_t Tag>
-inline std::string repr(const kfr::univector<T, Tag>& v);
-}
#include "../cometa/string.hpp"
#include <cmath>
@@ -83,20 +68,11 @@ std::string fmtvalue(std::true_type, const kfr::complex<T>& x)
template <typename T>
std::string fmtvalue(std::false_type, const T& x)
{
- return as_string(fmtwidth<number_width>(repr(x)));
-}
+ return as_string(fmtwidth<number_width>(representation<T>::get(x)));
}
template <typename T>
-inline std::string repr(const kfr::complex<T>& v)
-{
- return as_string(v.real()) + " + " + as_string(v.imag()) + "j";
-}
-
-inline std::string repr(kfr::cpu_t v) { return kfr::cpu_name(v); }
-
-template <typename T>
-inline std::string repr(const T* source, size_t N)
+inline std::string array_to_string(const T* source, size_t N)
{
std::string str;
for (size_t i = 0; i < N; i++)
@@ -114,7 +90,7 @@ inline std::string repr(const T* source, size_t N)
}
template <typename T>
-inline std::string repr(const kfr::complex<T>* source, size_t N)
+inline std::string array_to_string(const kfr::complex<T>* source, size_t N)
{
std::string str;
for (size_t i = 0; i < N; i++)
@@ -130,16 +106,38 @@ inline std::string repr(const kfr::complex<T>* source, size_t N)
}
return str;
}
+}
+
+template <typename T>
+struct representation<kfr::complex<T>>
+{
+ static std::string get(const kfr::complex<T>& value)
+ {
+ return as_string(value.real()) + " + " + as_string(value.imag()) + "j";
+ }
+};
+
+template <>
+struct representation<kfr::cpu_t>
+{
+ static std::string get(kfr::cpu_t value) { return kfr::cpu_name(value); }
+};
template <typename T, size_t N>
-inline std::string repr(kfr::vec<T, N> v)
+struct representation<kfr::vec<T, N>>
{
- return repr(v.data(), v.size());
-}
+ static std::string get(const kfr::vec<T, N>& value)
+ {
+ return details::array_to_string(value.data(), value.size());
+ }
+};
template <typename T, size_t Tag>
-inline std::string repr(const kfr::univector<T, Tag>& v)
+struct representation<kfr::univector<T, Tag>>
{
- return repr(v.data(), v.size());
-}
+ static std::string get(const kfr::univector<T, Tag>& value)
+ {
+ return details::array_to_string(value.data(), value.size());
+ }
+};
}
diff --git a/tests/base_test.cpp b/tests/base_test.cpp
@@ -4,11 +4,9 @@
* See LICENSE.txt for details
*/
-#include <kfr/io/tostring.hpp>
-
#include "testo/testo.hpp"
-#include <kfr/dsp.hpp>
-#include <kfr/math.hpp>
+#include <kfr/base.hpp>
+#include <kfr/io.hpp>
using namespace kfr;
diff --git a/tests/complex_test.cpp b/tests/complex_test.cpp
@@ -4,14 +4,9 @@
* See LICENSE.txt for details
*/
-#include <kfr/io/tostring.hpp>
-
#include "testo/testo.hpp"
-#include <kfr/base/basic_expressions.hpp>
-#include <kfr/base/complex.hpp>
-#include <kfr/base/reduce.hpp>
-#include <kfr/cometa/string.hpp>
-#include <kfr/math.hpp>
+#include <kfr/base.hpp>
+#include <kfr/io.hpp>
using namespace kfr;
using testo::assert_is_same;
diff --git a/tests/dft_test.cpp b/tests/dft_test.cpp
@@ -5,11 +5,10 @@
*/
#include "testo/testo.hpp"
-#include <kfr/io/tostring.hpp>
-
#include <kfr/base.hpp>
#include <kfr/dft.hpp>
#include <kfr/dsp.hpp>
+#include <kfr/io.hpp>
using namespace kfr;
diff --git a/tests/dsp_test.cpp b/tests/dsp_test.cpp
@@ -4,11 +4,11 @@
* See LICENSE.txt for details
*/
-#include <kfr/io/tostring.hpp>
-
#include "testo/testo.hpp"
+#include <kfr/base.hpp>
+#include <kfr/dft.hpp>
#include <kfr/dsp.hpp>
-#include <kfr/math.hpp>
+#include <kfr/io.hpp>
using namespace kfr;
diff --git a/tests/expression_test.cpp b/tests/expression_test.cpp
@@ -4,14 +4,11 @@
* See LICENSE.txt for details
*/
-// library_version()
-#include <kfr/io/tostring.hpp>
+#include "testo/testo.hpp"
#include <kfr/base.hpp>
-
-#include <tuple>
-
-#include "testo/testo.hpp"
+#include <kfr/dsp.hpp>
+#include <kfr/io.hpp>
using namespace kfr;
diff --git a/tests/intrinsic_test.cpp b/tests/intrinsic_test.cpp
@@ -4,11 +4,11 @@
* See LICENSE.txt for details
*/
-#include <kfr/io/tostring.hpp>
-
#include "testo/testo.hpp"
+
+#include <kfr/base.hpp>
#include <kfr/dsp.hpp>
-#include <kfr/math.hpp>
+#include <kfr/io.hpp>
using namespace kfr;
diff --git a/tests/multiarch.cpp b/tests/multiarch.cpp
@@ -4,10 +4,11 @@
* See LICENSE.txt for details
*/
-#include <kfr/io/tostring.hpp>
-
#include "testo/testo.hpp"
+
+#include <kfr/base.hpp>
#include <kfr/dsp.hpp>
+#include <kfr/io.hpp>
using namespace kfr;
diff --git a/tests/multiarch_fir_avx.cpp b/tests/multiarch_fir_avx.cpp
@@ -4,8 +4,9 @@
* See LICENSE.txt for details
*/
+#include <kfr/base.hpp>
#include <kfr/dsp.hpp>
-#include <kfr/io/tostring.hpp>
+#include <kfr/io.hpp>
using namespace kfr;
diff --git a/tests/multiarch_fir_sse2.cpp b/tests/multiarch_fir_sse2.cpp
@@ -4,8 +4,9 @@
* See LICENSE.txt for details
*/
+#include <kfr/base.hpp>
#include <kfr/dsp.hpp>
-#include <kfr/io/tostring.hpp>
+#include <kfr/io.hpp>
using namespace kfr;
diff --git a/tests/transcendental_test.cpp b/tests/transcendental_test.cpp
@@ -4,10 +4,9 @@
* See LICENSE.txt for details
*/
-#include <kfr/io/tostring.hpp>
-
#include "testo/testo.hpp"
-#include <kfr/math.hpp>
+#include <kfr/base.hpp>
+#include <kfr/io.hpp>
#define MPFR_THREAD_LOCAL
#include "mpfr/mpfrplus.hpp"
