diff options
| -rw-r--r-- | compiler/basicTypes/Module.hs | 2 | ||||
| -rw-r--r-- | compiler/iface/MkIface.hs | 2 | ||||
| -rw-r--r-- | compiler/rename/RnSource.hs | 4 | ||||
| -rw-r--r-- | compiler/typecheck/TcBinds.hs | 2 | ||||
| -rw-r--r-- | compiler/typecheck/TcClassDcl.hs | 2 | ||||
| -rw-r--r-- | compiler/typecheck/TcInteract.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/concurrent/prog001/Trit.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/typecheck/should_compile/twins.hs | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/compiler/basicTypes/Module.hs b/compiler/basicTypes/Module.hs index 98c30a9eb4..78abf2188d 100644 --- a/compiler/basicTypes/Module.hs +++ b/compiler/basicTypes/Module.hs @@ -189,7 +189,7 @@ import {-# SOURCE #-} Packages (componentIdString, improveUnitId, PackageConfigM -- - Same as Distribution.Package.ComponentId -- -- UnitId/InstalledUnitId: A ComponentId + a mapping from hole names --- (ModuleName) to Modules. This is how the compiler identifies instantatiated +-- (ModuleName) to Modules. This is how the compiler identifies instantiated -- components, and also is the main identifier by which GHC identifies things. -- - When Backpack is not being used, UnitId = ComponentId. -- this means a useful fiction for end-users is that there are diff --git a/compiler/iface/MkIface.hs b/compiler/iface/MkIface.hs index 46514188d0..9e6fa62af9 100644 --- a/compiler/iface/MkIface.hs +++ b/compiler/iface/MkIface.hs @@ -1159,7 +1159,7 @@ check_old_iface hsc_env mod_summary src_modified maybe_iface -- two things may have changed that mean we should recompile M: -- * The interface export by a dependency of M has changed. -- * The compiler flags specified this time for M have changed --- in a manner that is significant for recompilaiton. +-- in a manner that is significant for recompilation. -- We return not just if we should recompile the object file but also -- if we should rebuild the interface file. checkVersions :: HscEnv diff --git a/compiler/rename/RnSource.hs b/compiler/rename/RnSource.hs index c71abfa07c..4d0f926b83 100644 --- a/compiler/rename/RnSource.hs +++ b/compiler/rename/RnSource.hs @@ -1267,8 +1267,8 @@ Consider this Here the declaration of S depends on the /data instance/ declaration for 'D Int'. That makes things a lot more complicated, especially -if the data instance is an assocaited type of an enclosing class instance. -(And the class instance might have several assocatiated type instances +if the data instance is an associated type of an enclosing class instance. +(And the class instance might have several associated type instances with different dependency structure!) Ugh. For now we simply don't allow promotion of data constructors for diff --git a/compiler/typecheck/TcBinds.hs b/compiler/typecheck/TcBinds.hs index 60ef82671c..1c93962c05 100644 --- a/compiler/typecheck/TcBinds.hs +++ b/compiler/typecheck/TcBinds.hs @@ -1399,7 +1399,7 @@ We typecheck pattern bindings as follows. First tcLhs does this: gives us a fresh "mono_id" qm :: instantiate(ty), where qm has a fresh name. - Any fresh unification variables in instiatiate(ty) born here, not + Any fresh unification variables in instantiate(ty) born here, not deep under implications as would happen if we allocated them when we encountered q during tcPat. diff --git a/compiler/typecheck/TcClassDcl.hs b/compiler/typecheck/TcClassDcl.hs index aa5e1c41b9..162e91aa4f 100644 --- a/compiler/typecheck/TcClassDcl.hs +++ b/compiler/typecheck/TcClassDcl.hs @@ -457,7 +457,7 @@ tcATDefault emit_warn loc inst_subst defined_ats (ATI fam_tc defs) | tyConName fam_tc `elemNameSet` defined_ats = return [] - -- No user instance, have defaults ==> instatiate them + -- No user instance, have defaults ==> instantiate them -- Example: class C a where { type F a b :: *; type F a b = () } -- instance C [x] -- Then we want to generate the decl: type F [x] b = () diff --git a/compiler/typecheck/TcInteract.hs b/compiler/typecheck/TcInteract.hs index 9a94eef851..005be19f6e 100644 --- a/compiler/typecheck/TcInteract.hs +++ b/compiler/typecheck/TcInteract.hs @@ -1731,7 +1731,7 @@ where G is injective; and wanted constraints [W] TF (alpha, beta) ~ fuv [W] fuv ~ (Int, <some type>) -The injectivity will give rise to derived constraionts +The injectivity will give rise to derived constraints [D] gamma1 ~ alpha [D] Int ~ beta diff --git a/testsuite/tests/concurrent/prog001/Trit.hs b/testsuite/tests/concurrent/prog001/Trit.hs index b67d695984..c42fe6d4cf 100644 --- a/testsuite/tests/concurrent/prog001/Trit.hs +++ b/testsuite/tests/concurrent/prog001/Trit.hs @@ -61,7 +61,7 @@ subTrits x y = addTrits x (neg y) --- Shift left = *2 opertaion with Trit +-- Shift left = *2 operation with Trit shiftLeft :: Trit -> Trit shiftLeft (x, (y:ys)) = (x++ [y], ys) diff --git a/testsuite/tests/typecheck/should_compile/twins.hs b/testsuite/tests/typecheck/should_compile/twins.hs index 3fdc5b80df..99c77aa796 100644 --- a/testsuite/tests/typecheck/should_compile/twins.hs +++ b/testsuite/tests/typecheck/should_compile/twins.hs @@ -2,7 +2,7 @@ {-# LANGUAGE RankNTypes, LiberalTypeSynonyms #-} -- This test checks that deep skolemisation and deep --- instanatiation work right. A buggy prototype +-- instantiation work right. A buggy prototype -- of GHC 7.0, where the type checker generated wrong -- code, sent applyTypeToArgs into a loop. |