Now it is possible to define a 'cookable' operator with arity = 0 and hide = 0

diff --git a/helm/meta_style/meta_cic2mathml.xsl b/helm/meta_style/meta_cic2mathml.xsl
index 005821e6fbacddc8fa81007c67e1dd2004740f5a..f77890363dfbe41ad0d42acb8c562dda64987637 100644 (file)
--- a/helm/meta_style/meta_cic2mathml.xsl
+++ b/helm/meta_style/meta_cic2mathml.xsl
@@ -61,17 +61,16 @@
                </xsl:choose>
        </xsl:variable>
 
+       <xsl:variable name="const">
+               <xsl:value-of select="@arity = 0 and @hide = 0 and @cook = 'false'"/>
+       </xsl:variable>
+
        <xsl:choose>
-               <xsl:when test="@arity = 0 and @hide = 0 and $not = 'true'">
+               <xsl:when test="$const = 'true' and $not = 'true'">
                        <xsl:call-template name="out_comment">
                                <xsl:with-param name="name" select="concat($uri,': &quot;not&quot; cannot  be applyed to a constant operator')"/>
                        </xsl:call-template>
                </xsl:when>
-               <xsl:when test="@arity = 0 and @hide = 0 and @cook = 'true'">
-                       <xsl:call-template name="out_comment">
-                               <xsl:with-param name="name" select="concat($uri,': a constant operator cannot be cooked')"/>
-                       </xsl:call-template>
-               </xsl:when>
                <xsl:otherwise>
                        <!-- All uris in uri1 list (if not empty) have CONST c-tag -->
                        <xsl:variable name="uri1">
@@ -99,6 +98,7 @@
                                        <xsl:with-param name="arity" select="@arity"/>
                                        <xsl:with-param name="m-tag" select="@m-tag"/>
                                        <xsl:with-param name="c-tag" select="'CONST'"/>
+                                       <xsl:with-param name="const" select="$const"/>
                                </xsl:call-template>
                        </xsl:if>
 
@@ -112,6 +112,7 @@
                                        <xsl:with-param name="arity" select="@arity"/>
                                        <xsl:with-param name="m-tag" select="@m-tag"/>
                                        <xsl:with-param name="c-tag" select="'MUTIND'"/>
+                                       <xsl:with-param name="const" select="$const"/>
                                </xsl:call-template>
                        </xsl:if>
                </xsl:otherwise>
@@ -132,15 +133,19 @@
                </xsl:choose>
        </xsl:variable>
 
+       <xsl:variable name="const">
+               <xsl:value-of select="*[name() = 'Case']/@arity = 0 and @hide = 0 and @cook = 'false'"/>
+       </xsl:variable>
+
        <xsl:choose>
-               <xsl:when test="*[name() = 'Case']/@arity = 0 and @hide = 0 and $not = 'true'">
+               <xsl:when test="$const = 'false' and $not = 'true'">
                        <xsl:call-template name="out_comment">
                                <xsl:with-param name="name" select="concat($uri,': &quot;not&quot; cannot  be applyed to a constant operator')"/>
                        </xsl:call-template>
                </xsl:when>
-               <xsl:when test="*[name() = 'Case']/@arity = 0 and @hide = 0 and @cook = 'true'">
+               <xsl:when test="$const = 'true'">
                        <xsl:call-template name="out_comment">
-                               <xsl:with-param name="name" select="concat($uri,': a constant operator cannot be cooked')"/>
+                               <xsl:with-param name="name" select="concat($uri,':  cannot be specified a constant operator when using OpSet element')"/>
                        </xsl:call-template>
                </xsl:when>
                <xsl:otherwise>
@@ -199,20 +204,44 @@
        <xsl:param name="arity" select="0"/>
        <xsl:param name="m-tag"/>
        <xsl:param name="c-tag"/>
+       <xsl:param name="const" select="'false'"/>
 
        <xsl:variable name="apply_not">
                <xsl:if test="$not = 'true'">*[2]/</xsl:if>
        </xsl:variable>
 
        <xsl:variable name="match">
-               <xsl:call-template name="out_match">
-                       <xsl:with-param name="not"   select="$not"/>
-                       <xsl:with-param name="uri"   select="$uri"/>
-                       <xsl:with-param name="cook"  select="$cook"/>
-                       <xsl:with-param name="hide"  select="$hide"/>
-                       <xsl:with-param name="arity" select="$arity"/>
-                       <xsl:with-param name="c-tag" select="$c-tag"/>
-               </xsl:call-template>    
+               <xsl:variable name="match_op">
+                       <xsl:call-template name="out_match_op">
+                               <xsl:with-param name="not"   select="$not"/>
+                               <xsl:with-param name="uri"   select="$uri"/>
+                               <xsl:with-param name="c-tag" select="$c-tag"/>
+                       </xsl:call-template>
+               </xsl:variable>
+
+               <xsl:variable name="match_child">
+                       <xsl:if test="$cook = 'false' or $not = 'true'">
+                               <xsl:choose>
+                                       <!-- if the operator has been concatenated with not, the root apply node must have only two child -->
+                                       <xsl:when test="$not = 'true' and $cook = 'true'"> and count(*) = 2</xsl:when>
+                                       <xsl:when test="$not = 'true' and $cook = 'false'">
+                                               <xsl:value-of select="concat(' and count(*) = 2 and count(*[2]/*) = ',$arity + $hide + 1)"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <xsl:value-of select="concat('count(*) = ',$arity + $hide + 1)"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </xsl:if>
+               </xsl:variable>
+
+               <xsl:choose>
+                       <xsl:when test="$const = 'false'">
+                               <xsl:value-of select="concat('APPLY[',$match_op,$match_child,']')"/>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <xsl:value-of select="$match_op"/>
+                       </xsl:otherwise>
+               </xsl:choose>
        </xsl:variable>
 
        <xsl:variable name="op_uri_attr">
@@ -220,7 +249,7 @@
                        <xsl:call-template name="op_uri_attr">
                                <xsl:with-param name="not"   select="$not"/>
                                <xsl:with-param name="c-tag" select="$c-tag"/>
-                               <xsl:with-param name="const" select="$arity = 0 and $hide = 0"/>
+                               <xsl:with-param name="const" select="$const"/>
                        </xsl:call-template>
                </xsl:variable>
                <xsl:value-of select="substring-after(substring-before($tmp_op_uri_attr,'}'),'{')"/>
@@ -235,13 +264,10 @@
                <xsl:choose>
                        <xsl:when test="$cook = 'true'">
                                <oxsl:variable name="no_params">
-                                       <oxsl:variable name="no_params_tmp">
-                                               <oxsl:call-template name="get_no_params">
-                                                       <oxsl:with-param name="first_uri"  select="$CICURI"/>
-                                                       <oxsl:with-param name="second_uri" select="{$op_uri_attr}"/>
-                                               </oxsl:call-template>
-                                       </oxsl:variable>
-                                       <oxsl:value-of select="number($no_params_tmp)"/>
+                                       <oxsl:call-template name="get_no_params">
+                                               <oxsl:with-param name="first_uri"  select="$CICURI"/>
+                                               <oxsl:with-param name="second_uri" select="{$op_uri_attr}"/>
+                                       </oxsl:call-template>
                                </oxsl:variable>
                                <oxsl:choose>
                                        <oxsl:when test="{concat('count(',$apply_not,'*) = $no_params + ',$arity + $hide + 1)}">
@@ -252,6 +278,7 @@
                                                        <xsl:with-param name="hide"  select="$hide"/>
                                                        <xsl:with-param name="arity" select="$arity"/>
                                                        <xsl:with-param name="not"   select="$not"/>
+                                                       <xsl:with-param name="const" select="$const"/>
                                                </xsl:call-template>
                                         </oxsl:when>
                                         <oxsl:otherwise>
@@ -267,6 +294,7 @@
                                        <xsl:with-param name="hide"  select="$hide"/>
                                        <xsl:with-param name="arity" select="$arity"/>
                                        <xsl:with-param name="not"   select="$not"/>
+                                       <xsl:with-param name="const" select="$const"/>
                                </xsl:call-template>
                        </xsl:otherwise>
                </xsl:choose>
@@ -287,11 +315,19 @@
        </xsl:variable>
 
        <xsl:variable name="match">
-               <xsl:call-template name="out_match_op">
-                       <xsl:with-param name="not"   select="$not"/> 
-                       <xsl:with-param name="uri"   select="$uri"/> 
-                       <xsl:with-param name="c-tag" select="$c-tag"/>
-               </xsl:call-template>
+               <xsl:variable name="match_op">
+                       <xsl:call-template name="out_match_op">
+                               <xsl:with-param name="not"   select="$not"/> 
+                               <xsl:with-param name="uri"   select="$uri"/> 
+                               <xsl:with-param name="c-tag" select="$c-tag"/>
+                       </xsl:call-template>
+               </xsl:variable>
+               
+                <xsl:variable name="match_child">
+                       <xsl:if test="$not = 'true'"> and count(*) = 2</xsl:if>
+                </xsl:variable>
+
+                <xsl:value-of select="concat('APPLY[',$match_op,$match_child,']')"/>
        </xsl:variable>
 
        <xsl:variable name="apply_not">
@@ -314,16 +350,13 @@
                <xsl:with-param name="name" select="$name"/>
        </xsl:call-template>
        
-       <oxsl:template match="{concat('APPLY[',$match,']')}" mode="pure">
+       <oxsl:template match="{$match}" mode="pure">
                <xsl:if test="$cook = 'true'">
                        <oxsl:variable name="no_params">
-                               <oxsl:variable name="no_params_tmp">
-                                       <oxsl:call-template name="get_no_params">
-                                               <oxsl:with-param name="first_uri"  select="$CICURI"/>
-                                               <oxsl:with-param name="second_uri" select="{$op_uri_attr}"/>
-                                       </oxsl:call-template>
-                               </oxsl:variable>
-                               <oxsl:value-of select="number($no_params_tmp)"/>
+                               <oxsl:call-template name="get_no_params">
+                                       <oxsl:with-param name="first_uri"  select="$CICURI"/>
+                                       <oxsl:with-param name="second_uri" select="{$op_uri_attr}"/>
+                               </oxsl:call-template>
                        </oxsl:variable>
                </xsl:if>       
                <oxsl:choose>
@@ -381,90 +414,6 @@
        <xsl:value-of select="concat($app_not,$app_op)"/>
 </xsl:template>
 
-<!-- Returns a test on apply node children number-->
-<xsl:template name="out_match_child">
-       <xsl:param name="not"   select="'false'"/>
-       <xsl:param name="cook"  select="'false'"/>
-       <xsl:param name="hide"  select="0"/>
-       <xsl:param name="arity" select="0"/>
-
-       <!--
-               Test on children number only if the operator is concatenated with not of 
-               if it is not constant and it has not to be cooked.
-               It is not possible to concatenate a constant operator with not.
-       -->
-       <xsl:if test="$not = 'true' or (($arity != 0 or $hide != 0) and $cook = 'false')">
-               <xsl:choose>
-                       <!-- if the operator has been concatenated with not, the root apply node must have only two child -->
-                       <xsl:when test="$not = 'true'">
-                               <xsl:variable name="test_apply_children">
-                                       <xsl:if test="$cook = 'false'">
-                                               <xsl:value-of select="concat(' and count(*[2]/*) = ',$arity + $hide + 1)"/>
-                                       </xsl:if>
-                               </xsl:variable>
-                               
-                               <xsl:value-of select="concat('count(*) = 2',$test_apply_children)"/>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <xsl:value-of select="concat('count(*) = ',$arity + $hide + 1)"/>
-                       </xsl:otherwise>
-               </xsl:choose>
-       </xsl:if>
-</xsl:template>
-
-<xsl:template name="out_match">
-       <xsl:param name="not"   select="'false'"/>
-       <xsl:param name="uri"/>
-       <xsl:param name="cook"  select="'false'"/>
-       <xsl:param name="hide"  select="0"/>
-       <xsl:param name="arity" select="0"/>
-       <xsl:param name="c-tag"/>
-       
-       <!--           TEST ON OPERATOR(S) TYPE         -->
-       <xsl:variable name="match_op">
-               <xsl:call-template name="out_match_op">
-                       <xsl:with-param name="not"   select="$not"/>
-                       <xsl:with-param name="uri"   select="$uri"/>
-                       <xsl:with-param name="hide"  select="$hide"/>
-                       <xsl:with-param name="c-tag" select="$c-tag"/>
-               </xsl:call-template>
-       </xsl:variable>
-               
-       <!--           TEST ON CHILD(REN) NUMBER         -->
-       <xsl:variable name="match_child">
-               <xsl:call-template name="out_match_child">
-                       <xsl:with-param name="not"   select="$not"/>
-                       <xsl:with-param name="cook"  select="$cook"/>
-                       <xsl:with-param name="hide"  select="$hide"/>
-                       <xsl:with-param name="arity" select="$arity"/>
-               </xsl:call-template>
-       </xsl:variable>
-
-       <xsl:choose>
-               <!-- not a constant operator -->
-               <xsl:when test="$arity != 0 or $hide != 0">
-                       <xsl:choose>
-                               <xsl:when test="$match_child != ''">
-                                       <xsl:value-of select="concat('APPLY[',$match_op,' and ',$match_child,']')"/>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:value-of select="concat('APPLY[',$match_op,']')"/>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </xsl:when>
-               <xsl:otherwise>
-                       <xsl:choose>
-                               <xsl:when test="$match_child != ''">
-                                       <xsl:value-of select="concat($match_op,' and ',$match_child)"/>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:value-of select="$match_op"/>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </xsl:otherwise>
-       </xsl:choose>
-</xsl:template>
-
 <xsl:template name="out_params">
        <xsl:param name="params" select="1"/>
        <xsl:param name="cook"   select="'false'"/>
@@ -504,17 +453,20 @@
        <xsl:param name="hide"  select="0"/>
        <xsl:param name="arity" select="0"/>
        <xsl:param name="not"   select="'false'"/>
+       <xsl:param name="const" select="'false'"/>
 
        <xsl:choose>
                <!--            SIMPLE TRANSFORMATIONS            -->
                <xsl:when test="count(*) = 0">
-                       <xsl:variable name="xref">{@id}</xsl:variable>
+                       <xsl:variable name="xref">
+                                <xsl:if test="$const = 'false'">{@id}</xsl:if>
+                       </xsl:variable>
 
                        <xsl:variable name="definitionURL">
                                <xsl:call-template name="op_uri_attr">
                                        <xsl:with-param name="not"   select="$not"/>
                                        <xsl:with-param name="c-tag" select="$c-tag"/>
-                                       <xsl:with-param name="const" select="$arity = 0 and $hide = 0"/>
+                                       <xsl:with-param name="const" select="$const"/>
                                </xsl:call-template>
                        </xsl:variable>
 
@@ -522,7 +474,7 @@
                                <xsl:call-template name="op_id_attr">
                                        <xsl:with-param name="not"   select="$not"/>
                                        <xsl:with-param name="c-tag" select="$c-tag"/>
-                                       <xsl:with-param name="const" select="$arity = 0 and $hide = 0"/>
+                                       <xsl:with-param name="const" select="$const"/>
                                </xsl:call-template>
                         </xsl:variable>
                
@@ -554,6 +506,7 @@
                                <xsl:with-param name="hide"  select="$hide"/>
                                <xsl:with-param name="arity" select="$arity"/>
                                <xsl:with-param name="not"   select="$not"/>
+                               <xsl:with-param name="const" select="$const"/>
                        </xsl:apply-templates>
                </xsl:otherwise>
        </xsl:choose>
@@ -629,6 +582,7 @@
        <xsl:param name="hide"  select="0"/>
        <xsl:param name="arity" select="0"/>
        <xsl:param name="not"   select="'false'"/>
+       <xsl:param name="const" select="'false'"/>
        
        <xsl:variable name="helm:xref">
                <xsl:choose>
@@ -639,9 +593,12 @@
                                        <xsl:with-param name="hide"  select="$hide"/>
                                        <xsl:with-param name="arity" select="$arity"/>
                                        <xsl:with-param name="not"   select="$not"/>
+                                       <xsl:with-param name="const" select="$const"/>
                                </xsl:call-template>
                        </xsl:when>
-                       <xsl:otherwise>{@id}</xsl:otherwise>
+                       <xsl:otherwise>
+                               <xsl:if test="$const = 'false'">{@id}</xsl:if>
+                       </xsl:otherwise>
                </xsl:choose>
        </xsl:variable>
 
@@ -651,6 +608,7 @@
                        <xsl:with-param name="hide"   select="$hide"/>
                        <xsl:with-param name="arity"  select="$arity"/>
                        <xsl:with-param name="not"    select="$not"/>
+                       <xsl:with-param name="const" select="$const"/>
                        <xsl:with-param name="ignore" select="'xref'"/>
                </xsl:call-template>
        
@@ -660,6 +618,7 @@
                        <xsl:with-param name="hide"  select="$hide"/>
                        <xsl:with-param name="arity" select="$arity"/>
                        <xsl:with-param name="not"   select="$not"/>
+                       <xsl:with-param name="const" select="$const"/>
                </xsl:apply-templates>
        </m:apply>
 </xsl:template>
@@ -671,6 +630,7 @@
        <xsl:param name="hide"  select="0"/>
        <xsl:param name="arity" select="0"/>
        <xsl:param name="not"   select="'false'"/>
+       <xsl:param name="const" select="'false'"/>
 
        <!-- set definitonURL attribute -->
        <xsl:variable name="definitionURL">
@@ -682,13 +642,14 @@
                                        <xsl:with-param name="hide"  select="$hide"/>
                                        <xsl:with-param name="arity" select="$arity"/>
                                        <xsl:with-param name="not"   select="$not"/>
+                                       <xsl:with-param name="const" select="$const"/>
                                </xsl:call-template>
                        </xsl:when>
                        <xsl:otherwise>
                                <xsl:call-template name="op_uri_attr">
                                        <xsl:with-param name="not"   select="$not"/>
                                        <xsl:with-param name="c-tag" select="$c-tag"/>
-                                       <xsl:with-param name="const" select="$arity = 0 and $hide = 0"/>
+                                       <xsl:with-param name="const" select="$const"/>
                                </xsl:call-template>
                        </xsl:otherwise>
                </xsl:choose>
@@ -704,13 +665,14 @@
                                        <xsl:with-param name="hide"  select="$hide"/>
                                        <xsl:with-param name="arity" select="$arity"/>
                                        <xsl:with-param name="not"   select="$not"/>
+                                       <xsl:with-param name="const" select="$const"/>
                                </xsl:call-template>
                        </xsl:when>
                        <xsl:otherwise>
                                <xsl:call-template name="op_id_attr">
                                        <xsl:with-param name="not"   select="$not"/>
                                        <xsl:with-param name="c-tag" select="$c-tag"/>
-                                       <xsl:with-param name="const" select="$arity = 0 and $hide = 0"/>
+                                       <xsl:with-param name="const" select="$const"/>
                                </xsl:call-template>
                        </xsl:otherwise>
                </xsl:choose>
@@ -729,6 +691,7 @@
                        <xsl:with-param name="hide"   select="$hide"/>
                        <xsl:with-param name="arity"  select="$arity"/>
                        <xsl:with-param name="not"    select="$not"/>
+                       <xsl:with-param name="const" select="$const"/>
                        <xsl:with-param name="ignore" select="'xref + definitionURL + tag'"/>
                </xsl:call-template>
                
@@ -738,6 +701,7 @@
                        <xsl:with-param name="hide"  select="$hide"/>
                        <xsl:with-param name="arity" select="$arity"/>
                        <xsl:with-param name="not"   select="$not"/>
+                       <xsl:with-param name="const" select="$const"/>
                </xsl:apply-templates>
        </xsl:element>
 </xsl:template>
@@ -785,6 +749,7 @@
        <xsl:param name="hide"  select="0"/>
        <xsl:param name="arity" select="0"/>
        <xsl:param name="not"   select="'false'"/>
+       <xsl:param name="const" select="'false'"/>
        
        <xsl:copy>
                <xsl:call-template name="copy_attributes">
@@ -792,6 +757,7 @@
                        <xsl:with-param name="hide"  select="$hide"/>
                        <xsl:with-param name="arity" select="$arity"/>
                        <xsl:with-param name="not"   select="$not"/>
+                       <xsl:with-param name="const" select="$const"/>
                </xsl:call-template>
        
                <xsl:apply-templates>
@@ -800,6 +766,7 @@
                        <xsl:with-param name="hide"  select="$hide"/>
                        <xsl:with-param name="arity" select="$arity"/>
                        <xsl:with-param name="not"   select="$not"/>
+                       <xsl:with-param name="const" select="$const"/>
                </xsl:apply-templates>
        </xsl:copy>
 </xsl:template>
@@ -810,6 +777,7 @@
        <xsl:param name="hide"  select="0"/>
        <xsl:param name="arity" select="0"/>
        <xsl:param name="not"   select="'false'"/>
+       <xsl:param name="const" select="'false'"/>
 
        <xsl:variable name="binded_params">
                <xsl:call-template name="get_binded_params">
@@ -887,6 +855,7 @@
                                        <xsl:with-param name="hide"  select="$hide"/>
                                        <xsl:with-param name="arity" select="$arity"/>
                                        <xsl:with-param name="not"   select="$not"/>
+                                       <xsl:with-param name="const" select="$const"/>
                                </xsl:apply-templates>
                        </m:bvar>
                </xsl:when>
@@ -901,6 +870,7 @@
                                        <xsl:with-param name="hide"  select="$hide"/>
                                        <xsl:with-param name="arity" select="$arity"/>
                                        <xsl:with-param name="not"   select="$not"/>
+                                       <xsl:with-param name="const" select="$const"/>
                                </xsl:apply-templates>
                        </m:bvar>
                </xsl:otherwise>
@@ -1239,6 +1209,7 @@
        <xsl:param name="hide"   select="0"/>
        <xsl:param name="arity"  select="0"/>
        <xsl:param name="not"    select="'false'"/>
+       <xsl:param name="const"  select="'false'"/>
        <xsl:param name="ignore" select="''"/>
        
        <xsl:variable name="test">
@@ -1249,13 +1220,23 @@
        
        <xsl:for-each select="@*">
                <xsl:if test="contains($test,concat('+',name(),'+')) = false()">
-                       <xsl:attribute name="{name()}">
+                       <xsl:variable name="name">
+                               <xsl:choose>
+                                       <xsl:when test="name() = 'xref'">helm:xref</xsl:when>
+                                       <xsl:otherwise>
+                                               <xsl:value-of select="name()"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </xsl:variable>
+                       
+                       <xsl:attribute name="{$name}">
                                <xsl:call-template name="set_attribute">
                                        <xsl:with-param name="attr"  select="."/>
                                        <xsl:with-param name="c-tag" select="$c-tag"/>
                                        <xsl:with-param name="hide"  select="$hide"/>
                                        <xsl:with-param name="arity" select="$arity"/>
                                        <xsl:with-param name="not"   select="$not"/>
+                                       <xsl:with-param name="const" select="$const"/>
                                </xsl:call-template>
                        </xsl:attribute>
                </xsl:if>
@@ -1287,9 +1268,12 @@
        <xsl:param name="hide"  select="0"/>
        <xsl:param name="arity" select="0"/>
        <xsl:param name="not"   select="'false'"/>
+       <xsl:param name="const" select="'false'"/>
        
        <xsl:choose>
-               <xsl:when test="$attr = '$APP-ID'">{@id}</xsl:when>
+               <xsl:when test="$attr = '$APP-ID'">
+                       <xsl:if test="$const = 'false'">{@id}</xsl:if>
+               </xsl:when>
                <xsl:when test="$attr = '$OP-ID' or $attr = '$OP-URI'">
                        <xsl:variable name="attr_type">
                                <xsl:choose>
@@ -1302,7 +1286,7 @@
                                <xsl:with-param name="attr_type" select="$attr_type"/>
                                <xsl:with-param name="not"       select="$not"/>
                                <xsl:with-param name="c-tag"     select="$c-tag"/>
-                               <xsl:with-param name="const"     select="$arity = 0 and $hide = 0"/>
+                               <xsl:with-param name="const"     select="$const"/>
                        </xsl:call-template>
                </xsl:when>
                <xsl:otherwise>