[project @ 2000-03-08 17:48:24 by simonmar]

[ghc-hetmet.git] / ghc / compiler / deSugar / DsExpr.lhs

diff --git a/ghc/compiler/deSugar/DsExpr.lhs b/ghc/compiler/deSugar/DsExpr.lhs
index 7b1a96e..bce1b1d 100644 (file)
--- a/ghc/compiler/deSugar/DsExpr.lhs
+++ b/ghc/compiler/deSugar/DsExpr.lhs
@@ -296,13 +296,13 @@ dsExpr (CCall lbl args may_gc is_asm result_ty)
 
 dsExpr (HsSCC cc expr)
   = dsExpr expr                        `thenDs` \ core_expr ->
-    getModuleAndGroupDs                `thenDs` \ (mod_name, group_name) ->
-    returnDs (Note (SCC (mkUserCC cc mod_name group_name)) core_expr)
+    getModuleDs                        `thenDs` \ mod_name ->
+    returnDs (Note (SCC (mkUserCC cc mod_name)) core_expr)
 
 -- special case to handle unboxed tuple patterns.
 
-dsExpr (HsCase discrim matches@[Match _ [TuplePat ps boxed] _ _] src_loc)
- | not boxed && all var_pat ps 
+dsExpr (HsCase discrim matches src_loc)
+ | all ubx_tuple_match matches
  =  putSrcLocDs src_loc $
     dsExpr discrim                       `thenDs` \ core_discrim ->
     matchWrapper CaseMatch matches "case" `thenDs` \ ([discrim_var], matching_code) ->
@@ -310,6 +310,9 @@ dsExpr (HsCase discrim matches@[Match _ [TuplePat ps boxed] _ _] src_loc)
        Case (Var x) bndr alts | x == discrim_var -> 
                returnDs (Case core_discrim bndr alts)
        _ -> panic ("dsExpr: tuple pattern:\n" ++ showSDoc (ppr matching_code))
+  where
+    ubx_tuple_match (Match _ [TuplePat ps False{-unboxed-}] _ _) = True
+    ubx_tuple_match _ = False
 
 dsExpr (HsCase discrim matches src_loc)
   = putSrcLocDs src_loc $