From 0f88b902a934ccf944dc6d30e24b0b68ee382713 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike.gerwitz@rtspecialty.com>
Date: Wed, 20 Dec 2017 16:49:34 -0500
Subject: [PATCH] summary: Correct rendering of externs

---
 src/current/include/display.xsl | 69 +++++++++------------------------
 src/current/summary.xsl         | 16 ++------
 2 files changed, 22 insertions(+), 63 deletions(-)

diff --git a/src/current/include/display.xsl b/src/current/include/display.xsl
index 86f40981..3000f816 100644
--- a/src/current/include/display.xsl
+++ b/src/current/include/display.xsl
@@ -74,31 +74,18 @@
 
 <xsl:template match="preproc:sym[ @type='cgen' ]" mode="summary:desc" priority="5">
   <xsl:variable name="parent" select="@parent" />
-  <xsl:variable name="sym" select="
-      ancestor::preproc:symtable/preproc:sym[ @name=$parent ]
-    " />
+  <xsl:variable name="sym" select="preproc:sym-lookup( $parent )" />
 
   <xsl:apply-templates select="$sym" mode="summary:desc" />
 </xsl:template>
 
 
 <xsl:template match="preproc:sym[ @type='class' ]" mode="summary:desc" priority="5">
-  <xsl:variable name="name" select="@name" />
-  <xsl:variable name="document" select="
-      if ( @src ) then
-        document( concat( @src, '.xmlo' ), . )/lv:*
-      else
-        /lv:*
-    " />
-  <xsl:variable name="class" select="
-      $document/lv:classify[
-        @as=substring-after( $name, ':class:' )
-      ]
-    " />
+  <xsl:variable name="as" select="@orig-name" />
 
-  <span class="letlist-{$class/@as}">
+  <span class="letlist-{$as}">
     <xsl:text>"</xsl:text>
-    <xsl:value-of select="$class/@desc" />
+    <xsl:value-of select="@desc" />
     <xsl:text>"</xsl:text>
     <xsl:text> classification </xsl:text>
 
@@ -125,8 +112,8 @@
     <!-- TODO: use generator in letlist-* -->
     <span class="param">
       <xsl:text> (</xsl:text>
-      <a href="#:class:{$class/@as}" class="sym-ref sym-class">
-        <xsl:value-of select="$class/@as" />
+      <a href="#{@name}" class="sym-ref sym-class">
+        <xsl:value-of select="$as" />
       </a>
       <xsl:text>)</xsl:text>
     </span>
@@ -142,25 +129,12 @@
 
 
 <xsl:template match="preproc:sym[ @type='param' ]" mode="summary:desc" priority="5">
-  <xsl:variable name="name" select="@name" />
-  <xsl:variable name="document" select="
-      if ( @src ) then
-        document( concat( @src, '.xmlo' ), . )/lv:*
-      else
-        /lv:*
-    " />
-  <xsl:variable name="param" select="
-      $document/lv:param[
-        @name=$name
-      ]
-    " />
+  <xsl:value-of select="@desc" />
 
-  <xsl:value-of select="$param/@desc" />
-
-  <span class="param letlist-{$param/@name}">
+  <span class="param letlist-{@name}">
     <xsl:text> (</xsl:text>
-    <a href="#{$param/@name}" class="sym-ref sym-param">
-      <xsl:value-of select="$param/@name" />
+    <a href="#{@name}" class="sym-ref sym-param">
+      <xsl:value-of select="@name" />
     </a>
     <xsl:text>)</xsl:text>
   </span>
@@ -477,15 +451,15 @@
     " />
 
   <ul class="let">
+    <xsl:variable name="non-lparams" as="element( preproc:sym-ref )*"
+                  select="$deps/preproc:sym-ref[ not( @type = 'lparam' ) ]" />
+    <xsl:variable name="lparams" as="element( preproc:sym-ref )*"
+                  select="$deps/preproc:sym-ref[ @type = 'lparam' ]" />
+
     <!-- output a description for each dependency -->
     <xsl:variable name="result">
-      <xsl:for-each select="
-          /lv:*/preproc:symtable/preproc:sym[
-            not( @type='lparam' )
-            and @name=$deps/preproc:sym-ref/@name
-          ]
-        ">
-
+      <xsl:for-each select="for $name in $non-lparams/@name
+                              return preproc:sym-lookup( $name )">
         <xsl:call-template name="_gen-let-list-item">
           <xsl:with-param name="context" select="$context" />
         </xsl:call-template>
@@ -493,13 +467,8 @@
 
 
       <!-- handle c:let formatting separately -->
-      <xsl:for-each select="
-          /lv:*/preproc:symtable/preproc:sym[
-            @type='lparam'
-            and @name=$deps/preproc:sym-ref/@name
-          ]
-        ">
-
+      <xsl:for-each select="for $name in $lparams/@name
+                              return preproc:sym-lookup( $name )">
         <xsl:call-template name="_gen-let-list-item">
           <xsl:with-param name="context" select="$context" />
           <xsl:with-param name="class" select="'letequ'" />
diff --git a/src/current/summary.xsl b/src/current/summary.xsl
index f4e2f4f0..d86899bd 100644
--- a/src/current/summary.xsl
+++ b/src/current/summary.xsl
@@ -1584,21 +1584,11 @@
           </xsl:if>
 
           <!-- get class package -->
-          <xsl:variable name="src" select="
-              $root/lv:*/preproc:symtable/preproc:sym[ @name=$csymid ]/@src
-            " />
-          <xsl:variable name="pkg" select="
-              if ( $src ) then
-                document( concat( $src, '.xmlo' ), $root )
-              else
-                $root
-            " />
+          <xsl:variable name="sym" select="preproc:sym-lookup( $csymid )" />
 
           <!-- output description -->
           <a href="#{$csymid}" class="sym-ref sym-class">
-            <xsl:value-of select="
-              $pkg/lv:*/lv:classify[ @as=$cname ]/@desc
-            " />
+            <xsl:value-of select="$sym/@desc" />
           </a>
         </xsl:for-each>
       </div>
@@ -2246,7 +2236,7 @@
 
   <!-- XXX: There's a linker bug where there may be duplicate symbols in
        l:dep! -->
-  <xsl:sequence select="$program/l:dep/preproc:sym[ @name=$name ][0]" />
+  <xsl:sequence select="$program/l:dep/preproc:sym[ @name=$name ][1]" />
 </xsl:function>