From 3516799e4367c4354e08fd1421635222d3f545fc Mon Sep 17 00:00:00 2001
From: kibook <annadaniau@gmail.com>
Date: Thu, 2 Aug 2018 10:47:09 -0400
Subject: [PATCH] Handle enumerationLabel in s1kd-aspp -g

If an enumeration has the attribute enumerationLabel, and the value in
the annotation matches it, this label will be used instead of the
literal value.
---
 tools/s1kd-aspp/generateDisplayText.xsl | 18 +++++++++++++++++-
 tools/s1kd-aspp/s1kd-aspp.c             |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/tools/s1kd-aspp/generateDisplayText.xsl b/tools/s1kd-aspp/generateDisplayText.xsl
index 6e1ad02d..6b0ac9e0 100644
--- a/tools/s1kd-aspp/generateDisplayText.xsl
+++ b/tools/s1kd-aspp/generateDisplayText.xsl
@@ -35,7 +35,7 @@
   <xsl:template match="assert" mode="text">
     <xsl:call-template name="applicPropertyName"/>
     <xsl:text>: </xsl:text>
-    <xsl:apply-templates select="@applicPropertyValues|@actvalues" mode="text"/>
+    <xsl:call-template name="applicPropertyVal"/>
   </xsl:template>
 
   <xsl:template name="applicPropertyName">
@@ -57,6 +57,22 @@
     </xsl:choose>
   </xsl:template>
 
+  <xsl:template name="applicPropertyVal">
+    <xsl:param name="id" select="@applicPropertyIdent|@actidref"/>
+    <xsl:param name="type" select="@applicPropertyType|@actreftype"/>
+    <xsl:variable name="prop" select="//productAttribute[$type='prodattr' and @id=$id]|//prodattr[$type='prodattr' and @id=$id]|//cond[$type='condition' and @id=$id]|//condition[$type='condition' and @id=$id]"/>
+    <xsl:variable name="values" select="@applicPropertyValues|@actvalues"/>
+    <xsl:variable name="label" select="$prop/enumeration[@applicPropertyValues=$values]/@enumerationLabel"/>
+    <xsl:choose>
+      <xsl:when test="$label">
+        <xsl:value-of select="$label"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="$values" mode="text"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
   <xsl:template match="@applicPropertyValues|@actvalues" mode="text">
     <xsl:value-of select="translate(str:replace(., '|', ', '), '~', '-')"/>
   </xsl:template>
diff --git a/tools/s1kd-aspp/s1kd-aspp.c b/tools/s1kd-aspp/s1kd-aspp.c
index e376e315..2e0ada59 100644
--- a/tools/s1kd-aspp/s1kd-aspp.c
+++ b/tools/s1kd-aspp/s1kd-aspp.c
@@ -21,7 +21,7 @@
 #include "identity.h"
 
 #define PROG_NAME "s1kd-aspp"
-#define VERSION "1.1.1"
+#define VERSION "1.1.2"
 
 /* ID for the inline <applic> element representing the whole data module's
  * applicability. */