From 440b935dc0861d549a9bb77b75aa76447b172ee9 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike.gerwitz@rtspecialty.com>
Date: Mon, 29 Jan 2018 13:11:12 -0500
Subject: [PATCH] Display error on non-scalar constant lv:match/@value (bugfix)

* src/current/compiler/js.xsl (compile)[lv:match]: Display error on bad
  match, as it was intended.
---
 src/current/compiler/js.xsl | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/current/compiler/js.xsl b/src/current/compiler/js.xsl
index c004ca5d..c3f41774 100644
--- a/src/current/compiler/js.xsl
+++ b/src/current/compiler/js.xsl
@@ -811,19 +811,20 @@
         select="root(.)/preproc:symtable/preproc:sym[ @name=$value ]" />
 
       <choose>
+        <!-- value unavailable (TODO: vector/matrix support) -->
+        <when test="$sym and not( $sym/@value )">
+            <message>
+              <text>[jsc] !!! bad classification match: `</text>
+                <value-of select="$value" />
+              <text>' is not a scalar constant</text>
+            </message>
+        </when>
+
         <!-- simple constant -->
         <when test="$sym and @value">
           <value-of select="$sym/@value" />
         </when>
 
-        <!-- value unavailable (XXX: this probably should never happen...) -->
-        <when test="$sym and @value">
-            <message>
-              <text>[jsc] !!! TODO: bad classification match: '</text>
-                <value-of select="$value" />
-            </message>
-        </when>
-
         <otherwise>
           <text>'</text>
             <!-- TODO: Should we disallow entirely? -->