diff options
author | Gabor Greif <ggreif@gmail.com> | 2017-07-26 15:13:04 +0200 |
---|---|---|
committer | Gabor Greif <ggreif@gmail.com> | 2017-07-26 15:55:22 +0200 |
commit | 362339dd4cfd652b63c7cd1b7ea5a7486bb40944 (patch) | |
tree | 0f3ec7abbd3166e58feddadde9d6fd52a5ec3022 | |
parent | d31181b90cff7c791465687377cd2093627df429 (diff) | |
download | haskell-362339dd4cfd652b63c7cd1b7ea5a7486bb40944.tar.gz |
Fix note references and some typos
-rw-r--r-- | compiler/llvmGen/Llvm/AbsSyn.hs | 4 | ||||
-rw-r--r-- | compiler/llvmGen/Llvm/PpLlvm.hs | 2 | ||||
-rw-r--r-- | compiler/nativeGen/RegAlloc/Graph/Spill.hs | 2 | ||||
-rw-r--r-- | compiler/prelude/primops.txt.pp | 2 | ||||
-rw-r--r-- | compiler/specialise/Specialise.hs | 2 | ||||
-rw-r--r-- | compiler/typecheck/TcDerivInfer.hs | 2 | ||||
-rw-r--r-- | compiler/typecheck/TcRnTypes.hs | 2 | ||||
-rw-r--r-- | compiler/typecheck/TcTyClsDecls.hs | 6 | ||||
-rw-r--r-- | rts/ProfHeap.c | 2 | ||||
-rw-r--r-- | rts/RaiseAsync.c | 2 | ||||
-rw-r--r-- | rts/RetainerSet.h | 2 | ||||
-rw-r--r-- | testsuite/tests/programs/galois_raytrace/Eval.hs | 2 |
12 files changed, 15 insertions, 15 deletions
diff --git a/compiler/llvmGen/Llvm/AbsSyn.hs b/compiler/llvmGen/Llvm/AbsSyn.hs index 8f38c799c7..7dd3c4807b 100644 --- a/compiler/llvmGen/Llvm/AbsSyn.hs +++ b/compiler/llvmGen/Llvm/AbsSyn.hs @@ -323,8 +323,8 @@ data LlvmExpression basic block in a new variable of type tp. * tp: type of the merged variable, must match the types of the predecessor variables. - * precessors: A list of variables and the basic block that they originate - from. + * predecessors: A list of variables and the basic block that they originate + from. -} | Phi LlvmType [(LlvmVar,LlvmVar)] diff --git a/compiler/llvmGen/Llvm/PpLlvm.hs b/compiler/llvmGen/Llvm/PpLlvm.hs index 293999bd1e..f2eeffe114 100644 --- a/compiler/llvmGen/Llvm/PpLlvm.hs +++ b/compiler/llvmGen/Llvm/PpLlvm.hs @@ -238,7 +238,7 @@ ppLlvmExpression expr Malloc tp amount -> ppMalloc tp amount AtomicRMW aop tgt src ordering -> ppAtomicRMW aop tgt src ordering CmpXChg addr old new s_ord f_ord -> ppCmpXChg addr old new s_ord f_ord - Phi tp precessors -> ppPhi tp precessors + Phi tp predecessors -> ppPhi tp predecessors Asm asm c ty v se sk -> ppAsm asm c ty v se sk MExpr meta expr -> ppMetaExpr meta expr diff --git a/compiler/nativeGen/RegAlloc/Graph/Spill.hs b/compiler/nativeGen/RegAlloc/Graph/Spill.hs index 0014ab6fed..b86b143f59 100644 --- a/compiler/nativeGen/RegAlloc/Graph/Spill.hs +++ b/compiler/nativeGen/RegAlloc/Graph/Spill.hs @@ -34,7 +34,7 @@ import qualified Data.IntSet as IntSet -- TODO: See if we can split some of the live ranges instead of just globally -- spilling the virtual reg. This might make the spill cleaner's job easier. -- --- TODO: On CISCy x86 and x86_64 we don't nessesarally have to add a mov instruction +-- TODO: On CISCy x86 and x86_64 we don't necessarily have to add a mov instruction -- when making spills. If an instr is using a spilled virtual we may be able to -- address the spill slot directly. -- diff --git a/compiler/prelude/primops.txt.pp b/compiler/prelude/primops.txt.pp index 97ae89cb84..8039913110 100644 --- a/compiler/prelude/primops.txt.pp +++ b/compiler/prelude/primops.txt.pp @@ -1238,7 +1238,7 @@ primop ReadByteArrayOp_WideChar "readWideCharArray#" GenPrimOp primop ReadByteArrayOp_Int "readIntArray#" GenPrimOp MutableByteArray# s -> Int# -> State# s -> (# State# s, Int# #) - {Read intger; offset in words.} + {Read integer; offset in words.} with has_side_effects = True can_fail = True diff --git a/compiler/specialise/Specialise.hs b/compiler/specialise/Specialise.hs index 869da640ea..e8c6c28eaf 100644 --- a/compiler/specialise/Specialise.hs +++ b/compiler/specialise/Specialise.hs @@ -147,7 +147,7 @@ becomes in fl -We still have recusion for non-overloaded functions which we +We still have recursion for non-overloaded functions which we specialise, but the recursive call should get specialised to the same recursive version. diff --git a/compiler/typecheck/TcDerivInfer.hs b/compiler/typecheck/TcDerivInfer.hs index 02c0103eec..515ae52a67 100644 --- a/compiler/typecheck/TcDerivInfer.hs +++ b/compiler/typecheck/TcDerivInfer.hs @@ -760,7 +760,7 @@ Similarly for 'baz', givng the constraint C2 ~ Maybe s -> Maybe s -> Bool) In this case baz has no local quantification, so the implication -constraint has no local skolems and there are no unificaiton +constraint has no local skolems and there are no unification variables. [STEP DAC SOLVE] diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs index 6383b57c28..3e691c1100 100644 --- a/compiler/typecheck/TcRnTypes.hs +++ b/compiler/typecheck/TcRnTypes.hs @@ -1083,7 +1083,7 @@ data PromotionErr -- See Note [Don't promote pattern synonyms] in TcEnv | RecDataConPE -- Data constructor in a recursive loop - -- See Note [ARecDataCon: recusion and promoting data constructors] in TcTyClsDecls + -- See Note [Recursion and promoting data constructors] in TcTyClsDecls | NoDataKindsTC -- -XDataKinds not enabled (for a tycon) | NoDataKindsDC -- -XDataKinds not enabled (for a datacon) | NoTypeInTypeTC -- -XTypeInType not enabled (for a tycon) diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs index 5acf207dc6..3f53946031 100644 --- a/compiler/typecheck/TcTyClsDecls.hs +++ b/compiler/typecheck/TcTyClsDecls.hs @@ -203,7 +203,7 @@ tcTyClDecls tyclds role_annots -- Populate environment with knot-tied ATyCon for TyCons -- NB: if the decls mention any ill-staged data cons - -- (see Note [Recusion and promoting data constructors]) + -- (see Note [Recursion and promoting data constructors]) -- we will have failed already in kcTyClGroup, so no worries here ; tcExtendRecEnv (zipRecTyClss tc_tycons rec_tyclss) $ @@ -424,7 +424,7 @@ mkPromotionErrorEnv :: [LTyClDecl GhcRn] -> TcTypeEnv -- Maps each tycon/datacon to a suitable promotion error -- tc :-> APromotionErr TyConPE -- dc :-> APromotionErr RecDataConPE --- See Note [ARecDataCon: Recursion and promoting data constructors] +-- See Note [Recursion and promoting data constructors] mkPromotionErrorEnv decls = foldr (plusNameEnv . mk_prom_err_env . unLoc) @@ -454,7 +454,7 @@ getInitialKinds :: [LTyClDecl GhcRn] -> TcM (NameEnv TcTyThing) -- and each datacon to a suitable promotion error -- tc :-> ATcTyCon (tc:initial_kind) -- dc :-> APromotionErr RecDataConPE --- See Note [ARecDataCon: Recursion and promoting data constructors] +-- See Note [Recursion and promoting data constructors] getInitialKinds decls = tcExtendKindEnv promotion_err_env $ diff --git a/rts/ProfHeap.c b/rts/ProfHeap.c index 43801b8944..cb6a13c897 100644 --- a/rts/ProfHeap.c +++ b/rts/ProfHeap.c @@ -171,7 +171,7 @@ doingRetainerProfiling( void ) } #endif /* PROFILING */ -// Precesses a closure 'c' being destroyed whose size is 'size'. +// Processes a closure 'c' being destroyed whose size is 'size'. // Make sure that LDV_recordDead() is not invoked on 'inherently used' closures // such as TSO; they should not be involved in computing dragNew or voidNew. // diff --git a/rts/RaiseAsync.c b/rts/RaiseAsync.c index 6f1ab79691..f5e96a2c43 100644 --- a/rts/RaiseAsync.c +++ b/rts/RaiseAsync.c @@ -108,7 +108,7 @@ suspendComputation (Capability *cap, StgTSO *tso, StgUpdateFrame *stop_here) yourself using throwTo, the exception would actually immediately be delivered. This is because throwTo itself is considered an interruptible point, so the exception is always deliverable. Thus, - ordinarily, we never end up with a message to onesself in the + ordinarily, we never end up with a message to oneself in the blocked_exceptions queue. - In the case of a StackOverflow, we don't actually care about the diff --git a/rts/RetainerSet.h b/rts/RetainerSet.h index 52f12dc155..1b4dec0b3e 100644 --- a/rts/RetainerSet.h +++ b/rts/RetainerSet.h @@ -67,7 +67,7 @@ typedef struct _RetainerSet { struct _RetainerSet *link; // link to the next retainer set in the bucket int id; // unique id of this retainer set (used when printing) // Its absolute value is interpreted as its true id; if id is - // negative, it indicates that this retainer set has had a postive + // negative, it indicates that this retainer set has had a positive // cost after some retainer profiling. retainer element[0]; // elements of this retainer set // do not put anything below here! diff --git a/testsuite/tests/programs/galois_raytrace/Eval.hs b/testsuite/tests/programs/galois_raytrace/Eval.hs index bf43d10605..001842edad 100644 --- a/testsuite/tests/programs/galois_raytrace/Eval.hs +++ b/testsuite/tests/programs/galois_raytrace/Eval.hs @@ -243,7 +243,7 @@ doPrimOp primOp op args show op ++ " takes " ++ show (length types) ++ " argument" ++ s ++ " with" ++ the ++ " type" ++ s ++ "\n|\n|" ++ " " ++ unwords [ show ty | ty <- types ] ++ "\n|\n|" ++ - " currently, the relevent argument" ++ s ++ " on the stack " ++ + " currently, the relevant argument" ++ s ++ " on the stack " ++ are ++ "\n|\n| " ++ unwords [ "(" ++ show arg ++ ")" | arg <- reverse (take (length types) args) ] ++ "\n|\n| " |