X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=docs%2Fusers_guide%2Fflags.xml;h=b27b756785eb2ee0b0040827884f5004d56cf20a;hb=0352fbec15ec165bb2c8020d09e38bb758c5accf;hp=d0b01691a7f569fe75eb326f112950e1ea60ece2;hpb=cedd4187afc6fabf7884a6dc42c3c47ea09624a3;p=ghc-hetmet.git

diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index d0b0169..b27b756 100644
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -286,19 +286,22 @@
 	  </thead>
 	  <tbody>
 	    <row>
-	      <entry><option>-keep-hc-file</option></entry>
+	      <entry><option>-keep-hc-file</option> or
+                 <option>-keep-hc-files</option></entry>
 	      <entry>retain intermediate <literal>.hc</literal> files</entry>
 	      <entry>dynamic</entry>
 	      <entry>-</entry>
 	    </row>
 	    <row>
-	      <entry><option>-keep-s-file</option></entry>
+	      <entry><option>-keep-s-file</option> or
+                 <option>-keep-s-files</option></entry>
 	      <entry>retain intermediate <literal>.s</literal> files</entry>
 	      <entry>dynamic</entry>
 	      <entry>-</entry>
 	    </row>
 	    <row>
-	      <entry><option>-keep-raw-s-file</option></entry>
+	      <entry><option>-keep-raw-s-file</option> or
+                 <option>-keep-raw-s-files</option></entry>
 	      <entry>retain intermediate <literal>.raw_s</literal> files</entry>
 	      <entry>dynamic</entry>
 	      <entry>-</entry>
@@ -482,18 +485,6 @@
 	      <entry>-</entry>
 	    </row>
 	    <row>
-	      <entry><option>-short-ghci-banner</option></entry>
-	      <entry>Display a one-line banner at GHCi startup</entry>
-	      <entry>dynamic</entry>
-	      <entry>-</entry>
-	    </row>
-	    <row>
-	      <entry><option>-long-ghci-banner</option></entry>
-	      <entry>Display a full banner at GHCi startup</entry>
-	      <entry>dynamic</entry>
-	      <entry>-</entry>
-	    </row>
-	    <row>
 	      <entry><option>-fdebugging</option></entry>
 	      <entry>Generate bytecode enabled for debugging</entry>
 	      <entry>dynamic</entry>
@@ -596,23 +587,29 @@
 	  </thead>
 	  <tbody>
 	    <row>
-	      <entry><option>-fallow-overlapping-instances</option></entry>
+	      <entry><option>-fglasgow-exts</option></entry>
+	      <entry>Enable most language extensions</entry>
+	      <entry>dynamic</entry>
+	      <entry><option>-fno-glasgow-exts</option></entry>
+	    </row>
+	    <row>
+	      <entry><option>-X=AllowOverlappingInstances</option></entry>
 	      <entry>Enable <link linkend="instance-overlap">overlapping instances</link></entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fno-allow-overlapping-instances</option></entry>
+	      <entry><option>-X=NoAllowOverlappingInstances</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-fallow-incoherent-instances</option></entry>
+	      <entry><option>-X=AllowIncoherentInstances</option></entry>
 	      <entry>Enable <link linkend="instance-overlap">incoherent instances</link>.  
-	      Implies <option>-fallow-overlapping-instances</option> </entry>
+	      Implies <option>-X=AllowOverlappingInstances</option> </entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fno-allow-incoherent-instances</option></entry>
+	      <entry><option>-X=NoAllowIncoherentInstances</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-fallow-undecidable-instances</option></entry>
+	      <entry><option>-X=AllowUndecidableInstances</option></entry>
 	      <entry>Enable <link linkend="undecidable-instances">undecidable instances</link></entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fno-allow-undecidable-instances</option></entry>
+	      <entry><option>-X=NoAllowUndecidableInstances</option></entry>
 	    </row>
 	    <row>
 	      <entry><option>-fcontext-stack=N</option><replaceable>n</replaceable></entry>
@@ -621,37 +618,38 @@
 	      <entry><option>20</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-farrows</option></entry>
+	      <entry><option>-X=Arrows</option></entry>
 	      <entry>Enable <link linkend="arrow-notation">arrow
 	      notation</link> extension</entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fno-arrows</option></entry>
+	      <entry><option>-X=NoArrows</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-ffi</option> or <option>-fffi</option></entry>
-	      <entry>Enable <link linkend="ffi">foreign function interface</link> (implied by
-	      <option>-fglasgow-exts</option>)</entry>
+	      <entry><option>-fdisambiguate-record-fields</option></entry>
+	      <entry>Enable <link linkend="disambiguate-fields">record 
+	      field disambiguation</link></entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fno-ffi</option></entry>
+	      <entry><option>-fno-disambiguate-record-fields</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-fgenerics</option></entry>
-	      <entry>Enable <link linkend="generic-classes">generic classes</link></entry>
+	      <entry><option>-X=FFI</option> or <option>-X=ForeignFunctionInterface</option></entry>
+	      <entry>Enable <link linkend="ffi">foreign function interface</link> (implied by
+	      <option>-fglasgow-exts</option>)</entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fno-fgenerics</option></entry>
+	      <entry><option>-X=NoFFI</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-fglasgow-exts</option></entry>
-	      <entry>Enable most language extensions</entry>
+	      <entry><option>-X=Generics</option></entry>
+	      <entry>Enable <link linkend="generic-classes">generic classes</link></entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fno-glasgow-exts</option></entry>
+	      <entry><option>-X=NoGenerics</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-fimplicit-params</option></entry>
+	      <entry><option>-X=ImplicitParams</option></entry>
 	      <entry>Enable <link linkend="implicit-parameters">Implicit Parameters</link>.
 	      Implied by <option>-fglasgow-exts</option>.</entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fno-implicit-params</option></entry>
+	      <entry><option>-X=NoImplicitParams</option></entry>
 	    </row>
 	    <row>
 	      <entry><option>-firrefutable-tuples</option></entry>
@@ -660,61 +658,74 @@
 	      <entry><option>-fno-irrefutable-tuples</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-fno-implicit-prelude</option></entry>
+	      <entry><option>-X=NoImplicitPrelude</option></entry>
 	      <entry>Don't implicitly <literal>import Prelude</literal></entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fimplicit-prelude</option></entry>
+	      <entry><option>-X=ImplicitPrelude</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-fno-monomorphism-restriction</option></entry>
+	      <entry><option>-X=NoMonomorphismRestriction</option></entry>
 	      <entry>Disable the <link linkend="monomorphism">monomorphism restriction</link></entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fmonomorphism-restriction</option></entry>
+	      <entry><option>-X=MonomorphismRrestriction</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-fno-mono-pat-binds</option></entry>
+	      <entry><option>-X=NoMonoPatBinds</option></entry>
 	      <entry>Make <link linkend="monomorphism">pattern bindings polymorphic</link></entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fmono-pat-binds</option></entry>
+	      <entry><option>-X=MonoPatBinds</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-fextended-default-rules</option></entry>
+	      <entry><option>-X=RelaxedPolyRed</option></entry>
+	      <entry>Relaxed checking for <link linkend="typing-binds">mutually-recursive polymorphic functions</link></entry>
+	      <entry>dynamic</entry>
+	      <entry><option>-X=NoRelaxedPolyRec</option></entry>
+	    </row>
+	    <row>
+	      <entry><option>-X=ExtendedDefaultRules</option></entry>
 	      <entry>Use GHCi's <link linkend="extended-default-rules">extended default rules</link> in a normal module</entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fno-extended-default-rules</option></entry>
+	      <entry><option>-X=NoExtendedDefaultRules</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-foverloaded-strings</option></entry>
+	      <entry><option>-X=OverloadedStrings</option></entry>
 	      <entry>Enable <link linkend="overloaded-strings">overloaded string literals</link>.
 	      </entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fno-overloaded-strings</option></entry>
+	      <entry><option>-X=NoOverloadedStrings</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-fscoped-type-variables</option></entry>
+	      <entry><option>-X=GADTs</option></entry>
+	      <entry>Enable <link linkend="gadts">generalised algebraic data types</link>.
+	      </entry>
+	      <entry>dynamic</entry>
+	      <entry><option>-X=NoGADTs</option></entry>
+	    </row>
+	    <row>
+	      <entry><option>-X=TypeFamilies</option></entry>
+	      <entry>Enable <link linkend="type-families">type families</link>.</entry>
+	      <entry>dynamic</entry>
+	      <entry><option>-X=NoTypeFamilies</option></entry>
+	    </row>
+	    <row>
+	      <entry><option>-X=ScopedTypeVariables</option></entry>
 	      <entry>Enable <link linkend="scoped-type-variables">lexically-scoped type variables</link>.
 	      Implied by <option>-fglasgow-exts</option>.</entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fno-scoped-type-variables</option></entry>
+	      <entry><option>-X=NoScopedTypeVariables</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-fth</option></entry>
+	      <entry><option>-X=TH</option> or <option>-X=TemplateHaskell</option></entry>
 	      <entry>Enable <link linkend="template-haskell">Template Haskell</link>. 
 		No longer implied by <option>-fglasgow-exts</option>.</entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fno-th</option></entry>
+	      <entry><option>-X=NoTH</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-ftype-families</option></entry>
-	      <entry>Enable <link linkend="type-families">type families</link>.</entry>
-	      <entry>dynamic</entry>
-	      <entry><option>-fno-type-families</option></entry>
-	    </row>
-	    <row>
-	      <entry><option>-fbang-patterns</option></entry>
+	      <entry><option>-X=BangPtterns</option></entry>
 	      <entry>Enable <link linkend="bang-patterns">bang patterns</link>.</entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fno-bang-patterns</option></entry>
+	      <entry><option>-X=NoBangPatterns</option></entry>
 	    </row>
 	  </tbody>
 	</tgroup>
@@ -1189,6 +1200,39 @@
     </sect2>
 
     <sect2>
+      <title>Program coverage options</title>
+      
+      <para><xref linkend="hpc"/></para>
+
+      <informaltable>
+	<tgroup cols="4" align="left" colsep="1" rowsep="1">
+	  <thead>
+	    <row>
+	      <entry>Flag</entry>
+	      <entry>Description</entry>
+	      <entry>Static/Dynamic</entry>
+	      <entry>Reverse</entry>
+	    </row>
+	  </thead>
+	  <tbody>
+	    <row>
+	      <entry><option>-fhpc</option></entry>
+	      <entry>Turn on Haskell program coverage instrumentation</entry>
+	      <entry>static</entry>
+	      <entry><option>-</option></entry>
+	    </row>
+	    <row>
+	      <entry><option>-hpcdir dir</option></entry>
+	      <entry>Directory to deposit .mix files during compilation</entry>
+	      <entry>dynamic</entry>
+	      <entry><option>-</option></entry>
+	    </row>
+	  </tbody>
+	</tgroup>
+      </informaltable>
+    </sect2>
+
+    <sect2>
       <title>Haskell pre-processor options</title>
 
       <para><xref linkend="pre-processor"/></para>
@@ -1746,6 +1790,12 @@
 	      <entry>-</entry>
 	    </row>
 	    <row>
+	      <entry><option>-ddump-hpc</option></entry>
+	      <entry>Dump after intrumentation for program coverage</entry>
+	      <entry>dynamic</entry>
+	      <entry>-</entry>
+	    </row>
+	    <row>
 	      <entry><option>-ddump-inlinings</option></entry>
 	      <entry>Dump inlining info</entry>
 	      <entry>dynamic</entry>