Modified Files:

1) expandobj.xsl: comments
2) objcontent.xsl, params.xsl: parameters abstraction from objcontent to params

diff --git a/helm/style/expandobj.xsl b/helm/style/expandobj.xsl
index 6fc812f368a29e8d0b313f6e69ae1d9c1fbe8e56..d380be3ed63abb689ee61f2b3ef0118dcfdc766b 100644 (file)
--- a/helm/style/expandobj.xsl
+++ b/helm/style/expandobj.xsl
@@ -25,7 +25,7 @@
 <!-- http://cs.unibo.it/helm/.                                         -->
 
 <!--***********************************************************************--> 
-<!-- XSLT version 0.1 of theory objects to theory sections:                -->
+<!-- XSLT version 0.1 of theory sections to theory sections with objects   -->
 <!-- First draft: March 08 2001, Irene Schena                              -->
 <!--***********************************************************************--> 
 

diff --git a/helm/style/objcontent.xsl b/helm/style/objcontent.xsl
index 7c7488f1619c90532afc09ee6b861302fa341ba6..b9f77cb82700afbf9cddabcb7b7669b59d3532a8 100644 (file)
--- a/helm/style/objcontent.xsl
+++ b/helm/style/objcontent.xsl
@@ -157,107 +157,10 @@
     </Variable> 
 </xsl:template>
 
-<!--*******************************************-->
-<!--    ABSTRACTING PARAMETERS AND COUNTING    -->
-<!--*******************************************-->
-<!-- Si dimentica i CAST dei termini che astrae. Nel caso dell'astrazione -->
-<!-- dei lambda dei pattern del CASE, qualora i lambda non si trovino     -->
-<!-- nella forma weak-head, astrae solo i lambda che trova e restituisce  -->
-<!-- un corpo depurato da tutti i primi cast che precedono il termine     -->
-<!-- restituito.                                                          -->
+</xsl:stylesheet>
+
+
 
-<xsl:template match="*" mode="abstparams">
-<xsl:param name="noparams" select="0"/>
-<xsl:param name="target" select="0"/>
-<xsl:param name="binder">PROD</xsl:param>
-    <xsl:choose>
-    <xsl:when test="($noparams != 0) and ((name(.)=string($binder)) or (name(.)=&quot;CAST&quot;))">
-     <xsl:choose>
-     <xsl:when test="name(.) = string($binder)">
-      <xsl:if test="$target = 0">
-       <xsl:choose>
-       <xsl:when test="string($binder) = &quot;LAMBDA&quot;">
-        <m:ci>
-         <xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="target/@binder"/></xsl:with-param></xsl:call-template>
-        </m:ci>
-       </xsl:when>
-       <xsl:otherwise> 
-        <Param name="{target/@binder}">
-         <xsl:apply-templates select="source"/>
-        </Param>
-       </xsl:otherwise>
-       </xsl:choose>
-      </xsl:if>
-      <xsl:apply-templates select="target/*[1]" mode="abstparams">
-       <xsl:with-param name="noparams" select="$noparams - 1"/>
-       <xsl:with-param name="target" select="$target"/>
-       <xsl:with-param name="binder" select="$binder"/>
-      </xsl:apply-templates>
-     </xsl:when>
-     <xsl:otherwise>
-      <xsl:apply-templates select="term/*[1]" mode="abstparams">
-       <xsl:with-param name="noparams" select="$noparams"/>
-       <xsl:with-param name="target" select="$target"/>
-       <xsl:with-param name="binder" select="$binder"/>
-      </xsl:apply-templates>
-     </xsl:otherwise>
-     </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise> 
-     <xsl:choose>
-     <xsl:when test="($target = 1) and ($noparams != 0)">
-      <m:apply>
-      <m:csymbol>app</m:csymbol>
-      <xsl:apply-templates select="."/>
-      <xsl:call-template name="printparam"><xsl:with-param name="noleft" select="$noparams"/></xsl:call-template>
-      </m:apply>
-     </xsl:when>
-     <xsl:otherwise>
-      <xsl:choose>
-      <xsl:when test="$noparams != 0">
-      <xsl:call-template name="printparam"><xsl:with-param name="noleft" select="$noparams"/></xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-       <xsl:if test="$target = 1">
-        <xsl:apply-templates select="."/>
-       </xsl:if>
-      </xsl:otherwise>
-      </xsl:choose>
-     </xsl:otherwise>
-     </xsl:choose>
-    </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
 
-<xsl:template name="printparam">
-<xsl:param name="noleft" select="0"/>
-<xsl:param name="number" select="1"/>
-    <xsl:if test="$noleft != 0">
-     <m:ci><xsl:call-template name="insert_subscript"><xsl:with-param name="node_value">$<xsl:value-of select="$number"/></xsl:with-param></xsl:call-template></m:ci>
-     <xsl:call-template name="printparam"><xsl:with-param name="noleft" select="$noleft - 1"/><xsl:with-param name="number" select="$number + 1"/></xsl:call-template>  
-    </xsl:if>
-</xsl:template>
 
-<xsl:template match="*" mode="counting">
-<xsl:param name="noparams" select="0"/>
-<xsl:param name="count" select="0"/>
- <xsl:choose>
- <xsl:when test="name(.) = &quot;PROD&quot;">
-  <xsl:apply-templates select="target/*[1]" mode="counting">
-   <xsl:with-param name="noparams" select="$noparams"/>
-   <xsl:with-param name="count" select="$count + 1"/>
-  </xsl:apply-templates>
- </xsl:when>
- <xsl:when test="name(.) = &quot;CAST&quot;">
-  <xsl:apply-templates select="term/*[1]" mode="counting">
-   <xsl:with-param name="noparams" select="$noparams"/>
-   <xsl:with-param name="count" select="$count"/> 
-  </xsl:apply-templates>
- </xsl:when>
- <xsl:otherwise>
-  <xsl:value-of select="$count - $noparams"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
 
-</xsl:stylesheet>

diff --git a/helm/style/params.xsl b/helm/style/params.xsl
index 920cf50a51632684ada2343fcf0e022b82fe6ef3..b4d83bce8f7d83e2c3fffa86c855741badf676c5 100644 (file)
--- a/helm/style/params.xsl
+++ b/helm/style/params.xsl
@@ -258,6 +258,109 @@
 </xsl:template>
 
 
+<!--*******************************************-->
+<!--    ABSTRACTING PARAMETERS AND COUNTING    -->
+<!--*******************************************-->
+<!-- Si dimentica i CAST dei termini che astrae. Nel caso dell'astrazione -->
+<!-- dei lambda dei pattern del CASE, qualora i lambda non si trovino     -->
+<!-- nella forma weak-head, astrae solo i lambda che trova e restituisce  -->
+<!-- un corpo depurato da tutti i primi cast che precedono il termine     -->
+<!-- restituito.                                                          -->
+
+<xsl:template match="*" mode="abstparams">
+<xsl:param name="noparams" select="0"/>
+<xsl:param name="target" select="0"/>
+<xsl:param name="binder">PROD</xsl:param>
+    <xsl:choose>
+    <xsl:when test="($noparams != 0) and ((name(.)=string($binder)) or (name(.)=&quot;CAST&quot;))">
+     <xsl:choose>
+     <xsl:when test="name(.) = string($binder)">
+      <xsl:if test="$target = 0">
+       <xsl:choose>
+       <xsl:when test="string($binder) = &quot;LAMBDA&quot;">
+        <m:ci>
+         <xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="target/@binder"/></xsl:with-param></xsl:call-template>
+        </m:ci>
+       </xsl:when>
+       <xsl:otherwise> 
+        <Param name="{target/@binder}">
+         <xsl:apply-templates select="source"/>
+        </Param>
+       </xsl:otherwise>
+       </xsl:choose>
+      </xsl:if>
+      <xsl:apply-templates select="target/*[1]" mode="abstparams">
+       <xsl:with-param name="noparams" select="$noparams - 1"/>
+       <xsl:with-param name="target" select="$target"/>
+       <xsl:with-param name="binder" select="$binder"/>
+      </xsl:apply-templates>
+     </xsl:when>
+     <xsl:otherwise>
+      <xsl:apply-templates select="term/*[1]" mode="abstparams">
+       <xsl:with-param name="noparams" select="$noparams"/>
+       <xsl:with-param name="target" select="$target"/>
+       <xsl:with-param name="binder" select="$binder"/>
+      </xsl:apply-templates>
+     </xsl:otherwise>
+     </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise> 
+     <xsl:choose>
+     <xsl:when test="($target = 1) and ($noparams != 0)">
+      <m:apply>
+      <m:csymbol>app</m:csymbol>
+      <xsl:apply-templates select="."/>
+      <xsl:call-template name="printparam"><xsl:with-param name="noleft" select="$noparams"/></xsl:call-template>
+      </m:apply>
+     </xsl:when>
+     <xsl:otherwise>
+      <xsl:choose>
+      <xsl:when test="$noparams != 0">
+      <xsl:call-template name="printparam"><xsl:with-param name="noleft" select="$noparams"/></xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+       <xsl:if test="$target = 1">
+        <xsl:apply-templates select="."/>
+       </xsl:if>
+      </xsl:otherwise>
+      </xsl:choose>
+     </xsl:otherwise>
+     </xsl:choose>
+    </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template name="printparam">
+<xsl:param name="noleft" select="0"/>
+<xsl:param name="number" select="1"/>
+    <xsl:if test="$noleft != 0">
+     <m:ci><xsl:call-template name="insert_subscript"><xsl:with-param name="node_value">$<xsl:value-of select="$number"/></xsl:with-param></xsl:call-template></m:ci>
+     <xsl:call-template name="printparam"><xsl:with-param name="noleft" select="$noleft - 1"/><xsl:with-param name="number" select="$number + 1"/></xsl:call-template>  
+    </xsl:if>
+</xsl:template>
+
+<xsl:template match="*" mode="counting">
+<xsl:param name="noparams" select="0"/>
+<xsl:param name="count" select="0"/>
+ <xsl:choose>
+ <xsl:when test="name(.) = &quot;PROD&quot;">
+  <xsl:apply-templates select="target/*[1]" mode="counting">
+   <xsl:with-param name="noparams" select="$noparams"/>
+   <xsl:with-param name="count" select="$count + 1"/>
+  </xsl:apply-templates>
+ </xsl:when>
+ <xsl:when test="name(.) = &quot;CAST&quot;">
+  <xsl:apply-templates select="term/*[1]" mode="counting">
+   <xsl:with-param name="noparams" select="$noparams"/>
+   <xsl:with-param name="count" select="$count"/> 
+  </xsl:apply-templates>
+ </xsl:when>
+ <xsl:otherwise>
+  <xsl:value-of select="$count - $noparams"/>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
 </xsl:stylesheet>