X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fmatita%2Fhelp%2FC%2Fsec_terms.xml;h=a1353b2f021aac59be2fe0896c2fbd827ab2795d;hb=7a9b394943d524181128816a4b02152aa79929fe;hp=bd2d8c9c9cdb8a5331487f08b8039f6e8d719589;hpb=f64818068a077b8ca8a29ebc547cc488946cf072;p=helm.git

diff --git a/helm/software/matita/help/C/sec_terms.xml b/helm/software/matita/help/C/sec_terms.xml
index bd2d8c9c9..a1353b2f0 100644
--- a/helm/software/matita/help/C/sec_terms.xml
+++ b/helm/software/matita/help/C/sec_terms.xml
@@ -98,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>
@@ -116,7 +140,7 @@
   -->
 
   <para>
-  <table frame="topbot" rowsep="0" colsep="0" role="grammar">
+  <table id="tbl_terms" frame="topbot" rowsep="0" colsep="0" role="grammar">
     <title>Terms</title>
     <tgroup cols="4">
     <tbody>
@@ -285,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>
@@ -393,6 +417,12 @@
       <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>
@@ -568,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>
@@ -584,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>
@@ -597,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
@@ -669,12 +719,6 @@
         <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>
@@ -701,28 +745,93 @@
 
     <sect2 id="auto-params">
     <title>auto-params</title>
-    <para>&TODO;</para>
     <table frame="topbot" rowsep="0" colsep="0" role="grammar">
-      <title>reduction-kind</title>
+      <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>&TODO;</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>&TODO;</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">size=&nat;</emphasis></entry>
+        <entry>The maximal number of nodes in the proof</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><emphasis role="bold">&TODO;</emphasis></entry>
-        <entry>&TODO;</entry>
+        <entry>&autoparams;</entry>
+        <entry>Call automation</entry>
        </row>
       </tbody>
      </tgroup>