Seemingly up to scratch now

1 files changed, 3 insertions, 4 deletions

diff --git a/src/smp/macro_processor.py b/src/smp/macro_processor.py
index 8fa9d91..bda6c6f 100644
--- a/src/smp/macro_processor.py
+++ b/src/smp/macro_processor.py
@@ -124,8 +124,9 @@ class MacroProcessor:
             try:
                 return str(macro(*macro_args))
             except Exception as e:
-                s = f"{macro_name}({','.join([repr(x) for x in macro_args])})"
-                raise Exception(s)
+                s = f"{macro_name}({','.join([repr(x) for x in args])})"
+                self.warnings.append(f"Error expanding macro {s} ({e})")
+                return s
         if isinstance(macro, str):
             expanded = macro
             for i, arg in enumerate(args):
@@ -157,8 +158,6 @@ class MacroProcessor:
 
         skip_next_line_ending = False
 
-        line_begin = True
-
         # We should keep track of filename, linenumber, and character number on line here
         # So we can give sensible error messages
         # Probably add to python stack trace?