From 37977a88163b4ac97cf3b2c95ce4d9ddf6825eaf Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike.gerwitz@ryansg.com>
Date: Wed, 14 Jul 2021 09:59:45 -0400
Subject: [PATCH] entry-form.xsl: Correctly generate HTML for params with
 imported types

This is a nearly-10-year-old bug that was introduced when the Summary Page
was modified to use the then-new symbol table.  The compiler previously
concatenated all packages into a single XML tree and processed that, so no
package resolution was necessary here before.
---
 RELEASES.md                        |  5 +++++
 src/current/include/entry-form.xsl | 16 ++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/RELEASES.md b/RELEASES.md
index 748c0452..83c7905c 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -21,6 +21,11 @@ Compiler
 - Make Summary Page less chatty.
 - Fix incorrect package name for generated worksheet packages.
 
+Summary Page
+------------
+- Correctly generate input fields for params using imported types.
+  - This is a long-standing (nearly 10-year-old) bug.
+
 
 v18.0.1 (2021-06-24)
 ====================
diff --git a/src/current/include/entry-form.xsl b/src/current/include/entry-form.xsl
index f3a5a0cc..9eb533f3 100644
--- a/src/current/include/entry-form.xsl
+++ b/src/current/include/entry-form.xsl
@@ -276,9 +276,8 @@
 
   <xsl:variable name="type" select="@type" />
 
-  <!-- the typedef may or may not be in the same package as the param -->
-  <xsl:variable name="typesym" select="
-      $pkg/preproc:symtable/preproc:sym[
+  <xsl:variable name="typesym" as="element( preproc:sym )" select="
+      $program/l:dep/preproc:sym[
         @type='type'
         and @name=$type
       ]
@@ -295,10 +294,11 @@
   <!-- load the typedef from the appropriate package -->
   <xsl:variable name="typepkg" select="
       if ( $typesrc and not( $typesrc='' ) ) then
-        document( concat( $typesrc, '.xmlo' ), $sym )/lv:*
+        document( concat( $typesrc, '.xmlo' ), $program )/lv:*
       else
         $pkg
     " />
+
   <!-- this makes maintinance more difficult, but speeds up searching large
        trees -->
   <xsl:variable name="typedef" select="
@@ -316,15 +316,15 @@
 
     <xsl:otherwise>
       <xsl:message>
-        <xsl:text>[summary] warning: unknown param type `</xsl:text>
-          <xsl:value-of select="$typesym/@src" />
-          <xsl:text>/</xsl:text>
+        <xsl:text>[summary] internal: unhandled type `</xsl:text>
           <xsl:value-of select="@type" />
+        <xsl:text>' for param `</xsl:text>
+          <xsl:value-of select="@name" />
         <xsl:text>'</xsl:text>
       </xsl:message>
 
       <span class="error">
-        <xsl:text>Unknown type: </xsl:text>
+        <xsl:text>Unhandled type: </xsl:text>
         <xsl:value-of select="@type" />
       </span>
     </xsl:otherwise>