summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2018-06-20 16:00:50 +0200
committerGabor Greif <ggreif@gmail.com>2018-06-20 16:24:21 +0200
commite839ee2f91f9bcd390ead98e830b9e1d7d7b9240 (patch)
treebe9049502d8b53cd295d5f503185190ffd680ef9
parent7363ba4561d4c224efd73542e1e3f7fd524e6d6d (diff)
downloadhaskell-e839ee2f91f9bcd390ead98e830b9e1d7d7b9240.tar.gz
A few more typofixes in docs/comments [ci skip]
-rw-r--r--compiler/basicTypes/MkId.hs2
-rw-r--r--compiler/main/SysTools/BaseDir.hs2
-rw-r--r--compiler/typecheck/TcMatches.hs2
-rw-r--r--compiler/utils/Pair.hs2
-rw-r--r--docs/users_guide/glasgow_exts.rst2
-rw-r--r--libraries/template-haskell/Language/Haskell/TH/Syntax.hs2
6 files changed, 6 insertions, 6 deletions
diff --git a/compiler/basicTypes/MkId.hs b/compiler/basicTypes/MkId.hs
index 772bce47cc..d6a52b4df0 100644
--- a/compiler/basicTypes/MkId.hs
+++ b/compiler/basicTypes/MkId.hs
@@ -124,7 +124,7 @@ Note [magicIds]
~~~~~~~~~~~~~~~
The magicIds
- * Are exported from GHC.Maic
+ * Are exported from GHC.Magic
* Can be defined in Haskell (and are, in ghc-prim:GHC/Magic.hs).
This definition at least generates Haddock documentation for them.
diff --git a/compiler/main/SysTools/BaseDir.hs b/compiler/main/SysTools/BaseDir.hs
index 7cd1998da8..85635df264 100644
--- a/compiler/main/SysTools/BaseDir.hs
+++ b/compiler/main/SysTools/BaseDir.hs
@@ -201,7 +201,7 @@ foreign import WINDOWS_CCONV unsafe "dynamic"
makeGetFinalPathNameByHandle :: FunPtr GetFinalPath -> GetFinalPath
#elif defined(darwin_HOST_OS) || defined(linux_HOST_OS)
-- on unix, this is a bit more confusing.
--- The layout right now is somehting like
+-- The layout right now is something like
--
-- /bin/ghc-X.Y.Z <- wrapper script (1)
-- /bin/ghc <- symlink to wrapper script (2)
diff --git a/compiler/typecheck/TcMatches.hs b/compiler/typecheck/TcMatches.hs
index e2c29cad36..4ddf862bf7 100644
--- a/compiler/typecheck/TcMatches.hs
+++ b/compiler/typecheck/TcMatches.hs
@@ -986,7 +986,7 @@ When typechecking
we want to typecheck 'bar' in the knowledge that it should be an IO thing,
pushing info from the context into the RHS. To do this, we check the
rebindable syntax first, and push that information into (tcMonoExprNC rhs).
-Otherwise the error shows up when cheking the rebindable syntax, and
+Otherwise the error shows up when checking the rebindable syntax, and
the expected/inferred stuff is back to front (see Trac #3613).
Note [typechecking ApplicativeStmt]
diff --git a/compiler/utils/Pair.hs b/compiler/utils/Pair.hs
index 08b19be0b2..036dab062d 100644
--- a/compiler/utils/Pair.hs
+++ b/compiler/utils/Pair.hs
@@ -18,7 +18,7 @@ data Pair a = Pair { pFst :: a, pSnd :: a }
-- Note that Pair is a *unary* type constructor
-- whereas (,) is binary
--- The important thing about Pair is that it has a *homogenous*
+-- The important thing about Pair is that it has a *homogeneous*
-- Functor instance, so you can easily apply the same function
-- to both components
instance Functor Pair where
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 1b19b4cda8..4a860acfb1 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -540,7 +540,7 @@ corresponds closely to the underlying bit-encoding of the number.
In this notation floating point numbers are written using hexadecimal digits,
and so the digits are interpreted using base 16, rather then the usual 10.
This means that digits left of the decimal point correspond to positive
-powers of 16, while the ones to the right correspond to negaitve ones.
+powers of 16, while the ones to the right correspond to negative ones.
You may also write an explicit exponent, which is similar to the exponent
in decimal notation with the following differences:
diff --git a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs
index eb517a9247..b6f7c34673 100644
--- a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs
+++ b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs
@@ -494,7 +494,7 @@ addForeignSource lang src = do
runIO $ writeFile path src
addForeignFilePath lang path
--- | Same as 'addForeignSource', but expects to recieve a path pointing to the
+-- | Same as 'addForeignSource', but expects to receive a path pointing to the
-- foreign file instead of a 'String' of its contents. Consider using this in
-- conjunction with 'addTempFile'.
--