Fix #39 (#40)

* define some functions once

* rm eval

* v0.3.1

Co-authored-by: Michael Abbott <me@escbook>

Author: mcabbott

Project.toml

@@ -1,6 +1,6 @@
 name = "AppleAccelerate"
 uuid = "13e28ba4-7ad8-5781-acae-3021b1ed3924"
-version = "0.3.0"
+version = "0.3.1"
 
 [compat]
 julia = "≥ 1.0.0"

src/DSP.jl

@@ -24,7 +24,6 @@ end
 
 ## === FUNCTIONS == ##
 
-## === FUNCTIONS == ##
 for (T, suff) in ((Float64, "D"), (Float32, ""))
 
     """
@@ -198,6 +197,50 @@ for (T, suff) in ((Float64, "D"), )
 end
 
 ## == WINDOW GENERATION == ##
+
+"""
+    blackman(length, [rtype=Float64])
+
+Generates a Blackman window of length 'length'. Default return type
+is Vector{Float64}, but if rtype=Float32, Vector{Float32}
+will be returned.
+"""
+function blackman(length::Int, rtype::DataType=Float64)
+    result::Vector{rtype} = Array{rtype}(undef, length)
+    blackman!(result, length, 0)
+end
+
+"""
+    hamming(length, [rtype=Float64])
+
+Generates a Hamming window of length 'length'. Default return type
+is Vector{Float64}, but if rtype=Float32, Vector{Float32}
+will be returned.
+"""
+function hamming(length::Int, rtype::DataType=Float64)
+    result::Vector{rtype} = Array{rtype}(undef, length)
+    hamming!(result, length, 0)
+end
+
+"""
+    hanning(length, [rtype=Float64])
+
+Generates a denormalized Hanning window of length 'length'. Default
+return type is Vector{Float64}, but if rtype=Float32, Vector{Float32}
+will be returned.
+"""
+function hanning(length::Int, rtype::DataType=Float64)
+    result::Vector{rtype} = Array{rtype}(undef, length)
+    hanning!(result, length, 0)
+end
+
+"""
+Alias function for `hanning`
+"""
+function hann(length::Int, rtype::DataType=Float64)
+    hanning(length, rtype)
+end
+
 for (T, suff) in ((Float32, ""), (Float64, "D"))
 
     """
@@ -216,19 +259,6 @@ for (T, suff) in ((Float32, ""), (Float64, "D"))
         end
     end
 
-    """
-    Generates a Blackman window of length 'length'. Default return type
-    is Vector{Float64}, but if rtype=Float32, Vector{Float32}
-    will be returned.
-
-    Returns: Vector{$T}
-    """
-    @eval begin
-        function blackman(length::Int, rtype::DataType=Float64)
-            result::Vector{rtype} = Array{rtype}(undef, length)
-            blackman!(result, length, 0)
-        end
-    end
 
     """
     Generates a Hamming window of length 'length' and stores it in `result'. By
@@ -246,21 +276,6 @@ for (T, suff) in ((Float32, ""), (Float64, "D"))
         end
     end
 
-    """
-    Generates a Hamming window of length 'length'. Default return type
-    is Vector{Float64}, but if rtype=Float32, Vector{Float32}
-    will be returned.
-
-    Returns: Vector{$T}
-    """
-    @eval begin
-        function hamming(length::Int, rtype::DataType=Float64)
-            result::Vector{rtype} = Array{rtype}(undef, length)
-            hamming!(result, length, 0)
-        end
-    end
-
-
     """
     Generates a Hanning window of length 'length' and stores it in `result'.
     Different window options can be set using the flag argument; default value
@@ -282,20 +297,6 @@ for (T, suff) in ((Float32, ""), (Float64, "D"))
         end
     end
 
-    """
-    Generates a denormalized Hanning window of length 'length'. Default
-    return type is Vector{Float64}, but if rtype=Float32, Vector{Float32}
-    will be returned.
-
-    Returns: Vector{$T}
-    """
-    @eval begin
-        function hanning(length::Int, rtype::DataType=Float64)
-            result::Vector{rtype} = Array{rtype}(undef, length)
-            hanning!(result, length, 0)
-        end
-    end
-
     """
     Alias function for hanning!
 
@@ -307,17 +308,6 @@ for (T, suff) in ((Float32, ""), (Float64, "D"))
         end
     end
 
-    """
-    Alias function for hanning
-
-    Returns: Vector{$T}
-    """
-    @eval begin
-        function hann(length::Int, rtype::DataType=Float64)
-            hanning(length, rtype)
-        end
-    end
-
 end