Fix merge conflicts, remove dead code

Author: zwoop

doc/admin-guide/configuration/hrw4u.en.rst

@@ -60,13 +60,86 @@ HRW4U aims to improve the following:
 Standalone Compiler
 -------------------
 
-A standalone Python compiler is available in ``tools/hrw4u`` for development:
+A standalone Python compiler is available in ``tools/hrw4u`` for development,
+testing, and migration workflows. It provides additional features not available
+in the native C++ parser:
 
 - Debug tracing (``--debug``)
 - IDE integration via LSP (``hrw4u-lsp``)
 - Reverse conversion (``u4wrh``) to convert header_rewrite to hrw4u
 
-Build with Python 3.10+ using ``./bootstrap.sh && make package``.
+Building the Standalone Compiler
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Build with Python 3.10+ using the bootstrap script:
+
+.. code-block:: none
+
+   cd tools/hrw4u
+   ./bootstrap.sh
+   make package
+
+This produces a PIP package in the ``dist`` directory. Install with:
+
+.. code-block:: none
+
+   pipx install dist/hrw4u-1.4.0-py3-none-any.whl
+
+Basic Usage
+^^^^^^^^^^^
+
+Compile a single file to stdout:
+
+.. code-block:: none
+
+   hrw4u some_file.hrw4u
+
+Compile from stdin:
+
+.. code-block:: none
+
+   cat some_file.hrw4u | hrw4u
+
+Compile multiple files to stdout (separated by ``# ---``):
+
+.. code-block:: none
+
+   hrw4u file1.hrw4u file2.hrw4u file3.hrw4u
+
+Bulk Compilation
+^^^^^^^^^^^^^^^^
+
+For bulk compilation, use the ``input:output`` format to compile multiple files
+to their respective output files in a single command:
+
+.. code-block:: none
+
+   hrw4u file1.hrw4u:file1.conf file2.hrw4u:file2.conf file3.hrw4u:file3.conf
+
+This is particularly useful for build systems or when processing many configuration
+files at once. All files are processed in a single invocation, improving performance
+for large batches of files.
+
+Reverse Tool (u4wrh)
+^^^^^^^^^^^^^^^^^^^^
+
+The reverse tool converts existing ``header_rewrite`` configurations to ``hrw4u``.
+It supports the same usage patterns:
+
+.. code-block:: none
+
+   # Convert single file to stdout
+   u4wrh existing_config.conf
+
+   # Bulk conversion
+   u4wrh file1.conf:file1.hrw4u file2.conf:file2.hrw4u
+
+IDE Support
+^^^^^^^^^^^
+
+For IDE integration, the package provides an LSP server named ``hrw4u-lsp``.
+This enables syntax highlighting, error diagnostics, and auto-completion in
+editors that support the Language Server Protocol.
 
 Syntax Differences
 ==================
@@ -401,8 +474,19 @@ These can be used with both sets and equality checks, using the ``with`` keyword
 Debugging
 =========
 
-Syntax errors are reported with filename, line, and column position. For development,
-the standalone compiler's ``--debug all`` option traces lexer, parser, and evaluation.
+Syntax errors are reported with filename, line, and column position. The native
+parser in ``header_rewrite`` provides clear error messages when parsing fails.
+
+For development and debugging complex rules, use the standalone Python compiler
+with ``--debug`` to trace:
+
+- Lexer and parser behavior
+- Condition evaluations
+- State and output emission
+
+.. code-block:: none
+
+   hrw4u --debug /path/to/rules.hrw4u
 
 Examples
 ========

tools/hrw4u/pyproject.toml

@@ -20,7 +20,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hrw4u"
-version = "1.4.2"
+version = "1.5.0"
 description = "HRW4U CLI tool for Apache Traffic Server header rewrite rules"
 authors = [
     {name = "Leif Hedstrom", email = "leif@apache.org"}

tools/hrw4u/scripts/u4wrh

@@ -27,27 +27,14 @@ from u4wrh.u4wrhParser import u4wrhParser
 
 def main() -> None:
     """Main entry point for the u4wrh script."""
-    parser, output_group = create_base_parser("Process header_rewrite (HRW) lines and reconstruct hrw4u source.")
-
-    # Argument parsing
-    output_group.add_argument("--hrw4u", action="store_true", help="Produce reconstructed hrw4u output (default)")
-    parser.add_argument("--no-comments", action="store_true", help="Skip comment preservation (ignore comments in output)")
-    parser.add_argument(
-        "--no-merge-sections",
-        action="store_true",
-        help="Disable section merging (create separate sections for each cond directive)")
-    args = parser.parse_args()
-
-    # Default to hrw4u output if neither AST nor hrw4u specified
-    if not (args.ast or args.hrw4u):
-        args.hrw4u = True
-
-    content, filename = process_input(args.input_file)
-    tree, parser_obj, error_collector = create_parse_tree(
-        content, filename, u4wrhLexer, u4wrhParser, "u4wrh", not args.stop_on_error)
-
-    # Generate output
-    generate_output(tree, parser_obj, HRWInverseVisitor, filename, args, error_collector)
+    run_main(
+        description="Process header_rewrite (HRW) lines and reconstruct hrw4u source.",
+        lexer_class=u4wrhLexer,
+        parser_class=u4wrhParser,
+        visitor_class=HRWInverseVisitor,
+        error_prefix="u4wrh",
+        output_flag_name="hrw4u",
+        output_flag_help="Produce reconstructed hrw4u output (default)")
 
 
 if __name__ == "__main__":

tools/hrw4u/src/common.py

@@ -109,26 +109,6 @@ def fatal(message: str) -> NoReturn:
     sys.exit(1)
 
 
-def create_base_parser(description: str) -> tuple[argparse.ArgumentParser, argparse._MutuallyExclusiveGroup]:
-    """Create base argument parser with common options."""
-    parser = argparse.ArgumentParser(description=description, formatter_class=argparse.RawDescriptionHelpFormatter)
-    parser.add_argument(
-        "input_file",
-        help="The input file to parse (default: stdin)",
-        nargs="?",
-        type=argparse.FileType("r", encoding="utf-8"),
-        default=sys.stdin)
-
-    output_group = parser.add_mutually_exclusive_group()
-    output_group.add_argument("--ast", action="store_true", help="Produce the ANTLR parse tree only")
-
-    parser.add_argument("--debug", action="store_true", help="Enable debug output")
-    parser.add_argument(
-        "--stop-on-error", action="store_true", help="Stop processing on first error (default: collect and report multiple errors)")
-
-    return parser, output_group
-
-
 def process_input(input_file: TextIO) -> tuple[str, str]:
     """Read input content and determine filename."""
     content = input_file.read()