diff options
| author | John J. Camilleri <john@digitalgrammars.com> | 2018-11-28 14:47:20 +0100 |
|---|---|---|
| committer | John J. Camilleri <john@digitalgrammars.com> | 2018-11-28 14:47:20 +0100 |
| commit | 6352799ccb7d7b9c7d006fd1149b1a977f78e9b3 (patch) | |
| tree | b4db91f52d0c0777be3ff92ca1beb3b8c0bab91c /src/runtime | |
| parent | b1611eccd82fa28d3a701a87291dc8d83537071e (diff) | |
| parent | a45c735545052501e53ecccfa33d0c3e42cc25fd (diff) | |
Merge branch 'master' into new-website
# Conflicts:
# index.html
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/haskell-bind/PGF2/Internal.hsc | 3 | ||||
| -rw-r--r-- | src/runtime/haskell/pgf.cabal | 26 |
2 files changed, 12 insertions, 17 deletions
diff --git a/src/runtime/haskell-bind/PGF2/Internal.hsc b/src/runtime/haskell-bind/PGF2/Internal.hsc index c4aef323a..6582a9ada 100644 --- a/src/runtime/haskell-bind/PGF2/Internal.hsc +++ b/src/runtime/haskell-bind/PGF2/Internal.hsc @@ -12,6 +12,9 @@ module PGF2.Internal(-- * Access the internal structures build, eAbs, eApp, eMeta, eFun, eVar, eTyped, eImplArg, dTyp, hypo, AbstrInfo, newAbstr, ConcrInfo, newConcr, newPGF, + -- * Expose PGF and Concr for FFI with C + PGF(..), Concr(..), + -- * Write an in-memory PGF to a file writePGF ) where diff --git a/src/runtime/haskell/pgf.cabal b/src/runtime/haskell/pgf.cabal index 8a84dc278..76e12bd2c 100644 --- a/src/runtime/haskell/pgf.cabal +++ b/src/runtime/haskell/pgf.cabal @@ -1,5 +1,5 @@ name: pgf -version: 3.9.1-git +version: 3.10 cabal-version: >= 1.20 build-type: Simple @@ -12,11 +12,6 @@ bug-reports: https://github.com/GrammaticalFramework/gf-core/issues maintainer: Thomas Hallgren tested-with: GHC==7.6.3, GHC==7.8.3, GHC==7.10.3, GHC==8.0.2 -flag custom-binary - Description: Use a customised version of the binary package - Default: True - Manual: True - Library default-language: Haskell2010 build-depends: base >= 4.6 && <5, @@ -29,17 +24,14 @@ Library mtl, exceptions - if flag(custom-binary) - other-modules: - -- not really part of GF but I have changed the original binary library - -- and we have to keep the copy for now. - Data.Binary - Data.Binary.Put - Data.Binary.Get - Data.Binary.Builder - Data.Binary.IEEE754 - else - build-depends: binary, data-binary-ieee754 + other-modules: + -- not really part of GF but I have changed the original binary library + -- and we have to keep the copy for now. + Data.Binary + Data.Binary.Put + Data.Binary.Get + Data.Binary.Builder + Data.Binary.IEEE754 --ghc-options: -fwarn-unused-imports --if impl(ghc>=7.8) |