Some helpers for working with constant expression evaluator

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.16.0 (2024)
+  * Added `--show-make-list` option
+  * Some robustness improvements around mod files
+
 ### 0.15.1 (Jun 22, 2023)
   * remove unused vector-sized dependency
 

fortran-src.cabal

@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 

src/Language/Fortran/Repr/Value/Machine.hs

@@ -2,6 +2,8 @@
 
 module Language.Fortran.Repr.Value.Machine where
 
+import Language.Fortran.Repr.Value.Scalar.Real
+import Language.Fortran.Repr.Value.Scalar.Int.Machine
 import Language.Fortran.Repr.Value.Scalar.Machine
 import Language.Fortran.Repr.Type
 
@@ -18,3 +20,15 @@ data FValue = MkFScalarValue FScalarValue
 fValueType :: FValue -> FType
 fValueType = \case
   MkFScalarValue a -> MkFScalarType $ fScalarValueType a
+
+fromConstInt :: FValue -> Maybe Integer
+fromConstInt (MkFScalarValue (FSVInt a)) = Just $ withFInt a
+fromConstInt _          = Nothing
+
+fromConstReal :: FValue -> Maybe Double
+fromConstReal (MkFScalarValue (FSVReal (FReal4 a))) = Just $ floatToDouble a
+  where
+    floatToDouble :: Float -> Double
+    floatToDouble = realToFrac
+fromConstReal (MkFScalarValue (FSVReal (FReal8 a))) = Just $ a
+fromConstReal _ = Nothing

src/Language/Fortran/Repr/Value/Scalar/Machine.hs

@@ -55,4 +55,4 @@ fScalarValueType = \case
   FSVReal    a -> FSTReal    $ fKind a
   FSVComplex a -> FSTComplex $ fKind a
   FSVLogical a -> FSTLogical $ fKind a
-  FSVString  a -> FSTString  $ fromIntegral $ Text.length a
+  FSVString  a -> FSTString  $ fromIntegral $ Text.length a

test/Language/Fortran/Analysis/ModGraphSpec.hs

@@ -1,7 +1,7 @@
 module Language.Fortran.Analysis.ModGraphSpec (spec) where
 
 import Test.Hspec
 import TestUtil
 
 import Language.Fortran.Analysis.ModGraph
 import Language.Fortran.Util.Files (expandDirs)
@@ -17,10 +17,14 @@
 -- A simple test on a simple module structure to check that
 -- we are understanding this correctly (via the dependency graph
 -- and then its topological sort).
 testDependencyList = do
     paths' <- expandDirs ["test-data" </> "module"]
     mg <- genModGraph (Just Fortran90) ["."] Nothing paths'
     let list = modGraphToList mg
-    let files = ["leaf.f90", "mid1.f90", "mid2.f90", "top.f90"]
-    let filesWithPaths = map (("test-data" </> "module") </>) files
-    list `shouldBe` filesWithPaths
+    -- we should have two possible orderings
+    let files1 = ["leaf.f90", "mid1.f90", "mid2.f90", "top.f90"]
+    let filesWithPaths1 = map (("test-data" </> "module") </>) files1
+    -- or in a different order
+    let files2 = ["leaf.f90", "mid2.f90", "mid1.f90", "top.f90"]
+    let filesWithPaths2 = map (("test-data" </> "module") </>) files2
+    shouldSatisfy list (\x -> x == filesWithPaths1 || x == filesWithPaths2)