X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=docs%2Fusers_guide%2Fflags.xml;h=9292b280c6e1031a1cdaad7669831c38a6ee2065;hb=9c5aa098ab000536caf3ac5f61d901d146d3e9d8;hp=e288da2fb24ff3ac5c621bfed00713ae1c2505b7;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index e288da2..9292b28 100644
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -426,11 +426,11 @@
 	  </thead>
 	  <tbody>
 	    <row>
-	      <entry><option>-no-recomp</option></entry>
+	      <entry><option>-fforce-recomp</option></entry>
 	      <entry>Turn off recompilation checking; implied by any
 	      <option>-ddump-X</option> option</entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-recomp</option></entry>
+	      <entry><option>-fno-force-recomp</option></entry>
 	    </row>
 	  </tbody>
 	</tgroup>
@@ -545,45 +545,46 @@
 	  <tbody>
 	    <row>
 	      <entry><option>-fallow-overlapping-instances</option></entry>
-	      <entry>Enable overlapping instances</entry>
+	      <entry>Enable <link linkend="instance-overlap">overlapping instances</link></entry>
 	      <entry>dynamic</entry>
 	      <entry><option>-fno-allow-overlapping-instances</option></entry>
 	    </row>
 	    <row>
+	      <entry><option>-fallow-incoherent-instances</option></entry>
+	      <entry>Enable <link linkend="instance-overlap">incoherent instances</link>.  
+	      Implies <option>-fallow-overlapping-instances</option> </entry>
+	      <entry>dynamic</entry>
+	      <entry><option>-fno-allow-incoherent-instances</option></entry>
+	    </row>
+	    <row>
 	      <entry><option>-fallow-undecidable-instances</option></entry>
-	      <entry>Enable undecidable instances</entry>
+	      <entry>Enable <link linkend="undecidable-instances">undecidable instances</link></entry>
 	      <entry>dynamic</entry>
 	      <entry><option>-fno-allow-undecidable-instances</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-fallow-incoherent-instances</option></entry>
-	      <entry>Enable incoherent instances.  
-	      Implies <option>-fallow-overlapping-instances</option> </entry>
+	      <entry><option>-fcontext-stack=N</option><replaceable>n</replaceable></entry>
+	      <entry>set the <link linkend="undecidable-instances">limit for context reduction</link></entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fno-allow-incoherent-instances</option></entry>
+	      <entry><option>20</option></entry>
 	    </row>
 	    <row>
 	      <entry><option>-farrows</option></entry>
-	      <entry>Enable arrow notation extension</entry>
+	      <entry>Enable <link linkend="arrow-notation">arrow
+	      notation</link> extension</entry>
 	      <entry>dynamic</entry>
 	      <entry><option>-fno-arrows</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-fcontext-stack</option><replaceable>n</replaceable></entry>
-	      <entry>set the limit for context reduction</entry>
-	      <entry>static</entry>
-	      <entry><option>-</option></entry>
-	    </row>
-	    <row>
 	      <entry><option>-ffi</option> or <option>-fffi</option></entry>
-	      <entry>Enable foreign function interface (implied by
+	      <entry>Enable <link linkend="ffi">foreign function interface</link> (implied by
 	      <option>-fglasgow-exts</option>)</entry>
 	      <entry>dynamic</entry>
 	      <entry><option>-fno-ffi</option></entry>
 	    </row>
 	    <row>
 	      <entry><option>-fgenerics</option></entry>
-	      <entry>Enable generics</entry>
+	      <entry>Enable <link linkend="generic-classes">generic classes</link></entry>
 	      <entry>dynamic</entry>
 	      <entry><option>-fno-fgenerics</option></entry>
 	    </row>
@@ -595,7 +596,7 @@
 	    </row>
 	    <row>
 	      <entry><option>-fimplicit-params</option></entry>
-	      <entry>Enable Implicit Parameters.
+	      <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>
@@ -614,24 +615,42 @@
 	    </row>
 	    <row>
 	      <entry><option>-fno-monomorphism-restriction</option></entry>
-	      <entry>Disable the monomorphism restriction</entry>
+	      <entry>Disable the <link linkend="monomorphism">monomorphism restriction</link></entry>
 	      <entry>dynamic</entry>
 	      <entry><option>-fmonomorphism-restriction</option></entry>
 	    </row>
 	    <row>
+	      <entry><option>-fno-mono-pat-binds</option></entry>
+	      <entry>Make <link linkend="monomorphism">pattern bindings polymorphic</link></entry>
+	      <entry>dynamic</entry>
+	      <entry><option>-fmono-pat-binds</option></entry>
+	    </row>
+	    <row>
+	      <entry><option>-fextended-default-rules</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>
+	    </row>
+	    <row>
 	      <entry><option>-fscoped-type-variables</option></entry>
-	      <entry>Enable lexically-scoped type variables.
+	      <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>
 	    </row>
 	    <row>
 	      <entry><option>-fth</option></entry>
-	      <entry>Enable Template Haskell. 
-		Implied by <option>-fglasgow-exts</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>
 	    </row>
+	    <row>
+	      <entry><option>-fbang-patterns</option></entry>
+	      <entry>Enable <link linkend="sec-bang-patterns">bang patterns</link>.</entry>
+	      <entry>dynamic</entry>
+	      <entry><option>-fno-bang-patterns</option></entry>
+	    </row>
 	  </tbody>
 	</tgroup>
       </informaltable>
@@ -640,7 +659,7 @@
     <sect2>
       <title>Warnings</title>
       
-      <para>(<xref linkend="options-sanity"/></para>
+      <para><xref linkend="options-sanity"/></para>
 
     <informaltable>
       <tgroup cols="4" align="left" colsep="1" rowsep="1">
@@ -1081,9 +1100,9 @@
     </sect2>
 
     <sect2>
-      <title>Parallelism options</title>
+      <title>Haskell pre-processor options</title>
 
-      <para><xref linkend="sec-using-parallel"/></para>
+      <para><xref linkend="pre-processor"/></para>
 
       <informaltable>
 	<tgroup cols="4" align="left" colsep="1" rowsep="1">
@@ -1097,21 +1116,12 @@
 	  </thead>
 	  <tbody>
 	    <row>
-	      <entry><option>-gransim</option></entry>
-	      <entry>Enable GRANSIM</entry>
-	      <entry>static</entry>
-	      <entry>-</entry>
-	    </row>
-	    <row>
-	      <entry><option>-parallel</option></entry>
-	      <entry>Enable Parallel Haskell</entry>
-	      <entry>static</entry>
-	      <entry>-</entry>
-	    </row>
-	    <row>
-	      <entry><option>-smp</option></entry>
-	      <entry>Enable SMP support</entry>
-	      <entry>static</entry>
+	      <entry><option>-F</option></entry>
+	      <entry>
+                  Enable the use of a pre-processor
+                  (set with <option>-pgmF</option>)
+              </entry>
+	      <entry>dynamic</entry>
 	      <entry>-</entry>
 	    </row>
 	  </tbody>
@@ -1306,12 +1316,6 @@
 	      <entry>-</entry>
 	    </row>
 	    <row>
-	      <entry><option>-package</option> <replaceable>name</replaceable></entry>
-	      <entry>Link in package <replaceable>name</replaceable></entry>
-	      <entry>dynamic</entry>
-	      <entry>-</entry>
-	    </row>
-	    <row>
 	      <entry><option>-split-objs</option></entry>
 	      <entry>Split objects (for libraries)</entry>
 	      <entry>dynamic</entry>
@@ -1870,6 +1874,12 @@
 	      <entry>dynamic</entry>
 	      <entry>-</entry>
 	    </row>
+	    <row>
+	      <entry><option>-fno-print-bind-result</option></entry>
+	      <entry><link id="ghci-stmts">Turn off printing of binding results in GHCi</link></entry>
+	      <entry>dynamic</entry>
+	      <entry>-</entry>
+	    </row>
 	  </tbody>
 	</tgroup>
       </informaltable>