fix(precheck): use ruff/ffmt --check mode; fix formatting of fortran_gen.py

Author: sbryngelson

toolchain/bootstrap/precheck.sh

@@ -15,17 +15,6 @@ show_help() {
   exit 0
 }
 
-# Cross-platform hash function (macOS uses md5, Linux uses md5sum)
-compute_hash() {
-    if command -v md5sum > /dev/null 2>&1; then
-        md5sum | cut -d' ' -f1
-    elif command -v md5 > /dev/null 2>&1; then
-        md5 -q
-    else
-        # Fallback: use cksum if neither available
-        cksum | cut -d' ' -f1
-    fi
-}
 
 JOBS=1
 
@@ -68,17 +57,14 @@ echo ""
 TMPDIR_PC=$(mktemp -d)
 trap "rm -rf $TMPDIR_PC" EXIT
 
-# --- Phase 1: Format (modifies files, must run alone) ---
-BEFORE_HASH=$(git diff -- '*.f90' '*.fpp' '*.py' 2>/dev/null | compute_hash)
-if ! ./mfc.sh format -j "$JOBS" > /dev/null 2>&1; then
-    FORMAT_OK=1
-else
-    AFTER_HASH=$(git diff -- '*.f90' '*.fpp' '*.py' 2>/dev/null | compute_hash)
-    if [ "$BEFORE_HASH" != "$AFTER_HASH" ]; then
-        FORMAT_OK=2
-    else
-        FORMAT_OK=0
-    fi
+# --- Phase 1: Format check (non-mutating; mirrors CI's format+diff check) ---
+# Use --check mode so staged-but-unformatted code is caught even if the
+# working tree was already reformatted by a prior ./mfc.sh format run.
+FORMAT_OK=0
+if ! ruff format --check toolchain/ examples/ benchmarks/ > /dev/null 2>&1; then
+    FORMAT_OK=2
+elif ! ffmt --check -j "$JOBS" src/ > /dev/null 2>&1; then
+    FORMAT_OK=2
 fi
 
 # --- Phase 2: All fast checks in parallel (read-only) ---
@@ -147,14 +133,8 @@ PID_EXAMPLES=$!
 FAILED=0
 
 log "[$CYAN 1/$NCHECK$COLOR_RESET] Checking$MAGENTA formatting$COLOR_RESET..."
-if [ "$FORMAT_OK" = "1" ]; then
-    error "Formatting check failed to run."
-    FAILED=1
-elif [ "$FORMAT_OK" = "2" ]; then
-    error "Code was not formatted. Files have been auto-formatted; review and stage the changes."
-    echo ""
-    git diff --stat -- '*.f90' '*.fpp' '*.py' 2>/dev/null || true
-    echo ""
+if [ "$FORMAT_OK" = "2" ]; then
+    error "Code is not formatted. Run$MAGENTA ./mfc.sh format$COLOR_RESET and re-stage the changes."
     FAILED=1
 else
     ok "Formatting check passed."

toolchain/mfc/params/generators/fortran_gen.py

@@ -99,14 +99,7 @@ def generate_namelist_fpp(target: str) -> str:
         opt_lines = _pack_namelist(opt, _CONT_PREFIX, _CONT2_PREFIX, _MAX_LINE)
         nl_with_cont = nl_lines[:]
         nl_with_cont[-1] += ", &"
-        parts = (
-            [_HEADER.rstrip(), "#:if MFC_CASE_OPTIMIZATION"]
-            + nl_lines
-            + ["#:else"]
-            + nl_with_cont
-            + opt_lines
-            + ["#:endif"]
-        )
+        parts = [_HEADER.rstrip(), "#:if MFC_CASE_OPTIMIZATION"] + nl_lines + ["#:else"] + nl_with_cont + opt_lines + ["#:endif"]
     else:
         parts = [_HEADER.rstrip()] + nl_lines
     return "\n".join(parts) + "\n"
@@ -124,10 +117,7 @@ def generate_decls_fpp(target: str) -> str:
         if name in FORTRAN_ARRAY_DIMS:
             member = REGISTRY.all_params.get(f"{name}(1)")
             if member is None:
-                raise ValueError(
-                    f"FORTRAN_ARRAY_DIMS[{name!r}] has no {name}(1) in the registry. "
-                    "Register at least one indexed variant (e.g. _r(f'{name}(1)', ...))."
-                )
+                raise ValueError(f"FORTRAN_ARRAY_DIMS[{name!r}] has no {name}(1) in the registry. " "Register at least one indexed variant (e.g. _r(f'{name}(1)', ...)).")
             ftype = fortran_type_decl(member)
             dim = FORTRAN_ARRAY_DIMS[name]
             lines.append(f"{(ftype + ', dimension(' + dim + ')').ljust(_ARRAY_DECL_COL)}:: {name}")
@@ -136,10 +126,7 @@ def generate_decls_fpp(target: str) -> str:
         if param is None:
             continue
         if any(k.startswith(f"{name}(") for k in REGISTRY.all_params):
-            raise ValueError(
-                f"{name!r} has indexed variants (e.g. {name}(1)) but is missing from "
-                "FORTRAN_ARRAY_DIMS. Add it there with its Fortran dimension expression."
-            )
+            raise ValueError(f"{name!r} has indexed variants (e.g. {name}(1)) but is missing from " "FORTRAN_ARRAY_DIMS. Add it there with its Fortran dimension expression.")
         lines.append(f"{fortran_type_decl(param).ljust(_DECL_COL)}:: {name}")
     return "\n".join(lines) + "\n"