diff --git a/src/AutGroup.jl b/src/AutGroup.jl index 87ed518..65a12f9 100644 --- a/src/AutGroup.jl +++ b/src/AutGroup.jl @@ -4,16 +4,16 @@ # ############################################################################### -@compat struct AutSymbol <: GSymbol +struct AutSymbol <: GSymbol str::String pow::Int ex::Expr func::Function end -@compat AutGroupElem = GWord{AutSymbol} +AutGroupElem = GWord{AutSymbol} -@compat mutable struct AutGroup <: AbstractFPGroup +mutable struct AutGroup <: AbstractFPGroup objectGroup::Group gens::Vector{AutSymbol} end diff --git a/src/FreeGroup.jl b/src/FreeGroup.jl index 7fd9fff..42bf748 100644 --- a/src/FreeGroup.jl +++ b/src/FreeGroup.jl @@ -4,14 +4,14 @@ # ############################################################################### -@compat struct FreeSymbol <: GSymbol +struct FreeSymbol <: GSymbol str::String pow::Int end -@compat FreeGroupElem = GWord{FreeSymbol} +FreeGroupElem = GWord{FreeSymbol} -@compat mutable struct FreeGroup <: AbstractFPGroup +mutable struct FreeGroup <: AbstractFPGroup gens::Vector{FreeSymbol} # order::Vector{T} # fastmult_table::Array{Int,2} diff --git a/src/Groups.jl b/src/Groups.jl index 1a32d06..c4b129f 100644 --- a/src/Groups.jl +++ b/src/Groups.jl @@ -1,5 +1,4 @@ module Groups -using Compat using Nemo import Nemo: Group, GroupElem, Ring @@ -25,7 +24,7 @@ doc""" > * `pow` which is the (multiplicative) exponent of a symbol. """ -@compat abstract type GSymbol end +abstract type GSymbol end doc""" W::GWord{T<:GSymbol} <:GroupElem @@ -43,18 +42,18 @@ doc""" """ -@compat mutable struct GWord{T<:GSymbol} <: GroupElem +mutable struct GWord{T<:GSymbol} <: GroupElem symbols::Vector{T} savedhash::UInt modified::Bool parent::Group - @compat function GWord{T}(symbols::Vector{T}) where {T<:GSymbol} + function GWord{T}(symbols::Vector{T}) where {T<:GSymbol} return new(symbols, hash(symbols), true) end end -@compat abstract type AbstractFPGroup <: Group end +abstract type AbstractFPGroup <: Group end ############################################################################### # @@ -81,7 +80,7 @@ convert{T<:GSymbol}(::Type{GWord{T}}, s::T) = GWord{T}(T[s]) function hash(W::GWord, h::UInt) W.modified && reduce!(W) - @compat res = xor(W.savedhash, h) + res = xor(W.savedhash, h) return res end