ffmt 0.3.0__tar.gz → 0.3.1__tar.gz

{ffmt-0.3.0 → ffmt-0.3.1}/.github/workflows/ci.yml

@@ -126,7 +126,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [cpu, gpu-acc, gpu-omp]
+        target: [cpu, gpu-omp]
     steps:
       - uses: actions/checkout@v4
 

{ffmt-0.3.0 → ffmt-0.3.1}/Cargo.lock

@@ -156,7 +156,7 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "ffmt"
-version = "0.3.0"
+version = "0.3.1"
 dependencies = [
  "clap",
  "ignore",

{ffmt-0.3.0 → ffmt-0.3.1}/Cargo.toml

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

{ffmt-0.3.0 → ffmt-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ffmt
-Version: 0.3.0
+Version: 0.3.1
 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.2.8
+    rev: v0.3.0
     hooks:
       - id: ffmt
 ```

{ffmt-0.3.0 → ffmt-0.3.1}/README.md

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

{ffmt-0.3.0 → ffmt-0.3.1}/pyproject.toml

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

{ffmt-0.3.0 → ffmt-0.3.1}/src/formatter.rs

@@ -517,6 +517,9 @@ pub fn format_with_config(source: &str, config: &Config, range: Option<(usize, u
         output_lines = apply(output_lines, &|lines| reformat_use_statements(lines, iw));
     }
 
+    // Ensure blank line before and after `implicit none`
+    output_lines = apply(output_lines, &ensure_implicit_none_spacing);
+
     // Remove blank lines immediately before block closers/continuations
     output_lines = apply(output_lines, &remove_blanks_before_closers);
 
@@ -1182,6 +1185,36 @@ fn compact_use_statements(lines: &[String]) -> Vec<String> {
     result
 }
 
+/// Ensure one blank line before and after `implicit none`.
+/// The blank line before separates it from `use` statements.
+/// The blank line after separates it from declarations.
+fn ensure_implicit_none_spacing(lines: &[String]) -> Vec<String> {
+    let mut result = Vec::with_capacity(lines.len() + 4);
+    for (i, line) in lines.iter().enumerate() {
+        let trimmed = line.trim().to_ascii_lowercase();
+        if trimmed == "implicit none" {
+            // Ensure blank line before (unless at start or already blank)
+            if i > 0 {
+                let prev = result
+                    .last()
+                    .map(|s: &String| s.trim().is_empty())
+                    .unwrap_or(true);
+                if !prev {
+                    result.push(String::new());
+                }
+            }
+            result.push(line.clone());
+            // Ensure blank line after (unless next is blank or end)
+            if i + 1 < lines.len() && !lines[i + 1].trim().is_empty() {
+                result.push(String::new());
+            }
+        } else {
+            result.push(line.clone());
+        }
+    }
+    result
+}
+
 /// Remove blank lines immediately before block closers/continuations
 /// and immediately after block openers.
 fn remove_blanks_before_closers(lines: &[String]) -> Vec<String> {

{ffmt-0.3.0 → ffmt-0.3.1}/tests/fixtures/simple.expected.fpp

@@ -1,7 +1,9 @@
 module m_test
 
     use m_types
+
     implicit none
+
     private; public :: s_foo
     integer :: x
     real    :: y