From 93514b18629fe42c0a2688dac57d90998ea5daaa Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sat, 31 Aug 2013 09:54:03 -0500 Subject: [PATCH] convert a macro_translator assert in preprocessor AssertionError -> PreprocessorException --- preprocessor.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/preprocessor.py b/preprocessor.py index daed157d4..c6ae137c4 100644 --- a/preprocessor.py +++ b/preprocessor.py @@ -534,9 +534,15 @@ def macro_translator(macro, token, line): else: allowed_lengths = [allowed_length] - assert len(params) in allowed_lengths, \ - "mismatched number of parameters on this line: " + \ - original_line + if len(params) not in allowed_lengths: + raise PreprocessorException( + "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 ---