Remove clenshaw macro, fix namespace issues in macro

Author: dlfivefifty

src/LinearAlgebra/clenshaw.jl

@@ -1,4 +1,4 @@
-export clenshaw, @clenshaw
+export clenshaw
 
 
 ##
@@ -27,20 +27,6 @@ function ClenshawPlan(::Type{T},sp,N::Int,n::Int) where T
     ClenshawPlan(sp,Array{T}(undef,n),Array{T}(undef,n),Array{T}(undef,n),A,B,C)
 end
 
-macro clenshaw(x, c...)
-    a, b = :(zero(t)), :(zero(t))
-    as = []
-    N = length(c)
-    for k = N:-1:2
-        ak = Symbol("a",k)
-        push!(as, :($ak = $a))
-        a = :(muladd(t,$a,$(esc(c[k]))-$b))
-        b = :($ak)
-    end
-    ex = Expr(:block,as...,:(muladd(t/2,$a,$(esc(c[1]))-$b)))
-    Expr(:block, :(t = $(esc(2))*$(esc(x))), ex)
-end
-
 clenshaw(x,c) = clenshaw_halved(2*x, c)
 
 @generated function clenshaw_halved(x, c::StaticArrays.SVector{N,R}) where {N, R}

src/Operators/Operator.jl

@@ -515,40 +515,40 @@ macro wrappergetindex(Wrap)
             ds = domainspace(A)
             rs = rangespace(A)
             KR,JR = parentindices(S)
-            BandedMatrix(view(A,
-                              blockstart(rs,first(KR)):blockstop(rs,last(KR)),
-                              blockstart(ds,first(JR)):blockstop(ds,last(JR))))
+            ApproxFunBase.BandedMatrix(view(A,
+                              ApproxFunBase.blockstart(rs,first(KR)):ApproxFunBase.blockstop(rs,last(KR)),
+                              ApproxFunBase.blockstart(ds,first(JR)):ApproxFunBase.blockstop(ds,last(JR))))
         end
 
 
         # if the spaces change, then we need to be smarter
         function ApproxFunBase.BlockBandedMatrix(S::ApproxFunBase.SubOperator{T,OP}) where {T,OP<:$Wrap}
             P = parent(S)
-            if blocklengths(domainspace(P)) === blocklengths(domainspace(P.op)) &&
-                    blocklengths(rangespace(P)) === blocklengths(rangespace(P.op))
-                BlockBandedMatrix(view(parent(S).op,S.indexes[1],S.indexes[2]))
+            if ApproxFunBase.blocklengths(domainspace(P)) === ApproxFunBase.blocklengths(domainspace(P.op)) &&
+                    ApproxFunBase.blocklengths(rangespace(P)) === ApproxFunBase.blocklengths(rangespace(P.op))
+                ApproxFunBase.BlockBandedMatrix(view(parent(S).op,S.indexes[1],S.indexes[2]))
             else
-                default_BlockBandedMatrix(S)
+                ApproxFunBase.default_BlockBandedMatrix(S)
             end
         end
 
         function ApproxFunBase.PseudoBlockMatrix(S::ApproxFunBase.SubOperator{T,OP}) where {T,OP<:$Wrap}
             P = parent(S)
-            if blocklengths(domainspace(P)) === blocklengths(domainspace(P.op)) &&
-                    blocklengths(rangespace(P)) === blocklengths(rangespace(P.op))
-                PseudoBlockMatrix(view(parent(S).op,S.indexes[1],S.indexes[2]))
+            if ApproxFunBase.blocklengths(domainspace(P)) === ApproxFunBase.blocklengths(domainspace(P.op)) &&
+                    ApproxFunBase.blocklengths(rangespace(P)) === ApproxFunBase.blocklengths(rangespace(P.op))
+                ApproxFunBase.PseudoBlockMatrix(view(parent(S).op,S.indexes[1],S.indexes[2]))
             else
-                default_blockmatrix(S)
+                ApproxFunBase.default_blockmatrix(S)
             end
         end
 
         function ApproxFunBase.BandedBlockBandedMatrix(S::ApproxFunBase.SubOperator{T,OP}) where {T,OP<:$Wrap}
             P = parent(S)
-            if blocklengths(domainspace(P)) === blocklengths(domainspace(P.op)) &&
-                    blocklengths(rangespace(P)) === blocklengths(rangespace(P.op))
-                BandedBlockBandedMatrix(view(parent(S).op,S.indexes[1],S.indexes[2]))
+            if ApproxFunBase.blocklengths(domainspace(P)) === ApproxFunBase.blocklengths(domainspace(P.op)) &&
+                    ApproxFunBase.blocklengths(rangespace(P)) === ApproxFunBase.blocklengths(rangespace(P.op))
+                ApproxFunBase.BandedBlockBandedMatrix(view(parent(S).op,S.indexes[1],S.indexes[2]))
             else
-                default_BandedBlockBandedMatrix(S)
+                ApproxFunBase.default_BandedBlockBandedMatrix(S)
             end
         end