diff options
-rw-r--r-- | compiler/codeGen/StgCmmCon.hs | 2 | ||||
-rw-r--r-- | compiler/ghci/ByteCodeItbls.lhs | 2 | ||||
-rw-r--r-- | compiler/hsSyn/HsDecls.lhs | 2 | ||||
-rw-r--r-- | compiler/main/HscTypes.lhs | 2 | ||||
-rw-r--r-- | compiler/stgSyn/StgSyn.lhs | 4 | ||||
-rw-r--r-- | rts/posix/OSMem.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/compiler/codeGen/StgCmmCon.hs b/compiler/codeGen/StgCmmCon.hs index ddc6d91d80..3e95c59d12 100644 --- a/compiler/codeGen/StgCmmCon.hs +++ b/compiler/codeGen/StgCmmCon.hs @@ -129,7 +129,7 @@ buildDynCon' :: DynFlags {- We used to pass a boolean indicating whether all the args were of size zero, so we could use a static -construtor; but I concluded that it just isn't worth it. +constructor; but I concluded that it just isn't worth it. Now I/O uses unboxed tuples there just aren't any constructors with all size-zero args. diff --git a/compiler/ghci/ByteCodeItbls.lhs b/compiler/ghci/ByteCodeItbls.lhs index 79c88fd1df..f1524730b6 100644 --- a/compiler/ghci/ByteCodeItbls.lhs +++ b/compiler/ghci/ByteCodeItbls.lhs @@ -174,7 +174,7 @@ mkJumpToAddr a #elif powerpc_TARGET_ARCH -- We'll use r12, for no particular reason. --- 0xDEADBEEF stands for the adress: +-- 0xDEADBEEF stands for the address: -- 3D80DEAD lis r12,0xDEAD -- 618CBEEF ori r12,r12,0xBEEF -- 7D8903A6 mtctr r12 diff --git a/compiler/hsSyn/HsDecls.lhs b/compiler/hsSyn/HsDecls.lhs index bd007a8c6a..74e9f199fa 100644 --- a/compiler/hsSyn/HsDecls.lhs +++ b/compiler/hsSyn/HsDecls.lhs @@ -634,7 +634,7 @@ pprTyClDeclFlavour (ForeignType {}) = ptext (sLit "foreign type") data HsDataDefn name -- The payload of a data type defn -- Used *both* for vanilla data declarations, -- *and* for data family instances - = -- | Declares a data type or newtype, giving its construcors + = -- | Declares a data type or newtype, giving its constructors -- @ -- data/newtype T a = <constrs> -- data/newtype instance T [a] = <constrs> diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs index 2101fb5df8..7e1dc5c5d1 100644 --- a/compiler/main/HscTypes.lhs +++ b/compiler/main/HscTypes.lhs @@ -884,7 +884,7 @@ data CgGuts cg_binds :: CoreProgram, -- ^ The tidied main bindings, including -- previously-implicit bindings for record and class - -- selectors, and data construtor wrappers. But *not* + -- selectors, and data constructor wrappers. But *not* -- data constructor workers; reason: we we regard them -- as part of the code-gen of tycons diff --git a/compiler/stgSyn/StgSyn.lhs b/compiler/stgSyn/StgSyn.lhs index 6993d029fc..9780676809 100644 --- a/compiler/stgSyn/StgSyn.lhs +++ b/compiler/stgSyn/StgSyn.lhs @@ -118,9 +118,9 @@ isDllConApp dflags con args this_pkg = thisPackage dflags --- True of machine adddresses; these are the things that don't +-- True of machine addresses; these are the things that don't -- work across DLLs. The key point here is that VoidRep comes --- out False, so that a top level nullary GADT construtor is +-- out False, so that a top level nullary GADT constructor is -- False for isDllConApp -- data T a where -- T1 :: T Int diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c index 2237972837..26aebc2b44 100644 --- a/rts/posix/OSMem.c +++ b/rts/posix/OSMem.c @@ -99,7 +99,7 @@ my_mmap (void *addr, W_ size) kern_return_t err = 0; ret = addr; - if(addr) // try to allocate at adress + if(addr) // try to allocate at address err = vm_allocate(mach_task_self(),(vm_address_t*) &ret, size, FALSE); if(!addr || err) // try to allocate anywhere err = vm_allocate(mach_task_self(),(vm_address_t*) &ret, size, TRUE); |