Add dsplib/assert.h header. Remove dsplib/throw.h.

vitalsong · Sep 8, 2024 · 8cc8226 · 8cc8226
1 parent 9c8e513
commit 8cc8226
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 52 deletions.
diff --git a/include/dsplib.h b/include/dsplib.h
@@ -24,6 +24,7 @@
 #include <dsplib/resample.h>
 #include <dsplib/spectrum.h>
 #include <dsplib/stft.h>
+#include <dsplib/assert.h>
 
 #include <dsplib/audio/noise-gate.h>
 #include <dsplib/audio/compressor.h>

diff --git a/include/dsplib/array.h b/include/dsplib/array.h
@@ -7,7 +7,7 @@
 #include <dsplib/types.h>
 #include <dsplib/slice.h>
 #include <dsplib/indexing.h>
-#include <dsplib/throw.h>
+#include <dsplib/assert.h>
 
 namespace dsplib {
 

diff --git a/include/dsplib/assert.h b/include/dsplib/assert.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <dsplib/defs.h>
+#include <cassert>
+
+#ifdef DSPLIB_NO_EXCEPTIONS
+
+#include <iostream>
+
+//TODO: add filename to message
+#define DSPLIB_THROW(MSG)                                                                                              \
+    std::cerr << (std::string("dsplib: ") + MSG) << std::endl;                                                         \
+    std::abort();
+
+#else
+
+#include <stdexcept>
+
+#define DSPLIB_THROW(MSG) throw std::runtime_error(std::string("dsplib: ") + MSG);
+
+#endif
+
+#define DSPLIB_ASSERT(condition, message)                                                                              \
+    if (!(condition)) {                                                                                                \
+        DSPLIB_THROW(message);                                                                                         \
+    }
+
+#ifdef _MSC_VER
+#define DSPLIB_ASSUME(cond)                                                                                            \
+    assert(cond);                                                                                                      \
+    __assume(cond);
+#elif defined(__clang__)
+#define DSPLIB_ASSUME(cond)                                                                                            \
+    assert(cond);                                                                                                      \
+    __builtin_assume(cond)
+#elif defined(__GNUC__)
+#define DSPLIB_ASSUME(cond)                                                                                            \
+    assert(cond);                                                                                                      \
+    ((cond) ? static_cast<void>(0) : __builtin_unreachable());
+#else
+#define DSPLIB_ASSUME(cond)                                                                                            \
+    assert(cond);                                                                                                      \
+    static_cast<void>((cond) ? 0 : 0);
+#endif
diff --git a/include/dsplib/slice.h b/include/dsplib/slice.h
@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <cstring>
 
-#include <dsplib/throw.h>
+#include <dsplib/assert.h>
 #include <dsplib/iterator.h>
 
 namespace dsplib {

diff --git a/include/dsplib/throw.h b/include/dsplib/throw.h
diff --git a/lib/agc.cpp b/lib/agc.cpp
@@ -2,7 +2,6 @@
 #include <dsplib/math.h>
 #include <cmath>
 
-#include "dsplib/throw.h"
 #include "ma-filter.h"
 
 namespace dsplib {

diff --git a/lib/corr.cpp b/lib/corr.cpp
@@ -81,6 +81,8 @@ real_t corr(const arr_real& x, const arr_real& y, Correlation type) {
         return _spearman_corr(x, y);
     case Correlation::Kendall:
         return _kendall_corr(x, y);
+    default:
+        return 0;
     }
 }
 

diff --git a/lib/fft/czt.cpp b/lib/fft/czt.cpp
@@ -3,7 +3,6 @@
 #include <dsplib/ifft.h>
 #include <dsplib/math.h>
 #include <dsplib/utils.h>
-#include <dsplib/throw.h>
 
 #include <memory>
 

diff --git a/lib/fft/pow2-fft.cpp b/lib/fft/pow2-fft.cpp
@@ -1,7 +1,6 @@
 #include "fft/pow2-fft.h"
 
 #include <dsplib/math.h>
-#include <dsplib/throw.h>
 #include <dsplib/types.h>
 
 #include <cmath>

diff --git a/lib/fft/primes-fft.h b/lib/fft/primes-fft.h
@@ -3,7 +3,6 @@
 #include "dsplib/czt.h"
 #include "dsplib/fft.h"
 #include "dsplib/math.h"
-#include "dsplib/throw.h"
 #include "dsplib/utils.h"
 
 #include <cassert>

diff --git a/lib/hilbert.cpp b/lib/hilbert.cpp
@@ -1,6 +1,5 @@
-#include <dsplib/throw.h>
-#include <dsplib/window.h>
 #include <dsplib/hilbert.h>
+#include <dsplib/window.h>
 #include <dsplib/fft.h>
 #include <dsplib/ifft.h>
 #include <dsplib/math.h>

diff --git a/lib/lru-cache.h b/lib/lru-cache.h
@@ -5,8 +5,6 @@
 #include <cassert>
 #include <cstddef>
 
-#include <dsplib/throw.h>
-
 namespace dsplib {
 
 template<typename Key, typename Value>

diff --git a/lib/math.cpp b/lib/math.cpp
@@ -1,7 +1,6 @@
 #include "dsplib/array.h"
 #include "dsplib/keywords.h"
 #include "dsplib/math.h"
-#include "dsplib/throw.h"
 #include "dsplib/types.h"
 #include "dsplib/utils.h"
 

diff --git a/lib/medfilt.cpp b/lib/medfilt.cpp
@@ -1,6 +1,5 @@
 #include <dsplib/medfilt.h>
 #include <dsplib/utils.h>
-#include <dsplib/throw.h>
 
 #include <cassert>
 #include <algorithm>

diff --git a/lib/resample/fir-decimator.cpp b/lib/resample/fir-decimator.cpp
@@ -1,5 +1,4 @@
 #include "dsplib/resample.h"
-#include "dsplib/throw.h"
 
 namespace dsplib {
 

diff --git a/lib/resample/fir-rate-converter.cpp b/lib/resample/fir-rate-converter.cpp
@@ -1,5 +1,4 @@
 #include "dsplib/resample.h"
-#include "dsplib/throw.h"
 
 #include <cassert>
 

diff --git a/lib/snr.cpp b/lib/snr.cpp
@@ -3,7 +3,6 @@
 #include <dsplib/window.h>
 #include <dsplib/math.h>
 #include <dsplib/utils.h>
-#include <dsplib/throw.h>
 
 #include <utility>
 #include <vector>

diff --git a/lib/spectrum.cpp b/lib/spectrum.cpp
@@ -3,7 +3,6 @@
 #include "dsplib/fft.h"
 #include "dsplib/keywords.h"
 #include "dsplib/math.h"
-#include "dsplib/throw.h"
 #include "dsplib/utils.h"
 #include "dsplib/window.h"