ffmt 0.3.0__tar.gz → 0.3.4__tar.gz

{ffmt-0.3.0 → ffmt-0.3.4}/.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.4}/Cargo.lock

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

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ffmt
-Version: 0.3.0
+Version: 0.3.4
 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.3
     hooks:
       - id: ffmt
 ```

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

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

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

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "ffmt"
-version = "0.3.0"
+version = "0.3.4"
 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.4}/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.4}/src/whitespace.rs

@@ -730,6 +730,45 @@ fn is_io_format_star(tokens: &[Token]) -> bool {
     false
 }
 
+/// Check if a comma at `idx` is inside a slice expression.
+/// A comma is a "slice comma" if either the preceding or following dimension
+/// (at the same paren depth) contains a SliceColon.
+fn is_slice_comma(tokens: &[Token], idx: usize) -> bool {
+    // Look backward from idx for a SliceColon at the same nesting level
+    let mut depth: i32 = 0;
+    for token in tokens[..idx].iter().rev() {
+        match token {
+            Token::Op(OpKind::CloseParen, _) => depth += 1,
+            Token::Op(OpKind::OpenParen, _) => {
+                if depth == 0 {
+                    break;
+                }
+                depth -= 1;
+            }
+            Token::Op(OpKind::SliceColon, _) if depth == 0 => return true,
+            Token::Op(OpKind::Comma, _) if depth == 0 => break,
+            _ => {}
+        }
+    }
+    // Look forward from idx for a SliceColon at the same nesting level
+    depth = 0;
+    for token in tokens.iter().skip(idx + 1) {
+        match token {
+            Token::Op(OpKind::OpenParen, _) => depth += 1,
+            Token::Op(OpKind::CloseParen, _) => {
+                if depth == 0 {
+                    break;
+                }
+                depth -= 1;
+            }
+            Token::Op(OpKind::SliceColon, _) if depth == 0 => return true,
+            Token::Op(OpKind::Comma, _) if depth == 0 => break,
+            _ => {}
+        }
+    }
+    false
+}
+
 fn is_unary_context(tokens: &[Token]) -> bool {
     // Walk backwards, skipping Space tokens
     for token in tokens.iter().rev() {
@@ -829,12 +868,18 @@ fn render(tokens: &[Token], ws: &WhitespaceConfig) -> String {
                             out.push_str(op_str);
                         }
                     }
-                    // Comma: no space before, configurable space after
+                    // Comma: no space before, configurable space after.
+                    // When slice_colon is compact, commas inside slice expressions
+                    // (adjacent to a SliceColon) also omit the trailing space.
                     OpKind::Comma => {
                         trim_trailing_space(&mut out);
                         out.push_str(op_str);
                         if spaced {
-                            out.push(' ');
+                            let in_slice =
+                                !ws.slice_colon.is_enabled() && is_slice_comma(tokens, idx);
+                            if !in_slice {
+                                out.push(' ');
+                            }
                         }
                     }
                     // Keyword arg = : always no spaces

{ffmt-0.3.0 → ffmt-0.3.4}/tests/fixtures/blank_lines.expected.fpp

@@ -1,7 +1,6 @@
 subroutine s_test()
 
     integer :: i
-
     integer :: j
     !$acc parallel loop
 

ffmt-0.3.4/tests/fixtures/blank_lines.input.fpp

@@ -0,0 +1,11 @@
+subroutine s_test()
+
+    integer :: i
+    integer :: j
+    !$acc parallel loop
+
+    do i = 1, n
+        x(i) = 0
+    end do
+
+end subroutine s_test

ffmt-0.3.4/tests/fixtures/call_block.input.fpp

@@ -0,0 +1,10 @@
+subroutine s_test()
+
+    #:call GPU_HOST_DATA(use_device_addr='[buff]')
+        call MPI_Send(buff, n, mpi_p, dst, tag, comm, ierr)
+        do i = 1, n
+            x(i) = y(i)
+        end do
+    #:endcall GPU_HOST_DATA
+
+end subroutine s_test

ffmt-0.3.4/tests/fixtures/directives.input.fpp

@@ -0,0 +1,17 @@
+subroutine s_test()
+
+    integer :: i, j, k
+
+#if defined(MFC_OpenACC)
+    !$acc parallel loop collapse(3)
+    do k = 0, p
+        do j = 0, n
+            do i = 0, m
+                x(i, j, k) = y(i, j, k)*z(i, j, k)
+            end do
+        end do
+    end do
+    !$acc end parallel loop
+#endif
+
+end subroutine s_test

{ffmt-0.3.0 → ffmt-0.3.4}/tests/fixtures/doxygen_spacing.input.fpp

@@ -5,25 +5,38 @@ module m_test
 contains
 
     subroutine s_first()
+
         integer :: x
+
         x = 1
+
     end subroutine s_first
-    !> @brief Second procedure
-    !! Does something else
+
+    !> @brief Second procedure Does something else
     subroutine s_second()
+
         integer :: y
+
         y = 2
+
     end subroutine s_second
-    !> Third procedure with a long description that documents
-    !! what this function does
+
+    !> Third procedure with a long description that documents what this function does
     function f_third() result(z)
+
         integer :: z
+
         z = 3
+
     end function f_third
+
     !> Fourth procedure
     subroutine s_fourth()
+
         integer :: w
+
         w = 4
+
     end subroutine s_fourth
 
 end module m_test

ffmt-0.3.4/tests/fixtures/fypp.input.fpp

@@ -0,0 +1,31 @@
+#:include 'macros.fpp'
+module m_fypp_test
+
+    implicit none
+
+contains
+    subroutine s_test()
+
+        #:if defined('MFC_OpenACC')
+            $:GPU_PARALLEL_LOOP(collapse=3)
+            do k = 0, p
+                do j = 0, n
+                    do i = 0, m
+                        x(i, j, k) = 0.0_wp
+                    end do
+                end do
+            end do
+            $:END_GPU_PARALLEL_LOOP()
+        #:else
+            do k = 0, p
+                do j = 0, n
+                    do i = 0, m
+                        x(i, j, k) = 0.0_wp
+                    end do
+                end do
+            end do
+        #:endif
+
+    end subroutine s_test
+
+end module m_fypp_test

{ffmt-0.3.0 → ffmt-0.3.4}/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

ffmt-0.3.4/tests/fixtures/simple.input.fpp

@@ -0,0 +1,27 @@
+module m_test
+
+    use m_types
+
+    implicit none
+
+    private; public :: s_foo
+    integer :: x
+    real    :: y
+
+contains
+    subroutine s_foo(a, b)
+
+        integer, intent(in) :: a, b
+
+        if (a == b)then
+            x = a + b
+        else
+            x = a - b
+        end if
+        do i = 1, n
+            y = y + x
+        end do
+
+    end subroutine s_foo
+
+end module m_test

ffmt-0.3.0/tests/fixtures/blank_lines.input.fpp

@@ -1,12 +0,0 @@
-SUBROUTINE s_test()
-INTEGER :: i
-
-
-
-INTEGER :: j
-!$acc parallel loop
-
-DO i=1,n
-x(i)=0
-END DO
-END SUBROUTINE s_test

ffmt-0.3.0/tests/fixtures/call_block.input.fpp

@@ -1,8 +0,0 @@
-SUBROUTINE s_test()
-#:call GPU_HOST_DATA(use_device_addr='[buff]')
-CALL MPI_Send(buff,n,mpi_p,dst,tag,comm,ierr)
-DO i=1,n
-x(i)=y(i)
-END DO
-#:endcall GPU_HOST_DATA
-END SUBROUTINE s_test

ffmt-0.3.0/tests/fixtures/directives.input.fpp

@@ -1,14 +0,0 @@
-SUBROUTINE s_test()
-INTEGER :: i,j,k
-#if defined(MFC_OpenACC)
-!$acc parallel loop collapse(3)
-DO k=0,p
-DO j=0,n
-DO i=0,m
-x(i,j,k)=y(i,j,k)*z(i,j,k)
-END DO
-END DO
-END DO
-!$acc end parallel loop
-#endif
-END SUBROUTINE s_test

ffmt-0.3.0/tests/fixtures/fypp.input.fpp

@@ -1,26 +0,0 @@
-#:include 'macros.fpp'
-MODULE m_fypp_test
-IMPLICIT NONE
-CONTAINS
-SUBROUTINE s_test()
-#:if defined('MFC_OpenACC')
-$:GPU_PARALLEL_LOOP(collapse=3)
-DO k=0,p
-DO j=0,n
-DO i=0,m
-x(i,j,k)=0.0_wp
-END DO
-END DO
-END DO
-$:END_GPU_PARALLEL_LOOP()
-#:else
-DO k=0,p
-DO j=0,n
-DO i=0,m
-x(i,j,k)=0.0_wp
-END DO
-END DO
-END DO
-#:endif
-END SUBROUTINE s_test
-END MODULE m_fypp_test

ffmt-0.3.0/tests/fixtures/simple.input.fpp

@@ -1,19 +0,0 @@
-MODULE m_test
-USE m_types
-IMPLICIT NONE
-private;public :: s_foo
-INTEGER::x
-REAL   ::   y
-CONTAINS
-SUBROUTINE s_foo(a,b)
-INTEGER,INTENT(IN)::a,b
-IF(a==b)THEN
-x=a+b
-ELSE
-x=a-b
-END IF
-DO i=1,n
-y=y+x
-END DO
-END SUBROUTINE s_foo
-END MODULE m_test