ffmt 0.4.0__tar.gz → 0.4.2__tar.gz

{ffmt-0.4.0 → ffmt-0.4.2}/.github/workflows/ci.yml

@@ -128,6 +128,15 @@ jobs:
       matrix:
         target: [cpu, gpu-omp]
     steps:
+      - name: Free disk space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: false
+
       - uses: actions/checkout@v4
 
       - name: Install dependencies
@@ -206,3 +215,4 @@ jobs:
         with:
           name: wheels-${{ matrix.os }}
           path: dist/
+

{ffmt-0.4.0 → ffmt-0.4.2}/.github/workflows/release.yml

@@ -9,11 +9,31 @@ permissions:
 
 jobs:
   build-wheels:
-    name: Build wheels (${{ matrix.os }})
-    runs-on: ${{ matrix.os }}
+    name: Build wheels (${{ matrix.target }})
+    runs-on: ${{ matrix.runner }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        include:
+          # Linux x86_64 — manylinux_2_17 for broad HPC compatibility (glibc >= 2.17)
+          - runner: ubuntu-latest
+            target: x86_64
+            manylinux: manylinux_2_17
+          # Linux aarch64 — cross-compiled
+          - runner: ubuntu-latest
+            target: aarch64
+            manylinux: manylinux_2_17
+          # Linux ppc64le — Frontier/Summit compute nodes
+          - runner: ubuntu-latest
+            target: ppc64le
+            manylinux: manylinux_2_17
+          # macOS universal2 — fat binary covering both Intel and Apple Silicon
+          - runner: macos-latest
+            target: universal2-apple-darwin
+            manylinux: ""
+          # Windows x86_64
+          - runner: windows-latest
+            target: x86_64
+            manylinux: ""
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -23,10 +43,12 @@ jobs:
       - name: Build wheel
         uses: PyO3/maturin-action@v1
         with:
+          target: ${{ matrix.target }}
+          manylinux: ${{ matrix.manylinux || 'auto' }}
           args: --release --out dist
       - uses: actions/upload-artifact@v4
         with:
-          name: wheels-${{ matrix.os }}
+          name: wheels-${{ matrix.target }}-${{ matrix.runner }}
           path: dist/
 
   build-sdist:

{ffmt-0.4.0 → ffmt-0.4.2}/Cargo.lock

@@ -144,9 +144,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "either"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
 
 [[package]]
 name = "equivalent"
@@ -156,7 +156,7 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "ffmt"
-version = "0.4.0"
+version = "0.4.2"
 dependencies = [
  "clap",
  "ignore",
@@ -194,9 +194,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "ignore"
-version = "0.4.25"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3d782a365a015e0f5c04902246139249abf769125006fbe7649e2ee88169b4a"
+checksum = "b915661dd01db3f05050265b2477bcc6527b3792388e2749b41623cc592be67d"
 dependencies = [
  "crossbeam-deque",
  "globset",
@@ -232,15 +232,15 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "log"
-version = "0.4.29"
+version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
 
 [[package]]
 name = "memchr"
-version = "2.8.0"
+version = "2.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
 
 [[package]]
 name = "once_cell_polyfill"
@@ -288,9 +288,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.12.3"
+version = "1.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -311,9 +311,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
 
 [[package]]
 name = "same-file"
@@ -356,9 +356,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.149"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
  "itoa",
  "memchr",

{ffmt-0.4.0 → ffmt-0.4.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ffmt"
-version = "0.4.0"
+version = "0.4.2"
 edition = "2021"
 description = "A fast, configurable Fortran formatter with Fypp, Doxygen, and OpenACC/OpenMP support"
 license = "MIT"
@@ -17,3 +17,4 @@ ignore = "0.4"
 toml = "0.8"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
+

{ffmt-0.4.0 → ffmt-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ffmt
-Version: 0.4.0
+Version: 0.4.2
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
@@ -88,7 +88,7 @@ multdiv = false
 # pre-commit
 repos:
   - repo: https://github.com/sbryngelson/ffmt
-    rev: v0.4.0
+    rev: v0.4.2
     hooks:
       - id: ffmt
 ```

{ffmt-0.4.0 → ffmt-0.4.2}/README.md

@@ -71,7 +71,7 @@ multdiv = false
 # pre-commit
 repos:
   - repo: https://github.com/sbryngelson/ffmt
-    rev: v0.4.0
+    rev: v0.4.2
     hooks:
       - id: ffmt
 ```

{ffmt-0.4.0 → ffmt-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "ffmt"
-version = "0.4.0"
+version = "0.4.2"
 description = "A fast, configurable Fortran formatter with Fypp, Doxygen, and OpenACC/OpenMP support"
 license = { text = "MIT" }
 requires-python = ">=3.8"
@@ -23,3 +23,4 @@ classifiers = [
 [tool.maturin]
 # Binary-only distribution — no Python bindings, just the ffmt CLI
 bindings = "bin"
+

{ffmt-0.4.0 → ffmt-0.4.2}/src/classifier.rs

@@ -100,11 +100,31 @@ fn strip_trailing_comment(s: &str) -> String {
 
 /// Find the matching closing paren for the paren at position `start`.
 /// Returns the index of the closing paren, or None if not found.
+/// Parens inside string literals are ignored (e.g., `if (ch == '(') then`).
 fn find_matching_paren(s: &str, start: usize) -> Option<usize> {
     let bytes = s.as_bytes();
     let mut depth = 0i32;
-    for (i, &byte) in bytes.iter().enumerate().skip(start) {
+    let mut in_string = false;
+    let mut quote = b' ';
+    let mut i = start;
+    while i < bytes.len() {
+        let byte = bytes[i];
+        if in_string {
+            if byte == quote {
+                if i + 1 < bytes.len() && bytes[i + 1] == quote {
+                    i += 2; // escaped quote — stay in string
+                    continue;
+                }
+                in_string = false;
+            }
+            i += 1;
+            continue;
+        }
         match byte {
+            b'\'' | b'"' => {
+                in_string = true;
+                quote = byte;
+            }
             b'(' => depth += 1,
             b')' => {
                 depth -= 1;
@@ -114,6 +134,7 @@ fn find_matching_paren(s: &str, start: usize) -> Option<usize> {
             }
             _ => {}
         }
+        i += 1;
     }
     None
 }
@@ -178,6 +199,12 @@ fn classify_fortran(trimmed: &str) -> LineKind {
         }
     };
 
+    // Strip any trailing comment so checks like `lower == "contains"` and the
+    // "what follows the closing paren" tests are not confused by comment text
+    // (e.g., `contains ! public api`, `where (mask > 0) ! note`).
+    let stripped = strip_trailing_comment(line);
+    let line = stripped.as_str();
+
     let lower = line.to_ascii_lowercase();
 
     // --- Block closers (check first since "end" prefix is distinctive) ---

{ffmt-0.4.0 → ffmt-0.4.2}/src/cli.rs

@@ -6,7 +6,6 @@ use std::fs;
 use std::io::{self, Read, Write};
 use std::path::{Path, PathBuf};
 use std::process;
-use std::sync::atomic::{AtomicBool, Ordering};
 
 /// Default cache directory (relative to cwd).
 const CACHE_DIR: &str = ".ffmt_cache";
@@ -201,7 +200,6 @@ pub fn run() {
     };
 
     let range = parse_range(&args.range);
-    let any_changed = AtomicBool::new(false);
 
     let opts = ProcessOptions {
         check: args.check,
@@ -212,25 +210,37 @@ pub fn run() {
         verbose,
     };
 
-    files_to_process.par_iter().for_each(|path| {
-        let changed = process_file(path, &opts, &config);
-        if changed {
-            any_changed.store(true, Ordering::Relaxed);
-        }
-    });
-
-    // Update cache for all files (including ones we skipped — they're still valid)
+    let outcomes: Vec<(&PathBuf, Outcome)> = files_to_process
+        .par_iter()
+        .map(|path| (*path, process_file(path, &opts, &config)))
+        .collect();
+    let any_changed = outcomes.iter().any(|(_, o)| *o == Outcome::Changed);
+    let any_failed = outcomes.iter().any(|(_, o)| *o == Outcome::Failed);
+    let failed: std::collections::HashSet<&PathBuf> = outcomes
+        .iter()
+        .filter(|(_, o)| *o == Outcome::Failed)
+        .map(|(p, _)| *p)
+        .collect();
+
+    // Update cache for successfully processed files (including ones we skipped
+    // via the cache — they're still valid). Files that failed must NOT be
+    // cached, or the failure would be silently skipped on the next run.
     if let Some(ref mut cache) = cache {
         // Only update cache when formatting (not in check/diff mode)
         if !args.check && !args.diff {
             for f in &files {
-                cache.update(f);
+                if !failed.contains(f) {
+                    cache.update(f);
+                }
             }
             cache.save(cache_dir);
         }
     }
 
-    if args.check && any_changed.load(Ordering::Relaxed) {
+    if any_failed {
+        process::exit(2);
+    }
+    if args.check && any_changed {
         process::exit(1);
     }
 }
@@ -276,7 +286,10 @@ fn run_stdin(args: &Args, color: bool, quiet: bool, config: &crate::config::Conf
             if args.diff {
                 print_diff(Path::new(filepath), &source, &formatted, color);
             }
-            process::exit(1);
+            // --diff alone is informational; only --check signals failure
+            if args.check {
+                process::exit(1);
+            }
         }
     } else {
         io::stdout()
@@ -332,7 +345,7 @@ fn discover_files_with_config(
 
         for entry in builder.build().flatten() {
             let entry_path = entry.path();
-            if entry_path.is_file() && is_fortran_file(entry_path) {
+            if entry_path.is_file() && is_fortran_file_ext(entry_path, extensions) {
                 files.push(entry_path.to_path_buf());
             }
         }
@@ -343,10 +356,6 @@ fn discover_files_with_config(
     files
 }
 
-fn is_fortran_file(path: &Path) -> bool {
-    is_fortran_file_ext(path, &crate::config::FilesConfig::default().extensions)
-}
-
 fn is_fortran_file_ext(path: &Path, extensions: &[String]) -> bool {
     path.extension()
         .and_then(|e| e.to_str())
@@ -362,16 +371,24 @@ struct ProcessOptions {
     verbose: bool,
 }
 
-fn process_file(path: &Path, opts: &ProcessOptions, config: &crate::config::Config) -> bool {
+/// Result of processing one file.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum Outcome {
+    Unchanged,
+    Changed,
+    Failed,
+}
+
+fn process_file(path: &Path, opts: &ProcessOptions, config: &crate::config::Config) -> Outcome {
     let source = match fs::read_to_string(path) {
         Ok(s) => s,
         Err(e) if e.kind() == io::ErrorKind::InvalidData => {
             // Binary or invalid UTF-8: not a text Fortran file, skip silently
-            return false;
+            return Outcome::Unchanged;
         }
         Err(e) => {
             eprintln!("ffmt: cannot read {}: {e}", path.display());
-            return false;
+            return Outcome::Failed;
         }
     };
 
@@ -382,7 +399,7 @@ fn process_file(path: &Path, opts: &ProcessOptions, config: &crate::config::Conf
     let formatted = crate::formatter::format_with_config(&source, config, opts.range);
 
     if formatted == source {
-        return false;
+        return Outcome::Unchanged;
     }
 
     if opts.check || opts.diff {
@@ -392,14 +409,15 @@ fn process_file(path: &Path, opts: &ProcessOptions, config: &crate::config::Conf
         if opts.diff {
             print_diff(path, &source, &formatted, opts.color);
         }
-        return true;
+        return Outcome::Changed;
     }
 
     if let Err(e) = fs::write(path, &formatted) {
         eprintln!("ffmt: cannot write {}: {e}", path.display());
+        return Outcome::Failed;
     }
 
-    true
+    Outcome::Changed
 }
 
 fn print_diff(path: &Path, original: &str, formatted: &str, color: bool) {