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

Merge pull request #182 from kanzure/preprocessor-asserts 

Use PreprocessorException instead of AssertionError in preprocessor
This commit is contained in:
Bryan Bishop 2013-08-31 08:17:51 -07:00
parent 5118fb7578 ba67d3ba46
commit e91fb8ac14
1 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
preprocessor.py
View File

@ -296,6 +296,16 @@ chars = {
"9": 0xFF "9": 0xFF
} }
class PreprocessorException(Exception):
"""
There was a problem in the preprocessor.
"""
class MacroException(PreprocessorException):
"""
There was a problem with a macro.
"""
def separate_comment(l): def separate_comment(l):
""" """
Separates asm and comments on a single line. Separates asm and comments on a single line.
@ -435,7 +445,8 @@ def macro_translator(macro, token, line, show_original_lines=False, do_macro_san
@param show_original_lines: show lines before preprocessing in stdout @param show_original_lines: show lines before preprocessing in stdout
@param do_macro_sanity_check: helpful for debugging macros @param do_macro_sanity_check: helpful for debugging macros
""" """
assert macro.macro_name == token, "macro/token mismatch" if macro.macro_name != token:
raise MacroException("macro/token mismatch")
original_line = line original_line = line
@ -463,7 +474,7 @@ def macro_translator(macro, token, line, show_original_lines=False, do_macro_san
# check if there are no params (redundant) # check if there are no params (redundant)
if len(params) == 1 and params[0] == "": if len(params) == 1 and params[0] == "":
raise Exception, "macro has no params?" raise MacroException("macro has no params?")
# write out a comment showing the original line # write out a comment showing the original line
if show_original_lines: if show_original_lines:
@ -504,10 +515,15 @@ def macro_translator(macro, token, line, show_original_lines=False, do_macro_san
elif param_klass.size == 3: elif param_klass.size == 3:
allowed_length += 2 # bank and label allowed_length += 2 # bank and label
else: else:
raise Exception, "dunno what to do with a macro param with a size > 3" raise MacroException(
"dunno what to do with a macro param with a size > 3 (size={size})"
.format(size=param_klass.size)
)
else: else:
raise Exception, "dunno what to do with this non db/dw macro param: " + \ raise MacroException(
str(param_klass) + " in line: " + original_line "dunno what to do with this non db/dw macro param: {klass} in line {line}"
.format(klass=param_klass, line=original_line)
)
# sometimes the allowed length can vary # sometimes the allowed length can vary
if hasattr(macro, "allowed_lengths"): if hasattr(macro, "allowed_lengths"):
@ -515,9 +531,15 @@ def macro_translator(macro, token, line, show_original_lines=False, do_macro_san
else: else:
allowed_lengths = [allowed_length] allowed_lengths = [allowed_length]
assert len(params) in allowed_lengths, \ if len(params) not in allowed_lengths:
"mismatched number of parameters on this line: " + \ raise PreprocessorException(
original_line "mismatched number of parameters ({count}, instead of any of {allowed}) on this line: {line}"
.format(
count=len(params),
allowed=allowed_lengths,
line=original_line,
)
)
# --- end of ridiculously long sanity check --- # --- end of ridiculously long sanity check ---
@ -562,9 +584,13 @@ def macro_translator(macro, token, line, show_original_lines=False, do_macro_san
output += ("db " + param_klass.from_asm(param) + "\n") output += ("db " + param_klass.from_asm(param) + "\n")
index += 1 index += 1
else: else:
raise Exception, "dunno what to do with this macro " + \ raise MacroException(
"param (" + str(param_klass) + ") " + "on this line: " + \ "dunno what to do with this macro param ({klass}) in line: {line}"
original_line .format(
klass=param_klass,
line=original_line,
)
)
# or just print out the byte # or just print out the byte
else: else: