additional simplification

Author: angelhof

src/pash/preprocessor/pash_preprocessor.py

@@ -16,12 +16,7 @@
 from shasta.ast_node import AstNode
 
 from ast_util import PreprocessedAST, UnparsedScript, unzip
-from transformation_options import (
-    TransformationType,
-    TransformationState,
-    AirflowTransformationState,
-    AbstractTransformationState,
-)
+from transformation_options import TransformationState
 from walk_preprocess import WalkPreprocess, PreprocessContext
 from parse import parse_shell_to_asts, from_ast_objects_to_shell
 from util import log, logging_prefix, print_time_delta
@@ -90,7 +85,6 @@ def __init__(self, *args, **kwargs):
             help="(experimental) interpret the input as a bash script file",
             action="store_true",
         )
-        self.set_defaults(preprocess_mode="pash")
 
 
 @logging_prefix(LOGGING_PREFIX)
@@ -164,7 +158,7 @@ def preprocess(input_script_path, args):
 
 def preprocess_asts(ast_objects, args):
     """
-    Preprocess AST objects based on the transformation mode.
+    Preprocess AST objects by replacing candidate dataflow regions.
 
     Args:
         ast_objects: List of parsed AST objects
@@ -173,13 +167,7 @@ def preprocess_asts(ast_objects, args):
     Returns:
         List of preprocessed AST objects
     """
-    trans_mode = TransformationType(args.preprocess_mode)
-
-    if trans_mode is TransformationType.AIRFLOW:
-        trans_options = AirflowTransformationState()
-    else:
-        trans_options = TransformationState()
-
+    trans_options = TransformationState()
     return replace_ast_regions(ast_objects, trans_options)
 
 
@@ -188,7 +176,7 @@ def preprocess_asts(ast_objects, args):
 
 def preprocess_node(
     ast_node: AstNode,
-    trans_options: AbstractTransformationState,
+    trans_options: TransformationState,
     last_object: bool,
 ) -> PreprocessedAST:
     """
@@ -197,7 +185,7 @@ def preprocess_node(
 
     Parameters:
         ast_node (AstNode): The AstNode to parse
-        trans_options (AbstractTransformationState):
+        trans_options (TransformationState):
             A concrete transformation state instance corresponding to the output target
         last_object (bool): Flag for whether this is the last AstNode
 
@@ -208,7 +196,7 @@ def preprocess_node(
     return _pash_walker.walk(ast_node, ctx)
 
 
-def replace_ast_regions(ast_objects, trans_options: AbstractTransformationState):
+def replace_ast_regions(ast_objects, trans_options: TransformationState):
     """
     Replace candidate dataflow AST regions with calls to PaSh's runtime.
     """

src/pash/preprocessor/transformation_options.py

@@ -1,9 +1,7 @@
 """
-Transformation options and state classes for AST preprocessing.
+Transformation state for AST preprocessing.
 """
 
-from abc import ABC, abstractmethod
-from enum import Enum
 import os
 import pickle
 
@@ -20,15 +18,13 @@
 RUNTIME_EXECUTABLE = os.path.join(PASH_TOP, "jit_runtime/jit.sh")
 
 
-class TransformationType(Enum):
-    """Types of AST-to-AST transformations."""
+class TransformationState:
+    """
+    Transformation state for PaSh preprocessing.
 
-    PASH = "pash"
-    AIRFLOW = "airflow"
-
-
-class AbstractTransformationState(ABC):
-    """Base class for transformation state."""
+    Manages node IDs and generates replacement AST nodes that call the
+    PaSh runtime for dataflow region compilation.
+    """
 
     def __init__(self):
         self._node_counter = 0
@@ -45,16 +41,6 @@ def get_current_id(self):
     def get_number_of_ids(self):
         return self._node_counter
 
-    @abstractmethod
-    def replace_df_region(
-        self, asts, disable_parallel_pipelines=False, ast_text=None
-    ) -> AstNode:
-        pass
-
-
-class TransformationState(AbstractTransformationState):
-    """Standard PaSh transformation state."""
-
     def replace_df_region(
         self, asts, disable_parallel_pipelines=False, ast_text=None
     ) -> AstNode:
@@ -104,12 +90,6 @@ def make_call_to_pash_runtime(
         return runtime_node
 
 
-class AirflowTransformationState(TransformationState):
-    """Airflow transformation state (same as standard PaSh for now)."""
-
-    pass
-
-
 def get_shell_from_ast(asts, ast_text=None) -> str:
     """Get shell text from AST, using original text if available."""
     if ast_text is None:

src/pash/preprocessor/walk_preprocess.py

@@ -8,7 +8,7 @@
 
 from __future__ import annotations
 from dataclasses import dataclass
-from typing import Any, TYPE_CHECKING
+from typing import Any
 
 from shasta.ast_node import (
     AstNode,
@@ -21,17 +21,14 @@
 )
 from shasta.ast_walker import CommandVisitor, command_child_attrs
 
-if TYPE_CHECKING:
-    from transformation_options import AbstractTransformationState
-
 from ast_util import PreprocessedAST
 
 
 @dataclass
 class PreprocessContext:
     """Context threaded through preprocessing traversal."""
 
-    trans_options: Any  # AbstractTransformationState
+    trans_options: Any  # TransformationState
     last_object: bool = False