From 15af76f068dcfd3a7949d36314649f8fccb9d340 Mon Sep 17 00:00:00 2001
From: kalmar <kalmar@amu.edu.pl>
Date: Wed, 17 May 2017 14:38:00 +0200
Subject: [PATCH] formatting

---
 src/GroupRings.jl | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/GroupRings.jl b/src/GroupRings.jl
index 8592c19..a2cb714 100644
--- a/src/GroupRings.jl
+++ b/src/GroupRings.jl
@@ -160,11 +160,11 @@ end
 
 function show(io::IO, X::GroupRingElem)
    T = eltype(X.coeffs)
-   if X == parent(X)(T)
-      print(io, "0*$((parent(X).group)())")
+   RG = parent(X)
+   if X == RG(T)
+      print(io, "$(zero(T))*$((RG.group)())")
    else
-
-      elts = ("$(X[i])*$(parent(X).basis[i])" for i in 1:length(X) if X[i] != zero(T))
+      elts = ("$(X[i])*$(RG.basis[i])" for i in 1:length(X) if X[i] != zero(T))
       join(io, elts, " + ")
    end
 end
@@ -198,10 +198,8 @@ end
 
 (*){T<:Number}(a::T, X::GroupRingElem{T}) = GroupRingElem(a*X.coeffs, parent(X))
 
-function scalar_multiplication{T<:Number, S<:Number}(a::T,
-   X::GroupRingElem{S})
-   promote_type(T,S) == S || warn("Scalar and coeffs are in different rings!
-      Promoting result to $(promote_type(T,S))")
+function scalar_mult{T<:Number, S<:Number}(a::T, X::GroupRingElem{S})
+   promote_type(T,S) == S || warn("Scalar and coeffs are in different rings! Promoting result to $(promote_type(T,S))")
    return GroupRingElem(a*X.coeffs, parent(X))
 end