From: Claudio Sacerdoti Coen <claudio.sacerdoticoen@unibo.it>
Date: Mon, 18 Dec 2000 15:20:14 +0000 (+0000)
Subject: Performance improvements and bug fixed
X-Git-Tag: nogzip~94
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=8dd44f97c9c97ae32bc91288a9d08c00ef63c965;p=helm.git

Performance improvements and bug fixed
---

diff --git a/helm/style/content.xsl b/helm/style/content.xsl
index 67c83efcf..d36e0152a 100644
--- a/helm/style/content.xsl
+++ b/helm/style/content.xsl
@@ -110,7 +110,8 @@ Amaya o da chi di dovere in /really_very_local/helm/PARSER/example/.../]
    <xsl:choose>
     <!-- <xsl:when test="//InnerTypes and boolean(key('typeid',*/@id))"> -->
     <!-- start looking for subproofs -->
-    <xsl:when test="((*/@id) = (//InnerTypes/TYPE/@of))"> 
+    <!-- <xsl:when test="((*/@id) = (//InnerTypes/TYPE/@of))"> -->
+    <xsl:when test="//InnerTypes and count(*[@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')]) > 0">
      <m:apply helm:xref="{@id}">
       <m:csymbol>letin</m:csymbol>
       <!-- <xsl:for-each select="*[boolean(key('typeid',@id))]"> -->
@@ -142,26 +143,17 @@ Amaya o da chi di dovere in /really_very_local/helm/PARSER/example/.../]
 
 <xsl:template match="*" mode="flat">
  <xsl:param name="n" select="1"/>
+ <xsl:variable name="id" select="@id"/>
  <xsl:choose>
-  <xsl:when test="@id">
-   <xsl:variable name="id" select="@id"/>
-   <xsl:choose>
-    <!-- <xsl:when test="key('typeid',@id)"> -->
-    <xsl:when test="//InnerTypes/TYPE[@of=$id]">
-     <m:ci>
-      <xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="concat('h',$n)"/></xsl:with-param></xsl:call-template>
-     </m:ci>
-     <xsl:apply-templates mode="flat" select="following-sibling::*[1]">
-      <xsl:with-param name="n" select="$n+1"/>
-     </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:apply-templates mode="pure" select="."/>
-     <xsl:apply-templates mode="flat" select="following-sibling::*[1]">
-      <xsl:with-param name="n" select="$n"/>
-     </xsl:apply-templates>
-    </xsl:otherwise>
-   </xsl:choose>
+  <!-- <xsl:when test="key('typeid',@id)"> -->
+  <!-- <xsl:when test="//InnerTypes/TYPE[@of=$id]"> -->
+  <xsl:when test="//InnerTypes and @sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')">
+   <m:ci>
+    <xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="concat('h',$n)"/></xsl:with-param></xsl:call-template>
+   </m:ci>
+   <xsl:apply-templates mode="flat" select="following-sibling::*[1]">
+    <xsl:with-param name="n" select="$n+1"/>
+   </xsl:apply-templates>
   </xsl:when>
   <xsl:otherwise>
    <xsl:apply-templates mode="pure" select="."/>
diff --git a/helm/style/proofs.xsl b/helm/style/proofs.xsl
index 1f9c6c8f8..781ae3e42 100644
--- a/helm/style/proofs.xsl
+++ b/helm/style/proofs.xsl
@@ -31,7 +31,7 @@
 <xsl:template match="LAMBDA" mode="noannot">
  <xsl:variable name="id" select="@id"/>
  <xsl:choose>
-  <xsl:when test="@sort='Prop' and name(../..) != 'LAMBDA'">
+  <xsl:when test="//InnerTypes and @sort='Prop' and name(../..) != 'LAMBDA'">
   <!-- <xsl:when test="@sort='Prop' and //InnerTypes/TYPE[@of=$id]"> -->
    <xsl:call-template name="has_inner_type"/>
   </xsl:when>
@@ -46,7 +46,7 @@
  <xsl:choose>
   <!-- <xsl:when test="//InnerTypes and key('typeid',@id)"> -->
   <!-- <xsl:when test="//InnerTypes/TYPE[@of=$id]"> -->
-  <xsl:when test="@sort='Prop'">
+  <xsl:when test="//InnerTypes and @sort='Prop'">
    <xsl:call-template name="has_inner_type"/>
   </xsl:when>
   <xsl:otherwise>
@@ -157,7 +157,7 @@
  <xsl:apply-templates mode="noannot" select="."/>
 </xsl:when>
 <!--**** Fine Patch temporanea, per il problema dei threads ***-->
-   <xsl:when test="count(*[@id = //InnerTypes/TYPE/@of]) = 1">
+   <xsl:when test="//InnerTypes and count(*[@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')]) = 1">
        <xsl:variable name="id" select="@id"/>
        <m:apply helm:xref="{@id}">
         <m:csymbol>thread</m:csymbol>