From aeded560f430fe56c0f10a34d0ccaa17f1b9e0fb Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <gerwitzm@lovullo.com>
Date: Thu, 13 Jul 2017 15:24:30 -0400
Subject: [PATCH] Include meta automatically in link list

These used to be automatically added via @keep.

* src/current/compiler/linker.xsl (l:depgen): Include meta symbols.
* src/symtable/symbols.xsl (lv:meta): @pollute instead of @keep.
---
 src/current/compiler/linker.xsl | 9 ++++-----
 src/symtable/symbols.xsl        | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/current/compiler/linker.xsl b/src/current/compiler/linker.xsl
index 93eb0944..6afa4dd0 100644
--- a/src/current/compiler/linker.xsl
+++ b/src/current/compiler/linker.xsl
@@ -181,8 +181,10 @@
        symbol, then it must not be used); note that lv:yield actually compiles
        into a special symbol ___yield -->
   <variable name="yields" as="element( preproc:sym )+">
-    <!-- TOOD: this shouldn't be a magical exception; map it -->
-    <sequence select="preproc:sym[ @name='___yield' ]" />
+    <!-- TOOD: these shouldn't be a magical exception; map it -->
+    <sequence select="preproc:sym[ @name = '___yield'
+                                     or @name = '___worksheet'
+                                     or @type = 'meta' ]" />
 
     <!-- TODO: messy; refactor this symbol situation -->
     <!-- this should be the sole source of outputs and, consequently,
@@ -193,9 +195,6 @@
           or @type='retmap' or @type='retmap:head' or @type='retmap:tail'
         ]
       " />
-
-    <!-- TODO: also should not be an exception -->
-    <sequence select="preproc:sym[ @name='___worksheet' ]" />
   </variable>
 
   <!-- start at the top of the table and begin processing each symbol
diff --git a/src/symtable/symbols.xsl b/src/symtable/symbols.xsl
index 0e4e2155..b3f609e1 100644
--- a/src/symtable/symbols.xsl
+++ b/src/symtable/symbols.xsl
@@ -416,7 +416,7 @@
     <preproc:sym type="meta"
                  name=":meta:{@name}"
                  desc="Metavalue {@name}"
-                 keep="true" />
+                 pollute="true" />
   </for-each>
 </template>