Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some helpers for working with constant expression evaluator #285

Merged
merged 4 commits into from
Sep 4, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
some helpers for working with constant expression evaluator
dorchard committed Sep 3, 2024
commit 31a3e0652a1251f251eed7a4b66e66a8b2fcc288
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion fortran-src.cabal
Original file line number Diff line number Diff line change
@@ -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

14 changes: 14 additions & 0 deletions src/Language/Fortran/Repr/Value/Machine.hs
Original file line number Diff line number Diff line change
@@ -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 @@
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
-- convert Float to Double
fromConstReal (MkFScalarValue (FSVReal (FReal4 a))) = Just $ floatToDouble a

Check warning on line 30 in src/Language/Fortran/Repr/Value/Machine.hs

GitHub Actions / Ubuntu / GHC 9.0, Cabal / test

Pattern match(es) are non-exhaustive

Check warning on line 30 in src/Language/Fortran/Repr/Value/Machine.hs

GitHub Actions / Ubuntu / GHC 9.2, Cabal / test

Pattern match(es) are non-exhaustive

Check warning on line 30 in src/Language/Fortran/Repr/Value/Machine.hs

GitHub Actions / Ubuntu / GHC 9.4, Cabal / test

Pattern match(es) are non-exhaustive
where
floatToDouble :: Float -> Double
floatToDouble = realToFrac
fromConstReal (MkFScalarValue (FSVReal (FReal8 a))) = Just $ a
dorchard marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion src/Language/Fortran/Repr/Value/Scalar/Machine.hs
Original file line number Diff line number Diff line change
@@ -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
Loading