Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

combine multiple calls to sys.stdout.write

This commit is contained in:
Bryan Bishop 2013-01-10 16:25:57 -06:00
parent 849a57c9f1
commit 458709fc77
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
preprocessor.py
View File

@ -512,6 +512,8 @@ def macro_translator(macro, token, line):
# used for storetext # used for storetext
correction = 0 correction = 0
output = ""
index = 0 index = 0
while index < len(params): while index < len(params):
param_type = macro.param_types[index - correction] param_type = macro.param_types[index - correction]
@ -528,24 +530,24 @@ def macro_translator(macro, token, line):
if (byte_type == "dw" and size != 2) or \ if (byte_type == "dw" and size != 2) or \
(byte_type == "db" and size != 1): (byte_type == "db" and size != 1):
sys.stdout.write("; " + description + "\n") output += ("; " + description + "\n")
if size == 3 and issubclass(param_klass, PointerLabelBeforeBank): if size == 3 and issubclass(param_klass, PointerLabelBeforeBank):
# write the bank first # write the bank first
sys.stdout.write("db " + params[index].strip() + "\n") output += ("db " + param + "\n")
# write the pointer second # write the pointer second
sys.stdout.write("dw " + params[index+1].strip() + "\n") output += ("dw " + params[index+1].strip() + "\n")
index += 2 index += 2
correction += 1 correction += 1
elif size == 3 and issubclass(param_klass, PointerLabelAfterBank): elif size == 3 and issubclass(param_klass, PointerLabelAfterBank):
# write the pointer first # write the pointer first
sys.stdout.write("dw " + params[index].strip() + "\n") output += ("dw " + param + "\n")
# write the bank second # write the bank second
sys.stdout.write("db " + params[index+1].strip() + "\n") output += ("db " + params[index+1].strip() + "\n")
index += 2 index += 2
correction += 1 correction += 1
elif size == 3 and issubclass(param_klass, MoneyByteParam): elif size == 3 and issubclass(param_klass, MoneyByteParam):
sys.stdout.write("db " + MoneyByteParam.from_asm(params[index]) + "\n") output += ("db " + MoneyByteParam.from_asm(param) + "\n")
index += 1 index += 1
else: else:
raise Exception, "dunno what to do with this macro " + \ raise Exception, "dunno what to do with this macro " + \
@ -554,10 +556,12 @@ def macro_translator(macro, token, line):
# or just print out the byte # or just print out the byte
else: else:
sys.stdout.write(byte_type + " " + param + " ; " + description + "\n") output += (byte_type + " " + param + " ; " + description + "\n")
index += 1 index += 1
sys.stdout.write(output)
def include_file(asm): def include_file(asm):
"""This is more reliable than rgbasm/rgbds including files on its own.""" """This is more reliable than rgbasm/rgbds including files on its own."""