From 2ac796dbbc8f210132665a580d1ad55145c21fea Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Wed, 8 Jul 2020 21:55:42 +0200 Subject: [PATCH 01/10] Remove PGF from PGF2, clean up PGF2 cabal file. --- src/runtime/haskell-bind/PGF.hs | 3 - src/runtime/haskell-bind/PGF/Internal.hs | 1 - src/runtime/haskell-bind/pgf2.cabal | 72 ++++++++++++++---------- 3 files changed, 41 insertions(+), 35 deletions(-) delete mode 100644 src/runtime/haskell-bind/PGF.hs delete mode 100644 src/runtime/haskell-bind/PGF/Internal.hs diff --git a/src/runtime/haskell-bind/PGF.hs b/src/runtime/haskell-bind/PGF.hs deleted file mode 100644 index 8aeca7ab8..000000000 --- a/src/runtime/haskell-bind/PGF.hs +++ /dev/null @@ -1,3 +0,0 @@ -module PGF(module PGF2) where - -import PGF2 diff --git a/src/runtime/haskell-bind/PGF/Internal.hs b/src/runtime/haskell-bind/PGF/Internal.hs deleted file mode 100644 index e8193b788..000000000 --- a/src/runtime/haskell-bind/PGF/Internal.hs +++ /dev/null @@ -1 +0,0 @@ -module PGF.Internal where diff --git a/src/runtime/haskell-bind/pgf2.cabal b/src/runtime/haskell-bind/pgf2.cabal index 4022f0b9b..166369369 100644 --- a/src/runtime/haskell-bind/pgf2.cabal +++ b/src/runtime/haskell-bind/pgf2.cabal @@ -1,37 +1,47 @@ -name: pgf2 -version: 0.1.0.0 --- synopsis: --- description: -homepage: http://www.grammaticalframework.org -license: LGPL-3 ---license-file: LICENSE -author: Krasimir Angelov, Inari -maintainer: --- copyright: -category: Language -build-type: Simple -extra-source-files: README -cabal-version: >=1.10 +name: pgf2 +version: 1.0.0 +synopsis: Bindings to the Grammatical Framework C runtime +description: + GF, Grammatical Framework, is a programming language for multilingual grammar applications. + GF grammars are compiled into Portable Grammar Format (PGF) which can be used with the PGF runtime, written in C. + This package provides Haskell bindings to that runtime. +homepage: https://www.grammaticalframework.org +license: LGPL-3 +author: Krasimir Angelov, Inari Listenmaa +category: Language +build-type: Simple +extra-source-files: README +cabal-version: >=1.10 library - exposed-modules: PGF2, PGF2.Internal, SG - -- backwards compatibility API: - --, PGF, PGF.Internal - other-modules: PGF2.FFI, PGF2.Expr, PGF2.Type, SG.FFI - build-depends: base >=4.3, - containers, pretty - -- hs-source-dirs: - default-language: Haskell2010 - build-tools: hsc2hs - - extra-libraries: sg pgf gu - cc-options: -std=c99 - c-sources: utils.c + exposed-modules: + PGF2, + PGF2.Internal, + SG + other-modules: + PGF2.FFI, + PGF2.Expr, + PGF2.Type, + SG.FFI + build-depends: + base >=4.3, + containers, + pretty + default-language: Haskell2010 + build-tools: hsc2hs + extra-libraries: sg pgf gu + cc-options: -std=c99 + c-sources: utils.c executable pgf-shell - main-is: pgf-shell.hs - hs-source-dirs: examples - build-depends: base, pgf2, containers, mtl, lifted-base - default-language: Haskell2010 + main-is: pgf-shell.hs + hs-source-dirs: examples + build-depends: + base, + containers, + lifted-base, + mtl, + pgf2 + default-language: Haskell2010 if impl(ghc>=7.0) ghc-options: -rtsopts From 88a73c1d9e9e9bf1ac4c4194917e50df1bcce635 Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Sat, 11 Jul 2020 20:00:25 +0200 Subject: [PATCH 02/10] Bump pgf2 to 1.1.0, update README --- src/runtime/haskell-bind/README | 50 ++++++++++++++++++++--------- src/runtime/haskell-bind/pgf2.cabal | 2 +- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/src/runtime/haskell-bind/README b/src/runtime/haskell-bind/README index 4782c2d37..60251e653 100644 --- a/src/runtime/haskell-bind/README +++ b/src/runtime/haskell-bind/README @@ -1,26 +1,46 @@ -This is a binding to the new GF runtime in C. +# PGF2 + +This is a Haskell binding to the PGF runtime in C. The files are: -PGF2.hsc -- a user API similar to Python and Java APIs -PGF2/FFI.hs -- an internal module with FFI definitions for - -- the relevant C functions +- PGF2.hsc: a user API similar to Python and Java APIs +- PGF2/FFI.hs: an internal module with FFI definitions for the relevant C functions -HOW TO COMPILE: +## How to compile +``` cabal install +``` -HOW TO USE: +**Note:** you must have the PGF C runtime already installed and available. +See -- Import PGF to the Haskell program that you're writing. - The Cabal infrastructure will make sure to tell the compiler - where to find the relevant modules. Example: +## How to use - module Main where +Import PGF to the Haskell program that you're writing. +The Cabal infrastructure will make sure to tell the compiler +where to find the relevant modules. - import PGF2 - import qualified Data.Map as Map +## Example - main = do - pgf <- readPGF "Foo.pgf" - let Just english = Map.lookup "FooEng" (languages pgf) +```haskell +module Main where + +import PGF2 +import qualified Data.Map as Map + +main = do + pgf <- readPGF "Foo.pgf" + let Just english = Map.lookup "FooEng" (languages pgf) +``` + +## Changelog + +### 1.1.0 + +Remove SG library. + +### 1.0.0 + +Everything up until 2020-07-11. diff --git a/src/runtime/haskell-bind/pgf2.cabal b/src/runtime/haskell-bind/pgf2.cabal index 75b6e8a76..9e1e1e393 100644 --- a/src/runtime/haskell-bind/pgf2.cabal +++ b/src/runtime/haskell-bind/pgf2.cabal @@ -1,5 +1,5 @@ name: pgf2 -version: 1.0.0 +version: 1.1.0 synopsis: Bindings to the Grammatical Framework C runtime description: GF, Grammatical Framework, is a programming language for multilingual grammar applications. From 38f468eed3325d5e435021b8b137f80545f22a95 Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Sat, 11 Jul 2020 21:06:08 +0200 Subject: [PATCH 03/10] (pgf2) Readme, license, changelog --- src/runtime/haskell-bind/CHANGELOG.md | 7 + src/runtime/haskell-bind/LICENSE | 165 ++++++++++++++++++ .../haskell-bind/{README => README.md} | 30 ++-- src/runtime/haskell-bind/pgf2.cabal | 10 +- 4 files changed, 193 insertions(+), 19 deletions(-) create mode 100644 src/runtime/haskell-bind/CHANGELOG.md create mode 100644 src/runtime/haskell-bind/LICENSE rename src/runtime/haskell-bind/{README => README.md} (51%) diff --git a/src/runtime/haskell-bind/CHANGELOG.md b/src/runtime/haskell-bind/CHANGELOG.md new file mode 100644 index 000000000..e3d6410fa --- /dev/null +++ b/src/runtime/haskell-bind/CHANGELOG.md @@ -0,0 +1,7 @@ +## 1.1.0 + +- Remove SG library. + +## 1.0.0 + +- Everything up until 2020-07-11. diff --git a/src/runtime/haskell-bind/LICENSE b/src/runtime/haskell-bind/LICENSE new file mode 100644 index 000000000..0a041280b --- /dev/null +++ b/src/runtime/haskell-bind/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/src/runtime/haskell-bind/README b/src/runtime/haskell-bind/README.md similarity index 51% rename from src/runtime/haskell-bind/README rename to src/runtime/haskell-bind/README.md index 60251e653..a4ce0ef20 100644 --- a/src/runtime/haskell-bind/README +++ b/src/runtime/haskell-bind/README.md @@ -2,10 +2,10 @@ This is a Haskell binding to the PGF runtime in C. -The files are: +The exposed modules are: -- PGF2.hsc: a user API similar to Python and Java APIs -- PGF2/FFI.hs: an internal module with FFI definitions for the relevant C functions +- `PGF2`: a user API similar to Python and Java APIs +- `PGF2.Internal`: an internal module with FFI definitions for the relevant C functions ## How to compile @@ -31,16 +31,16 @@ import PGF2 import qualified Data.Map as Map main = do - pgf <- readPGF "Foo.pgf" - let Just english = Map.lookup "FooEng" (languages pgf) + pgf <- readPGF "App12.pgf" + let Just eng = Map.lookup "AppEng" (languages pgf) + + -- Parsing + let res = parse eng (startCat pgf) "this is a small theatre" + let ParseOk ((tree,prob):rest) = res + print tree + + -- Linearisation + let Just expr = readExpr "AdjCN (PositA red_A) (UseN theatre_N)" + let s = linearize eng expr + print s ``` - -## Changelog - -### 1.1.0 - -Remove SG library. - -### 1.0.0 - -Everything up until 2020-07-11. diff --git a/src/runtime/haskell-bind/pgf2.cabal b/src/runtime/haskell-bind/pgf2.cabal index 9e1e1e393..f0cc65e70 100644 --- a/src/runtime/haskell-bind/pgf2.cabal +++ b/src/runtime/haskell-bind/pgf2.cabal @@ -1,16 +1,18 @@ name: pgf2 version: 1.1.0 -synopsis: Bindings to the Grammatical Framework C runtime +synopsis: Bindings to the PGF runtime in C description: GF, Grammatical Framework, is a programming language for multilingual grammar applications. GF grammars are compiled into Portable Grammar Format (PGF) which can be used with the PGF runtime, written in C. This package provides Haskell bindings to that runtime. homepage: https://www.grammaticalframework.org license: LGPL-3 -author: Krasimir Angelov, Inari Listenmaa +license-file: LICENSE +author: Krasimir Angelov +maintainer: Krasimir Angelov, John J. Camilleri category: Language build-type: Simple -extra-source-files: README +extra-source-files: CHANGELOG.md, README.md cabal-version: >=1.10 library @@ -22,7 +24,7 @@ library PGF2.Expr, PGF2.Type build-depends: - base >=4.3, + base >=4.3 && <5, containers, pretty default-language: Haskell2010 From f00f0cb0ef46d1a203e9d4ac238ec1a2e867fd51 Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Tue, 28 Jul 2020 22:36:49 +0200 Subject: [PATCH 04/10] Bump pgf2 to 1.2.0 --- src/runtime/haskell-bind/CHANGELOG.md | 6 ++++++ src/runtime/haskell-bind/README.md | 17 ++++++++------- src/runtime/haskell-bind/pgf2.cabal | 30 +++++++++++++-------------- src/runtime/haskell-bind/stack.yaml | 1 + 4 files changed, 31 insertions(+), 23 deletions(-) create mode 100644 src/runtime/haskell-bind/stack.yaml diff --git a/src/runtime/haskell-bind/CHANGELOG.md b/src/runtime/haskell-bind/CHANGELOG.md index e3d6410fa..e9da7fac4 100644 --- a/src/runtime/haskell-bind/CHANGELOG.md +++ b/src/runtime/haskell-bind/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.2.0 + +- Stop `pgf-shell` from being built by default. +- parseToChart also returns the category. +- bugfix in bracketedLinearize. + ## 1.1.0 - Remove SG library. diff --git a/src/runtime/haskell-bind/README.md b/src/runtime/haskell-bind/README.md index a4ce0ef20..f136ad2da 100644 --- a/src/runtime/haskell-bind/README.md +++ b/src/runtime/haskell-bind/README.md @@ -1,6 +1,6 @@ # PGF2 -This is a Haskell binding to the PGF runtime in C. +This is a Haskell binding to the PGF runtime written in C. The exposed modules are: @@ -9,18 +9,19 @@ The exposed modules are: ## How to compile -``` -cabal install -``` - **Note:** you must have the PGF C runtime already installed and available. See +Once the runtine is installed, you can use: + +``` +cabal install pgf2 +``` + ## How to use -Import PGF to the Haskell program that you're writing. -The Cabal infrastructure will make sure to tell the compiler -where to find the relevant modules. +Simply import `PGF2` in your Haskell program. +The Cabal infrastructure will make sure to tell the compiler where to find the relevant modules. ## Example diff --git a/src/runtime/haskell-bind/pgf2.cabal b/src/runtime/haskell-bind/pgf2.cabal index f0cc65e70..a4e113f3b 100644 --- a/src/runtime/haskell-bind/pgf2.cabal +++ b/src/runtime/haskell-bind/pgf2.cabal @@ -1,6 +1,6 @@ name: pgf2 -version: 1.1.0 -synopsis: Bindings to the PGF runtime in C +version: 1.2.0 +synopsis: Bindings to the C version of the PGF runtime description: GF, Grammatical Framework, is a programming language for multilingual grammar applications. GF grammars are compiled into Portable Grammar Format (PGF) which can be used with the PGF runtime, written in C. @@ -9,7 +9,7 @@ homepage: https://www.grammaticalframework.org license: LGPL-3 license-file: LICENSE author: Krasimir Angelov -maintainer: Krasimir Angelov, John J. Camilleri +maintainer: kr.angelov@gmail.com category: Language build-type: Simple extra-source-files: CHANGELOG.md, README.md @@ -33,15 +33,15 @@ library cc-options: -std=c99 c-sources: utils.c -executable pgf-shell - main-is: pgf-shell.hs - hs-source-dirs: examples - build-depends: - base, - containers, - lifted-base, - mtl, - pgf2 - default-language: Haskell2010 - if impl(ghc>=7.0) - ghc-options: -rtsopts +-- executable pgf-shell +-- main-is: pgf-shell.hs +-- hs-source-dirs: examples +-- build-depends: +-- base, +-- containers, +-- lifted-base, +-- mtl, +-- pgf2 +-- default-language: Haskell2010 +-- if impl(ghc>=7.0) +-- ghc-options: -rtsopts diff --git a/src/runtime/haskell-bind/stack.yaml b/src/runtime/haskell-bind/stack.yaml new file mode 100644 index 000000000..3d69a763f --- /dev/null +++ b/src/runtime/haskell-bind/stack.yaml @@ -0,0 +1 @@ +resolver: lts-12.26 # ghc 8.4.4 From c53353f08763fbbfb5c0abeaa03da6a23aa64080 Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Tue, 28 Jul 2020 22:54:34 +0200 Subject: [PATCH 05/10] Updates to PGF2 readme --- src/runtime/haskell-bind/README.md | 15 ++++++++++++--- src/runtime/haskell-bind/stack.yaml | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/runtime/haskell-bind/README.md b/src/runtime/haskell-bind/README.md index f136ad2da..1cb68df65 100644 --- a/src/runtime/haskell-bind/README.md +++ b/src/runtime/haskell-bind/README.md @@ -9,13 +9,22 @@ The exposed modules are: ## How to compile -**Note:** you must have the PGF C runtime already installed and available. +**Important:** You must have the C runtime already installed and available on your system. See -Once the runtine is installed, you can use: +Once the runtine is installed, you can install the library to your global Cabal installation: ``` -cabal install pgf2 +cabal install pgf2 --extra-lib-dirs=/usr/local/lib +``` + +or add it to your `stack.yaml` file: + +```yaml +extra-deps: + - pgf2 +extra-lib-dirs: + - /usr/local/lib ``` ## How to use diff --git a/src/runtime/haskell-bind/stack.yaml b/src/runtime/haskell-bind/stack.yaml index 3d69a763f..3b1a3092b 100644 --- a/src/runtime/haskell-bind/stack.yaml +++ b/src/runtime/haskell-bind/stack.yaml @@ -1 +1,3 @@ +# This is mainly here so that I can run `stack sdist` for uploading to Hackage + resolver: lts-12.26 # ghc 8.4.4 From 030c3bfee91b6f6a633c73231f06a53b9c9be67d Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Fri, 31 Jul 2020 12:46:19 +0200 Subject: [PATCH 06/10] Add option "data" to Haskell options. Imports Data.Data, all GF types derive Data, and uses DeriveDataTypeable. --- src/compiler/GF/Compile/PGFtoHaskell.hs | 62 ++++++++++++++----------- src/compiler/GF/Infra/Option.hs | 5 +- 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/src/compiler/GF/Compile/PGFtoHaskell.hs b/src/compiler/GF/Compile/PGFtoHaskell.hs index fc17e4e4e..e1fbc49aa 100644 --- a/src/compiler/GF/Compile/PGFtoHaskell.hs +++ b/src/compiler/GF/Compile/PGFtoHaskell.hs @@ -26,50 +26,56 @@ import Data.List --(isPrefixOf, find, intersperse) import qualified Data.Map as Map type Prefix = String -> String +type DerivingClause = String -- | the main function grammar2haskell :: Options -> String -- ^ Module name. -> PGF -> String -grammar2haskell opts name gr = foldr (++++) [] $ - pragmas ++ haskPreamble gadt name ++ [types, gfinstances gId lexical gr'] ++ compos +grammar2haskell opts name gr = foldr (++++) [] $ + pragmas ++ haskPreamble gadt name derivingClause extraImports ++ + [types, gfinstances gId lexical gr'] ++ compos where gr' = hSkeleton gr gadt = haskellOption opts HaskellGADT + dataExt = haskellOption opts HaskellData lexical cat = haskellOption opts HaskellLexical && isLexicalCat opts cat gId | haskellOption opts HaskellNoPrefix = id | otherwise = ("G"++) pragmas | gadt = ["{-# OPTIONS_GHC -fglasgow-exts #-}","{-# LANGUAGE GADTs #-}"] + | dataExt = ["{-# LANGUAGE DeriveDataTypeable #-}"] | otherwise = [] + derivingClause + | dataExt = "deriving (Show,Data)" + | otherwise = "deriving Show" + extraImports | gadt = ["import Control.Monad.Identity", + "import Data.Monoid"] + | dataExt = ["import Data.Data"] + | otherwise = [] types | gadt = datatypesGADT gId lexical gr' - | otherwise = datatypes gId lexical gr' + | otherwise = datatypes gId derivingClause lexical gr' compos | gadt = prCompos gId lexical gr' ++ composClass | otherwise = [] -haskPreamble gadt name = +haskPreamble gadt name derivingClause extraImports = [ "module " ++ name ++ " where", "" - ] ++ - (if gadt then [ - "import Control.Monad.Identity", - "import Data.Monoid" - ] else []) ++ - [ + ] ++ extraImports ++ [ "import PGF hiding (Tree)", "----------------------------------------------------", "-- automatic translation from GF to Haskell", "----------------------------------------------------", - "", + "", "class Gf a where", " gf :: a -> Expr", " fg :: Expr -> a", "", - predefInst gadt "GString" "String" "unStr" "mkStr", + predefInst gadt derivingClause "GString" "String" "unStr" "mkStr", "", - predefInst gadt "GInt" "Int" "unInt" "mkInt", + predefInst gadt derivingClause "GInt" "Int" "unInt" "mkInt", "", - predefInst gadt "GFloat" "Double" "unFloat" "mkFloat", + predefInst gadt derivingClause "GFloat" "Double" "unFloat" "mkFloat", "", "----------------------------------------------------", "-- below this line machine-generated", @@ -77,11 +83,11 @@ haskPreamble gadt name = "" ] -predefInst gadt gtyp typ destr consr = +predefInst gadt derivingClause gtyp typ destr consr = (if gadt - then [] - else ("newtype" +++ gtyp +++ "=" +++ gtyp +++ typ +++ " deriving Show\n\n") - ) + then [] + else ("newtype" +++ gtyp +++ "=" +++ gtyp +++ typ +++ derivingClause ++ "\n\n") + ) ++ "instance Gf" +++ gtyp +++ "where" ++++ " gf (" ++ gtyp +++ "x) =" +++ consr +++ "x" ++++ @@ -94,24 +100,24 @@ type OIdent = String type HSkeleton = [(OIdent, [(OIdent, [OIdent])])] -datatypes :: Prefix -> (OIdent -> Bool) -> (String,HSkeleton) -> String -datatypes gId lexical = (foldr (+++++) "") . (filter (/="")) . (map (hDatatype gId lexical)) . snd +datatypes :: Prefix -> DerivingClause -> (OIdent -> Bool) -> (String,HSkeleton) -> String +datatypes gId derivingClause lexical = (foldr (+++++) "") . (filter (/="")) . (map (hDatatype gId derivingClause lexical)) . snd gfinstances :: Prefix -> (OIdent -> Bool) -> (String,HSkeleton) -> String gfinstances gId lexical (m,g) = (foldr (+++++) "") $ (filter (/="")) $ (map (gfInstance gId lexical m)) g -hDatatype :: Prefix -> (OIdent -> Bool) -> (OIdent, [(OIdent, [OIdent])]) -> String -hDatatype _ _ ("Cn",_) = "" --- -hDatatype gId _ (cat,[]) = "data" +++ gId cat -hDatatype gId _ (cat,rules) | isListCat (cat,rules) = - "newtype" +++ gId cat +++ "=" +++ gId cat +++ "[" ++ gId (elemCat cat) ++ "]" - +++ "deriving Show" -hDatatype gId lexical (cat,rules) = +hDatatype :: Prefix -> DerivingClause -> (OIdent -> Bool) -> (OIdent, [(OIdent, [OIdent])]) -> String +hDatatype _ _ _ ("Cn",_) = "" --- +hDatatype gId _ _ (cat,[]) = "data" +++ gId cat +hDatatype gId derivingClause _ (cat,rules) | isListCat (cat,rules) = + "newtype" +++ gId cat +++ "=" +++ gId cat +++ "[" ++ gId (elemCat cat) ++ "]" + +++ derivingClause +hDatatype gId derivingClause lexical (cat,rules) = "data" +++ gId cat +++ "=" ++ (if length rules == 1 then "" else "\n ") +++ foldr1 (\x y -> x ++ "\n |" +++ y) constructors ++++ - " deriving Show" + " " +++ derivingClause where constructors = [gId f +++ foldr (+++) "" (map (gId) xx) | (f,xx) <- nonLexicalRules (lexical cat) rules] ++ if lexical cat then [lexicalConstructor cat +++ "String"] else [] diff --git a/src/compiler/GF/Infra/Option.hs b/src/compiler/GF/Infra/Option.hs index c4108cbe3..afcd6f705 100644 --- a/src/compiler/GF/Infra/Option.hs +++ b/src/compiler/GF/Infra/Option.hs @@ -131,7 +131,7 @@ data CFGTransform = CFGNoLR deriving (Show,Eq,Ord) data HaskellOption = HaskellNoPrefix | HaskellGADT | HaskellLexical - | HaskellConcrete | HaskellVariants + | HaskellConcrete | HaskellVariants | HaskellData deriving (Show,Eq,Ord) data Warning = WarnMissingLincat @@ -530,7 +530,8 @@ haskellOptionNames = ("gadt", HaskellGADT), ("lexical", HaskellLexical), ("concrete", HaskellConcrete), - ("variants", HaskellVariants)] + ("variants", HaskellVariants), + ("data", HaskellData)] -- | This is for bacward compatibility. Since GHC 6.12 we -- started using the native Unicode support in GHC but it From aeabc955c8b107e5467cb6b384b40320fb453176 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Fri, 31 Jul 2020 15:05:46 +0200 Subject: [PATCH 07/10] Remove characters that aren't allowed in Haskell data types. GF allows more characters in its types, as long as they are inside single quotes. E.g. 'VP/Object' is a valid name for a GF category, but not for a Haskell data type. --- src/compiler/GF/Compile/PGFtoHaskell.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/compiler/GF/Compile/PGFtoHaskell.hs b/src/compiler/GF/Compile/PGFtoHaskell.hs index e1fbc49aa..41f928d31 100644 --- a/src/compiler/GF/Compile/PGFtoHaskell.hs +++ b/src/compiler/GF/Compile/PGFtoHaskell.hs @@ -40,8 +40,10 @@ grammar2haskell opts name gr = foldr (++++) [] $ gadt = haskellOption opts HaskellGADT dataExt = haskellOption opts HaskellData lexical cat = haskellOption opts HaskellLexical && isLexicalCat opts cat - gId | haskellOption opts HaskellNoPrefix = id - | otherwise = ("G"++) + gId | haskellOption opts HaskellNoPrefix = rmForbiddenChars + | otherwise = ("G"++) . rmForbiddenChars + -- GF grammars allow weird identifier names inside '', e.g. 'VP/Object' + rmForbiddenChars = filter (`notElem` "'!#$%&*+./<=>?@\\^|-~") pragmas | gadt = ["{-# OPTIONS_GHC -fglasgow-exts #-}","{-# LANGUAGE GADTs #-}"] | dataExt = ["{-# LANGUAGE DeriveDataTypeable #-}"] | otherwise = [] From 868566a31921e1f39881ac5adcc1308131050eca Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Fri, 31 Jul 2020 15:16:45 +0200 Subject: [PATCH 08/10] Remove accidentally added space character in deriving clause. --- src/compiler/GF/Compile/PGFtoHaskell.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/GF/Compile/PGFtoHaskell.hs b/src/compiler/GF/Compile/PGFtoHaskell.hs index 41f928d31..6cb078625 100644 --- a/src/compiler/GF/Compile/PGFtoHaskell.hs +++ b/src/compiler/GF/Compile/PGFtoHaskell.hs @@ -119,7 +119,7 @@ hDatatype gId derivingClause lexical (cat,rules) = "data" +++ gId cat +++ "=" ++ (if length rules == 1 then "" else "\n ") +++ foldr1 (\x y -> x ++ "\n |" +++ y) constructors ++++ - " " +++ derivingClause + " " +++ derivingClause where constructors = [gId f +++ foldr (+++) "" (map (gId) xx) | (f,xx) <- nonLexicalRules (lexical cat) rules] ++ if lexical cat then [lexicalConstructor cat +++ "String"] else [] From deddde953f9e9b71e35a80bb29af0ce81e1dc6d0 Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Mon, 3 Aug 2020 14:22:32 +0200 Subject: [PATCH 09/10] Add script for uploading PGF2 documentation to Hackage Hackage's attempt to build the package will fail because of missing C libraries --- .../haskell-bind/stack-haddock-upload.sh | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100755 src/runtime/haskell-bind/stack-haddock-upload.sh diff --git a/src/runtime/haskell-bind/stack-haddock-upload.sh b/src/runtime/haskell-bind/stack-haddock-upload.sh new file mode 100755 index 000000000..47333bf38 --- /dev/null +++ b/src/runtime/haskell-bind/stack-haddock-upload.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# Author: Dimitri Sabadie +# 2015 + +if [ $# -lt 2 ]; then + echo "Usage: ./stack-haddock-upload.sh NAME VERSION" + exit 1 +fi + +dist=`stack path --dist-dir --stack-yaml ./stack.yaml 2> /dev/null` + +echo -e "\033[1;36mGenerating documentation...\033[0m" +stack haddock 2> /dev/null + +if [ "$?" -eq "0" ]; then + docdir=$dist/doc/html + cd $docdir || exit + doc=$1-$2-docs + echo -e "Compressing documentation from \033[1;34m$docdir\033[0m for \033[1;35m$1\033[0m-\033[1;33m$2\033[1;30m" + cp -r $1 $doc + tar -c -v -z --format=ustar -f $doc.tar.gz $doc + echo -e "\033[1;32mUploading to Hackage...\033[0m" + read -p "Hackage username: " username + read -p "Hackage password: " -s password + echo "" + curl -X PUT -H 'Content-Type: application/x-tar' -H 'Content-Encoding: gzip' --data-binary "@$doc.tar.gz" "https://$username:$password@hackage.haskell.org/package/$1-$2/docs" + exit $? +else + echo -e "\033[1;31mNot in a stack-powered project\033[0m" +fi From 7c478016d0ca57753323e45b77505fc839b170f8 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Mon, 3 Aug 2020 19:45:20 +0200 Subject: [PATCH 10/10] Replace deprecated pragma with up-to-date one. (#17) --- src/compiler/GF/Compile/PGFtoHaskell.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/GF/Compile/PGFtoHaskell.hs b/src/compiler/GF/Compile/PGFtoHaskell.hs index 6cb078625..6356c9f6d 100644 --- a/src/compiler/GF/Compile/PGFtoHaskell.hs +++ b/src/compiler/GF/Compile/PGFtoHaskell.hs @@ -44,7 +44,7 @@ grammar2haskell opts name gr = foldr (++++) [] $ | otherwise = ("G"++) . rmForbiddenChars -- GF grammars allow weird identifier names inside '', e.g. 'VP/Object' rmForbiddenChars = filter (`notElem` "'!#$%&*+./<=>?@\\^|-~") - pragmas | gadt = ["{-# OPTIONS_GHC -fglasgow-exts #-}","{-# LANGUAGE GADTs #-}"] + pragmas | gadt = ["{-# LANGUAGE GADTs, FlexibleInstances, KindSignatures, RankNTypes, TypeSynonymInstances #-}"] | dataExt = ["{-# LANGUAGE DeriveDataTypeable #-}"] | otherwise = [] derivingClause