X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcoreSyn%2FCoreSyn.lhs;h=1181931fa7723d4e1be533a6709a23dfa0313ffd;hp=fb7865b354f56150cdf7ad0085aefd86dc2554ae;hb=4c9154facefe185dcbb99e2bb1cfe118f02f8bd3;hpb=66413c79385a5b30a668e91789b8a334f6977ca9

diff --git a/compiler/coreSyn/CoreSyn.lhs b/compiler/coreSyn/CoreSyn.lhs
index fb7865b..1181931 100644
--- a/compiler/coreSyn/CoreSyn.lhs
+++ b/compiler/coreSyn/CoreSyn.lhs
@@ -59,6 +59,9 @@ module CoreSyn (
 	-- * Annotated expression data types
 	AnnExpr, AnnExpr'(..), AnnBind(..), AnnAlt,
 	
+        -- ** Operations on annotated expressions
+        collectAnnArgs,
+
 	-- ** Operations on annotations
 	deAnnotate, deAnnotate', deAnnAlt, collectAnnBndrs,
 
@@ -319,7 +322,7 @@ data CoreRule
   = Rule { 
 	ru_name :: RuleName,            -- ^ Name of the rule, for communication with the user
 	ru_act  :: Activation,          -- ^ When the rule is active
-	
+
 	-- Rough-matching stuff
 	-- see comments with InstEnv.Instance( is_cls, is_rough )
 	ru_fn    :: Name,	        -- ^ Name of the 'Id.Id' at the head of this rule
@@ -336,6 +339,10 @@ data CoreRule
 					-- See Note [OccInfo in unfoldings and rules]
 
 	-- Locality
+        ru_auto :: Bool,	-- ^ @True@  <=> this rule is auto-generated
+		   		--   @False@ <=> generated at the users behest
+				--   Main effect: reporting of orphan-hood
+
 	ru_local :: Bool	-- ^ @True@ iff the fn at the head of the rule is
 				-- defined in the same module as the rule
 				-- and is not an implicit 'Id' (like a record selector,
@@ -476,7 +483,20 @@ data UnfoldingSource
     		       -- Replace uf_tmpl each time around
 
   | InlineStable       -- From an INLINE or INLINABLE pragma 
-    		       -- Do not replace uf_tmpl; instead, keep it unchanged
+                       --   INLINE     if guidance is UnfWhen
+                       --   INLINABLE  if guidance is UnfIfGoodArgs
+                       -- (well, technically an INLINABLE might be made
+                       -- UnfWhen if it was small enough, and then
+                       -- it will behave like INLINE outside the current
+                       -- module, but that is the way automatic unfoldings
+                       -- work so it is consistent with the intended
+                       -- meaning of INLINABLE).
+                       --
+    		       -- uf_tmpl may change, but only as a result of
+                       -- gentle simplification, it doesn't get updated
+                       -- to the current RHS during compilation as with
+                       -- InlineRhs.
+                       --
     		       -- See Note [InlineRules]
 
   | InlineCompulsory   -- Something that *has* no binding, so you *must* inline it
@@ -1138,6 +1158,17 @@ data AnnBind bndr annot
 \end{code}
 
 \begin{code}
+-- | Takes a nested application expression and returns the the function
+-- being applied and the arguments to which it is applied
+collectAnnArgs :: AnnExpr b a -> (AnnExpr b a, [AnnExpr b a])
+collectAnnArgs expr
+  = go expr []
+  where
+    go (_, AnnApp f a) as = go f (a:as)
+    go e 	       as = (e, as)
+\end{code}
+
+\begin{code}
 deAnnotate :: AnnExpr bndr annot -> Expr bndr
 deAnnotate (_, e) = deAnnotate' e