ffmt 0.4.3__tar.gz → 0.4.4__tar.gz

{ffmt-0.4.3 → ffmt-0.4.4}/Cargo.lock

@@ -63,12 +63,12 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.12.1"
+version = "1.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
+checksum = "5cee35f73844aa3014bb606320a6c1f010249dbdf43342fe54b5a4f6a8ed4b79"
 dependencies = [
  "memchr",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -119,9 +119,9 @@ checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
@@ -129,18 +129,18 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.18"
+version = "0.9.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17"
 
 [[package]]
 name = "either"
@@ -156,7 +156,7 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "ffmt"
-version = "0.4.3"
+version = "0.4.4"
 dependencies = [
  "clap",
  "ignore",
@@ -194,9 +194,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "ignore"
-version = "0.4.26"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b915661dd01db3f05050265b2477bcc6527b3792388e2749b41623cc592be67d"
+checksum = "2adf14691c72bcfc1058740436a35bdd3ae9c07d1a941ef00b749e9ea16aefa7"
 dependencies = [
  "crossbeam-deque",
  "globset",
@@ -232,15 +232,15 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "log"
-version = "0.4.32"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
 
 [[package]]
 name = "memchr"
-version = "2.8.2"
+version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
 [[package]]
 name = "once_cell_polyfill"
@@ -259,9 +259,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.45"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
 dependencies = [
  "proc-macro2",
 ]
@@ -288,9 +288,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.12.4"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
+checksum = "2a0e75113e14dc5acb068cd0786884f214f1312650a3d36d269f5c4f3cdee8a2"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -300,9 +300,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
+checksum = "1f388202e4b80542a0921078cc23b6333bcf1409c1e3f86404cae4766a6131db"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -384,9 +384,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "2.0.117"
+version = "2.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -491,6 +491,6 @@ dependencies = [
 
 [[package]]
 name = "zmij"
-version = "1.0.21"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"

{ffmt-0.4.3 → ffmt-0.4.4}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ffmt"
-version = "0.4.3"
+version = "0.4.4"
 edition = "2021"
 description = "A fast, configurable Fortran formatter with Fypp, Doxygen, and OpenACC/OpenMP support"
 license = "MIT"

{ffmt-0.4.3 → ffmt-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ffmt
-Version: 0.4.3
+Version: 0.4.4
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research

{ffmt-0.4.3 → ffmt-0.4.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "ffmt"
-version = "0.4.3"
+version = "0.4.4"
 description = "A fast, configurable Fortran formatter with Fypp, Doxygen, and OpenACC/OpenMP support"
 license = { text = "MIT" }
 requires-python = ">=3.8"

{ffmt-0.4.3 → ffmt-0.4.4}/src/classifier.rs

@@ -480,6 +480,66 @@ fn classify_fortran(trimmed: &str) -> LineKind {
     LineKind::FortranStatement
 }
 
+/// Split a Fortran line into its top-level statements at semicolons, ignoring
+/// semicolons inside string literals and stopping at an inline comment.
+/// Returns the trimmed pieces (empty pieces are kept so callers can skip them).
+fn split_top_level_statements(line: &str) -> Vec<&str> {
+    let bytes = line.as_bytes();
+    let mut pieces = Vec::new();
+    let mut start = 0;
+    let mut in_string = false;
+    let mut quote = b' ';
+    let mut i = 0;
+    while i < bytes.len() {
+        let b = bytes[i];
+        if in_string {
+            if b == quote {
+                // Doubled quote is an escape — stay inside the string.
+                if i + 1 < bytes.len() && bytes[i + 1] == quote {
+                    i += 2;
+                    continue;
+                }
+                in_string = false;
+            }
+            i += 1;
+            continue;
+        }
+        match b {
+            b'\'' | b'"' => {
+                in_string = true;
+                quote = b;
+            }
+            b'!' => break, // inline comment — nothing after it is a statement
+            b';' => {
+                pieces.push(line[start..i].trim());
+                start = i + 1;
+            }
+            _ => {}
+        }
+        i += 1;
+    }
+    pieces.push(line[start..].trim());
+    pieces
+}
+
+/// Net indentation effect of a line's top-level statements: +1 per block
+/// opener, -1 per block closer, 0 for everything else (continuations,
+/// statements). A self-contained single-line construct nets to 0.
+fn net_block_delta(pieces: &[&str]) -> i32 {
+    let mut delta = 0;
+    for &piece in pieces {
+        if piece.is_empty() {
+            continue;
+        }
+        match classify_fortran(piece) {
+            LineKind::FortranBlockOpen => delta += 1,
+            LineKind::FortranBlockClose => delta -= 1,
+            _ => {}
+        }
+    }
+    delta
+}
+
 /// Classify a logical line.
 pub fn classify(line: &str) -> LineKind {
     let trimmed = line.trim();
@@ -518,7 +578,23 @@ pub fn classify(line: &str) -> LineKind {
     }
 
     // 6. Fortran
-    classify_fortran(trimmed)
+    let kind = classify_fortran(trimmed);
+
+    // A construct that opens AND closes on the same line (e.g.
+    // `do d = 1, n; s = s + d; end do`) has a net-zero indent effect. The
+    // leading keyword makes `classify_fortran` report a block opener, which
+    // would leak an indent level onto every following line. When the opener's
+    // matching closer is on the same line (net delta 0), treat the whole line
+    // as a plain statement instead — a block opener and a statement both sit at
+    // the current depth, so the line's own indentation is unchanged.
+    if kind == LineKind::FortranBlockOpen {
+        let pieces = split_top_level_statements(trimmed);
+        if pieces.len() > 1 && net_block_delta(&pieces) == 0 {
+            return LineKind::FortranStatement;
+        }
+    }
+
+    kind
 }
 
 /// Extract the scope name from a Fortran block-opening line.

{ffmt-0.4.3 → ffmt-0.4.4}/tests/bugfixes.rs

@@ -726,3 +726,63 @@ fn test_keyword_case_upper_works() {
         "identifier was uppercased:\n{out}"
     );
 }
+
+// --- Single-line `do ...; end do` leaked an indent level (issue #5) ---
+
+#[test]
+fn test_single_line_do_does_not_leak_indent() {
+    // The `do ...; ...; end do` opens and closes on one line (net-zero indent).
+    // The following statement must stay at the SAME indent as the `do` line,
+    // not be over-indented by one level.
+    let src = "module m\n\
+contains\n\
+    subroutine demo(n)\n\
+        integer, intent(in) :: n\n\
+        integer :: d, s\n\
+        s = 0\n\
+        do d = 1, n; s = s + d; end do\n\
+        s = s + 1\n\
+    end subroutine demo\n\
+end module m\n";
+    let out = ffmt::format_string(src);
+    assert!(
+        out.contains("        do d = 1, n; s = s + d; end do\n        s = s + 1\n"),
+        "single-line do leaked an indent level:\n{out}"
+    );
+}
+
+#[test]
+fn test_single_line_do_output_is_idempotent() {
+    // Running ffmt twice must be a no-op (the correct output is the fixed point).
+    let src = "module m\n\
+contains\n\
+    subroutine demo(n)\n\
+        integer, intent(in) :: n\n\
+        integer :: d, s\n\
+        s = 0\n\
+        do d = 1, n; s = s + d; end do\n\
+        s = s + 1\n\
+    end subroutine demo\n\
+end module m\n";
+    let once = ffmt::format_string(src);
+    let twice = ffmt::format_string(&once);
+    assert_eq!(once, twice, "formatting is not idempotent");
+}
+
+#[test]
+fn test_nested_single_line_do_does_not_compound_indent() {
+    // Two single-line constructs in sequence must each net to zero; the final
+    // statement stays at the subroutine-body indent (8 spaces).
+    let src = "program p\n\
+    integer :: i, j, s\n\
+    s = 0\n\
+    do i = 1, 3; s = s + i; end do\n\
+    if (s > 0) then; s = s + 1; end if\n\
+    s = s + 1\n\
+end program p\n";
+    let out = ffmt::format_string(src);
+    assert!(
+        out.contains("    s = s + 1\nend program p\n"),
+        "single-line constructs compounded the indent:\n{out}"
+    );
+}

{ffmt-0.4.3 → ffmt-0.4.4}/tests/classifier.rs

@@ -387,3 +387,58 @@ fn test_interface_operator() {
         LineKind::FortranBlockOpen
     );
 }
+
+// --- Self-contained single-line constructs (issue #5) ---
+// A construct that opens and closes on the same line has a net-zero indent
+// effect, so it must classify as a statement (not a block opener), otherwise
+// the trailing lines leak an indent level.
+#[test]
+fn test_single_line_do_is_statement() {
+    assert_eq!(
+        classify("do d = 1, n; s = s + d; end do"),
+        LineKind::FortranStatement
+    );
+}
+#[test]
+fn test_single_line_if_then_is_statement() {
+    assert_eq!(
+        classify("if (x > 0) then; y = 1; end if"),
+        LineKind::FortranStatement
+    );
+}
+#[test]
+fn test_single_line_block_is_statement() {
+    assert_eq!(
+        classify("block; call foo; end block"),
+        LineKind::FortranStatement
+    );
+}
+#[test]
+fn test_single_line_associate_is_statement() {
+    assert_eq!(
+        classify("associate (a => b); x = a; end associate"),
+        LineKind::FortranStatement
+    );
+}
+#[test]
+fn test_single_line_if_then_else_is_statement() {
+    // A continuation (else) between the opener and closer must not disturb the
+    // net-zero balance.
+    assert_eq!(
+        classify("if (x) then; a = 1; else; a = 2; end if"),
+        LineKind::FortranStatement
+    );
+}
+#[test]
+fn test_do_with_body_no_end_stays_open() {
+    // Opener with a same-line body but NO closer still opens a scope.
+    assert_eq!(classify("do i = 1, n; a = 1"), LineKind::FortranBlockOpen);
+}
+#[test]
+fn test_do_reopening_after_close_stays_open() {
+    // Opens, closes, opens again: net +1 → still a block opener.
+    assert_eq!(
+        classify("do i = 1, n; end do; do j = 1, m"),
+        LineKind::FortranBlockOpen
+    );
+}