X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fhelp%2FC%2Fsec_terms.xml;h=287267bd6285941bd5436a53c2de6b4bddf66c97;hb=ca41435a6021292ccba239aa173651c0be705b45;hp=30692211e93b52de3dc55fa181dd3532fedc581e;hpb=f511e0dbbbc4c9a5d425076307c935062d78809d;p=helm.git

diff --git a/helm/software/matita/help/C/sec_terms.xml b/helm/software/matita/help/C/sec_terms.xml
index 30692211e..287267bd6 100644
--- a/helm/software/matita/help/C/sec_terms.xml
+++ b/helm/software/matita/help/C/sec_terms.xml
@@ -26,6 +26,18 @@
   <title>Terms &amp; co.</title>
   <sect2 id="lexical">
   <title>Lexical conventions</title>
+    <table frame="topbot" rowsep="0" colsep="0" role="grammar">
+      <title>qstring</title>
+      <tgroup cols="4">
+      <tbody>
+       <row>
+	<entry id="grammar.qstring">&qstring;</entry>
+	<entry>::=</entry>
+        <entry><emphasis role="bold">&quot;</emphasis><emphasis>〈〈any sequence of characters excluded &quot;〉〉</emphasis><emphasis role="bold">&quot;</emphasis></entry>
+       </row>
+      </tbody>
+     </tgroup>
+    </table>
     <table frame="topbot" rowsep="0" colsep="0" role="grammar">
       <title>id</title>
       <tgroup cols="4">
@@ -86,6 +98,30 @@
       </tbody>
      </tgroup>
     </table>
+    <table frame="topbot" rowsep="0" colsep="0" role="grammar">
+      <title>csymbol</title>
+      <tgroup cols="4">
+      <tbody>
+       <row>
+        <entry id="grammar.csymbol">&csymbol;</entry>
+        <entry>::=</entry>
+        <entry><emphasis role="bold">'</emphasis>&id;</entry>
+       </row>
+      </tbody>
+      </tgroup>
+    </table>
+    <table frame="topbot" rowsep="0" colsep="0" role="grammar">
+      <title>symbol</title>
+      <tgroup cols="4">
+      <tbody>
+       <row>
+        <entry id="grammar.symbol">&symbol;</entry>
+        <entry>::=</entry>
+        <entry><emphasis role="bold">〈〈None of the above〉〉</emphasis></entry>
+       </row>
+      </tbody>
+      </tgroup>
+    </table>
   </sect2>
   <sect2 id="terms">
   <title>Terms</title>
@@ -186,7 +222,7 @@
 	<entry id="grammar.rec_def">&rec_def;</entry>
 	<entry>::=</entry>
 	<entry>
-	  &id; [&id;|<emphasis role="bold">(</emphasis>&id;[<emphasis role="bold">,</emphasis>&term;]… <emphasis role="bold">:</emphasis>&term;<emphasis role="bold">)</emphasis>]…
+	  &id; [&id;|<emphasis role="bold">_</emphasis>|<emphasis role="bold">(</emphasis>&id;[<emphasis role="bold">,</emphasis>&id;]… <emphasis role="bold">:</emphasis>&term;<emphasis role="bold">)</emphasis>]…
 	</entry>
 	<entry />
       </row>
@@ -194,7 +230,7 @@
 	<entry />
 	<entry />
 	<entry>
-	  [<emphasis role="bold">on</emphasis> &nat;]
+	  [<emphasis role="bold">on</emphasis> &id;]
 	  [<emphasis role="bold">:</emphasis> &term;]
 	  <emphasis role="bold">≝</emphasis> &term;]
 	</entry>
@@ -273,7 +309,7 @@
       <entry/>
       <entry>|</entry>
         <entry><emphasis role="bold">match</emphasis> &term; 
-        [ <emphasis role="bold">in</emphasis> &term; ]
+        [ <emphasis role="bold">in</emphasis> &id; ]
         [ <emphasis role="bold">return</emphasis> &term; ]
         <emphasis role="bold">with</emphasis>
       </entry>
@@ -375,6 +411,18 @@
       <entry><emphasis role="bold">(</emphasis>&id; &id; [&id;]…<emphasis role="bold">)</emphasis></entry>
       <entry>n-ary constructor (binds the n arguments)</entry>
      </row>
+     <row>
+      <entry/>
+      <entry>|</entry>
+      <entry>&id; &id; [&id;]…</entry>
+      <entry>n-ary constructor (binds the n arguments)</entry>
+     </row>
+     <row>
+      <entry/>
+      <entry>|</entry>
+      <entry><emphasis role="bold">_</emphasis></entry>
+      <entry>any remaining constructor (ignoring its arguments)</entry>
+     </row>
     </tbody>
    </tgroup>
   </table>
@@ -405,6 +453,11 @@
      <command>f</command> must be defined by means of tactics.</para>
     <para>Notice that the command is equivalent to <command>theorem f: T ≝ t</command>.</para>
   </sect2>
+  <sect2 id="letrec">
+    <title><emphasis role="bold">letrec</emphasis> &TODO;</title>
+    <titleabbrev>&TODO;</titleabbrev>
+    <para>&TODO;</para>
+  </sect2>
   <sect2 id="inductive">
     <title>[<emphasis role="bold">inductive</emphasis>|<emphasis role="bold">coinductive</emphasis>] &id; [&args2;]… <emphasis role="bold">:</emphasis> &term; <emphasis role="bold">≝</emphasis> [<emphasis role="bold">|</emphasis>] [&id;<emphasis role="bold">:</emphasis>&term;] [<emphasis role="bold">|</emphasis> &id;<emphasis role="bold">:</emphasis>&term;]…
 [<emphasis role="bold">with</emphasis> &id; <emphasis role="bold">:</emphasis> &term; <emphasis role="bold">≝</emphasis> [<emphasis role="bold">|</emphasis>] [&id;<emphasis role="bold">:</emphasis>&term;] [<emphasis role="bold">|</emphasis> &id;<emphasis role="bold">:</emphasis>&term;]…]…
@@ -479,7 +532,7 @@
     <para>Notice that the command is equivalent to <command>definition f: T ≝ t</command>.</para>
    </sect2>
    <sect2 id="variant">
-    <title><emphasis role="bold">variant</emphasis> &id;[<emphasis role="bold">:</emphasis> &term;] [<emphasis role="bold">≝</emphasis> &term;]</title>
+    <title><emphasis role="bold">variant</emphasis> &id;<emphasis role="bold">:</emphasis> &term; <emphasis role="bold">≝</emphasis> &term;</title>
     <titleabbrev>variant</titleabbrev>
     <para><userinput>variant f: T ≝ t</userinput></para>
     <para>Same as <command>theorem f: T ≝ t</command>, but it does not
@@ -545,7 +598,7 @@
        <row>
         <entry/>
         <entry>|</entry>
-        <entry><emphasis role="bold">in match</emphasis> &term;
+        <entry><emphasis role="bold">in match</emphasis> &path;
           [<emphasis role="bold">in</emphasis>
           [&id;[<emphasis role="bold">:</emphasis> &path;]]…
           [<emphasis role="bold">⊢</emphasis> &path;]]</entry>
@@ -561,7 +614,7 @@
        <row>
 	<entry id="grammar.path">&path;</entry>
 	<entry>::=</entry>
-        <entry><emphasis>〈〈any &sterm; whithout occurrences of <emphasis role="bold">Set</emphasis>, <emphasis role="bold">Prop</emphasis>, <emphasis role="bold">CProp</emphasis>, <emphasis role="bold">Type</emphasis>, &id;, &uri; and user provided notation; however, <emphasis role="bold">%</emphasis> is now an additional production for &sterm;〉〉</emphasis></entry>
+        <entry><emphasis>〈〈any &sterm; without occurrences of <emphasis role="bold">Set</emphasis>, <emphasis role="bold">Prop</emphasis>, <emphasis role="bold">CProp</emphasis>, <emphasis role="bold">Type</emphasis>, &id;, &uri; and user provided notation; however, <emphasis role="bold">%</emphasis> is now an additional production for &sterm;〉〉</emphasis></entry>
        </row>
       </tbody>
      </tgroup>
@@ -574,6 +627,26 @@
        that can be represented by <emphasis role="bold">?</emphasis>.
        </para></listitem>
     </orderedlist>
+    <para>Warning: the format for a path for a <emphasis role="bold">match</emphasis> … <emphasis role="bold">with</emphasis>
+     expression is restricted to: <emphasis role="bold">match</emphasis> &path;
+     <emphasis role="bold">with</emphasis>
+     <emphasis role="bold">[</emphasis>
+     <emphasis role="bold">_</emphasis>
+     <emphasis role="bold">⇒</emphasis>
+     &path;
+     <emphasis role="bold">|</emphasis> …
+     <emphasis role="bold">|</emphasis>
+     <emphasis role="bold">_</emphasis>
+     <emphasis role="bold">⇒</emphasis>
+     &path;
+     <emphasis role="bold">]</emphasis>
+     Its semantics is the following: the n-th 
+     &quot;<emphasis role="bold">_</emphasis>
+     <emphasis role="bold">⇒</emphasis>
+     &path;&quot; branch is matched against the n-th constructor of the
+     inductive data type. The head λ-abstractions of &path; are matched
+     against the corresponding constructor arguments. 
+    </para>
     <para>For instance, the path
       <userinput>∀_,_:?.(? ? % ?)→(? ? ? %)</userinput>
        locates at once the subterms
@@ -643,20 +716,9 @@
        <row>
 	<entry id="grammar.reduction-kind">&reduction-kind;</entry>
 	<entry>::=</entry>
-        <entry><emphasis role="bold">demodulate</emphasis></entry>
-       </row>
-       <row>
-        <entry/>
-        <entry>|</entry>
         <entry><emphasis role="bold">normalize</emphasis></entry>
         <entry>Computes the βδιζ-normal form</entry>
        </row>
-       <row>
-        <entry/>
-        <entry>|</entry>
-        <entry><emphasis role="bold">reduce</emphasis></entry>
-        <entry>Computes the βδιζ-normal form</entry>
-       </row>
        <row>
         <entry/>
         <entry>|</entry>
@@ -680,6 +742,95 @@
      </tgroup>
     </table>
     </sect2>
+
+    <sect2 id="auto-params">
+    <title>auto-params</title>
+    <table frame="topbot" rowsep="0" colsep="0" role="grammar">
+      <title>auto-params</title>
+      <tgroup cols="4">
+      <tbody>
+       <row>
+	<entry id="grammar.autoparams">&autoparams;</entry>
+	<entry>::=</entry>
+        <entry>[&simpleautoparam;]…
+               [<emphasis role="bold">by</emphasis>
+                &term; [,&term;]…]
+        </entry>
+       </row>
+      </tbody>
+     </tgroup>
+    </table>
+    <table frame="topbot" rowsep="0" colsep="0" role="grammar">
+      <title>simple-auto-param</title>
+      <tgroup cols="4">
+      <tbody>
+       <row>
+	<entry id="grammar.simpleautoparam">&simpleautoparam;</entry>
+	<entry>::=</entry>
+        <entry><emphasis role="bold">depth=&nat;</emphasis></entry>
+        <entry>Give a bound to the depth of the search tree</entry>
+       </row>
+       <row>
+        <entry/>
+        <entry>|</entry>
+        <entry><emphasis role="bold">width=&nat;</emphasis></entry>
+        <entry>The maximal width of the search tree</entry>
+       </row>
+       <row>
+        <entry/>
+        <entry>|</entry>
+        <entry><emphasis role="bold">library</emphasis></entry>
+        <entry>Search everywhere (not only in included files)</entry>
+       </row>
+       <row>
+        <entry/>
+        <entry>|</entry>
+        <entry><emphasis role="bold">type</emphasis></entry>
+        <entry>Try to close also goals of sort Type, otherwise only goals
+               living in sort Prop are attacked.
+        </entry>
+       </row>
+       <row>
+        <entry/>
+        <entry>|</entry>
+        <entry><emphasis role="bold">paramodulation</emphasis></entry>
+        <entry>Try to close the goal performing unit-equality paramodulation
+        </entry>
+       </row>
+       <row>
+        <entry/>
+        <entry>|</entry>
+        <entry><emphasis role="bold">timeout=&nat;</emphasis></entry>
+        <entry>Timeout in seconds
+        </entry>
+       </row>
+      </tbody>
+     </tgroup>
+    </table>
+    </sect2>
+
+    <sect2 id="justification">
+    <title>justification</title>
+    <table frame="topbot" rowsep="0" colsep="0" role="grammar">
+      <title>justification</title>
+      <tgroup cols="4">
+      <tbody>
+       <row>
+	<entry id="grammar.justification">&justification;</entry>
+  <entry>::=</entry>
+        <entry><emphasis role="bold">using</emphasis> &term;</entry>
+        <entry>Proof term manually provided</entry>
+       </row>
+       <row>
+        <entry/>
+        <entry>|</entry>
+        <entry>&autoparams;</entry>
+        <entry>Call automation</entry>
+       </row>
+      </tbody>
+     </tgroup>
+    </table>
+    </sect2>
   </sect1>
 
 </chapter>