summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Greif <ggreif@gmail.com>2017-05-09 13:49:00 +0200
committerGabor Greif <ggreif@gmail.com>2017-05-10 10:01:46 +0200
commit22a03e7288129a165dc2cb866041185a06adb0e9 (patch)
treef7c06e4716c8c0df2c800582368a2195fa8e8c7f
parent8e72a2eee29543f8a663256f6b8cf4422692cb3a (diff)
downloadhaskell-22a03e7288129a165dc2cb866041185a06adb0e9.tar.gz
Typos [ci skip]
-rw-r--r--compiler/basicTypes/MkId.hs2
-rw-r--r--compiler/main/SysTools.hs2
-rw-r--r--compiler/rename/RnBinds.hs2
-rw-r--r--compiler/rename/RnPat.hs2
-rw-r--r--compiler/specialise/SpecConstr.hs4
-rw-r--r--compiler/utils/Binary.hs4
-rw-r--r--rts/Schedule.c2
7 files changed, 9 insertions, 9 deletions
diff --git a/compiler/basicTypes/MkId.hs b/compiler/basicTypes/MkId.hs
index 08b9efa54f..e9a57bc02e 100644
--- a/compiler/basicTypes/MkId.hs
+++ b/compiler/basicTypes/MkId.hs
@@ -1497,7 +1497,7 @@ Also see https://ghc.haskell.org/trac/ghc/wiki/OneShot.
Note [magicDictId magic]
~~~~~~~~~~~~~~~~~~~~~~~~~
The identifier `magicDict` is just a place-holder, which is used to
-implement a primitve that we cannot define in Haskell but we can write
+implement a primitive that we cannot define in Haskell but we can write
in Core. It is declared with a place-holder type:
magicDict :: forall a. a
diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
index ad2e33c85c..612206bc5d 100644
--- a/compiler/main/SysTools.hs
+++ b/compiler/main/SysTools.hs
@@ -1508,7 +1508,7 @@ foreign import WINDOWS_CCONV unsafe "windows.h GetModuleFileNameW"
-- is located at. See Trac #11759.
getFinalPath :: FilePath -> IO (Maybe FilePath)
getFinalPath name = do
- dllHwnd <- failIfNull "LoadLibray" $ loadLibrary "kernel32.dll"
+ dllHwnd <- failIfNull "LoadLibrary" $ loadLibrary "kernel32.dll"
-- Note: The API GetFinalPathNameByHandleW is only available starting from Windows Vista.
-- This means that we can't bind directly to it since it may be missing.
-- Instead try to find it's address at runtime and if we don't succeed consider the
diff --git a/compiler/rename/RnBinds.hs b/compiler/rename/RnBinds.hs
index 0b4cbeb276..f91ca52960 100644
--- a/compiler/rename/RnBinds.hs
+++ b/compiler/rename/RnBinds.hs
@@ -518,7 +518,7 @@ because they don't do anything! But we have two exceptions:
(b) is sometimes used to give a type sig for,
or an occurrence of, a variable on the RHS
-* A strict patten binding; that is, one with an outermost bang
+* A strict pattern binding; that is, one with an outermost bang
!Just _ = e
This can fail, so unlike the lazy variant, it is not a no-op.
Moreover, Trac #13646 argues that even for single constructor
diff --git a/compiler/rename/RnPat.hs b/compiler/rename/RnPat.hs
index 77e213410a..ac3cf64cb7 100644
--- a/compiler/rename/RnPat.hs
+++ b/compiler/rename/RnPat.hs
@@ -432,7 +432,7 @@ rnPatAndThen mk (NPlusKPat rdr (L l lit) _ _ _ _)
; (lit', _) <- liftCpsFV $ rnOverLit lit -- See Note [Negative zero]
-- We skip negateName as
-- negative zero doesn't make
- -- sense in n + k pattenrs
+ -- sense in n + k patterns
; minus <- liftCpsFV $ lookupSyntaxName minusName
; ge <- liftCpsFV $ lookupSyntaxName geName
; return (NPlusKPat (L (nameSrcSpan new_name) new_name)
diff --git a/compiler/specialise/SpecConstr.hs b/compiler/specialise/SpecConstr.hs
index dd6f19153a..39ec7e6946 100644
--- a/compiler/specialise/SpecConstr.hs
+++ b/compiler/specialise/SpecConstr.hs
@@ -1952,8 +1952,8 @@ trim_pats env fn (SI { si_n_specs = done_spec_count }) pats
-- segment of this list
pat_cons :: CallPat -> Int
- -- How many data consturorst of literals are in
- -- the patten. More data-cons => less general
+ -- How many data constructors of literals are in
+ -- the pattern. More data-cons => less general
pat_cons (qs, ps) = foldr ((+) . n_cons) 0 ps
where
q_set = mkVarSet qs
diff --git a/compiler/utils/Binary.hs b/compiler/utils/Binary.hs
index 9d385d23ea..99ab07ec33 100644
--- a/compiler/utils/Binary.hs
+++ b/compiler/utils/Binary.hs
@@ -336,7 +336,7 @@ getByte :: BinHandle -> IO Word8
getByte h = getWord8 h
-- -----------------------------------------------------------------------------
--- Primitve Word writes
+-- Primitive Word writes
instance Binary Word8 where
put_ = putWord8
@@ -355,7 +355,7 @@ instance Binary Word64 where
get h = getWord64 h
-- -----------------------------------------------------------------------------
--- Primitve Int writes
+-- Primitive Int writes
instance Binary Int8 where
put_ h w = put_ h (fromIntegral w :: Word8)
diff --git a/rts/Schedule.c b/rts/Schedule.c
index 0a1d761b6a..f82d924183 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -2835,7 +2835,7 @@ deleteThread_(Capability *cap, StgTSO *tso)
/* -----------------------------------------------------------------------------
raiseExceptionHelper
- This function is called by the raise# primitve, just so that we can
+ This function is called by the raise# primitive, just so that we can
move some of the tricky bits of raising an exception from C-- into
C. Who knows, it might be a useful re-useable thing here too.
-------------------------------------------------------------------------- */