[commit: ghc] master: s/warn-type-holes/warn-typed-holes/g (778b48a)
git at git.haskell.org
git at git.haskell.org
Wed Jan 15 15:41:26 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/778b48afc36e2b0eb44387e2a36947ac0c6ddd95/ghc
>---------------------------------------------------------------
commit 778b48afc36e2b0eb44387e2a36947ac0c6ddd95
Author: Austin Seipp <austin at well-typed.com>
Date: Wed Jan 15 08:35:37 2014 -0600
s/warn-type-holes/warn-typed-holes/g
Signed-off-by: Austin Seipp <austin at well-typed.com>
>---------------------------------------------------------------
778b48afc36e2b0eb44387e2a36947ac0c6ddd95
compiler/main/DynFlags.hs | 6 +++---
compiler/rename/RnExpr.lhs | 4 ++--
docs/users_guide/7.8.1-notes.xml | 4 ++--
docs/users_guide/flags.xml | 6 +++---
docs/users_guide/glasgow_exts.xml | 6 +++---
docs/users_guide/using.xml | 6 +++---
testsuite/tests/module/mod71.hs | 2 +-
testsuite/tests/rename/should_fail/rnfail016.hs | 2 +-
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 29f3834..f720db0 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -464,7 +464,7 @@ data WarningFlag =
| Opt_WarnUnsupportedCallingConventions
| Opt_WarnUnsupportedLlvmVersion
| Opt_WarnInlineRuleShadowing
- | Opt_WarnTypeHoles
+ | Opt_WarnTypedHoles
deriving (Eq, Show, Enum)
data Language = Haskell98 | Haskell2010
@@ -2575,7 +2575,7 @@ fWarningFlags = [
( "warn-identities", Opt_WarnIdentities, nop ),
( "warn-auto-orphans", Opt_WarnAutoOrphans, nop ),
( "warn-tabs", Opt_WarnTabs, nop ),
- ( "warn-type-holes", Opt_WarnTypeHoles, nop ),
+ ( "warn-typed-holes", Opt_WarnTypedHoles, nop ),
( "warn-unrecognised-pragmas", Opt_WarnUnrecognisedPragmas, nop ),
( "warn-lazy-unlifted-bindings", Opt_WarnLazyUnliftedBindings,
\_ -> deprecate "it has no effect, and will be removed in GHC 7.10" ),
@@ -2990,7 +2990,7 @@ standardWarnings
Opt_WarnWarningsDeprecations,
Opt_WarnDeprecatedFlags,
Opt_WarnAMP,
- Opt_WarnTypeHoles,
+ Opt_WarnTypedHoles,
Opt_WarnUnrecognisedPragmas,
Opt_WarnPointlessPragmas,
Opt_WarnDuplicateConstraints,
diff --git a/compiler/rename/RnExpr.lhs b/compiler/rename/RnExpr.lhs
index 0da22d6..01e8a44 100644
--- a/compiler/rename/RnExpr.lhs
+++ b/compiler/rename/RnExpr.lhs
@@ -104,7 +104,7 @@ finishHsVar name
rnExpr (HsVar v)
= do { mb_name <- lookupOccRn_maybe v
; case mb_name of {
- Nothing -> do { opt_TypeHoles <- woptM Opt_WarnTypeHoles
+ Nothing -> do { opt_TypeHoles <- woptM Opt_WarnTypedHoles
; if opt_TypeHoles && startsWithUnderscore (rdrNameOcc v)
then return (HsUnboundVar v, emptyFVs)
else do { n <- reportUnboundName v; finishHsVar n } } ;
@@ -313,7 +313,7 @@ Since all the symbols are reservedops we can simply reject them.
We return a (bogus) EWildPat in each case.
\begin{code}
-rnExpr e at EWildPat = do { holes <- woptM Opt_WarnTypeHoles
+rnExpr e at EWildPat = do { holes <- woptM Opt_WarnTypedHoles
; if holes
then return (hsHoleExpr, emptyFVs)
else patSynErr e
diff --git a/docs/users_guide/7.8.1-notes.xml b/docs/users_guide/7.8.1-notes.xml
index a5edeea..72601f3 100644
--- a/docs/users_guide/7.8.1-notes.xml
+++ b/docs/users_guide/7.8.1-notes.xml
@@ -19,13 +19,13 @@
<listitem>
<para>
By default, GHC has a new warning enabled,
- <literal>-fwarn-type-holes</literal>, which causes the
+ <literal>-fwarn-typed-holes</literal>, which causes the
compiler to respond with the types of unbound
variables it encounters in the source code. (It is
reminiscient of the "holes" feature in languages such
as Agda.)
- For more information, see <xref linkend="type-holes"/>.
+ For more information, see <xref linkend="typed-holes"/>.
</para>
</listitem>
diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index a9b989d..3a69c8f 100644
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -1522,10 +1522,10 @@
</row>
<row>
- <entry><option>-fwarn-type-holes</option></entry>
- <entry>Enable <link linkend="type-holes">holes</link> in expressions.</entry>
+ <entry><option>-fwarn-typed-holes</option></entry>
+ <entry>Enable <link linkend="typed-holes">holes</link> in expressions.</entry>
<entry>dynamic</entry>
- <entry><option>-fno-warn-type-holes</option></entry>
+ <entry><option>-fno-warn-typed-holes</option></entry>
</row>
</tbody>
diff --git a/docs/users_guide/glasgow_exts.xml b/docs/users_guide/glasgow_exts.xml
index 32f2c2e..d336ee9 100644
--- a/docs/users_guide/glasgow_exts.xml
+++ b/docs/users_guide/glasgow_exts.xml
@@ -7671,14 +7671,14 @@ with <option>-XNoMonoLocalBinds</option> but type inference becomes less predica
</sect1>
<!-- ==================== End of type system extensions ================= -->
-<sect1 id="type-holes">
+<sect1 id="typed-holes">
<title>Type Holes</title>
<para>Type hole support is enabled with the option
-<option>-fwarn-type-holes</option>, which is enabled by default.</para>
+<option>-fwarn-typed-holes</option>, which is enabled by default.</para>
<para>
-The goal of the type holes extension is not to change the type system, but to help with writing Haskell
+The goal of the type holes warning is not to change the type system, but to help with writing Haskell
code. Type holes can be used to obtain extra information from the type checker, which might otherwise be hard
to get.
Normally, the type checker is used to decide if a module is well typed or not. Using GHCi,
diff --git a/docs/users_guide/using.xml b/docs/users_guide/using.xml
index 7192e6a..8d8211e 100644
--- a/docs/users_guide/using.xml
+++ b/docs/users_guide/using.xml
@@ -1094,9 +1094,9 @@ test.hs:(5,4)-(6,7):
<variablelist>
<varlistentry>
- <term><option>-fwarn-type-holes</option>:</term>
+ <term><option>-fwarn-typed-holes</option>:</term>
<listitem>
- <indexterm><primary><option>-fwarn-type-holes</option></primary>
+ <indexterm><primary><option>-fwarn-typed-holes</option></primary>
</indexterm>
<indexterm><primary>warnings</primary></indexterm>
<para>When the compiler encounters an unbound local
@@ -1106,7 +1106,7 @@ test.hs:(5,4)-(6,7):
includes the type it needs to type check. It works
particularly well with <link
linkend="defer-type-errors">deferred type errors</link>.
- See <xref linkend="type-holes"/></para>
+ See <xref linkend="typed-holes"/></para>
<para>This warning is on by default.</para>
</listitem>
diff --git a/testsuite/tests/module/mod71.hs b/testsuite/tests/module/mod71.hs
index 7798cfc..28d388c 100644
--- a/testsuite/tests/module/mod71.hs
+++ b/testsuite/tests/module/mod71.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-type-holes #-}
+{-# OPTIONS_GHC -fno-warn-typed-holes #-}
-- !!! Illegal _ in expression
module M where
f x = x _ 1
diff --git a/testsuite/tests/rename/should_fail/rnfail016.hs b/testsuite/tests/rename/should_fail/rnfail016.hs
index 5e71207..1bf15b0 100644
--- a/testsuite/tests/rename/should_fail/rnfail016.hs
+++ b/testsuite/tests/rename/should_fail/rnfail016.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-type-holes #-}
+{-# OPTIONS_GHC -fno-warn-typed-holes #-}
module ShouldFail where
-- !!! Pattern syntax in expressions
More information about the ghc-commits
mailing list