diff options
| author | Gabor Greif <ggreif@gmail.com> | 2015-12-30 12:27:57 (GMT) |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2015-12-30 12:28:25 (GMT) |
| commit | b0fa286475e5251e6b92e83da3716f9ca9ed37b6 (patch) | |
| tree | 7fb88d5b671ce8a3b0a8828897acc4e423d3a995 | |
| parent | 3bbc01a425f8a0b395751a7394c40d1507e77bbc (diff) | |
| download | ghc-b0fa286475e5251e6b92e83da3716f9ca9ed37b6.zip ghc-b0fa286475e5251e6b92e83da3716f9ca9ed37b6.tar.gz ghc-b0fa286475e5251e6b92e83da3716f9ca9ed37b6.tar.bz2 | |
Fix some typos
| -rw-r--r-- | compiler/parser/Parser.y | 4 | ||||
| -rw-r--r-- | compiler/parser/RdrHsSyn.hs | 2 | ||||
| -rw-r--r-- | compiler/typecheck/TcRnDriver.hs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y index 11dc84f..9ddeb56 100644 --- a/compiler/parser/Parser.y +++ b/compiler/parser/Parser.y @@ -2863,9 +2863,9 @@ constructors with 'type' keyword. This ambiguity causes reduce/reduce conflicts in parser, which are always resolved in favour of variable constructors. To get rid of conflicts we demand -that ambigous type constructors (those, which are formed by the same +that ambiguous type constructors (those, which are formed by the same productions as variable constructors) are always prefixed with 'type' keyword. -Unambigous type constructors may occur both with or without 'type' keyword. +Unambiguous type constructors may occur both with or without 'type' keyword. -} qtyconop :: { Located RdrName } -- Qualified or unqualified diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs index d8c8b3a..f423c6e 100644 --- a/compiler/parser/RdrHsSyn.hs +++ b/compiler/parser/RdrHsSyn.hs @@ -1287,7 +1287,7 @@ mkImport (L lc cconv) (L ls safety) (L loc (StringLiteral esrc entity), v, ty) , fd_co = noForeignImportCoercionYet , fd_fi = importSpec })) --- the string "foo" is ambigous: either a header or a C identifier. The +-- the string "foo" is ambiguous: either a header or a C identifier. The -- C identifier case comes first in the alternatives below, so we pick -- that one. parseCImport :: Located CCallConv -> Located Safety -> FastString -> String diff --git a/compiler/typecheck/TcRnDriver.hs b/compiler/typecheck/TcRnDriver.hs index 823bd38..078b7df 100644 --- a/compiler/typecheck/TcRnDriver.hs +++ b/compiler/typecheck/TcRnDriver.hs @@ -1953,7 +1953,7 @@ isGHCiMonad hsc_env ty _ <- tcLookupInstance ghciClass [userTy] return name - Just _ -> failWithTc $ text "Ambigous type!" + Just _ -> failWithTc $ text "Ambiguous type!" Nothing -> failWithTc $ text ("Can't find type:" ++ ty) -- tcRnExpr just finds the type of an expression |