Merge branch 'master' into preprocessor-asserts

This commit is contained in:
Bryan Bishop 2013-08-31 10:17:25 -05:00
commit ba67d3ba46
2 changed files with 9 additions and 12 deletions

View File

@ -31,12 +31,6 @@ macros += movement_command_classes
macros += music_classes macros += music_classes
macros += effect_classes macros += effect_classes
# show lines before preprocessing in stdout
show_original_lines = False
# helpful for debugging macros
do_macro_sanity_check = False
chars = { chars = {
"": 0x05, "": 0x05,
"": 0x06, "": 0x06,
@ -444,11 +438,13 @@ def is_based_on(something, base):
options += [something.__name__] options += [something.__name__]
return (base in options) return (base in options)
def macro_translator(macro, token, line): def macro_translator(macro, token, line, show_original_lines=False, do_macro_sanity_check=False):
""" """
Converts a line with a macro into a rgbasm-compatible line. Converts a line with a macro into a rgbasm-compatible line.
"""
@param show_original_lines: show lines before preprocessing in stdout
@param do_macro_sanity_check: helpful for debugging macros
"""
if macro.macro_name != token: if macro.macro_name != token:
raise MacroException("macro/token mismatch") raise MacroException("macro/token mismatch")

View File

@ -1,8 +1,9 @@
# coding: utf-8 # coding: utf-8
"""
# Starting a new python process to preprocess each source file Starting a new python process to preprocess each source file creates too much
# creates too much overhead. Instead, a list of files to preprocess overhead. Instead, a list of files to preprocess is fed into a script run from
# is fed into a script run from a single process. a single process.
"""
import os import os
import sys import sys