diff options
| author | Gabor Greif <ggreif@gmail.com> | 2017-01-04 18:37:23 +0100 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2017-01-04 18:37:23 +0100 |
| commit | df723689c415573fa6c7d83663758154fa7dc46f (patch) | |
| tree | ac112c1df39efb83b35fc4089a815be6b39e08d1 | |
| parent | 6b3c039117d3af575e44e0c4577b94db76eaf560 (diff) | |
| download | haskell-df723689c415573fa6c7d83663758154fa7dc46f.tar.gz | |
Typofixes in manual and comments [ci skip]
| -rw-r--r-- | compiler/nativeGen/RegAlloc/Liveness.hs | 2 | ||||
| -rw-r--r-- | compiler/simplCore/Simplify.hs | 2 | ||||
| -rw-r--r-- | docs/users_guide/glasgow_exts.rst | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/compiler/nativeGen/RegAlloc/Liveness.hs b/compiler/nativeGen/RegAlloc/Liveness.hs index a904202ba7..4b00ed6cd6 100644 --- a/compiler/nativeGen/RegAlloc/Liveness.hs +++ b/compiler/nativeGen/RegAlloc/Liveness.hs @@ -801,7 +801,7 @@ computeLiveness -> [SCC (LiveBasicBlock instr)] -> ([SCC (LiveBasicBlock instr)], -- instructions annotated with list of registers -- which are "dead after this instruction". - BlockMap RegSet) -- blocks annontated with set of live registers + BlockMap RegSet) -- blocks annotated with set of live registers -- on entry to the block. computeLiveness platform sccs diff --git a/compiler/simplCore/Simplify.hs b/compiler/simplCore/Simplify.hs index e51ef054a4..0b9f5f0948 100644 --- a/compiler/simplCore/Simplify.hs +++ b/compiler/simplCore/Simplify.hs @@ -1437,7 +1437,7 @@ rebuildCall env (ArgInfo { ai_fun = fun, ai_args = rev_args, ai_strs = [] }) con -- the continuation, leaving just the bottoming expression. But the -- type might not be right, so we may have to add a coerce. | not (contIsTrivial cont) -- Only do this if there is a non-trivial - = return (env, castBottomExpr res cont_ty) -- contination to discard, else we do it + = return (env, castBottomExpr res cont_ty) -- continuation to discard, else we do it where -- again and again! res = argInfoExpr fun rev_args cont_ty = contResultType cont diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst index 919ec7d468..e21a975993 100644 --- a/docs/users_guide/glasgow_exts.rst +++ b/docs/users_guide/glasgow_exts.rst @@ -3872,7 +3872,7 @@ generates :: instance Num Dollars -One can think of this instance being implementated with the same code as the +One can think of this instance being implemented with the same code as the ``Num Int`` instance, but with ``Dollars`` and ``getDollars`` added wherever necessary in order to make it typecheck. (In practice, GHC uses a somewhat different approach to code generation. See the :ref:`precise-gnd-specification` |