From 17ba35af029cee0122f91fc91427a307a5f11dfa Mon Sep 17 00:00:00 2001 From: Dominic Steinitz Date: Mon, 19 Mar 2018 17:59:00 +0000 Subject: Fix naming --- packages/sundials/hmatrix-sundials.cabal | 33 ++++++++++++++++++++++++++++++++ packages/sundials/src/Bar.hsc | 8 ++++---- packages/sundials/sundials.cabal | 33 -------------------------------- 3 files changed, 37 insertions(+), 37 deletions(-) create mode 100644 packages/sundials/hmatrix-sundials.cabal delete mode 100644 packages/sundials/sundials.cabal (limited to 'packages') diff --git a/packages/sundials/hmatrix-sundials.cabal b/packages/sundials/hmatrix-sundials.cabal new file mode 100644 index 0000000..43a83d0 --- /dev/null +++ b/packages/sundials/hmatrix-sundials.cabal @@ -0,0 +1,33 @@ +-- Initial sundials.cabal generated by cabal init. For further +-- documentation, see http://haskell.org/cabal/users-guide/ + +name: sundials +version: 0.1.0.0 +-- synopsis: +-- description: +homepage: https://github.com/idontgetoutmuch/hmatrix/tree/sundials +license: BSD3 +license-file: LICENSE +author: Dominic Steinitz +maintainer: dominic@steinitz.org +-- copyright: +category: Math +build-type: Simple +extra-source-files: ChangeLog.md +cabal-version: >=1.10 + +extra-source-files: src/helpers.c, src/helpers.h + +executable sundials + main-is: Main.hs + other-modules: Types + other-extensions: QuasiQuotes, TemplateHaskell, MultiWayIf, OverloadedStrings + build-depends: base >=4.10 && <4.11, + inline-c >=0.6 && <0.7, + vector >=0.12 && <0.13, + template-haskell >=2.12 && <2.13, + containers >=0.5 && <0.6 + hs-source-dirs: src + default-language: Haskell2010 + extra-libraries: sundials_arkode + C-sources: src/helpers.c src/helpers.h diff --git a/packages/sundials/src/Bar.hsc b/packages/sundials/src/Bar.hsc index b1159b6..434c4d4 100644 --- a/packages/sundials/src/Bar.hsc +++ b/packages/sundials/src/Bar.hsc @@ -14,11 +14,11 @@ import Foreign.C.String getContentPtr :: Storable a => Ptr b -> IO a -getContPtr ptr = (#peek BarType, content) ptr +getContentPtr ptr = (#peek BarType, content) ptr +getData :: Storable a => Ptr b -> IO a getData ptr = (#peek BazType, data) ptr -foo ptr = do - qtr <- getContPtr ptr - getData qtr + + diff --git a/packages/sundials/sundials.cabal b/packages/sundials/sundials.cabal deleted file mode 100644 index 43a83d0..0000000 --- a/packages/sundials/sundials.cabal +++ /dev/null @@ -1,33 +0,0 @@ --- Initial sundials.cabal generated by cabal init. For further --- documentation, see http://haskell.org/cabal/users-guide/ - -name: sundials -version: 0.1.0.0 --- synopsis: --- description: -homepage: https://github.com/idontgetoutmuch/hmatrix/tree/sundials -license: BSD3 -license-file: LICENSE -author: Dominic Steinitz -maintainer: dominic@steinitz.org --- copyright: -category: Math -build-type: Simple -extra-source-files: ChangeLog.md -cabal-version: >=1.10 - -extra-source-files: src/helpers.c, src/helpers.h - -executable sundials - main-is: Main.hs - other-modules: Types - other-extensions: QuasiQuotes, TemplateHaskell, MultiWayIf, OverloadedStrings - build-depends: base >=4.10 && <4.11, - inline-c >=0.6 && <0.7, - vector >=0.12 && <0.13, - template-haskell >=2.12 && <2.13, - containers >=0.5 && <0.6 - hs-source-dirs: src - default-language: Haskell2010 - extra-libraries: sundials_arkode - C-sources: src/helpers.c src/helpers.h -- cgit v1.2.3