From b92276ade280e5765c57861cb22e1d9796d12181 Mon Sep 17 00:00:00 2001
From: kalmarek <kalmar@amu.edu.pl>
Date: Wed, 25 Mar 2020 04:05:28 +0100
Subject: [PATCH] separate GSymbols

---
 src/Groups.jl  | 28 ++--------------------------
 src/symbols.jl | 18 ++++++++++++++++++
 src/types.jl   | 11 +++++++++++
 3 files changed, 31 insertions(+), 26 deletions(-)
 create mode 100644 src/symbols.jl
 create mode 100644 src/types.jl

diff --git a/src/Groups.jl b/src/Groups.jl
index ac93cc4..6a53c04 100644
--- a/src/Groups.jl
+++ b/src/Groups.jl
@@ -22,7 +22,8 @@ Base.one(r::NCRingElem) = one(parent(r))
 #   ParentType / ObjectType definition
 #
 
-abstract type AbstractFPGroup <: Group end
+include("types.jl")
+include("gsymbols.jl")
 
 function Base.one(G::Gr) where Gr <: AbstractFPGroup
     El = elem_type(G)
@@ -34,25 +35,7 @@ end
 elem_type(G::Gr) where Gr <:AbstractFPGroup = elem_type(Gr) # fallback definition
 
 @doc doc"""
-    ::GSymbol
-> Abstract type which all group symbols of AbstractFPGroups should subtype. Each
-> concrete subtype should implement fields:
-> * `id` which is the `Symbol` representation/identification of a symbol
-> * `pow` which is the (multiplicative) exponent of a symbol.
 
-"""
-abstract type GSymbol end
-
-Base.iterate(s::GS, i=1) where GS<:GSymbol = i <= abs(s.pow) ? (GS(s.id, sign(s.pow)), i+1) : nothing
-Base.length(s::GSymbol) = abs(s.pow)
-Base.size(s::GSymbol) = (length(s), )
-Base.eltype(s::GS) where GS<:GSymbol = GS
-Base.isone(s::GSymbol) = iszero(s.pow)
-
-change_pow(s::S, n::Integer) where S<:GSymbol = S(s.id, n)
-Base.inv(s::GSymbol) = change_pow(s, -s.pow)
-
-hash(s::S, h::UInt) where S<:GSymbol = hash(s.id, hash(s.pow, hash(S, h)))
 
 abstract type GWord{T<:GSymbol} <: GroupElem end
 
@@ -233,13 +216,6 @@ function (==)(W::T, Z::T) where T <: GWord
     hash(W) != hash(Z) && return false
     return syllables(W) == syllables(Z)
 end
-
-function (==)(s::GSymbol, t::GSymbol)
-    isone(s) && isone(t) && return true
-    s.pow == t.pow && s.id == t.id && return true
-    return false
-end
-
 ###############################################################################
 #
 #   Binary operators
diff --git a/src/symbols.jl b/src/symbols.jl
new file mode 100644
index 0000000..3e0c023
--- /dev/null
+++ b/src/symbols.jl
@@ -0,0 +1,18 @@
+change_pow(s::S, n::Integer) where S<:GSymbol = S(s.id, n)
+
+function Base.iterate(s::GS, i=1) where GS<:GSymbol
+    return i <= abs(s.pow) ? (GS(s.id, sign(s.pow)), i+1) : nothing
+end
+Base.length(s::GSymbol) = abs(s.pow)
+Base.size(s::GSymbol) = (length(s), )
+Base.eltype(s::GS) where GS<:GSymbol = GS
+
+Base.isone(s::GSymbol) = iszero(s.pow)
+Base.inv(s::GSymbol) = change_pow(s, -s.pow)
+Base.hash(s::S, h::UInt) where S<:GSymbol = hash(s.id, hash(s.pow, hash(S, h)))
+
+function (==)(s::GSymbol, t::GSymbol)
+    isone(s) && isone(t) && return true
+    s.pow == t.pow && s.id == t.id && return true
+    return false
+end
diff --git a/src/types.jl b/src/types.jl
new file mode 100644
index 0000000..9d93fc8
--- /dev/null
+++ b/src/types.jl
@@ -0,0 +1,11 @@
+abstract type AbstractFPGroup <: Group end
+
+@doc doc"""
+    ::GSymbol
+> Represents a syllable.
+> Abstract type which all group symbols of AbstractFPGroups should subtype. Each
+> concrete subtype should implement fields:
+> * `id` which is the `Symbol` representation/identification of a symbol
+> * `pow` which is the (multiplicative) exponent of a symbol.
+"""
+abstract type GSymbol end