re-organized code definitions

Author: chakravala

.appveyor.yml

@@ -6,6 +6,7 @@ environment:
   - julia_version: 1.3
   - julia_version: 1.4
   - julia_version: 1.5
+  - julia_version: 1.6
   - julia_version: nightly
 
 platform:

.travis.yml

@@ -11,6 +11,7 @@ julia:
   - 1.3
   - 1.4
   - 1.5
+  - 1.6
   - nightly
 matrix:
   allow_failures:

Project.toml

@@ -1,7 +1,7 @@
 name = "DirectSum"
 uuid = "22fd7b30-a8c0-5bf2-aabe-97783860d07c"
 authors = ["Michael Reed"]
-version = "0.7.6"
+version = "0.7.7"
 
 [deps]
 ComputedFieldTypes = "459fdd68-db75-56b8-8c15-d717a790f88e"

src/DirectSum.jl

@@ -292,6 +292,18 @@ for A ∈ (Signature,DiagonalForm,SubManifold)
     end
 end
 
+# conversions
+
+@pure Manifold(V::SubManifold{M}) where M = (t=typeof(M);t<:SubManifold||t<:Int ? M : V)
+@pure Signature(V::SubManifold{M,N} where M) where N = Signature{N,options(V)}(Vector(signbit.(V[:])),diffvars(V),diffmode(V))
+@pure Signature(V::DiagonalForm{N,M}) where {N,M} = Signature{N,M}(Vector(signbit.(V[:])))
+@pure DiagonalForm(V::Signature{N,M}) where {N,M} = DiagonalForm{N,M}([t ? -1 : 1 for t∈V[:]])
+
+# indices
+
+#@pure supblade(N,S,B) = bladeindex(N,expandbits(N,S,B))
+#@pure supmulti(N,S,B) = basisindex(N,expandbits(N,S,B))
+
 @inline indices(b::SubManifold{V}) where V = indices(UInt(b),mdims(V))
 
 shift_indices(V::M,b::UInt) where M<:TensorBundle = shift_indices!(V,copy(indices(b,mdims(V))))
@@ -409,6 +421,13 @@ for Field ∈ Fields
     end
 end
 
+for M ∈ (:Signature,:DiagonalForm,:SubManifold)
+    @eval begin
+        @inline (V::$M)(s::LinearAlgebra.UniformScaling{T}) where T = Simplex{V}(T<:Bool ? (s.λ ? 1 : -1) : s.λ,getbasis(V,(one(T)<<(mdims(V)-diffvars(V)))-1))
+        (W::$M)(b::Simplex) = Simplex{W}(value(b),W(basis(b)))
+    end
+end
+
 include("generic.jl")
 include("operations.jl")
 include("basis.jl")

src/operations.jl

@@ -61,7 +61,7 @@ end
 end
 for M ∈ (0,4)
     @eval begin
-        @pure function Base.:^(v::T,i::I) where T<:TensorBundle{N,$M,S} where {N,S,I<:Integer}
+        @pure function Base.:^(v::T,i::I) where T<:TensorBundle{N,$M} where {N,I<:Integer}
             iszero(i) && (return V0)
             let V = v
                 for k ∈ 2:i
@@ -154,23 +154,6 @@ end
     end
 end
 
-# conversions
-
-@pure Manifold(V::SubManifold{M}) where M = (t=typeof(M);t<:SubManifold||t<:Int ? M : V)
-@pure Signature(V::SubManifold{M,N} where M) where N = Signature{N,options(V)}(Vector(signbit.(V[:])),diffvars(V),diffmode(V))
-@pure Signature(V::DiagonalForm{N,M}) where {N,M} = Signature{N,M}(Vector(signbit.(V[:])))
-@pure DiagonalForm(V::Signature{N,M}) where {N,M} = DiagonalForm{N,M}([t ? -1 : 1 for t∈V[:]])
-
-for M ∈ (:Signature,:DiagonalForm,:SubManifold)
-    @eval begin
-        @inline (V::$M)(s::LinearAlgebra.UniformScaling{T}) where T = Simplex{V}(T<:Bool ? (s.λ ? 1 : -1) : s.λ,getbasis(V,(one(T)<<(mdims(V)-diffvars(V)))-1))
-        (W::$M)(b::Simplex) = Simplex{W}(value(b),W(basis(b)))
-    end
-end
-
-#@pure supblade(N,S,B) = bladeindex(N,expandbits(N,S,B))
-#@pure supmulti(N,S,B) = basisindex(N,expandbits(N,S,B))
-
 ## Basis forms
 
 @pure evaluate1(a::A,b::B) where {A<:TensorTerm{V,1},B<:TensorTerm{V,1}} where V = evaluate1(V,UInt(a),UInt(b))