summaryrefslogtreecommitdiff
path: root/preprocessor.py
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-01-27 17:45:23 -0600
committerBryan Bishop <kanzure@gmail.com>2013-01-27 17:45:23 -0600
commit80fc1f42c4222e467ad9e1a0ef69a6832b345d71 (patch)
treeac970e66b5140ae2aaee31712396807225dcc794 /preprocessor.py
parentfd6bb7de55183152bc116902be7b341ab71269ff (diff)
clean up the preprocessor macro list
Diffstat (limited to 'preprocessor.py')
-rw-r--r--preprocessor.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/preprocessor.py b/preprocessor.py
index 5fe331b64..3ef9e1e88 100644
--- a/preprocessor.py
+++ b/preprocessor.py
@@ -17,20 +17,23 @@ from extras.crystal import (
TextEndingCommand,
text_command_classes,
movement_command_classes,
- music_classes
+ music_classes,
)
-macros = command_classes + \
- [
+even_more_macros = [
Warp,
XYTrigger,
Signpost,
PeopleEvent,
DataByteWordMacro,
ItemFragment,
- ] + [x[1] for x in text_command_classes] + \
- movement_command_classes + \
- music_classes
+]
+
+macros = command_classes
+macros += even_more_macros
+macros += [each[1] for each in text_command_classes]
+macros += movement_command_classes
+macros += music_classes
# show lines before preprocessing in stdout
show_original_lines = False