From 19a6d67dc44214f905d0fb3aab09dd4c23eb4ae9 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike.gerwitz@ryansg.com>
Date: Wed, 15 Jan 2020 16:32:46 -0500
Subject: [PATCH] TAMER: Separate static xmle section

---
 .rev-xmle                  | 2 +-
 src/current/standalone.xsl | 2 +-
 tamer/src/ld/poc.rs        | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.rev-xmle b/.rev-xmle
index 0a9afa0c..d5f323cf 100644
--- a/.rev-xmle
+++ b/.rev-xmle
@@ -1,4 +1,4 @@
 # This number is incremented for every linker change to force rebuilding
 # of xmle files.
-3
+4
 
diff --git a/src/current/standalone.xsl b/src/current/standalone.xsl
index 59b29faa..eb1cf879 100644
--- a/src/current/standalone.xsl
+++ b/src/current/standalone.xsl
@@ -54,8 +54,8 @@
     <!-- (moved from linker during TAMER POC linker) -->
     <call-template name="compiler:entry" />
     <call-template name="compiler:classifier" />
+    <value-of disable-output-escaping="yes" select="/lv:package/l:static/text()" />
     <call-template name="compiler:entry-rater" />
-
     <value-of disable-output-escaping="yes" select="/lv:package/l:exec/text()" />
   <text>; </text>
 
diff --git a/tamer/src/ld/poc.rs b/tamer/src/ld/poc.rs
index df4fd676..7dd764b1 100644
--- a/tamer/src/ld/poc.rs
+++ b/tamer/src/ld/poc.rs
@@ -512,13 +512,17 @@ fn output_xmle<'a, 'i, I: Interner<'i>>(
     }
 
     writer.write_event(Event::End(BytesEnd::borrowed(b"l:retmap-exec")))?;
-    writer.write_event(Event::Start(BytesStart::borrowed_name(b"l:exec")))?;
+    writer.write_event(Event::Start(BytesStart::borrowed_name(b"l:static")))?;
 
     write_fragments(&mut writer, &sorted.meta)?;
     write_fragments(&mut writer, &sorted.worksheet)?;
     write_fragments(&mut writer, &sorted.params)?;
     write_fragments(&mut writer, &sorted.types)?;
     write_fragments(&mut writer, &sorted.funcs)?;
+
+    writer.write_event(Event::End(BytesEnd::borrowed(b"l:static")))?;
+    writer.write_event(Event::Start(BytesStart::borrowed_name(b"l:exec")))?;
+
     write_fragments(&mut writer, &sorted.rater)?;
 
     writer.write_event(Event::End(BytesEnd::borrowed(b"l:exec")))?;