Merge branch 'main' into legacyFreeForm

Author: dorchard

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
 
     # relative paths are relative to the project directory
     - name: Cache Stack build artifacts (user + project)
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ~/.stack
@@ -81,15 +81,15 @@ jobs:
 
     - name: Setup Haskell build environment
       id: setup-haskell-build-env
-      uses: haskell/actions/setup@v2
+      uses: haskell-actions/setup@v2
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: ${{ matrix.cabal }}
+        cabal-version: 'latest'
 
-    - run: cabal freeze
+    - run: cabal freeze --enable-tests
 
     - name: Cache Cabal build artifacts
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ${{ steps.setup-haskell-build-env.outputs.cabal-store }}
@@ -99,7 +99,7 @@ jobs:
           ${{ runner.os }}-cabal-${{ matrix.ghc }}
 
     - name: Test
-      run: cabal test --test-show-details=streaming
+      run: cabal test --enable-tests --test-show-details=streaming
       env:
         HSPEC_OPTIONS: --color
 
@@ -118,15 +118,15 @@ jobs:
 
     - name: Setup Haskell build environment
       id: setup-haskell-build-env
-      uses: haskell/actions/setup@v2
+      uses: haskell-actions/setup@v2
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: ${{ matrix.cabal }}
+        cabal-version: 'latest'
 
-    - run: cabal freeze
+    - run: cabal freeze --enable-tests
 
     - name: Cache Cabal build artifacts
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ${{ steps.setup-haskell-build-env.outputs.cabal-store }}
@@ -139,7 +139,7 @@ jobs:
       run: cabal install
 
     - name: Test
-      run: cabal test --test-show-details=streaming
+      run: cabal test --enable-tests --test-show-details=streaming
       env:
         HSPEC_OPTIONS: --color
 
@@ -166,15 +166,15 @@ jobs:
 
     - name: Setup Haskell build environment
       id: setup-haskell-build-env
-      uses: haskell/actions/setup@v2
+      uses: haskell-actions/setup@v2
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: ${{ matrix.cabal }}
+        cabal-version: 'latest'
 
-    - run: cabal freeze
+    - run: cabal freeze --enable-tests
 
     - name: Cache Cabal build artifacts
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ${{ steps.setup-haskell-build-env.outputs.cabal-store }}
@@ -187,7 +187,7 @@ jobs:
       run: cabal install
 
     - name: Test
-      run: cabal test --test-show-details=streaming
+      run: cabal test --enable-tests --test-show-details=streaming
       env:
         HSPEC_OPTIONS: --color
 
@@ -197,3 +197,10 @@ jobs:
         path: "C:/cabal/bin/${{ env.EXE_NAME }}.exe"
         name: ${{ env.EXE_NAME }}-windows-ghc-${{ matrix.ghc }}-cabal-${{ github.sha }}.exe
         if-no-files-found: error
+
+    - name: Upload cabal build logs
+      if: failure()
+      uses: actions/upload-artifact@v4
+      with:
+        name: cabal-build-logs
+        path: C:\cabal\logs\

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.16.8
+  * Package build support up to GHC 9.12
+  * Fixed pretty printing of array semantic types
+
 ### 0.16.7
   * Added mention of Fortran 2003 version support in the help message
   * Improved parsing of `allocate` statements

README.md

@@ -3,7 +3,12 @@
 [![DOI](https://joss.theoj.org/papers/10.21105/joss.07571/status.svg)](https://doi.org/10.21105/joss.07571)
 
 
-fortran-src is an open-source Haskell library and command-line application for the lexing, parsing, and static analysis of Fortran source code. It provides an interface to build other tools, e.g., for static analysis, automated refactoring, verification, and compilation. The following
+fortran-src is an open-source Haskell library and command-line application for the lexing, parsing, and static analysis of Fortran source code. It provides an interface to build other tools, e.g., for static analysis, automated refactoring, verification, and compilation.
+
+> To cite this work, or for a high-level overview, please take a look at our paper: [Contrastin et al., (2025). fortran-src: Fortran static analysis infrastructure. Journal of Open Source Software, 10(106), 7571, https://doi.org/10.21105/joss.07571](https://joss.theoj.org/papers/10.21105/joss.07571)
+
+
+The following
 Fortran standards are covered:
 
   * FORTRAN 66 (ANSI X3.9-1966)
@@ -96,7 +101,7 @@ via the package `libgmp-dev`.
 Haskell library dependencies are listed in `package.yaml`. fortran-src supports
 building with Stack or Cabal.
 
-fortran-src supports **GHC 9.0 through GHC 9.4**. We regularly test at least the
+fortran-src supports **GHC 9.0 through GHC 9.12** (as of Aug 2025). We regularly test at least the
 minimum and maximum supported GHCs. Releases prior to/newer than those may have
 issues. We welcome fixes that would let us support a wider range of compilers.
 

app/Main.hs

@@ -51,7 +51,7 @@ programName :: String
 programName = "fortran-src"
 
 showVersion :: String
-showVersion = "0.16.7"
+showVersion = "0.16.8"
 
 main :: IO ()
 main = do

fortran-src.cabal

@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.38.0.
+-- This file has been generated from package.yaml by hpack version 0.38.1.
 --
 -- see: https://github.com/sol/hpack
 
 name:           fortran-src
-version:        0.16.7
+version:        0.16.8
 synopsis:       Parsers and analyses for Fortran standards 66, 77, 90, 95 and 2003 (partial).
 description:    Provides lexing, parsing, and basic analyses of Fortran code covering standards: FORTRAN 66, FORTRAN 77, Fortran 90, Fortran 95, Fortran 2003 (partial) and some legacy extensions. Includes data flow and basic block analysis, a renamer, and type analysis. For example usage, see the @<https://hackage.haskell.org/package/camfort CamFort>@ project, which uses fortran-src as its front end.
 category:       Language
@@ -20,7 +20,7 @@ license:        Apache-2.0
 license-file:   LICENSE
 build-type:     Simple
 tested-with:
-    GHC >= 9.0
+    GHC == 9.0, GHC == 9.2, GHC == 9.4, GHC == 9.6, GHC == 9.8, GHC == 9.10, GHC == 9.12
 extra-source-files:
     README.md
     CHANGELOG.md
@@ -193,7 +193,7 @@ library
   build-depends:
       GenericPretty >=1.2.2 && <2
     , array ==0.5.*
-    , base >=4.6 && <5
+    , base >=4.6 && <4.22
     , binary >=0.8.3.0 && <0.11
     , bytestring >=0.10 && <0.13
     , containers >=0.5 && <0.7
@@ -205,9 +205,9 @@ library
     , mtl >=2.2 && <3
     , pretty >=1.1 && <2
     , process >=1.2.0.0
-    , singletons ==3.0.*
-    , singletons-base >=3.0 && <3.4
-    , singletons-th >=3.0 && <3.4
+    , singletons >=3.0 && <3.6
+    , singletons-base >=3.0 && <3.6
+    , singletons-th >=3.0 && <3.6
     , temporary >=1.2 && <1.4
     , text >=1.2 && <2.2
     , uniplate >=1.6 && <2
@@ -256,7 +256,7 @@ executable fortran-src
   build-depends:
       GenericPretty >=1.2.2 && <2
     , array ==0.5.*
-    , base >=4.6 && <5
+    , base >=4.6 && <4.22
     , binary >=0.8.3.0 && <0.11
     , bytestring >=0.10 && <0.13
     , containers >=0.5 && <0.7
@@ -269,9 +269,9 @@ executable fortran-src
     , mtl >=2.2 && <3
     , pretty >=1.1 && <2
     , process >=1.2.0.0
-    , singletons ==3.0.*
-    , singletons-base >=3.0 && <3.4
-    , singletons-th >=3.0 && <3.4
+    , singletons >=3.0 && <3.6
+    , singletons-base >=3.0 && <3.6
+    , singletons-th >=3.0 && <3.6
     , temporary >=1.2 && <1.4
     , text >=1.2 && <2.2
     , uniplate >=1.6 && <2
@@ -354,7 +354,7 @@ test-suite spec
       GenericPretty >=1.2.2 && <2
     , QuickCheck >=2.10 && <2.15
     , array ==0.5.*
-    , base >=4.6 && <5
+    , base >=4.6 && <4.22
     , binary >=0.8.3.0 && <0.11
     , bytestring >=0.10 && <0.13
     , containers >=0.5 && <0.7
@@ -368,9 +368,9 @@ test-suite spec
     , mtl >=2.2 && <3
     , pretty >=1.1 && <2
     , process >=1.2.0.0
-    , singletons ==3.0.*
-    , singletons-base >=3.0 && <3.4
-    , singletons-th >=3.0 && <3.4
+    , singletons >=3.0 && <3.6
+    , singletons-base >=3.0 && <3.6
+    , singletons-th >=3.0 && <3.6
     , temporary >=1.2 && <1.4
     , text >=1.2 && <2.2
     , uniplate >=1.6 && <2

package.yaml

@@ -1,5 +1,5 @@
 name: fortran-src
-version: '0.16.7'
+version: '0.16.8'
 synopsis: Parsers and analyses for Fortran standards 66, 77, 90, 95 and 2003 (partial).
 description: >-
   Provides lexing, parsing, and basic analyses of Fortran code covering
@@ -8,7 +8,7 @@ description: >-
   analysis, a renamer, and type analysis. For example usage, see the
   @<https://hackage.haskell.org/package/camfort CamFort>@ project, which uses
   fortran-src as its front end.
-tested-with: GHC >= 9.0
+tested-with: GHC == 9.0, GHC == 9.2, GHC == 9.4, GHC == 9.6, GHC == 9.8, GHC == 9.10, GHC == 9.12
 github: camfort/fortran-src
 bug-reports: https://github.com/camfort/fortran-src/issues
 author: [Mistral Contrastin, Matthew Danish, Dominic Orchard, Andrew Rice]
@@ -80,7 +80,7 @@ ghc-options:
 #- -Werror # appears bad to do in distribution, can be useful for development
 
 dependencies:
-- base >=4.6 && <5
+- base >=4.6 && <4.22
 - mtl >=2.2 && <3
 - array >=0.5 && <0.6
 - uniplate >=1.6 && <2
@@ -99,11 +99,11 @@ dependencies:
 - either ^>=5.0.1.1
 - process >= 1.2.0.0
 
-- singletons      >= 3.0 && < 3.1
+- singletons      >= 3.0 && < 3.6
 
-# 3.0 = GHC 9.0, 3.1 = GHC 9.2, 3.1.1 = GHC 9.4, 3.2 = GHC 9.6, 3.3 = GHC 9.8
-- singletons-th   >= 3.0 && < 3.4
-- singletons-base >= 3.0 && < 3.4
+# 3.0 = GHC 9.0, 3.1 = GHC 9.2, 3.1.1 = GHC 9.4, 3.2 = GHC 9.6, 3.3 = GHC 9.8, 3.5 = GHC 9.10
+- singletons-th   >= 3.0 && < 3.6
+- singletons-base >= 3.0 && < 3.6
 
 library:
   source-dirs: src

src/Language/Fortran/Analysis/SemanticTypes.hs

@@ -66,7 +66,7 @@ instance Pretty SemType where
       TLogical k -> "logical"<>pd k
       TByte    k -> "byte"<>pd k
       TCharacter _ _ -> "character(TODO)"
-      TArray st dims -> pprint' v st <> pprint' v dims
+      TArray st dims -> pprint' v st <> pdims v dims
       TCustom str -> pprint' v (TypeCustom str)
     | otherwise = \case
       TInteger k -> "integer"<>ad k
@@ -75,11 +75,13 @@ instance Pretty SemType where
       TLogical k -> "logical"<>ad k
       TByte    k -> "byte"<>ad k
       TCharacter _ _ -> "character*TODO"
-      TArray st dims -> pprint' v st <> pprint' v dims
+      TArray st dims -> pprint' v st <> pdims v dims
       TCustom str -> pprint' v (TypeCustom str)
     where
        pd = Pretty.parens . doc
        ad k = doc '*' <> doc k
+       pdims v dims = maybe Pretty.empty (pprint' v) (dimsTraverse dims)
+
 
 -- | Convert 'Dimensions' data type to its previous type synonym
 --   @(Maybe [(Int, Int)])@.

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-20.01
+resolver: lts-23.27
 packages:
-- '.'
+  - '.'
 save-hackage-creds: false

stack.yaml.lock

@@ -1,12 +1,12 @@
 # This file was autogenerated by Stack.
 # You should not edit this file by hand.
 # For more information, please see the documentation at:
-#   https://docs.haskellstack.org/en/stable/lock_files
+#   https://docs.haskellstack.org/en/stable/topics/lock_files
 
 packages: []
 snapshots:
 - completed:
-    sha256: b73b2b116143aea728c70e65c3239188998bac5bc3be56465813dacd74215dc5
-    size: 648424
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/1.yaml
-  original: lts-20.1
+    sha256: 069c8189232279d04bd107557d3a62132c04ae5ce3c710649e6b40f67f10b9d5
+    size: 684285
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/27.yaml
+  original: lts-23.27

test/Language/Fortran/Analysis/SemanticTypesSpec.hs

@@ -1,3 +1,6 @@
+{-# LANGUAGE OverloadedLists #-}
+{-# LANGUAGE OverloadedStrings #-}
+
 module Language.Fortran.Analysis.SemanticTypesSpec where
 
 import Test.Hspec
@@ -7,6 +10,10 @@ import Language.Fortran.Analysis.SemanticTypes
 import Language.Fortran.AST
 import Language.Fortran.Version
 
+import Language.Fortran.PrettyPrint
+import Text.PrettyPrint hiding ((<>))
+import Text.PrettyPrint.GenericPretty
+
 spec :: Spec
 spec = do
   describe "Semantic types" $ do
@@ -29,3 +36,9 @@ spec = do
       let semtype  = TCharacter CharLenStar 1
           typespec = TypeSpec () u TypeCharacter (Just (Selector () u (Just (ExpValue () u ValStar)) Nothing))
        in recoverSemTypeTypeSpec () u Fortran90 semtype `shouldBe` typespec
+
+    it "prints semantic type with dimensions" $ do
+      let dims = DimsExplicitShape ( [ Dim (Just 1) (Just 3), Dim (Just 1) (Just 4) ] )
+      let semtype  = TArray (TReal 8) dims
+      pprint Fortran90 semtype Nothing `shouldBe` "real(8)(1:3, 1:4)"
+