Merge branch 'master' of git://git.haskell.org/ghc
authorSjoerd Visscher <sjoerd@w3future.com>
Fri, 6 Jun 2014 12:31:51 +0000 (14:31 +0200)
committerSjoerd Visscher <sjoerd@w3future.com>
Fri, 6 Jun 2014 12:31:51 +0000 (14:31 +0200)
Conflicts:
docs/users_guide/flags.xml

1  2 
docs/users_guide/flags.xml
docs/users_guide/glasgow_exts.xml

              </entry>
              <entry>dynamic</entry>
              <entry><option>-XNoMonoLocalBinds</option></entry>
 -          </row>
 +          </row>          
            <row>
 -            <entry><option>-XRebindableSyntax</option></entry>
 -            <entry>Employ <link linkend="rebindable-syntax">rebindable syntax</link></entry>
 +            <entry><option>-XNoMonomorphismRestriction</option></entry>
 +            <entry>Disable the <link linkend="monomorphism">monomorphism restriction</link>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoRebindableSyntax</option></entry>
 +            <entry><option>-XMonomorphismRrestriction</option></entry>
            </row>
            <row>
 -            <entry><option>-XScopedTypeVariables</option></entry>
 -            <entry>Enable <link linkend="scoped-type-variables">lexically-scoped type variables</link>.
 -              </entry>
 +            <entry><option>-XMultiParamTypeClasses</option></entry>
 +            <entry>Enable <link linkend="multi-param-type-classes">multi parameter type classes</link>.
 +              Implied by <option>-XFunctionalDependencies</option>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoScopedTypeVariables</option></entry>
 +            <entry><option>-XNoMultiParamTypeClasses</option></entry>
            </row>
            <row>
 -            <entry><option>-XTemplateHaskell</option></entry>
 -            <entry>Enable <link linkend="template-haskell">Template Haskell</link>.</entry>
 +            <entry><option>-XMultiWayIf</option></entry>
 +            <entry>Enable <link linkend="multi-way-if">multi-way if-expressions</link>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoTemplateHaskell</option></entry>
 +            <entry><option>-XNoMultiWayIf</option></entry>
            </row>
            <row>
 -            <entry><option>-XBangPatterns</option></entry>
 -            <entry>Enable <link linkend="bang-patterns">bang patterns</link>.</entry>
 +            <entry><option>-XNamedFieldPuns</option></entry>
 +            <entry>Enable <link linkend="record-puns">record puns</link>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoBangPatterns</option></entry>
 +            <entry><option>-XNoNamedFieldPuns</option></entry>
            </row>
            <row>
 -            <entry><option>-XCPP</option></entry>
 -            <entry>Enable the <link linkend="c-pre-processor">C preprocessor</link>.</entry>
 +            <entry><option>-XNegativeLiterals</option></entry>
 +            <entry>Enable support for <link linkend="negative-literals">negative literals</link>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoCPP</option></entry>
 +            <entry><option>-XNoNegativeLiterals</option></entry>
            </row>
            <row>
 -            <entry><option>-XPatternGuards</option></entry>
 -            <entry>Enable <link linkend="pattern-guards">pattern guards</link>.</entry>
 +            <entry><option>-XNoNPlusKPatterns</option></entry>
 +            <entry>Disable support for <literal>n+k</literal> patterns.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoPatternGuards</option></entry>
 +            <entry><option>-XNPlusKPatterns</option></entry>
            </row>
            <row>
 -            <entry><option>-XViewPatterns</option></entry>
 -            <entry>Enable <link linkend="view-patterns">view patterns</link>.</entry>
 +            <entry><option>-XNullaryTypeClasses</option></entry>
-             <entry>Enable <link linkend="nullary-type-classes">nullary (no parameter) type classes</link>.</entry>
++            <entry>Deprecated, does nothing. <link linkend="nullary-type-classes">nullary (no parameter) type classes</link> are now enabled using <option>-XMultiParamTypeClasses</option>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoViewPatterns</option></entry>
 +            <entry><option>-XNoNullaryTypeClasses</option></entry>
            </row>
            <row>
 -            <entry><option>-XUnicodeSyntax</option></entry>
 -            <entry>Enable <link linkend="unicode-syntax">unicode syntax</link>.</entry>
 +            <entry><option>-XNumDecimals</option></entry>
 +            <entry>Enable support for 'fractional' integer literals.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoUnicodeSyntax</option></entry>
 +            <entry><option>-XNoNumDecimals</option></entry>
            </row>
            <row>
 -            <entry><option>-XMagicHash</option></entry>
 -            <entry>Allow "#" as a <link linkend="magic-hash">postfix modifier on identifiers</link>.</entry>
 +            <entry><option>-XOverlappingInstances</option></entry>
 +            <entry>Enable <link linkend="instance-overlap">overlapping instances</link>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoMagicHash</option></entry>
 +            <entry><option>-XNoOverlappingInstances</option></entry>
            </row>
            <row>
 -            <entry><option>-XExplicitForAll</option></entry>
 -            <entry>Enable <link linkend="explicit-foralls">explicit universal quantification</link>.
 -              Implied by <option>-XScopedTypeVariables</option>,
 -              <option>-XLiberalTypeSynonyms</option>,
 -              <option>-XRankNTypes</option>,
 -              <option>-XExistentialQuantification</option>
 +            <entry><option>-XOverloadedLists</option></entry>
 +            <entry>Enable <link linkend="overloaded-lists">overloaded lists</link>.
              </entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoExplicitForAll</option></entry>
 -          </row>
 -          <row>
 -            <entry><option>-XPolymorphicComponents</option></entry>
 -            <entry>Enable <link linkend="universal-quantification">polymorphic components for data constructors</link>.</entry>
 -            <entry>dynamic, synonym for <option>-XRankNTypes</option></entry>
 -            <entry><option>-XNoPolymorphicComponents</option></entry>
 +            <entry><option>-XNoOverloadedLists</option></entry>
            </row>
            <row>
 -            <entry><option>-XRank2Types</option></entry>
 -            <entry>Enable <link linkend="universal-quantification">rank-2 types</link>.</entry>
 -            <entry>dynamic, synonym for <option>-XRankNTypes</option></entry>
 -            <entry><option>-XNoRank2Types</option></entry>
 +            <entry><option>-XOverloadedStrings</option></entry>
 +            <entry>Enable <link linkend="overloaded-strings">overloaded string literals</link>.
 +            </entry>
 +            <entry>dynamic</entry>
 +            <entry><option>-XNoOverloadedStrings</option></entry>
            </row>
            <row>
 -            <entry><option>-XRankNTypes</option></entry>
 -            <entry>Enable <link linkend="universal-quantification">rank-N types</link>.</entry>
 +            <entry><option>-XPackageImports</option></entry>
 +            <entry>Enable <link linkend="package-imports">package-qualified imports</link>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoRankNTypes</option></entry>
 +            <entry><option>-XNoPackageImports</option></entry>
            </row>
            <row>
 -            <entry><option>-XImpredicativeTypes</option></entry>
 -            <entry>Enable <link linkend="impredicative-polymorphism">impredicative types</link>.</entry>
 +            <entry><option>-XParallelArrays</option></entry>
 +            <entry>Enable parallel arrays.
 +              Implies <option>-XParallelListComp</option>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoImpredicativeTypes</option></entry>
 +            <entry><option>-XNoParallelArrays</option></entry>
            </row>
            <row>
 -            <entry><option>-XExistentialQuantification</option></entry>
 -            <entry>Enable <link linkend="existential-quantification">existential quantification</link>.</entry>
 +            <entry><option>-XParallelListComp</option></entry>
 +            <entry>Enable <link linkend="parallel-list-comprehensions">parallel list comprehensions</link>.
 +              Implied by <option>-XParallelArrays</option>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoExistentialQuantification</option></entry>
 +            <entry><option>-XNoParallelListComp</option></entry>
            </row>
            <row>
 -            <entry><option>-XKindSignatures</option></entry>
 -            <entry>Enable <link linkend="kinding">kind signatures</link>.</entry>
 +            <entry><option>-XPatternGuards</option></entry>
 +            <entry>Enable <link linkend="pattern-guards">pattern guards</link>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoKindSignatures</option></entry>
 +            <entry><option>-XNoPatternGuards</option></entry>
            </row>
            <row>
 -            <entry><option>-XEmptyDataDecls</option></entry>
 -            <entry>Enable empty data declarations.</entry>
 +            <entry><option>-XPatternSynonyms</option></entry>
 +            <entry>Enable <link linkend="pattern-synonyms">pattern synonyms</link>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoEmptyDataDecls</option></entry>
 +            <entry><option>-XNoPatternSynonyms</option></entry>
            </row>
            <row>
 -            <entry><option>-XParallelListComp</option></entry>
 -            <entry>Enable <link linkend="parallel-list-comprehensions">parallel list comprehensions</link>.</entry>
 +            <entry><option>-XPolyKinds</option></entry>
 +            <entry>Enable <link linkend="kind-polymorphism">kind polymorphism</link>.
 +                   Implies <option>-XKindSignatures</option>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoParallelListComp</option></entry>
 +            <entry><option>-XNoPolyKinds</option></entry>
            </row>
            <row>
 -            <entry><option>-XTransformListComp</option></entry>
 -            <entry>Enable <link linkend="generalised-list-comprehensions">generalised list comprehensions</link>.</entry>
 -            <entry>dynamic</entry>
 -            <entry><option>-XNoTransformListComp</option></entry>
 +            <entry><option>-XPolymorphicComponents</option></entry>
 +            <entry>Enable <link linkend="universal-quantification">polymorphic components for data constructors</link>.</entry>
 +            <entry>dynamic, synonym for <option>-XRankNTypes</option></entry>
 +            <entry><option>-XNoPolymorphicComponents</option></entry>
            </row>
            <row>
 -            <entry><option>-XMonadComprehensions</option></entry>
 -            <entry>Enable <link linkend="monad-comprehensions">monad comprehensions</link>.</entry>
 +            <entry><option>-XPostfixOperators</option></entry>
 +            <entry>Enable <link linkend="postfix-operators">postfix operators</link>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoMonadComprehensions</option></entry>
 +            <entry><option>-XNoPostfixOperators</option></entry>
            </row>
            <row>
 -            <entry><option>-XUnliftedFFITypes</option></entry>
 -            <entry>Enable unlifted FFI types.</entry>
 +            <entry><option>-XQuasiQuotes</option></entry>
 +            <entry>Enable <link linkend="th-quasiquotation">quasiquotation</link>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoUnliftedFFITypes</option></entry>
 +            <entry><option>-XNoQuasiQuotes</option></entry>
            </row>
            <row>
 -            <entry><option>-XInterruptibleFFI</option></entry>
 -            <entry>Enable interruptible FFI.</entry>
 -            <entry>dynamic</entry>
 -            <entry><option>-XNoInterruptibleFFI</option></entry>
 +            <entry><option>-XRank2Types</option></entry>
 +            <entry>Enable <link linkend="universal-quantification">rank-2 types</link>.</entry>
 +            <entry>dynamic, synonym for <option>-XRankNTypes</option></entry>
 +            <entry><option>-XNoRank2Types</option></entry>
            </row>
            <row>
 -            <entry><option>-XLiberalTypeSynonyms</option></entry>
 -            <entry>Enable <link linkend="type-synonyms">liberalised type synonyms</link>.</entry>
 +            <entry><option>-XRankNTypes</option></entry>
 +            <entry>Enable <link linkend="universal-quantification">rank-N types</link>.
 +              Implied by <option>-XImpredicativeTypes</option>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoLiberalTypeSynonyms</option></entry>
 +            <entry><option>-XNoRankNTypes</option></entry>
            </row>
            <row>
 -            <entry><option>-XTypeOperators</option></entry>
 -            <entry>Enable <link linkend="type-operators">type operators</link>.</entry>
 +            <entry><option>-XRebindableSyntax</option></entry>
 +            <entry>Employ <link linkend="rebindable-syntax">rebindable syntax</link>.
 +              Implies <option>-XNoImplicitPrelude</option>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoTypeOperators</option></entry>
 +            <entry><option>-XNoRebindableSyntax</option></entry>
            </row>
            <row>
 -            <entry><option>-XExplicitNamespaces</option></entry>
 -            <entry>Enable using the keyword <literal>type</literal> to specify the namespace of
 -                   entries in imports and exports (<xref linkend="explicit-namespaces"/>).
 -                   Implied by <option>-XTypeOperators</option> and <option>-XTypeFamilies</option>.</entry>
 +            <entry><option>-XRecordWildCards</option></entry>
 +            <entry>Enable <link linkend="record-wildcards">record wildcards</link>.
 +              Implies <option>-XDisambiguateRecordFields</option>.</entry>
              <entry>dynamic</entry>
 -            <entry><option>-XNoExplicitNamespaces</option></entry>
 +            <entry><option>-XNoRecordWildCards</option></entry>
            </row>
            <row>
              <entry><option>-XRecursiveDo</option></entry>
Simple merge