Merge branch 'master' of /Users/benl/devel/ghc/ghc-head

diff --combined compiler/main/StaticFlags.hs
index e080cd8,eddc9ca..732224b
--- 1/compiler/main/StaticFlags.hs
--- 2/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@@ -167,7 -167,7 +167,7 @@@ try_read sw st
    = case reads str of
        ((x,_):_) -> x  -- Be forgiving: ignore trailing goop, and alternative parses
        []        -> ghcError (UsageError ("Malformed argument " ++ str ++ " for flag " ++ sw))
-                       -- ToDo: hack alert. We should really parse the arugments
+                       -- ToDo: hack alert. We should really parse the arguments
                        --       and announce errors in a more civilised way.
  
  
@@@ -192,12 -192,16 +192,12 @@@ opt_IgnoreDotGhci               = lookUp (fsLit "-ig
  
  -- debugging options
  -- | Suppress all that is suppressable in core dumps.
 +--   Except for uniques, as some simplifier phases introduce new varibles that
 +--   have otherwise identical names.
  opt_SuppressAll :: Bool
  opt_SuppressAll       
        = lookUp  (fsLit "-dsuppress-all")
  
 --- | Suppress unique ids on variables.
 -opt_SuppressUniques :: Bool
 -opt_SuppressUniques
 -      =  lookUp  (fsLit "-dsuppress-all")
 -      || lookUp  (fsLit "-dsuppress-uniques")
 -
  -- | Suppress all coercions, them replacing with '...'
  opt_SuppressCoercions :: Bool
  opt_SuppressCoercions
@@@ -228,16 -232,10 +228,16 @@@ opt_SuppressTypeSignature
        =  lookUp  (fsLit "-dsuppress-all")
        || lookUp  (fsLit "-dsuppress-type-signatures")
  
 +-- | Suppress unique ids on variables.
 +--   Except for uniques, as some simplifier phases introduce new variables that
 +--   have otherwise identical names.
 +opt_SuppressUniques :: Bool
 +opt_SuppressUniques
 +      =  lookUp  (fsLit "-dsuppress-uniques")
  
  -- | Display case expressions with a single alternative as strict let bindings
  opt_PprCaseAsLet :: Bool
 -opt_PprCaseAsLet              = lookUp   (fsLit "-dppr-case-as-let")
 +opt_PprCaseAsLet      = lookUp   (fsLit "-dppr-case-as-let")
  
  -- | Set the maximum width of the dumps
  --   If GHC's command line options are bad then the options parser uses the

diff --combined docs/users_guide/flags.xml
index 8829c60,26ab9eb..73faae7
--- 1/docs/users_guide/flags.xml
--- 2/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@@ -1180,6 -1180,13 +1180,13 @@@
          </row>
  
          <row>
+           <entry><option>-fwarn-missing-local-sigs</option></entry>
+           <entry>warn about polymorphic local bindings without signatures</entry>
+           <entry>dynamic</entry>
+           <entry><option>-fno-warn-missing-local-sigs</option></entry>
+         </row>
+ 
+         <row>
            <entry><option>-fwarn-name-shadowing</option></entry>
            <entry>warn when names are shadowed</entry>
            <entry>dynamic</entry>
@@@ -2461,68 -2468,32 +2468,68 @@@ phase <replaceable>n</replaceable></ent
              <entry>-</entry>
            </row>
            <row>
 +            <entry><option>-dppr-noprags</option></entry>
 +            <entry>Don't output pragma info in dumps</entry>
 +            <entry>static</entry>
 +            <entry>-</entry>
 +          </row>
 +          <row>
 +            <entry><option>-dppr-user-length</option></entry>
 +            <entry>Set the depth for printing expressions in error msgs</entry>
 +            <entry>static</entry>
 +            <entry>-</entry>
 +          </row>
 +          <row>
 +            <entry><option>-dppr-colsNNN</option></entry>
 +            <entry>Set the width of debugging output. For example <option>-dppr-cols200</option></entry>
 +            <entry>static</entry>
 +            <entry>-</entry>
 +          </row>
 +          <row>
 +            <entry><option>-dppr-case-as-let</option></entry>
 +            <entry>Print single alternative case expressions as strict lets.</entry>
 +            <entry>static</entry>
 +            <entry>-</entry>
 +          </row>
 +          <row>
 +            <entry><option>-dsuppress-all</option></entry>
 +            <entry>In core dumps, suppress everything that is suppressable.</entry>
 +            <entry>static</entry>
 +            <entry>-</entry>
 +          </row>
 +          <row>
              <entry><option>-dsuppress-uniques</option></entry>
 -            <entry>Suppress the printing of uniques in debug output (easier to use <command>diff</command>.</entry>
 +            <entry>Suppress the printing of uniques in debug output (easier to use <command>diff</command>)</entry>
              <entry>static</entry>
              <entry>-</entry>
            </row>
            <row>
 -            <entry><option>-dsuppress-coercions</option></entry>
 -            <entry>Suppress the printing of coercions in Core dumps to make them shorter.</entry>
 +            <entry><option>-dsuppress-idinfo</option></entry>
 +            <entry>Suppress extended information about identifiers where they are bound</entry>
              <entry>static</entry>
              <entry>-</entry>
            </row>
            <row>
              <entry><option>-dsuppress-module-prefixes</option></entry>
 -            <entry>Suppress the printing of module qualification prefixes in Core dumps to make them easier to read.</entry>
 +            <entry>Suppress the printing of module qualification prefixes</entry>
              <entry>static</entry>
              <entry>-</entry>
            </row>
            <row>
 -            <entry><option>-dppr-noprags</option></entry>
 -            <entry>Don't output pragma info in dumps</entry>
 +            <entry><option>-dsuppress-type-signatures</option></entry>
 +            <entry>Suppress type signatures</entry>
              <entry>static</entry>
              <entry>-</entry>
            </row>
            <row>
 -            <entry><option>-dppr-user-length</option></entry>
 -            <entry>Set the depth for printing expressions in error msgs</entry>
 +            <entry><option>-dsuppress-type-applications</option></entry>
 +            <entry>Suppress type applications</entry>
 +            <entry>static</entry>
 +            <entry>-</entry>
 +          </row>
 +          <row>
 +            <entry><option>-dsuppress-coercions</option></entry>
 +            <entry>Suppress the printing of coercions in Core dumps to make them shorter</entry>
              <entry>static</entry>
              <entry>-</entry>
            </row>