diff options
| -rw-r--r-- | WebSetup.hs | 7 | ||||
| -rwxr-xr-x[-rw-r--r--] | bin/build-binary-dist.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | bin/gfmap | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | bin/update_html | 0 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | download/index-3.8.t2t (renamed from download/index-next.t2t) | 70 | ||||
| -rw-r--r-- | download/index.t2t | 79 | ||||
| -rw-r--r-- | download/release-3.9.t2t (renamed from download/release-next.t2t) | 23 | ||||
| -rw-r--r-- | gf.cabal | 8 | ||||
| -rw-r--r-- | index.html | 6 | ||||
| -rw-r--r-- | src/compiler/GF/System/Catch.hs | 8 | ||||
| -rw-r--r-- | src/compiler/GF/System/Concurrency.hs | 10 | ||||
| -rw-r--r-- | src/runtime/c/configure.ac | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/runtime/c/setup.sh | 0 | ||||
| -rw-r--r-- | src/runtime/haskell/PGF/Optimize.hs | 6 |
15 files changed, 107 insertions, 120 deletions
diff --git a/WebSetup.hs b/WebSetup.hs index 3e2e0832d..ee9f741d6 100644 --- a/WebSetup.hs +++ b/WebSetup.hs @@ -98,14 +98,13 @@ execute command args = showArg arg = if ' ' `elem` arg then "'" ++ arg ++ "'" else arg -- | This function is used to enable parallel compilation of the RGL and --- example grammars, but it is commented out by default --- to avoid casing problems for developers using Cabal<1.20 +-- example grammars numJobs flags = if null n then ["-j","+RTS","-A20M","-N","-RTS"] else ["-j="++n,"+RTS","-A20M","-N"++n,"-RTS"] where -- buildNumJobs is only available in Cabal>=1.20 - n = {-case buildNumJobs flags of + n = case buildNumJobs flags of Flag mn | mn/=Just 1-> maybe "" show mn - _ ->-} "" + _ -> "" diff --git a/bin/build-binary-dist.sh b/bin/build-binary-dist.sh index e44aaef0c..e44aaef0c 100644..100755 --- a/bin/build-binary-dist.sh +++ b/bin/build-binary-dist.sh diff --git a/bin/gfmap b/bin/gfmap index e9f420830..e9f420830 100644..100755 --- a/bin/gfmap +++ b/bin/gfmap diff --git a/bin/update_html b/bin/update_html index 75f54b13e..75f54b13e 100644..100755 --- a/bin/update_html +++ b/bin/update_html diff --git a/debian/changelog b/debian/changelog index 476d09d0b..b3cb6db35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gf (3.9-1) vivid xenial zesty; urgency=low + + * GF 3.9 + + -- Thomas Hallgren <hallgren@chalmers.se> Fri, 11 Aug 2017 20:00:00 +0200 + gf (3.8-1) precise trusty vivid; urgency=low * GF 3.8 diff --git a/download/index-next.t2t b/download/index-3.8.t2t index 4f44ccc5b..1222cdff1 100644 --- a/download/index-next.t2t +++ b/download/index-3.8.t2t @@ -7,21 +7,21 @@ Grammatical Framework Download and Installation %!postproc(html): <TD><I> <TD><small> %!postproc(html): </I></TD> </small></TD> -**GF 3.9** will be released on ?? August 2017. +**GF 3.8** was released on 22 June 2016. -What's new? See the [Release notes release-3.9.html]. +What's new? See the [Release notes release-3.8.html]. == Binary packages == || Platform | Download | Features | How to install -| macOS | [gf-3.9.pkg gf-3.9.pkg] | //GF+S+C+J+P// | Double-click on the package icon (*) -| macOS | [gf-3.9-bin-intel-mac.tar.gz gf-3.9-bin-intel-mac.tar.gz] | //GF+S+C+J+P// | ``sudo tar -C /usr/local -zxf gf-3.9-bin-intel-mac.tar.gz`` +| Mac OS X | [gf-3.8.pkg gf-3.8.pkg] | //GF+S+C+P// | Double-click on the package icon (*) +| Mac OS X | [gf-3.8-bin-intel-mac.tar.gz gf-3.8-bin-intel-mac.tar.gz] | //GF+S+C+P// | ``sudo tar -C /usr/local -zxf gf-3.8-bin-intel-mac.tar.gz`` %| Fedora (32-bit) | [Fedora RPMs /~hallgren/tmp/Fedora/] | //GF+S+C+J+P// | ``sudo rpm -i ...`` -| Ubuntu (32-bit) | [gf_3.9-1_i386.deb gf_3.9-1_i386.deb] | //GF+S+C+J+P// | ``sudo dpkg -i gf_3.9-1_i386.deb`` -| Ubuntu (64-bit) | [gf_3.9-1_amd64.deb gf_3.9-1_amd64.deb] | //GF+S+C+J+P// | ``sudo dpkg -i gf_3.9-1_amd64.deb`` -| Windows | [gf-3.9-bin-windows.zip gf-3.9-bin-windows.zip] | //GF+S// | ``unzip gf-3.9-bin-windows.zip`` -%| MINGW | [gf-3.9-bin-i686-MINGW32_NT-6.1.tar.gz gf-3.9-bin-i686-MINGW32_NT-6.1.tar.gz] | //GF+S+C// | ``tar -C / gf-3.9-bin-i686-MINGW32_NT-6.1.tar.gz`` +| Ubuntu (32-bit) | [gf_3.8-1_i386.deb gf_3.8-1_i386.deb] | //GF+S+C+J+P// | ``sudo dpkg -i gf_3.8-1_i386.deb`` +| Ubuntu (64-bit) | [gf_3.8-1_amd64.deb gf_3.8-1_amd64.deb] | //GF+S+C+J+P// | ``sudo dpkg -i gf_3.8-1_amd64.deb`` +| Windows | [gf-3.8-bin-windows.zip gf-3.8-bin-windows.zip] | //GF+S// | ``unzip gf-3.8-bin-windows.zip`` +%| MINGW | [gf-3.8-bin-i686-MINGW32_NT-6.1.tar.gz gf-3.8-bin-i686-MINGW32_NT-6.1.tar.gz] | //GF+S+C// | ``tar -C / gf-3.8-bin-i686-MINGW32_NT-6.1.tar.gz`` %| ... | ... | ... | ... Features: GF = GF shell and grammar compiler and the Resource Grammar Library, @@ -44,14 +44,13 @@ variables, see Inari's notes on %(which is started with ``C:\MinGW\msys\1.0\msys.bat``). %It should work out of the box without any additional settings. -The ``.deb`` packages should work on Ubuntu 16.04 and 17.04 and similar +The ``.deb`` packages should work on Ubuntu 12.04, 14.04 and 16.04 and similar Linux distributions. -The packages for macOS (Mac OS X) should work on at -least 10.11 and 10.12 (El Capitan and Sierra). +The packages for Mac OS X should work on at least 10.9, 10.10 and 10.11 (Mavericks, Yosemite and El Capitan). -(*) **Note** that for compatibility with OS X 10.11 and newer, -``gf-3.9.pkg`` will install the ``gf`` executable in ``/usr/local/bin`` +(*) **Note** that for compatibility with OS X 10.11, +``gf-3.8.pkg`` will install the ``gf`` executable in ``/usr/local/bin`` instead of ``/usr/bin``, so make sure ``/usr/local/bin`` is in your ``$PATH``. Also, if you still have an older version of GF installed in ``/usr/bin``, remove it and/or make sure ``/usr/local/bin`` comes before ``/usr/bin`` @@ -63,7 +62,7 @@ You can install them in other locations, but then you need to set the ``GF_LIB_PATH`` environment variable: ``` - export GF_LIB_PATH=/usr/local/share/gf-3.9/lib + export GF_LIB_PATH=/usr/local/share/gf-3.8/lib ``` where ``/usr/local`` should be replaced with the path to the location where you @@ -85,7 +84,7 @@ circumstances the prodedure is fairly simple: You can also download the full source package from here: -[``gf-3.9.tar.gz`` gf-3.9.tar.gz]. +[``gf-3.8.tar.gz`` gf-3.8.tar.gz]. === Notes === @@ -116,21 +115,21 @@ manually. Here is one way to do this: **Note 2**. -The GF source code has been updated to compile with GHC 8.2.1. Using older -versions of GHC (e.g. 8.0.x and 7.10.3) should still work too. - -%=== Known problems === -% -%There seems to be a bug in some versions of Cabal that can cause -% -%``` -% Distribution/Simple/PackageIndex.hs:124:8-13: Assertion failed -%``` -% -%if the same version of GF is -%already installed. If you encounter this, you can use ``ghc-pkg unregister gf`` -%to remove the installed version of GF and ``ghc-pkg list gf`` to verify that -%it is gone. +The GF source code has been updated to compile with GHC 8.0.1. Using older +versions of GHC (7.10.3, 7.10.2, 7.8, 7.6) should work too. + +=== Known problems === + +There seems to be a bug in some versions of Cabal that can cause + +``` + Distribution/Simple/PackageIndex.hs:124:8-13: Assertion failed +``` + +if the same version of GF is +already installed. If you encounter this, you can use ``ghc-pkg unregister gf`` +to remove the installed version of GF and ``ghc-pkg list gf`` to verify that +it is gone. ==Installing from the latest developer source code== @@ -138,7 +137,7 @@ The first time: %, assuming you already have the Haskell Platform and darcs ``` - git clone https://github.com/GrammaticalFramework/GF.git + darcs get --lazy http://www.grammaticalframework.org/ GF cd GF cabal install ``` @@ -147,13 +146,13 @@ Subsequently: ``` cd GF - git pull + darcs pull -a cabal install ``` -%Alternatively, you can get the code from the -%[GF GitHub https://github.com/GrammaticalFramework/GF/] mirror, which is -%updated nightly. +Alternatively, you can get the code from the +[GF GitHub https://github.com/GrammaticalFramework/GF/] mirror, which is +updated nightly. The above notes for installing from source apply also in these cases. For more info on working with the GF source code, see the @@ -161,7 +160,6 @@ For more info on working with the GF source code, see the ==Older releases== -- [GF 3.8 index-3.8.html] (June 2016) - [GF 3.7.1 index-3.7.1.html] (October 2015) - [GF 3.7 index-3.7.html] (June 2015) - [GF 3.6 index-3.6.html] (June 2014) diff --git a/download/index.t2t b/download/index.t2t index 1222cdff1..1fc8f0681 100644 --- a/download/index.t2t +++ b/download/index.t2t @@ -7,21 +7,22 @@ Grammatical Framework Download and Installation %!postproc(html): <TD><I> <TD><small> %!postproc(html): </I></TD> </small></TD> -**GF 3.8** was released on 22 June 2016. +**GF 3.9** was released on 11 August 2017. -What's new? See the [Release notes release-3.8.html]. +What's new? See the [Release notes release-3.9.html]. == Binary packages == || Platform | Download | Features | How to install -| Mac OS X | [gf-3.8.pkg gf-3.8.pkg] | //GF+S+C+P// | Double-click on the package icon (*) -| Mac OS X | [gf-3.8-bin-intel-mac.tar.gz gf-3.8-bin-intel-mac.tar.gz] | //GF+S+C+P// | ``sudo tar -C /usr/local -zxf gf-3.8-bin-intel-mac.tar.gz`` +| macOS | [gf-3.9.pkg gf-3.9.pkg] | //GF+S+C+J+P// | Double-click on the package icon +| macOS | [gf-3.9-bin-intel-mac.tar.gz gf-3.9-bin-intel-mac.tar.gz] | //GF+S+C+J+P// | ``sudo tar -C /usr/local -zxf gf-3.9-bin-intel-mac.tar.gz`` %| Fedora (32-bit) | [Fedora RPMs /~hallgren/tmp/Fedora/] | //GF+S+C+J+P// | ``sudo rpm -i ...`` -| Ubuntu (32-bit) | [gf_3.8-1_i386.deb gf_3.8-1_i386.deb] | //GF+S+C+J+P// | ``sudo dpkg -i gf_3.8-1_i386.deb`` -| Ubuntu (64-bit) | [gf_3.8-1_amd64.deb gf_3.8-1_amd64.deb] | //GF+S+C+J+P// | ``sudo dpkg -i gf_3.8-1_amd64.deb`` -| Windows | [gf-3.8-bin-windows.zip gf-3.8-bin-windows.zip] | //GF+S// | ``unzip gf-3.8-bin-windows.zip`` -%| MINGW | [gf-3.8-bin-i686-MINGW32_NT-6.1.tar.gz gf-3.8-bin-i686-MINGW32_NT-6.1.tar.gz] | //GF+S+C// | ``tar -C / gf-3.8-bin-i686-MINGW32_NT-6.1.tar.gz`` +%| Raspian 8.0 | [gf_3.9-1_armhf.deb gf_3.9-1_armhf.deb] | //GF+S+C+J+P// | ``sudo dpkg -i gf_3.9-1_armhf.deb`` +| Ubuntu (32-bit) | [gf_3.9-1_i386.deb gf_3.9-1_i386.deb] | //GF+S+C+J+P// | ``sudo dpkg -i gf_3.9-1_i386.deb`` +| Ubuntu (64-bit) | [gf_3.9-1_amd64.deb gf_3.9-1_amd64.deb] | //GF+S+C+J+P// | ``sudo dpkg -i gf_3.9-1_amd64.deb`` +| Windows | [gf-3.9-bin-windows.zip gf-3.9-bin-windows.zip] | //GF+S// | ``unzip gf-3.9-bin-windows.zip`` +%| MINGW | [gf-3.9-bin-i686-MINGW32_NT-6.1.tar.gz gf-3.9-bin-i686-MINGW32_NT-6.1.tar.gz] | //GF+S+C// | ``tar -C / gf-3.9-bin-i686-MINGW32_NT-6.1.tar.gz`` %| ... | ... | ... | ... Features: GF = GF shell and grammar compiler and the Resource Grammar Library, @@ -44,17 +45,18 @@ variables, see Inari's notes on %(which is started with ``C:\MinGW\msys\1.0\msys.bat``). %It should work out of the box without any additional settings. -The ``.deb`` packages should work on Ubuntu 12.04, 14.04 and 16.04 and similar +The ``.deb`` packages should work on Ubuntu 16.04 and 17.04 and similar Linux distributions. -The packages for Mac OS X should work on at least 10.9, 10.10 and 10.11 (Mavericks, Yosemite and El Capitan). +The packages for macOS (Mac OS X) should work on at +least 10.11 and 10.12 (El Capitan and Sierra). -(*) **Note** that for compatibility with OS X 10.11, -``gf-3.8.pkg`` will install the ``gf`` executable in ``/usr/local/bin`` -instead of ``/usr/bin``, so make sure ``/usr/local/bin`` is in your ``$PATH``. -Also, if you still have an older version of GF installed in ``/usr/bin``, -remove it and/or make sure ``/usr/local/bin`` comes before ``/usr/bin`` -in your ``$PATH`` so you don't accidentally run the old version. +%(*) **Note** that for compatibility with OS X 10.11 and newer, +%``gf-3.9.pkg`` will install the ``gf`` executable in ``/usr/local/bin`` +%instead of ``/usr/bin``, so make sure ``/usr/local/bin`` is in your ``$PATH``. +%Also, if you still have an older version of GF installed in ``/usr/bin``, +%remove it and/or make sure ``/usr/local/bin`` comes before ``/usr/bin`` +%in your ``$PATH`` so you don't accidentally run the old version. The Mac OS and Linux ``.tar.gz`` packages are designed to be installed in ``/usr/local``. @@ -62,7 +64,7 @@ You can install them in other locations, but then you need to set the ``GF_LIB_PATH`` environment variable: ``` - export GF_LIB_PATH=/usr/local/share/gf-3.8/lib + export GF_LIB_PATH=/usr/local/share/gf-3.9/lib ``` where ``/usr/local`` should be replaced with the path to the location where you @@ -84,7 +86,7 @@ circumstances the prodedure is fairly simple: You can also download the full source package from here: -[``gf-3.8.tar.gz`` gf-3.8.tar.gz]. +[``gf-3.9.tar.gz`` gf-3.9.tar.gz]. === Notes === @@ -115,21 +117,21 @@ manually. Here is one way to do this: **Note 2**. -The GF source code has been updated to compile with GHC 8.0.1. Using older -versions of GHC (7.10.3, 7.10.2, 7.8, 7.6) should work too. - -=== Known problems === - -There seems to be a bug in some versions of Cabal that can cause - -``` - Distribution/Simple/PackageIndex.hs:124:8-13: Assertion failed -``` - -if the same version of GF is -already installed. If you encounter this, you can use ``ghc-pkg unregister gf`` -to remove the installed version of GF and ``ghc-pkg list gf`` to verify that -it is gone. +The GF source code has been updated to compile with GHC 8.2.1. Using older +versions of GHC (e.g. 8.0.x and 7.10.3) should still work too. + +%=== Known problems === +% +%There seems to be a bug in some versions of Cabal that can cause +% +%``` +% Distribution/Simple/PackageIndex.hs:124:8-13: Assertion failed +%``` +% +%if the same version of GF is +%already installed. If you encounter this, you can use ``ghc-pkg unregister gf`` +%to remove the installed version of GF and ``ghc-pkg list gf`` to verify that +%it is gone. ==Installing from the latest developer source code== @@ -137,7 +139,7 @@ The first time: %, assuming you already have the Haskell Platform and darcs ``` - darcs get --lazy http://www.grammaticalframework.org/ GF + git clone https://github.com/GrammaticalFramework/GF.git cd GF cabal install ``` @@ -146,13 +148,13 @@ Subsequently: ``` cd GF - darcs pull -a + git pull cabal install ``` -Alternatively, you can get the code from the -[GF GitHub https://github.com/GrammaticalFramework/GF/] mirror, which is -updated nightly. +%Alternatively, you can get the code from the +%[GF GitHub https://github.com/GrammaticalFramework/GF/] mirror, which is +%updated nightly. The above notes for installing from source apply also in these cases. For more info on working with the GF source code, see the @@ -160,6 +162,7 @@ For more info on working with the GF source code, see the ==Older releases== +- [GF 3.8 index-3.8.html] (June 2016) - [GF 3.7.1 index-3.7.1.html] (October 2015) - [GF 3.7 index-3.7.html] (June 2015) - [GF 3.6 index-3.6.html] (June 2014) diff --git a/download/release-next.t2t b/download/release-3.9.t2t index 6dad61389..fc1e71447 100644 --- a/download/release-next.t2t +++ b/download/release-3.9.t2t @@ -24,6 +24,11 @@ Over 200 changes have been pushed to the source repository since ===GF compiler and run-time library=== + +====New features and notable changes==== + +- Support for language-specific depencency configurations (in addition to abstract syntax based ones); see ``help vd`` in the GF shell + - An experimental support for sentence lookup which makes it possible to find the sentence from the grammar that matches best a set of keywords. Right now it is usable only with controlled languages since it might be @@ -34,19 +39,10 @@ very innefficient for some grammars. - The API in the Java binding is extended and it covers more from the full functionality of the C runtime. -====New features and notable changes==== - -- Support for language-specific depencency configurations (in addition to abstract syntax based ones); see ``help vd`` in the GF shell - - -====Other changes and bug fixes==== - -- ... - ====Changes of interest to compiler developers==== -- The compiler source code has been updated for compatibility with GHC 8.2.1 +- The compiler source code has been updated for compatibility with GHC 8.2.1. ===Resource Grammar Library=== @@ -62,18 +58,15 @@ the full functionality of the C runtime. - Various fixes for several languages. - - ... - -- Numerous fixes in the translation dictionaries. - - ... +- Various fixes in the translation dictionaries. ===Apps and Cloud services=== - PGF service: support for language-specific depencency configurations in ``command=deptree``. -- ... + -------------------- @@ -1,7 +1,7 @@ name: gf -version: 3.8-darcs +version: 3.9-git -cabal-version: >= 1.10 +cabal-version: >= 1.20 build-type: Custom license: OtherLicense license-file: LICENSE @@ -57,6 +57,7 @@ flag interrupt flag server Description: Include --server mode Default: True + flag network-uri description: Get Network.URI from the network-uri package default: True @@ -68,6 +69,7 @@ flag network-uri flag custom-binary Description: Use a customised version of the binary package Default: True + Manual: True flag c-runtime Description: Include functionality from the C run-time library (which must be installed already) @@ -75,7 +77,7 @@ flag c-runtime Library default-language: Haskell2010 - build-depends: base >= 4.5 && <5, + build-depends: base >= 4.6 && <5, array, containers, bytestring, diff --git a/index.html b/index.html index 050de9c31..d38227c1a 100644 --- a/index.html +++ b/index.html @@ -81,7 +81,7 @@ function sitesearch() { <li><a href="http://ci.zjyto.net/job/GF/job/Build/"><img src="http://ci.zjyto.net/job/GF/job/Build/badge/icon" alt="GF build status"></a> --> <li><a href="doc/gf-developers.html">GF Developers Guide</a> - <li><A HREF="https://github.com/GrammaticalFramework/GF/">GitHub mirror</A> + <li><A HREF="https://github.com/GrammaticalFramework/GF/">GF on GitHub</A> <li><A HREF="https://github.com/GrammaticalFramework/gf-contrib/">Contibutions GitHub</A> <li><A HREF="http://code.google.com/p/grammatical-framework/wiki/SideBar?tm=6">Wiki</A> <li><a href="/~hallgren/gf-experiment/browse/">Browse Source Code</a> @@ -89,7 +89,7 @@ function sitesearch() { </ul> <h4>Develop Applications</h4> <ul> - <li><a href="http://hackage.haskell.org/package/gf-3.7.1/docs/PGF.html">PGF library API (Haskell)</a> + <li><a href="http://hackage.haskell.org/package/gf-3.9/docs/PGF.html">PGF library API (Haskell)</a> <li><a href="doc/python-api.html">PGF library API (Python)</a> <li><a href="doc/java-api/index.html">PGF library API (Java)</a> <li><a href="doc/dotNet-api/index.html">PGF library API (.NET)</a> @@ -120,6 +120,8 @@ document.write('<div style="float: right; margin-top: 3ex;"> <form onsubmit="re <div class=news2> <table class=news> +<tr><td>2016-08-11:<td><strong>GF 3.9 released!</strong> + <a href="download/release-3.9.html">Release notes</a>. <tr><td>2017-06-29:<td>GF is moving to <a href="https://github.com/GrammaticalFramework/GF/">GitHub</a>! <tr><td>2017-03-13:<td><strong>GF Summer School in Riga (Latvia), 14-25 August 2017</strong> <a href="http://school.grammaticalframework.org/2017/">Summer diff --git a/src/compiler/GF/System/Catch.hs b/src/compiler/GF/System/Catch.hs index f69934af5..11fae1a7b 100644 --- a/src/compiler/GF/System/Catch.hs +++ b/src/compiler/GF/System/Catch.hs @@ -1,13 +1,7 @@ --- | Isolate backwards incompatible library changes to 'catch' and 'try' -{-# LANGUAGE CPP #-} +-- | Backwards compatible 'catch' and 'try' module GF.System.Catch where import qualified System.IO.Error as S -- ** Backwards compatible try and catch -#if MIN_VERSION_base(4,4,0) catch = S.catchIOError try = S.tryIOError -#else -catch = S.catch -try = S.try -#endif diff --git a/src/compiler/GF/System/Concurrency.hs b/src/compiler/GF/System/Concurrency.hs index 41f318c7a..514eab649 100644 --- a/src/compiler/GF/System/Concurrency.hs +++ b/src/compiler/GF/System/Concurrency.hs @@ -1,7 +1,6 @@ -{-# LANGUAGE CPP,ForeignFunctionInterface #-} +{-# LANGUAGE ForeignFunctionInterface #-} -- | A variant of 'Control.Concurrent.setNumCapabilities' that automatically --- detects the number of processors in the system, and is available --- even when compiling with GHC<7.6. +-- detects the number of processors in the system. module GF.System.Concurrency( -- * Controlling parallelism setNumCapabilities,getNumberOfProcessors) where @@ -16,13 +15,8 @@ import Foreign.C.Types(CInt(..)) -- hasn't already been set with @+RTS -N/n/ -RTS@. setNumCapabilities opt_n = do n <- maybe getNumberOfProcessors return opt_n -#if MIN_VERSION_base(4,6,0) C.setNumCapabilities n return True -#else - n_now <- C.getNumCapabilities - return (n==n_now) -#endif -- | Returns the number of processors in the system. getNumberOfProcessors = fmap fromEnum c_getNumberOfProcessors diff --git a/src/runtime/c/configure.ac b/src/runtime/c/configure.ac index 2af9016de..f52479a5b 100644 --- a/src/runtime/c/configure.ac +++ b/src/runtime/c/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(Portable Grammar Format library, 0.1.pre, - https://code.google.com/p/grammatical-framework/, +AC_INIT(Portable Grammar Format library, 0.1-pre, + http://www.grammaticalframework.org/, libpgf) AC_PREREQ(2.58) diff --git a/src/runtime/c/setup.sh b/src/runtime/c/setup.sh index fdc8f7aec..fdc8f7aec 100644..100755 --- a/src/runtime/c/setup.sh +++ b/src/runtime/c/setup.sh diff --git a/src/runtime/haskell/PGF/Optimize.hs b/src/runtime/haskell/PGF/Optimize.hs index 45b4311a5..8739c8665 100644 --- a/src/runtime/haskell/PGF/Optimize.hs +++ b/src/runtime/haskell/PGF/Optimize.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE CPP, BangPatterns #-} +{-# LANGUAGE BangPatterns #-} module PGF.Optimize ( optimizePGF , updateProductionIndices @@ -11,11 +11,7 @@ import PGF.Macros import Data.List (mapAccumL) import Data.Array.IArray import Data.Array.MArray -#if MIN_VERSION_base(4,6,0) import Data.Array.Unsafe as U(unsafeFreeze) -#else -import Data.Array.ST as U(unsafeFreeze) -#endif import Data.Array.ST import Data.Array.Unboxed import qualified Data.Map as Map |