Don't unwrap conversion

Author: jishnub

Project.toml

@@ -1,6 +1,6 @@
 name = "ApproxFunBase"
 uuid = "fbd15aa5-315a-5a7d-a8a4-24992e37be05"
-version = "0.9.5"
+version = "0.9.6"
 
 [deps]
 AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"

src/Operators/Operator.jl

@@ -81,6 +81,9 @@ for f in [:iswrapperstructure, :iswrapperindexing, :iswrapperspaces]
     @eval $f(@nospecialize(_)) = false
 end
 
+iswrapperstructure(A::Operator) = iswrapperstructure(typeof(A))
+iswrapperindexing(A::Operator) = iswrapperindexing(typeof(A))
+iswrapperspaces(A::Operator) = iswrapperspaces(typeof(A))
 iswrapper(A) = iswrapperstructure(A) || iswrapperindexing(A) || iswrapperspaces(A)
 
 struct Functional <: OperatorStyle end
@@ -748,6 +751,9 @@ macro wrapper(Wrap, forwarddomain = true, forwardrange = true)
 end
 
 unwrap(A::Operator) = iswrapper(A) ? A.op : A
+unwrapstructure(A::Operator) = iswrapperstructure(A) ? A.op : A
+unwrapindexing(A::Operator) = iswrapperindexing(A) ? A.op : A
+unwrapspace(A::Operator) = iswrapperspace(A) ? A.op : A
 
 ## Standard Operators and linear algebra
 

src/Operators/banded/Conversion.jl

@@ -129,9 +129,12 @@ end
 domainspace(C::ConversionWrapper) = C.domainspace
 rangespace(C::ConversionWrapper) = C.rangespace
 
+ConversionWrapper(d::Space, r::Space, B::ConversionWrapper) =
+    ConversionWrapper(d, r, B.op)
+
 function ConversionWrapper(B::Operator,
         d::Space=domainspace(B), r::Space=rangespace(B))
-    ConversionWrapper(d, r, unwrap(B))
+    ConversionWrapper(d, r, B)
 end
 Conversion(A::Space,B::Space,C::Space) =
     ConversionWrapper(Conversion(B,C)*Conversion(A,B), A, C)

src/Operators/general/algebra.jl

@@ -226,7 +226,7 @@ function check_times(ops)
     for k = 1:length(ops)-1
         size(ops[k], 2) == size(ops[k+1], 1) || throw(ArgumentError("incompatible operator sizes"))
         spacescompatible(domainspace(ops[k]), rangespace(ops[k+1])) ||
-            throw(ArgumentError("incompatible spaces at index $k, received $(domainspace(ops[k])) and $(rangespace(ops[k+1]))"))
+            throw(ArgumentError("incompatible spaces at index $k, received $(domainspace(ops[k])) and $(rangespace(ops[k+1])); ops = $ops"))
     end
     return nothing
 end
@@ -619,7 +619,7 @@ end
 
 # Conversions we always assume are intentional: no need to promote
 function *(A::Conversion, B::Conversion)
-    T = TimesOperator(unwrap(A), unwrap(B))
+    T = TimesOperator(A, B)
     ConversionWrapper(T, domainspace(B), rangespace(A))
 end
 *(A::Conversion, B::TimesOperator) = TimesOperator(A, B)