Mike Gerwitz

Activist for User Freedom

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Gerwitz <gerwitzm@lovullo.com>2017-07-13 15:24:30 -0400
committerMike Gerwitz <gerwitzm@lovullo.com>2017-07-13 15:24:30 -0400
commitaeded560f430fe56c0f10a34d0ccaa17f1b9e0fb (patch)
treeca4faf2fec0e74da69079972e429eb654b56ee42
parent32afebd63145e793559074b38e3bb21cceb6647c (diff)
downloadtame-aeded560f430fe56c0f10a34d0ccaa17f1b9e0fb.tar.gz
tame-aeded560f430fe56c0f10a34d0ccaa17f1b9e0fb.tar.bz2
tame-aeded560f430fe56c0f10a34d0ccaa17f1b9e0fb.zip
Include meta automatically in link listv2.1.1
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.
-rw-r--r--src/current/compiler/linker.xsl9
-rw-r--r--src/symtable/symbols.xsl2
2 files changed, 5 insertions, 6 deletions
diff --git a/src/current/compiler/linker.xsl b/src/current/compiler/linker.xsl
index 93eb094..6afa4dd 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 0e4e215..b3f609e 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>