about summary refs log tree commit diff stats
path: root/subx/apps/merge.subx
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2019-02-18 21:48:19 -0800
committerKartik Agaram <vc@akkartik.com>2019-02-18 21:48:19 -0800
commit8188bbbc9408322c18cdc2d1049126900abf793c (patch)
tree2141b32bc1b7df6106980e12f0edbacc7dcfd329 /subx/apps/merge.subx
parent6607a30415e2bede27c43b57ce3c5cbc42278fa9 (diff)
downloadmu-8188bbbc9408322c18cdc2d1049126900abf793c.tar.gz
4981 - no, go back to 3 phases
Considering how much trouble a merge phase would be (commit 4978), it seems
simpler to just add the extra syntax for controlling the entry point of
the generated ELF binary.

But I wouldn't have noticed this if I hadn't taken the time to write out
the commit messages of 4976 and 4978.

Even if we happened to already have linked list primitives built, this
may still be a good idea considering that I'm saving quite a lot of code
in duplicated entrypoints.
Diffstat (limited to 'subx/apps/merge.subx')
-rw-r--r--subx/apps/merge.subx36
1 files changed, 0 insertions, 36 deletions
diff --git a/subx/apps/merge.subx b/subx/apps/merge.subx
deleted file mode 100644
index a5ecc987..00000000
--- a/subx/apps/merge.subx
+++ /dev/null
@@ -1,36 +0,0 @@
-# Read a text file of SubX segment 'fragments' with duplicate names, and emit
-# a list of 'merged' segments.
-#
-# Example input:
-#   == A
-#   a
-#   b
-#   c
-#   == B
-#   d
-#   e
-#   == A
-#   f
-#   g
-#   == A
-#   h
-#
-# Output:
-#   == A
-#   h
-#   f
-#   g
-#   a
-#   b
-#   c
-#   == B
-#   d
-#   e
-#
-# The output gives each segment the contents of all its fragments, with later
-# fragments *prepended* to earlier ones.
-#
-# Prepending necessitates buffering output until the end. We'll convert
-# fragments to distinct streams, maintain each segment as a linked list of
-# fragments that's easy to prepend to, and finally emit the linked lists in
-# order.