X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FBasicTypes.lhs;h=4b0d3d73da433edeb655a09d0f859f11bbe71e8a;hb=1967fd3474913f3c0dc72b070019a830223c7fab;hp=e6e3a90dfb9d7798db2f93ba80d9f07952998c87;hpb=c248518fe81b6d2807d3bcbb8a09ae14facce1ad;p=ghc-hetmet.git

diff --git a/compiler/basicTypes/BasicTypes.lhs b/compiler/basicTypes/BasicTypes.lhs
index e6e3a90..4b0d3d7 100644
--- a/compiler/basicTypes/BasicTypes.lhs
+++ b/compiler/basicTypes/BasicTypes.lhs
@@ -1,4 +1,5 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The GRASP/AQUA Project, Glasgow University, 1997-1998
 %
 \section[BasicTypes]{Miscellanous types}
@@ -13,6 +14,13 @@ types that
 \end{itemize}
 
 \begin{code}
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 module BasicTypes(
 	Version, bumpVersion, initialVersion,
 
@@ -38,7 +46,7 @@ module BasicTypes(
 	TupCon(..), tupleParens,
 
 	OccInfo(..), seqOccInfo, isFragileOcc, isOneOcc, 
-	isDeadOcc, isLoopBreaker, isNoOcc,
+	isDeadOcc, isLoopBreaker, isNonRuleLoopBreaker, isNoOcc,
 
 	InsideLam, insideLam, notInsideLam,
 	OneBranch, oneBranch, notOneBranch,
@@ -235,7 +243,7 @@ isBoxed Unboxed = False
 %*									*
 %************************************************************************
 
-\begin{code} 
+\begin{code}
 data RecFlag = Recursive 
 	     | NonRecursive
 	     deriving( Eq )
@@ -367,18 +375,24 @@ defn of OccInfo here, safely at the bottom
 data OccInfo 
   = NoOccInfo		-- Many occurrences, or unknown
 
-  | RulesOnly		-- Occurs only in the RHS of one or more rules
-
   | IAmDead		-- Marks unused variables.  Sometimes useful for
 			-- lambda and case-bound variables.
 
-  | OneOcc !InsideLam	-- Occurs exactly once, not inside a rule
- 	   !OneBranch
-	   !InterestingCxt
+  | OneOcc		-- Occurs exactly once, not inside a rule
+	!InsideLam
+ 	!OneBranch
+	!InterestingCxt
 
   | IAmALoopBreaker	-- Used by the occurrence analyser to mark loop-breakers
 			-- in a group of recursive definitions
+	!RulesOnly	-- True <=> This is a weak or rules-only loop breaker
+			--  See OccurAnal Note [Weak loop breakers]
+
+type RulesOnly = Bool
+\end{code}
+
 
+\begin{code}
 isNoOcc :: OccInfo -> Bool
 isNoOcc NoOccInfo = True
 isNoOcc other     = False
@@ -405,8 +419,12 @@ oneBranch    = True
 notOneBranch = False
 
 isLoopBreaker :: OccInfo -> Bool
-isLoopBreaker IAmALoopBreaker = True
-isLoopBreaker other	      = False
+isLoopBreaker (IAmALoopBreaker _) = True
+isLoopBreaker other	          = False
+
+isNonRuleLoopBreaker :: OccInfo -> Bool
+isNonRuleLoopBreaker (IAmALoopBreaker False) = True	-- Loop-breaker that breaks a non-rule cycle
+isNonRuleLoopBreaker other	             = False
 
 isDeadOcc :: OccInfo -> Bool
 isDeadOcc IAmDead = True
@@ -423,10 +441,9 @@ isFragileOcc other	    = False
 \begin{code}
 instance Outputable OccInfo where
   -- only used for debugging; never parsed.  KSW 1999-07
-  ppr NoOccInfo  			  	  = empty
-  ppr RulesOnly  			  	  = ptext SLIT("RulesOnly")
-  ppr IAmALoopBreaker 				  = ptext SLIT("LoopBreaker")
-  ppr IAmDead					  = ptext SLIT("Dead")
+  ppr NoOccInfo  	   = empty
+  ppr (IAmALoopBreaker ro) = ptext SLIT("LoopBreaker") <> if ro then char '!' else empty
+  ppr IAmDead		   = ptext SLIT("Dead")
   ppr (OneOcc inside_lam one_branch int_cxt)
 	= ptext SLIT("Once") <> pp_lam <> pp_br <> pp_args
 	where
@@ -479,6 +496,10 @@ instance Outputable StrictnessMark where
 \begin{code}
 data SuccessFlag = Succeeded | Failed
 
+instance Outputable SuccessFlag where
+    ppr Succeeded = ptext SLIT("Succeeded")
+    ppr Failed    = ptext SLIT("Failed")
+
 successIf :: Bool -> SuccessFlag
 successIf True  = Succeeded
 successIf False = Failed
@@ -523,14 +544,21 @@ alwaysInlineSpec  = Inline AlwaysActive True	-- INLINE always
 neverInlineSpec   = Inline NeverActive  False	-- NOINLINE 
 
 instance Outputable Activation where
-   ppr AlwaysActive     = empty		-- The default
+   ppr NeverActive      = ptext SLIT("NEVER")
+   ppr AlwaysActive     = ptext SLIT("ALWAYS")
    ppr (ActiveBefore n) = brackets (char '~' <> int n)
    ppr (ActiveAfter n)  = brackets (int n)
-   ppr NeverActive      = ptext SLIT("NEVER")
     
 instance Outputable InlineSpec where
-   ppr (Inline act True)  = ptext SLIT("INLINE") <> ppr act
-   ppr (Inline act False) = ptext SLIT("NOINLINE") <> ppr act
+   ppr (Inline act is_inline)  
+	| is_inline = ptext SLIT("INLINE")
+		      <> case act of
+			   AlwaysActive -> empty
+			   other	-> ppr act
+	| otherwise = ptext SLIT("NOINLINE")
+		      <> case act of
+			    NeverActive -> empty
+			    other	-> ppr act
 
 isActive :: CompilerPhase -> Activation -> Bool
 isActive p NeverActive      = False