fix typo

8 files changed, 37 insertions, 6 deletions

diff --git a/src/compiler/GF/Interactive2.hs b/src/compiler/GF/Interactive2.hs
index d429b4530..f0c3f6043 100644
--- a/src/compiler/GF/Interactive2.hs
+++ b/src/compiler/GF/Interactive2.hs
@@ -12,7 +12,7 @@ import GF.Command.Abstract
 import GF.Command.Parse(readCommandLine,pCommand)
 import GF.Data.Operations (Err(..))
 import GF.Data.Utilities(whenM,repeatM)
-
+import Control.Monad (join, when, (<=<))
 import GF.Infra.UseIO(ioErrorText,putStrLnE)
 import GF.Infra.SIO
 import GF.Infra.Option
diff --git a/src/runtime/haskell-bind/pgf2.cabal b/src/runtime/haskell-bind/pgf2.cabal
index 83c990bf3..d7a98489e 100644
--- a/src/runtime/haskell-bind/pgf2.cabal
+++ b/src/runtime/haskell-bind/pgf2.cabal
@@ -15,7 +15,7 @@ homepage: https://www.grammaticalframework.org/
 bug-reports: https://github.com/GrammaticalFramework/gf-core/issues
 author: Krasimir Angelov
 extra-source-files: CHANGELOG.md, README.md
-tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4
+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4, GHC=9.6.6
 
 library
   exposed-modules:
@@ -26,7 +26,7 @@ library
     PGF2.Expr,
     PGF2.Type
   build-depends:
-    base >= 4.9.1 && < 4.16,
+    base >= 4.9.1 && < 4.22,
     containers >= 0.5.7 && < 0.7,
     pretty >= 1.1.3 && < 1.2
   default-language: Haskell2010
diff --git a/src/runtime/python/pgf.egg-info/PKG-INFO b/src/runtime/python/pgf.egg-info/PKG-INFO
new file mode 100644
index 000000000..efb9707ad
--- /dev/null
+++ b/src/runtime/python/pgf.egg-info/PKG-INFO
@@ -0,0 +1,17 @@
+Metadata-Version: 2.4
+Name: pgf
+Version: 1.0
+Summary: Python bindings to the Grammatical Framework's PGF runtime
+Home-page: https://www.grammaticalframework.org/
+Author: Krasimir Angelov
+Author-email: kr.angelov@gmail.com
+License: BSD
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: summary
+
+Grammatical Framework (GF) is a programming language for multilingual grammar applications.
+This package provides Python bindings to GF runtime, which allows you to parse and generate text using GF grammars compiled into the PGF format.
diff --git a/src/runtime/python/pgf.egg-info/SOURCES.txt b/src/runtime/python/pgf.egg-info/SOURCES.txt
new file mode 100644
index 000000000..8512c6dd4
--- /dev/null
+++ b/src/runtime/python/pgf.egg-info/SOURCES.txt
@@ -0,0 +1,12 @@
+INSTALL
+README.org
+pypgf.c
+setup.py
+test.py
+examples/README
+examples/gf_utils.py
+examples/translation_pipeline.py
+pgf.egg-info/PKG-INFO
+pgf.egg-info/SOURCES.txt
+pgf.egg-info/dependency_links.txt
+pgf.egg-info/top_level.txt
\ No newline at end of file
diff --git a/src/runtime/python/pgf.egg-info/dependency_links.txt b/src/runtime/python/pgf.egg-info/dependency_links.txt
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/src/runtime/python/pgf.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/src/runtime/python/pgf.egg-info/top_level.txt b/src/runtime/python/pgf.egg-info/top_level.txt
new file mode 100644
index 000000000..aba271cc3
--- /dev/null
+++ b/src/runtime/python/pgf.egg-info/top_level.txt
@@ -0,0 +1 @@
+pgf
diff --git a/src/runtime/python/setup.py b/src/runtime/python/setup.py
index fdc2fe8c5..52078649d 100644
--- a/src/runtime/python/setup.py
+++ b/src/runtime/python/setup.py
@@ -1,4 +1,4 @@
-from distutils.core import setup, Extension
+from setuptools import setup, Extension
 import os
 
 includes = os.getenv('EXTRA_INCLUDE_DIRS','').split(':')
diff --git a/src/server/PGFService.hs b/src/server/PGFService.hs
index 6e72ce5ea..fda611fdc 100644
--- a/src/server/PGFService.hs
+++ b/src/server/PGFService.hs
@@ -159,13 +159,13 @@ cpgfMain qsem command (t,(pgf,pc)) =
                     -> out t=<< bracketedLin # tree % to
     "c-linearizeAll"-> out t=<< linAll # tree % to
     "c-translate"   -> withQSem qsem $
-                       out t=<<join(trans # input % cat % to % start % limit%treeopts)
+                       out t=<<join(trans # input % cat % to % start % limit % treeopts)
     "c-lookupmorpho"-> out t=<< morpho # from1 % textInput
     "c-lookupcohorts"->out t=<< cohorts # from1 % getInput "filter" % textInput
     "c-flush"       -> out t=<< flush
     "c-grammar"     -> out t grammar
     "c-abstrtree"   -> outputGraphviz=<< C.graphvizAbstractTree pgf C.graphvizDefaults # tree
-    "c-parsetree"   -> outputGraphviz=<< (\cnc -> C.graphvizParseTree cnc C.graphvizDefaults) . snd # from1 %tree
+    "c-parsetree"   -> outputGraphviz=<< (\cnc -> C.graphvizParseTree cnc C.graphvizDefaults) . snd # from1 % tree
     "c-wordforword" -> out t =<< wordforword # input % cat % to
     _               -> badRequest "Unknown command" command
   where