Mike Gerwitz

Activist for User Freedom

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Gerwitz <gerwitzm@lovullo.com>2017-05-08 16:35:34 -0400
committerMike Gerwitz <gerwitzm@lovullo.com>2017-07-05 13:51:28 -0400
commit353440ef31b07849fa805f316f2d01a26c2087f9 (patch)
tree064f31094f48af12db222c2992e6425f9955b131
parentec4c73f749035d51b953716e3e20ab373500b56e (diff)
downloadtame-353440ef31b07849fa805f316f2d01a26c2087f9.tar.gz
tame-353440ef31b07849fa805f316f2d01a26c2087f9.tar.bz2
tame-353440ef31b07849fa805f316f2d01a26c2087f9.zip
Reorder static linked output
`set_defaults' wasn't in scope of maps. * src/current/compiler/js.xsl (compiler:exit-rater lv:package): Remove static output. * src/current/compiler/linker.xsl (l:link-deps lv:package): Link static after all other blocks, at highest scope within the compiled module.
-rw-r--r--src/current/compiler/js.xsl3
-rw-r--r--src/current/compiler/linker.xsl3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/current/compiler/js.xsl b/src/current/compiler/js.xsl
index cefdf42..273b6a3 100644
--- a/src/current/compiler/js.xsl
+++ b/src/current/compiler/js.xsl
@@ -217,9 +217,6 @@
</for-each>
<text>}; </text>
- <!-- common stuff -->
- <call-template name="compiler:static" />
-
<!-- the rater has been generated; return it -->
<text>return rater;</text>
<text>} )()</text>
diff --git a/src/current/compiler/linker.xsl b/src/current/compiler/linker.xsl
index c6b64d8..42f9a98 100644
--- a/src/current/compiler/linker.xsl
+++ b/src/current/compiler/linker.xsl
@@ -954,6 +954,7 @@
<xsl:text>compiling entry point...</xsl:text>
</xsl:with-param>
</xsl:call-template>
+
<xsl:apply-templates select="." mode="compiler:entry" />
@@ -979,6 +980,8 @@
<xsl:with-param name="deps" select="$deps" />
</xsl:apply-templates>
+ <!-- common stuff -->
+ <xsl:call-template name="compiler:static" />
<!-- finally, finish up -->
<xsl:call-template name="log:info">