Remove lots of commented out 'in' keywords

6 files changed, 0 insertions, 43 deletions

diff --git a/compiler/codeGen/CgCase.lhs b/compiler/codeGen/CgCase.lhs
index dd607de1fc..745bf47710 100644
--- a/compiler/codeGen/CgCase.lhs
+++ b/compiler/codeGen/CgCase.lhs
@@ -520,7 +520,6 @@ cgAlgAlts gc_flag cc_slot alt_type alts
 
             branches = [(dataConTagZ con, blks)
                        | (DataAlt con, blks) <- alts]
-       -- in
        return (branches, mb_deflt)
 
 
diff --git a/compiler/codeGen/CgForeignCall.hs b/compiler/codeGen/CgForeignCall.hs
index 600bbbe0df..e957b90b20 100644
--- a/compiler/codeGen/CgForeignCall.hs
+++ b/compiler/codeGen/CgForeignCall.hs
@@ -59,7 +59,6 @@ cgForeignCall results fcall stg_args live
 
         arg_hints = zipWith CmmHinted
                       arg_exprs (map (typeForeignHint.stgArgType) stg_args)
-  -- in
   emitForeignCall results fcall arg_hints live
 
 
diff --git a/compiler/ghci/ByteCodeGen.lhs b/compiler/ghci/ByteCodeGen.lhs
index 851ca389ab..6bce7c3263 100644
--- a/compiler/ghci/ByteCodeGen.lhs
+++ b/compiler/ghci/ByteCodeGen.lhs
@@ -871,7 +871,6 @@ doCase d s p (_,scrut) bndr alts is_unboxed_tuple
          alt_bco_name = getName bndr
          alt_bco = mkProtoBCO alt_bco_name alt_final (Left alts)
                        0{-no arity-} bitmap_size bitmap True{-is alts-}
-     -- in
 --     trace ("case: bndr = " ++ showSDocDebug (ppr bndr) ++ "\ndepth = " ++ show d ++ "\nenv = \n" ++ showSDocDebug (ppBCEnv p) ++
 --            "\n      bitmap = " ++ show bitmap) $ do
      scrut_code <- schemeE (d + ret_frame_sizeW)
@@ -1025,7 +1024,6 @@ generateCCall d0 s p (CCallSpec target cconv safety) fn args_r_to_l
                           | otherwise
                           = target
 
-     -- in
      (is_static, static_target_addr) <- get_target_info
      let
 
@@ -1061,7 +1059,6 @@ generateCCall d0 s p (CCallSpec target cconv safety) fn args_r_to_l
          -- is.  See comment in Interpreter.c with the CCALL instruction.
          stk_offset   = trunc16 $ d_after_r - s
 
-     -- in
      -- the only difference in libffi mode is that we prepare a cif
      -- describing the call type by calling libffi, and we attach the
      -- address of this to the CCALL instruction.
@@ -1076,7 +1073,6 @@ generateCCall d0 s p (CCallSpec target cconv safety) fn args_r_to_l
          -- slide and return
          wrapup       = mkSLIDE r_sizeW (d_after_r - fromIntegral r_sizeW - s)
                         `snocOL` RETURN_UBX (primRepToCgRep r_rep)
-     --in
          --trace (show (arg1_offW, args_offW  ,  (map cgRepSizeW a_reps) )) $
      return (
          push_args `appOL`
@@ -1326,7 +1322,6 @@ mkMultiBranch maybe_ncons raw_ways = do
                 []         -> nilOL
                 [(_, def)] -> LABEL lbl_default `consOL` def
                 _          -> panic "mkMultiBranch/the_default"
-     -- in
      instrs <- mkTree notd_ways init_lo init_hi
      return (instrs `appOL` the_default)
   where
diff --git a/compiler/main/CodeOutput.lhs b/compiler/main/CodeOutput.lhs
index 8cac6b03f7..24906671cd 100644
--- a/compiler/main/CodeOutput.lhs
+++ b/compiler/main/CodeOutput.lhs
@@ -188,7 +188,6 @@ outputForeignStubs dflags mod location stubs
             -- Header file protos for "foreign export"ed functions.
             stub_h_output_d = pprCode CStyle h_code
             stub_h_output_w = showSDoc dflags stub_h_output_d
-        -- in
 
         createDirectoryIfMissing True (takeDirectory stub_h)
 
diff --git a/compiler/nativeGen/PPC/CodeGen.hs b/compiler/nativeGen/PPC/CodeGen.hs
index 22406073b5..edbaa14f51 100644
--- a/compiler/nativeGen/PPC/CodeGen.hs
+++ b/compiler/nativeGen/PPC/CodeGen.hs
@@ -105,7 +105,6 @@ basicBlockCodeGen (BasicBlock id stmts) = do
           = (instrs, blocks, CmmData sec dat:statics)
         mkBlocks instr (instrs,blocks,statics)
           = (instr:instrs, blocks, statics)
-  -- in
   return (BasicBlock id top : other_blocks, statics)
 
 stmtsToInstrs :: [CmmStmt] -> NatM InstrBlock
@@ -285,7 +284,6 @@ assignMem_I64Code addrTree valueTree = do
                 -- Big-endian store
                 mov_hi = ST II32 rhi hi_addr
                 mov_lo = ST II32 rlo lo_addr
-        -- in
         return (vcode `appOL` addr_code `snocOL` mov_lo `snocOL` mov_hi)
 
 
@@ -298,7 +296,6 @@ assignReg_I64Code (CmmLocal (LocalReg u_dst _)) valueTree = do
          r_src_hi = getHiVRegFromLo r_src_lo
          mov_lo = MR r_dst_lo r_src_lo
          mov_hi = MR r_dst_hi r_src_hi
-   -- in
    return (
         vcode `snocOL` mov_lo `snocOL` mov_hi
      )
@@ -333,7 +330,6 @@ iselExpr64 (CmmLit (CmmInt i _)) = do
                 LIS rhi (ImmInt half3),
                 OR rlo rlo (RIImm $ ImmInt half2)
                 ]
-  -- in
   return (ChildCode64 code rlo)
 
 iselExpr64 (CmmMachOp (MO_Add _) [e1,e2]) = do
@@ -347,7 +343,6 @@ iselExpr64 (CmmMachOp (MO_Add _) [e1,e2]) = do
                 code2 `appOL`
                 toOL [ ADDC rlo r1lo r2lo,
                        ADDE rhi r1hi r2hi ]
-   -- in
    return (ChildCode64 code rlo)
 
 iselExpr64 (CmmMachOp (MO_UU_Conv W32 W64) [expr]) = do
diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs
index 68f8adf250..d480f78b1d 100644
--- a/compiler/nativeGen/X86/CodeGen.hs
+++ b/compiler/nativeGen/X86/CodeGen.hs
@@ -130,7 +130,6 @@ basicBlockCodeGen (BasicBlock id stmts) = do
           = (instrs, blocks, CmmData sec dat:statics)
         mkBlocks instr (instrs,blocks,statics)
           = (instr:instrs, blocks, statics)
-  -- in
   return (BasicBlock id top : other_blocks, statics)
 
 
@@ -307,7 +306,6 @@ assignMem_I64Code addrTree valueTree = do
         -- Little-endian store
         mov_lo = MOV II32 (OpReg rlo) (OpAddr addr)
         mov_hi = MOV II32 (OpReg rhi) (OpAddr (fromJust (addrOffset addr 4)))
-  -- in
   return (vcode `appOL` addr_code `snocOL` mov_lo `snocOL` mov_hi)
 
 
@@ -320,7 +318,6 @@ assignReg_I64Code (CmmLocal (LocalReg u_dst _)) valueTree = do
          r_src_hi = getHiVRegFromLo r_src_lo
          mov_lo = MOV II32 (OpReg r_src_lo) (OpReg r_dst_lo)
          mov_hi = MOV II32 (OpReg r_src_hi) (OpReg r_dst_hi)
-   -- in
    return (
         vcode `snocOL` mov_lo `snocOL` mov_hi
      )
@@ -339,7 +336,6 @@ iselExpr64 (CmmLit (CmmInt i _)) = do
                 MOV II32 (OpImm (ImmInteger r)) (OpReg rlo),
                 MOV II32 (OpImm (ImmInteger q)) (OpReg rhi)
                 ]
-  -- in
   return (ChildCode64 code rlo)
 
 iselExpr64 (CmmLoad addrTree ty) | isWord64 ty = do
@@ -348,7 +344,6 @@ iselExpr64 (CmmLoad addrTree ty) | isWord64 ty = do
    let
         mov_lo = MOV II32 (OpAddr addr) (OpReg rlo)
         mov_hi = MOV II32 (OpAddr (fromJust (addrOffset addr 4))) (OpReg rhi)
-   -- in
    return (
             ChildCode64 (addr_code `snocOL` mov_lo `snocOL` mov_hi)
                         rlo
@@ -370,7 +365,6 @@ iselExpr64 (CmmMachOp (MO_Add _) [e1, CmmLit (CmmInt i _)]) = do
                        ADD II32 (OpImm (ImmInteger r)) (OpReg rlo),
                        MOV II32 (OpReg r1hi) (OpReg rhi),
                        ADC II32 (OpImm (ImmInteger q)) (OpReg rhi) ]
-   -- in
    return (ChildCode64 code rlo)
 
 iselExpr64 (CmmMachOp (MO_Add _) [e1,e2]) = do
@@ -386,7 +380,6 @@ iselExpr64 (CmmMachOp (MO_Add _) [e1,e2]) = do
                        ADD II32 (OpReg r2lo) (OpReg rlo),
                        MOV II32 (OpReg r1hi) (OpReg rhi),
                        ADC II32 (OpReg r2hi) (OpReg rhi) ]
-   -- in
    return (ChildCode64 code rlo)
 
 iselExpr64 (CmmMachOp (MO_UU_Conv _ W64) [expr]) = do
@@ -717,7 +710,6 @@ getRegister' is32Bit (CmmMachOp mop [x, y]) = do -- dyadic MachOps
                                 -- compare against upper
                            -- eax==0 if high part == sign extended low part
                         ]
-         -- in
          return (Fixed size eax code)
 
     --------------------
@@ -735,7 +727,6 @@ getRegister' is32Bit (CmmMachOp mop [x, y]) = do -- dyadic MachOps
                code dst
                   = x_code dst `snocOL`
                     instr size (OpImm (litToImm lit)) (OpReg dst)
-          -- in
           return (Any size code)
 
     {- Case2: shift length is complex (non-immediate)
@@ -761,7 +752,6 @@ getRegister' is32Bit (CmmMachOp mop [x, y]) = do -- dyadic MachOps
            code = x_code tmp `appOL`
                   y_code ecx `snocOL`
                   instr size (OpReg ecx) (OpReg tmp)
-        -- in
         return (Fixed size tmp code)
 
     --------------------
@@ -810,7 +800,6 @@ getRegister' is32Bit (CmmMachOp mop [x, y]) = do -- dyadic MachOps
              result | quotient  = eax
                     | otherwise = edx
 
-           -- in
            return (Fixed size result code)
 
 
@@ -1153,7 +1142,6 @@ loadFloatAmode use_sse2 w addr addr_code = do
                  if use_sse2
                     then MOV size (OpAddr addr) (OpReg dst)
                     else GLD size addr dst
-  -- in
   return (Any (if use_sse2 then size else FF80) code)
 
 
@@ -1282,7 +1270,6 @@ condIntCode' is32Bit cond x y | isOperand is32Bit y = do
     let
         code = x_code `appOL` y_code `snocOL`
                   CMP (cmmTypeSize (cmmExprType x)) y_op (OpReg x_reg)
-    -- in
     return (CondCode False cond code)
 
 -- anything vs anything
@@ -1293,7 +1280,6 @@ condIntCode' _ cond x y = do
         code = y_code `appOL`
                x_code `snocOL`
                   CMP (cmmTypeSize (cmmExprType x)) (OpReg y_reg) x_op
-  -- in
   return (CondCode False cond code)
 
 
@@ -1328,7 +1314,6 @@ condFltCode cond x y
                   CMP (floatSize $ cmmExprWidth x) y_op (OpReg x_reg)
         -- NB(1): we need to use the unsigned comparison operators on the
         -- result of this comparison.
-    -- in
     return (CondCode True (condToUnsigned cond) code)
 
 -- -----------------------------------------------------------------------------
@@ -1766,7 +1751,6 @@ genCCall32' target dest_regs args = do
         delta <- getDeltaNat
         MASSERT (delta == delta0 - tot_arg_size)
 
-        -- in
         -- deal with static vs dynamic call targets
         (callinsns,cconv) <-
           case target of
@@ -1805,7 +1789,6 @@ genCCall32' target dest_regs args = do
                       ++
                       [DELTA delta0]
                    )
-        -- in
         setDeltaNat delta0
 
         let
@@ -1857,7 +1840,6 @@ genCCall32' target dest_regs args = do
             setDeltaNat (delta - 8)
             let
                 r_hi = getHiVRegFromLo r_lo
-            -- in
             return (       code `appOL`
                            toOL [PUSH II32 (OpReg r_hi), DELTA (delta - 4),
                                  PUSH II32 (OpReg r_lo), DELTA (delta - 8),
@@ -2067,7 +2049,6 @@ genCCall64' platform target dest_regs args = do
                   ++
                   [DELTA (delta + real_size)]
                )
-    -- in
     setDeltaNat (delta + real_size)
 
     let
@@ -2318,7 +2299,6 @@ genSwitch expr ids
             code = e_code `appOL` toOL [
                     JMP_TBL op ids ReadOnlyData lbl
                  ]
-        -- in
         return code
 
 generateJumpTableForInstr :: Instr -> Maybe (NatCmmDecl (Alignment, CmmStatics) Instr)
@@ -2357,7 +2337,6 @@ condIntReg cond x y = do
                     SETCC cond (OpReg tmp),
                     MOVZxL II8 (OpReg tmp) (OpReg dst)
                   ]
-  -- in
   return (Any II32 code)
 
 
@@ -2373,7 +2352,6 @@ condFltReg is32Bit cond x y = if_sse2 condFltReg_sse2 condFltReg_x87
                     SETCC cond (OpReg tmp),
                     MOVZxL II8 (OpReg tmp) (OpReg dst)
                   ]
-    -- in
     return (Any II32 code)
 
   condFltReg_sse2 = do
@@ -2419,7 +2397,6 @@ condFltReg is32Bit cond x y = if_sse2 condFltReg_sse2 condFltReg_x87
                     AND II8 (OpReg tmp1) (OpReg tmp2),
                     MOVZxL II8 (OpReg tmp2) (OpReg dst)
                   ]
-    -- in
     return (Any II32 code)
 
 
@@ -2498,7 +2475,6 @@ trivialCode' is32Bit width _ (Just revinstr) (CmmLit lit_a) b
        code dst
          = b_code dst `snocOL`
            revinstr (OpImm (litToImm lit_a)) (OpReg dst)
-  -- in
   return (Any (intSize width) code)
 
 trivialCode' _ width instr _ a b
@@ -2528,7 +2504,6 @@ genTrivialCode rep instr a b = do
                 b_code `appOL`
                 a_code dst `snocOL`
                 instr b_op (OpReg dst)
-  -- in
   return (Any rep code)
 
 regClashesWithOp :: Reg -> Operand -> Bool
@@ -2577,7 +2552,6 @@ trivialUFCode size instr x = do
      code dst =
         x_code `snocOL`
         instr x_reg dst
-  -- in
   return (Any size code)
 
 
@@ -2602,7 +2576,6 @@ coerceInt2FP from to x = if_sse2 coerce_sse2 coerce_x87
                              n -> panic $ "coerceInt2FP.sse: unhandled width ("
                                          ++ show n ++ ")"
            code dst = x_code `snocOL` opc (intSize from) x_op dst
-     -- in
      return (Any (floatSize to) code)
         -- works even if the destination rep is <II32
 
@@ -2618,7 +2591,6 @@ coerceFP2Int from to x = if_sse2 coerceFP2Int_sse2 coerceFP2Int_x87
                                            ++ show n ++ ")"
            code dst = x_code `snocOL` opc x_reg dst
         -- ToDo: works for non-II32 reps?
-     -- in
      return (Any (intSize to) code)
 
    coerceFP2Int_sse2 = do
@@ -2628,7 +2600,6 @@ coerceFP2Int from to x = if_sse2 coerceFP2Int_sse2 coerceFP2Int_x87
                                n -> panic $ "coerceFP2Init.sse: unhandled width ("
                                            ++ show n ++ ")"
            code dst = x_code `snocOL` opc (intSize to) x_op dst
-     -- in
      return (Any (intSize to) code)
          -- works even if the destination rep is <II32
 
@@ -2644,7 +2615,6 @@ coerceFP2FP to x = do
                                                  ++ show n ++ ")"
             | otherwise = GDTOF
         code dst = x_code `snocOL` opc x_reg dst
-  -- in
   return (Any (if use_sse2 then floatSize to else FF80) code)
 
 --------------------------------------------------------------------------------