[project @ 2002-09-10 10:50:28 by malcolm]

[ghc-base.git] / GHC / Real.lhs

diff --git a/GHC/Real.lhs b/GHC/Real.lhs
index c2e73c0..a656c5f 100644 (file)
--- a/GHC/Real.lhs
+++ b/GHC/Real.lhs
@@ -26,6 +26,7 @@ import GHC.Show
 
 infixr 8  ^, ^^
 infixl 7  /, `quot`, `rem`, `div`, `mod`
+infixl 7  %
 
 default ()             -- Double isn't available yet, 
                        -- and we shouldn't be using defaults anyway
@@ -46,6 +47,10 @@ data  (Integral a)   => Ratio a = !a :% !a  deriving (Eq)
 -- the '%' operator.
 type  Rational         =  Ratio Integer
 
+ratioPrec, ratioPrec1 :: Int
+ratioPrec  = 7         -- Precedence of ':%' constructor
+ratioPrec1 = ratioPrec + 1
+
 infinity, notANumber :: Rational
 infinity   = 1 :% 0
 notANumber = 0 :% 0
@@ -246,11 +251,10 @@ instance  (Integral a)    => RealFrac (Ratio a)  where
 
 instance  (Integral a)  => Show (Ratio a)  where
     {-# SPECIALIZE instance Show Rational #-}
-    showsPrec p (x:%y) =  showParen (p > ratio_prec)
-                              (shows x . showString " % " . shows y)
-
-ratio_prec :: Int
-ratio_prec = 7
+    showsPrec p (x:%y) =  showParen (p > ratioPrec) $
+                          showsPrec ratioPrec1 x . 
+                          showString " % " . 
+                          showsPrec ratioPrec1 y
 
 instance  (Integral a) => Enum (Ratio a)  where
     {-# SPECIALIZE instance Enum Rational #-}