diff options
author | Gabor Greif <ggreif@gmail.com> | 2014-06-11 01:37:01 +0200 |
---|---|---|
committer | Gabor Greif <ggreif@gmail.com> | 2014-06-11 20:22:51 +0200 |
commit | edd5764509c7df65e3f5409888cbacf58435d11e (patch) | |
tree | 2814d348ae5c3b2d30165b10484b230f9f677802 | |
parent | a9ff7d0819fce392a243549c08299b897f04d555 (diff) | |
download | haskell-edd5764509c7df65e3f5409888cbacf58435d11e.tar.gz |
Some typos in comments
-rw-r--r-- | compiler/basicTypes/OccName.lhs | 2 | ||||
-rw-r--r-- | compiler/coreSyn/CoreTidy.lhs | 4 | ||||
-rw-r--r-- | compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 2 | ||||
-rw-r--r-- | compiler/main/PprTyThing.hs | 2 | ||||
-rw-r--r-- | compiler/nativeGen/AsmCodeGen.lhs | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/compiler/basicTypes/OccName.lhs b/compiler/basicTypes/OccName.lhs index 087298f41a..124843213e 100644 --- a/compiler/basicTypes/OccName.lhs +++ b/compiler/basicTypes/OccName.lhs @@ -128,7 +128,7 @@ import Data.Data %* * %************************************************************************ -FastStringEnv can't be in FastString becuase the env depends on UniqFM +FastStringEnv can't be in FastString because the env depends on UniqFM \begin{code} type FastStringEnv a = UniqFM a -- Keyed by FastString diff --git a/compiler/coreSyn/CoreTidy.lhs b/compiler/coreSyn/CoreTidy.lhs index af1e12c9ef..4754aa5afb 100644 --- a/compiler/coreSyn/CoreTidy.lhs +++ b/compiler/coreSyn/CoreTidy.lhs @@ -256,11 +256,11 @@ Consider False -> 2# in ...) -The z# binding is ok becuase the RHS is ok-for-speculation, +The z# binding is ok because the RHS is ok-for-speculation, but Lint will complain unless it can *see* that. So we preserve the evaluated-ness on 'y' in tidyBndr. -(Another alterantive would be to tidy unboxed lets into cases, +(Another alternative would be to tidy unboxed lets into cases, but that seems more indirect and surprising.) diff --git a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs index 342b94f93f..517553516b 100644 --- a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs +++ b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs @@ -804,7 +804,7 @@ genSwitch cond maybe_ids = do let pairs = [ (ix, id) | (ix,Just id) <- zip [0..] maybe_ids ] let labels = map (\(ix, b) -> (mkIntLit ty ix, blockIdToLlvm b)) pairs - -- out of range is undefied, so lets just branch to first label + -- out of range is undefined, so let's just branch to first label let (_, defLbl) = head labels let s1 = Switch vc defLbl labels diff --git a/compiler/main/PprTyThing.hs b/compiler/main/PprTyThing.hs index d88b137a68..d993ab87c8 100644 --- a/compiler/main/PprTyThing.hs +++ b/compiler/main/PprTyThing.hs @@ -82,7 +82,7 @@ See #7730, #8776 for details -} -- | Pretty-prints a 'FamInst' (type/data family instance) with its defining location. pprFamInst :: FamInst -> SDoc -- * For data instances we go via pprTyThing of the represntational TyCon, --- becuase there is already much cleverness associated with printing +-- because there is already much cleverness associated with printing -- data type declarations that I don't want to duplicate -- * For type instances we print directly here; there is no TyCon -- to give to pprTyThing diff --git a/compiler/nativeGen/AsmCodeGen.lhs b/compiler/nativeGen/AsmCodeGen.lhs index 82193b49eb..e53bb11cc3 100644 --- a/compiler/nativeGen/AsmCodeGen.lhs +++ b/compiler/nativeGen/AsmCodeGen.lhs @@ -606,7 +606,7 @@ makeImportsDoc dflags imports then text ".section .note.GNU-stack,\"\",@progbits" else empty) $$ - -- And just because every other compiler does, lets stick in + -- And just because every other compiler does, let's stick in -- an identifier directive: .ident "GHC x.y.z" (if platformHasIdentDirective platform then let compilerIdent = text "GHC" <+> text cProjectVersion |