refactor: put all expansion custom error from the sh_expand library (…

…expand.py file) under one ExpansionError class in custom_error to catch and log these errors separately
binpash · Jun 11, 2024 · c7ce083 · c7ce083
1 parent ad2b687
commit c7ce083
Show file tree

Hide file tree

Showing 3 changed files with 525 additions and 2 deletions.
diff --git a/compiler/custom_error.py b/compiler/custom_error.py
@@ -2,4 +2,7 @@ class UnparallelizableError(Exception):
     pass
 
 class AdjLineNotImplementedError(Exception):
-    pass
+    pass
+
+class ExpansionError(RuntimeError): 
+    pass 
diff --git a/compiler/pash_compiler.py b/compiler/pash_compiler.py
@@ -93,7 +93,9 @@ def compile_ir(ir_filename, compiled_script_file, args, compiler_config):
         ret = compile_optimize_output_script(
             ir_filename, compiled_script_file, args, compiler_config
         )
-    except UnparallelizableError as e: 
+    except ExpansionError as e: 
+        log("WARNING: Exception caught because some region(s) are not expandable and therefore unparallelizable:", e) 
+    except (ExpansionError, UnparallelizableError) as e: 
         log("WARNING: Exception caught because some region(s) are unparallelizable:", e) 
         # log(traceback.format_exc()) # uncomment for exact trace report (PaSh user should see informative messages for unparellizable regions) 
     except (AdjLineNotImplementedError, NotImplementedError) as e: