diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 4 | ||||
| -rw-r--r-- | compiler/typecheck/TcHsType.lhs | 2 | ||||
| -rw-r--r-- | compiler/typecheck/TcSimplify.lhs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs index def9e2b81e..33107c0b68 100644 --- a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs +++ b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs @@ -1007,7 +1007,7 @@ genMachOp _ op [x] = case op of w | w > toWidth -> sameConv' reduce _w -> return x' - panicOp = panic $ "LLVM.CodeGen.genMachOp: non unary op encourntered" + panicOp = panic $ "LLVM.CodeGen.genMachOp: non unary op encountered" ++ "with one argument! (" ++ show op ++ ")" -- Handle GlobalRegs pointers @@ -1252,7 +1252,7 @@ genMachOp_slow opt op [x, y] = case op of else panic $ "isSMulOK: Not bit type! (" ++ showSDoc dflags (ppr word) ++ ")" - panicOp = panic $ "LLVM.CodeGen.genMachOp_slow: unary op encourntered" + panicOp = panic $ "LLVM.CodeGen.genMachOp_slow: unary op encountered" ++ "with two arguments! (" ++ show op ++ ")" -- More then two expression, invalid! diff --git a/compiler/typecheck/TcHsType.lhs b/compiler/typecheck/TcHsType.lhs index 64f5fafd09..38a4f2b37a 100644 --- a/compiler/typecheck/TcHsType.lhs +++ b/compiler/typecheck/TcHsType.lhs @@ -884,7 +884,7 @@ as if $(..blah..) :: forall k. k. In the e1 example, the context of the splice fixes kappa to *. But in the e2 example, we'll desugar the type, zonking the kind unification -variables as we go. When we encournter the unconstrained kappa, we +variables as we go. When we encounter the unconstrained kappa, we want to default it to '*', not to AnyK. diff --git a/compiler/typecheck/TcSimplify.lhs b/compiler/typecheck/TcSimplify.lhs index 0ffda048af..ca29111b76 100644 --- a/compiler/typecheck/TcSimplify.lhs +++ b/compiler/typecheck/TcSimplify.lhs @@ -220,7 +220,7 @@ simplifyInfer _top_lvl apply_mr name_taus wanteds | isEmptyWC wanteds = do { gbl_tvs <- tcGetGlobalTyVars ; qtkvs <- quantifyTyVars gbl_tvs (tyVarsOfTypes (map snd name_taus)) - ; traceTc "simplifyInfer: emtpy WC" (ppr name_taus $$ ppr qtkvs) + ; traceTc "simplifyInfer: empty WC" (ppr name_taus $$ ppr qtkvs) ; return (qtkvs, [], False, emptyTcEvBinds) } | otherwise |