an API to the dependency graph visualization

.gitignore

@@ -39,24 +39,8 @@ src/runtime/c/sg/.dirstamp
 src/runtime/c/stamp-h1
 src/runtime/java/.libs/
 src/runtime/python/build/
+src/ui/android/libs/
+src/ui/android/obj/
 .cabal-sandbox
 cabal.sandbox.config
-.stack-work
 DATA_DIR
-
-# Generated documentation (not exhaustive)
-demos/index-numbers.html
-demos/resourcegrammars.html
-demos/translation.html
-doc/tutorial/gf-tutorial.html
-doc/index.html
-doc/gf-bibliography.html
-doc/gf-developers.html
-doc/gf-editor-modes.html
-doc/gf-people.html
-doc/gf-refman.html
-doc/gf-shell-reference.html
-doc/icfp-2012.html
-download/*.html
-gf-book/index.html
-src/www/gf-web-api.html

LICENSE

@@ -8,9 +8,24 @@ other. For this reason the different components have different licenses.
 In summary:
 
   - the GF compiler in the folder src/compiler and the PGF Web service in src/server
-are under the GNU GENERAL PUBLIC LICENSE.
+are under the GNU GENERAL PUBLIC LICENSE. 
 
-  - the GF runtime in src/runtime is under dual GNU LESSER GENERAL PUBLIC LICENSE and BSD LICENSE
+  - the GF runtime in src/runtime is under dual GNU LESSER GENERAL PUBLIC LICENSE
+and BSD LICENSE
+
+  - the resource grammar library in lib/src is under GNU LESSER GENERAL PUBLIC LICENSE.
+However the user have the right to choose any license for any application grammar
+derived from the resource grammar by using the grammar API.
+
+  - the resource grammar library also includes large coverage lexicons for some languages.
+Since these lexicons are derived from external sources they might be under different licenses.
+Look at the source file for every lexicon for details. The lexicons that we currently have
+are:
+
+       lib/src/bulgarian/    DictBul.gf DictBulAbs.gf    for Bulgarian
+       lib/src/english/      DictEng.gf DictEngAbs.gf    for English
+       lib/src/turkish/      DictTur.gf DictTurAbs.gf    for Turkish
+       lib/src/swedish/      DictSwe.gf DictSweAbs.gf    for Swedish
 
 The rest of this document contains copies of the GPL, LGPL and BSD licenses
 which are applicable to the different components of Grammatical Framework

Makefile

@@ -20,7 +20,6 @@ doc:
 
 clean:
 	cabal clean
-	bash bin/clean_html
 
 gf:
 	cabal build rgl-none
@@ -33,7 +32,7 @@ html::
 # number to the top of debian/changelog.
 # (Tested on Ubuntu 15.04. You need to install dpkg-dev & debhelper.)
 deb:
-	dpkg-buildpackage -b -uc
+	dpkg-buildpackage -b
 
 # Make an OS X Installer package
 pkg:

README.md

@@ -37,6 +37,13 @@ The simplest way of installing GF is with the command:
 cabal install
 ```
 
+This can be broken down into the usual sub-steps:
+```
+cabal configure
+cabal build
+cabal copy
+```
+
 For more details, see the [download page](http://www.grammaticalframework.org/download/index.html)
 and [developers manual](http://www.grammaticalframework.org/doc/gf-developers.html).
 

Setup.hs

@@ -1,4 +1,3 @@
-import Distribution.System(Platform(..),OS(..))
 import Distribution.Simple(defaultMainWithHooks,UserHooks(..),simpleUserHooks)
 import Distribution.Simple.LocalBuildInfo(LocalBuildInfo(..),absoluteInstallDirs,datadir)
 import Distribution.Simple.Setup(BuildFlags(..),Flag(..),InstallFlags(..),CopyDest(..),CopyFlags(..),SDistFlags(..))
@@ -74,9 +73,5 @@ dataDirFile = "DATA_DIR"
 default_gf :: LocalBuildInfo -> FilePath
 default_gf lbi = buildDir lbi </> exeName' </> exeNameReal
   where
-    -- shadows Distribution.Simple.BuildPaths.exeExtension, which changed type signature in Cabal 2.4
-    exeExtension = case hostPlatform lbi of
-      Platform arch Windows -> "exe"
-      _ -> ""
     exeName' = "gf"
     exeNameReal = exeName' <.> exeExtension

WebSetup.hs

@@ -70,7 +70,7 @@ buildWeb gf flags (pkg,lbi) = do
         gf_lib_path = datadir (absoluteInstallDirs pkg lbi dest) </> "lib"
         args = numJobs flags++["-make","-s"] -- ,"-optimize-pgf"
                ++["--gfo-dir="++tmp_dir,
-                --"--gf-lib-path="++gf_lib_path,
+                  "--gf-lib-path="++gf_lib_path,
                   "--name="++dropExtension pgf,
                   "--output-dir="++gfo_dir]
                ++[dir</>file|file<-src]
@@ -104,10 +104,9 @@ setupWeb dest (pkg,lbi) = do
     copy_pgf (pgf,subdir,_) =
       do let src = gfo_dir </> pgf
          let dst = grammars_dir </> pgf
+         putStrLn $ "Installing "++dst
          ex <- doesFileExist src
-         if ex then do putStrLn $ "Installing "++dst
-                       copyFile src dst
-               else putStrLn $ "Not installing "++dst
+         if ex then copyFile src dst else return ()
 
     gf_logo = "gf0.png"
 

bin/build-binary-dist.sh

@@ -2,7 +2,7 @@
 
 ### This script builds a binary distribution of GF from the source
 ### package that this script is a part of. It assumes that you have installed
-### a recent version of the Haskell Platform.
+### the Haskell Platform, version 2013.2.0.0 or 2012.4.0.0.
 ### Two binary package formats are supported: plain tar files (.tar.gz) and
 ### OS X Installer packages (.pkg).
 
@@ -16,14 +16,13 @@ name="gf-$ver"
 destdir="$PWD/dist/$name"          # assemble binary dist here
 prefix=${PREFIX:-/usr/local}       # where to install
 fmt=${FMT:-tar.gz}                 # binary package format (tar.gz or pkg)
-ghc=${GHC:-ghc}                    # which Haskell compiler to use
 
 extralib="$destdir$prefix/lib"
 extrainclude="$destdir$prefix/include"
 extra="--extra-lib-dirs=$extralib --extra-include-dirs=$extrainclude"
 
 set -e                             # Stop if an error occurs
-set -x                             # print commands before executing them
+set -x                             # print commands before exuting them
 
 ## First configure & build the C run-time system
 pushd src/runtime/c
@@ -65,30 +64,13 @@ else
 fi
 
 ## Build GF, with C run-time support enabled
-cabal install -w "$ghc" --only-dependencies -fserver -fc-runtime $extra
-cabal configure -w "$ghc" --prefix="$prefix" -fserver -fc-runtime $extra
+cabal install --only-dependencies -fserver -fc-runtime $extra
+cabal configure --prefix="$prefix" -fserver -fc-runtime $extra
 DYLD_LIBRARY_PATH="$extralib" LD_LIBRARY_PATH="$extralib" cabal build
-  # Building the example grammars will fail, because the RGL is missing
-cabal copy --destdir="$destdir"  # create www directory
-
-## Build the RGL and copy it to $destdir
-PATH=$PWD/dist/build/gf:$PATH
-export GF_LIB_PATH="$(dirname $(find "$destdir" -name www))/lib"   # hmm
-mkdir -p "$GF_LIB_PATH"
-pushd ../gf-rgl
-make build
-make copy
-popd
-
-# Build GF again, including example grammars that need the RGL
-DYLD_LIBRARY_PATH="$extralib" LD_LIBRARY_PATH="$extralib" cabal build
-
-## Copy GF to $destdir
 cabal copy --destdir="$destdir"
 libdir=$(dirname $(find "$destdir" -name PGF.hi))
 cabal register --gen-pkg-config=$libdir/gf-$ver.conf
 
-## Create the binary distribution package
 case $fmt in
     tar.gz)
 	targz="$name-bin-$hw-$os.tar.gz"     # the final tar file

bin/clean_html

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# This script finds all .t2t (txt2tags) and .md (Markdown) files
-# and deletes the corresponding HTML file of the same name.
-
-find . -name '*.t2t' | while read t2t ; do
-  html="${t2t%.t2t}.html"
-  if [ -f "$html" ] ; then
-    echo "$html"
-    rm -f "$html"
-  fi
-done
-
-find . -name '*.md' | while read md ; do
-  html="${md%.md}.html"
-  if [ -f "$html" ] ; then
-    echo "$html"
-    rm -f "$html"
-  fi
-done

bin/template.html

@@ -1,146 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="$lang$" xml:lang="$lang$"$if(dir)$ dir="$dir$"$endif$>
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-$for(author-meta)$
-  <meta name="author" content="$author-meta$" />
-$endfor$
-$if(date-meta)$
-  <meta name="dcterms.date" content="$date-meta$" />
-$endif$
-$if(keywords)$
-  <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
-$endif$
-  <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.2/css/all.css" integrity="sha384-/rXc/GQVaYpyDdyxK+ecHPVYJSN9bmVFBvjA/9eOB+pb3F2w2N6fc5qB9Ew5yIns" crossorigin="anonymous">
-$for(css)$
-  <link rel="stylesheet" href="$css$" />
-$endfor$
-$if(math)$
-  $math$
-$endif$
-  <!--[if lt IE 9]>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
-  <![endif]-->
-$for(header-includes)$
-  $header-includes$
-$endfor$
-</head>
-<body class="bg-light">
-  <div class="bg-white pb-5">
-$for(include-before)$
-$include-before$
-$endfor$
-<div class="container-fluid py-5" style="max-width:1200px">
-
-$if(title)$
-<header id="title-block-header">
-<a href="$rel-root$" title="Home">
-  <img src="$rel-root$/doc/Logos/gf1.svg" height="200" class="float-md-right ml-3 mb-3 bg-white" alt="GF Logo">
-</a>
-<h1 class="title">$title$</h1>
-$if(subtitle)$
-<p class="subtitle">$subtitle$</p>
-$endif$
-$for(author)$
-<p class="author">$author$</p>
-$endfor$
-$if(date)$
-<p class="date">$date$</p>
-$endif$
-</header>
-$endif$
-$if(toc)$
-<nav id="$idprefix$TOC">
-$if(table-of-contents)$
-  <!-- pandoc >= 2.0 -->
-  $table-of-contents$
-$else$
-  <!-- pandoc < 2.0 -->
-  $toc$
-$endif$
-</nav>
-$endif$
-$body$
-</div><!-- .container -->
-</div><!-- .bg-white -->
-
-<footer class="py-5">
-  <div class="container">
-    <div class="row">
-
-      <div class="col-6 col-sm-3">
-        <a href="$rel-root$">
-          <i class="fas fa-home"></i>
-          Home
-        </a>
-        <h6 class="text-muted mt-3">Get started</h6>
-        <ul class="list-unstyled">
-          <li><a href="https://www.youtube.com/watch?v=x1LFbDQhbso">Google Tech Talk</a></li>
-          <li><a href="http://cloud.grammaticalframework.org/">GF Cloud</a></li>
-          <li>
-            <a href="$rel-root$/doc/tutorial/gf-tutorial.html">Tutorial</a>
-            /
-            <a href="$rel-root$/lib/doc/rgl-tutorial/index.html">RGL Tutorial</a>
-          </li>
-          <li><a href="$rel-root$/download"><strong>Download GF</strong></a></li>
-        </ul>
-      </div>
-
-      <div class="col-6 col-sm-3">
-        <h6 class="text-muted">Learn more</h6>
-        <ul class="list-unstyled">
-          <li><a href="$rel-root$/gf-book">The GF Book</a></li>
-          <li><a href="$rel-root$/doc/gf-refman.html">Reference Manual</a></li>
-          <li><a href="$rel-root$/doc/gf-shell-reference.html">GF Shell Reference</a></li>
-          <li><a href="http://www.molto-project.eu/sites/default/files/MOLTO_D2.3.pdf">Best Practices</a></li>
-          <li><a href="$rel-root$/lib/doc/synopsis/index.html"><strong>RGL Synopsis</strong></a></li>
-        </ul>
-      </div>
-
-      <div class="col-6 col-sm-3">
-        <h6 class="text-muted">Develop</h6>
-        <ul class="list-unstyled">
-          <li><a href="$rel-root$/doc/gf-developers.html">Developers Guide</a></li>
-          <li><a href="http://hackage.haskell.org/package/gf/docs/PGF.html">PGF library API (Haskell runtime)</a></li>
-          <li><a href="$rel-root$/doc/runtime-api.html">PGF library API (C runtime)</a></li>
-          <li><a href="http://hackage.haskell.org/package/gf/docs/GF.html">GF compiler API</a></li>
-          <li><a href="$rel-root$/doc/gf-editor-modes.html">Text Editor Support</a></li>
-        </ul>
-      </div>
-
-      <div class="col-6 col-sm-3">
-        <h6 class="text-muted">Contribute</h6>
-        <ul class="list-unstyled">
-          <li><a href="http://groups.google.com/group/gf-dev">Mailing List</a></li>
-          <li><a href="https://github.com/GrammaticalFramework/gf-core/issues">Issue Tracker</a></li>
-          <li><a href="$rel-root$/doc/gf-people.html">Authors</a></li>
-          <li><a href="http://school.grammaticalframework.org/2018/">Summer School</a></li>
-        </ul>
-        <h6 class="text-muted">
-          Repositories
-          <i class="fab fa-github ml-1"></i>
-        </h6>
-        <a href="https://github.com/GrammaticalFramework/gf-core">GF</a> ·
-        <a href="https://github.com/GrammaticalFramework/gf-rgl">RGL</a> ·
-        <a href="https://github.com/GrammaticalFramework/gf-contrib">Contributions</a>
-      </div>
-    </div>
-  </div>
-</footer>
-$for(include-after)$
-$include-after$
-$endfor$
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-7811807-3");
-pageTracker._trackPageview();
-} catch(err) {}</script>
-</body>
-</html>

bin/update_html

@@ -1,156 +1,11 @@
 #!/bin/bash
 
-# Generate HTML from txt2tags (.t2t) and Markdown (.md)
-# Usage:
-# - update_html
-#   Look for all .t2t and .md files in the current directory and below,
-#   generating the output HTML when the source is newer than the HTML.
-# - update_html path/to/file.t2t path/to/another.md
-#   Generate HTML for the specified file(s), ignoring modification time.
-#
-# Requires:
-# - txt2tags for .t2t files. Tested with 2.6.
-# - pandoc for both .t2t and .md files. Tested with 1.16.0.2 and 2.3.1.
-# - the template file `template.html` in the same directory as this script.
-#
-# Tested with Ubuntu 16.04 and macOS Mojave.
-#
-# See also clean_html for removing the files generated by this script.
+### This script finds all .t2t (txt2tags) files and updates the corresponding
+### .html file, if it is out-of-date.
 
-# Path to directory where this script is
-# https://stackoverflow.com/a/246128/98600
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-
-# HTML template
-template="$DIR/template.html"
-
-# Render txt2tags into html file
-# Arguments:
-# 1. txt2tags source file, e.g. download/index.t2t
-# 2. html target file, e.g. download/index.html
-function render_t2t_html {
-  t2t="$1"
-  html="$2"
-  tmp="$2.tmp"
-  relroot="$( dirname $t2t | sed -E 's/^.\///' | sed -E 's/[^/]+/../g' )"
-
-  # First render with txt2tags to handle pre/post processing
-  txt2tags \
-    --target=html \
-    --no-headers \
-    --quiet \
-    --outfile="$tmp" \
-    --infile="$t2t"
-
-  # Replace <A NAME="toc3"></A> with <div id="toc3"></div> so that Pandoc retains it
-  # Do this for both cases since BSD sed doesn't support /i
-  sed -i.bak "s/<a name=\"\(.*\)\"><\/a>/<div id=\"\1\"><\/div>/" "$tmp"
-  sed -i.bak "s/<A NAME=\"\(.*\)\"><\/A>/<div id=\"\1\"><\/div>/" "$tmp"
-  rm -f "$tmp.bak"
-
-  # Capture first 3 lines of t2t file: title, author, date
-  # Documentation here: https://txt2tags.org/userguide/headerarea
-  l1=$(head -n 1 "$t2t")
-  l2=$(tail -n+2 "$t2t" | head -n 1)
-  l3=$(tail -n+3 "$t2t" | head -n 1)
-  title=
-  author=
-  date=
-  if [ -n "$l1" ] ; then
-    title="$l1"
-    if [ -n "$l2" ] ; then author="$l2" ; fi
-    if [ -n "$l3" ] ; then date="$l3" ; fi
+find . -name '*.t2t' | while read t2t ; do
+  html="${t2t%.t2t}.html"
+  if [ "$t2t" -nt "$html" ] ; then
+    txt2tags -thtml "$t2t"
   fi
-
-  # Run txt2tag's HTML through Pandoc for cleanup
-  pandoc \
-    --from=html \
-    --to=html5 \
-    --standalone \
-    --template="$template" \
-    --variable="lang:en" \
-    --variable="rel-root:$relroot" \
-    --metadata="title:$title" \
-    --metadata="author:$author" \
-    --metadata="date:$date" \
-    "$tmp" \
-    --output="$html"
-  rm -f "$tmp"
-
-  # Final post-processing
-  if [ -f "$html" ] ; then
-    sed -i.bak "s/<table/<table class=\"table\"/" "$html" && rm "$html.bak"
-    echo "$html"
-  fi
-}
-
-# Render markdown into html file
-# Arguments:
-# 1. markdown source file, e.g. download/index.md
-# 2. html target file, e.g. download/index.html
-function render_md_html {
-  md="$1"
-  html="$2"
-  relroot="$( dirname $md | sed -E 's/^.\///' | sed -E 's/[^/]+/../g' )"
-
-  # Look for `show-toc: true` in metadata (first ten lines of file)
-  if head -n 10 "$md" | grep --quiet 'show-toc: true' ; then
-    tocflag='--table-of-contents'
-  else
-    tocflag=''
-  fi
-
-  pandoc \
-    --from=markdown \
-    --to=html5 \
-    --standalone \
-    $tocflag \
-    --template="$template" \
-    --variable="lang:en" \
-    --variable="rel-root:$relroot" \
-    "$md" \
-    --output="$html"
-
-  # Final post-processing
-  if [ -f "$html" ] ; then
-    # add "table" class to tables
-    sed -i.bak "s/<table/<table class=\"table\"/" "$html"
-    # rewrite anchors that Pandoc 1.16 ignores: [content]{#anchor} -> <span id="anchor">content</span>
-    sed -i.bak -E "s/\[(.*)\]\{#(.+)\}/<span id=\"\2\">\1<\/span>/" "$html"
-    rm -f "$html.bak"
-    echo "$html"
-  fi
-}
-
-# Main entry point
-# Script can be run in one of two modes:
-if [ $# -gt 0 ] ; then
-  # Render specific file(s) from args, ignoring dates
-  for file in "$@" ; do
-    ext="${file##*.}"
-    html="${file%.$ext}.html"
-    case $ext in
-      "md")
-        render_md_html "$file" "$html"
-        ;;
-      "t2t")
-        render_t2t_html "$file" "$html"
-        ;;
-    esac
-  done
-else
-  # Render all files found in cwd and deeper if source is newer
-  find . -name '*.t2t' | while read file ; do
-    html="${file%.t2t}.html"
-    if [ "$file" -nt "$html" ] || [ "$template" -nt "$html" ] ; then
-      render_t2t_html "$file" "$html"
-    fi
-  done
-  find . -name '*.md' | while read file ; do
-    if [[ "$file" == *"README.md" ]] ; then continue ; fi
-    html="${file%.md}.html"
-    if [ "$file" -nt "$html" ] || [ "$template" -nt "$html" ] ; then
-      render_md_html "$file" "$html"
-    fi
-  done
-fi
+done

css/style0.css

@@ -17,7 +17,10 @@ h1 img.nofloat { float: none; }
 img.right { float: right; }
 
 ol.languages {
-    column-width: 12em;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    height: 12em;
 }
 
 .grow {

debian/changelog

@@ -1,21 +1,3 @@
-gf (3.10.3-1) xenial bionic cosmic; urgency=low
-
-  * GF 3.10.3
-
- -- Thomas Hallgren <hallgren@chalmers.se>  Fri,  5 Mar 2019 19:30:00 +0100
-
-gf (3.10-2) xenial bionic cosmic; urgency=low
-
-  * GF 3.10
-
- -- Thomas Hallgren <hallgren@chalmers.se>  Fri,  5 Mar 2019 16:00:00 +0100
-
-gf (3.10-1) xenial bionic cosmic; urgency=low
-
-  * GF 3.10
-
- -- Thomas Hallgren <hallgren@chalmers.se>  Fri,  2 Dec 2018 15:00:00 +0100
-
 gf (3.9-1) vivid xenial zesty; urgency=low
 
   * GF 3.9

debian/control

@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Thomas Hallgren <hallgren@chalmers.se>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 5), haskell-platform (>= 2011.2.0.1), libghc-haskeline-dev, libghc-mtl-dev, libghc-json-dev, autoconf, automake, libtool-bin, python-dev, java-sdk, txt2tags, pandoc
+Build-Depends: debhelper (>= 5), haskell-platform (>= 2011.2.0.1), libghc-haskeline-dev, libghc-mtl-dev, libghc-json-dev, autoconf, automake, libtool-bin, python-dev, java-sdk, txt2tags
 Homepage: http://www.grammaticalframework.org/
 
 Package: gf

debian/rules

@@ -13,38 +13,33 @@
 override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
 
-override_dh_auto_configure:
-	cd src/runtime/c && bash setup.sh configure --prefix=/usr
-	cd src/runtime/c && bash setup.sh build
-	cabal update
-	cabal install --only-dependencies
-	cabal configure --prefix=/usr -fserver -fc-runtime --extra-lib-dirs=$(CURDIR)/src/runtime/c/.libs --extra-include-dirs=$(CURDIR)/src/runtime/c
-
-SET_LDL=LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs
-
 override_dh_auto_build:
 	cd src/runtime/python && EXTRA_INCLUDE_DIRS=$(CURDIR)/src/runtime/c EXTRA_LIB_DIRS=$(CURDIR)/src/runtime/c/.libs python setup.py build
 	cd src/runtime/java && make CFLAGS="-I$(CURDIR)/src/runtime/c -L$(CURDIR)/src/runtime/c/.libs" INSTALL_PATH=/usr/lib
-	echo $(SET_LDL)
-	$(SET_LDL) cabal build # builds gf, fails to build example grammars 
-	PATH=$(CURDIR)/dist/build/gf:$$PATH && make -C ../gf-rgl build
-	GF_LIB_PATH=$(CURDIR)/../gf-rgl/dist $(SET_LDL) cabal build # have RGL now, ok to build example grammars
+	echo LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs
+	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs cabal build
 	make html
 
-override_dh_auto_install:
-	$(SET_LDL) cabal copy --destdir=$(CURDIR)/debian/gf # creates www directory
-	export GF_LIB_PATH="$$(dirname $$(find "$(CURDIR)/debian/gf" -name www))/lib" && echo "GF_LIB_PATH=$$GF_LIB_PATH" && mkdir -p "$$GF_LIB_PATH" && make -C ../gf-rgl copy
-	cd src/runtime/c && bash setup.sh copy prefix=$(CURDIR)/debian/gf/usr
-	cd src/runtime/python && python setup.py install --prefix=$(CURDIR)/debian/gf/usr
-	cd src/runtime/java && make INSTALL_PATH=$(CURDIR)/debian/gf/usr/lib install
-	D="`find debian/gf -name site-packages`" && [ -n "$$D" ] && cd $$D && cd .. && mv site-packages dist-packages
-
 override_dh_auto_clean:
 	rm -fr dist/build
 	-cd src/runtime/python && rm -fr build
 	-cd src/runtime/java && make clean
 	-cd src/runtime/c && make clean
 
+override_dh_auto_configure:
+	cd src/runtime/c && bash setup.sh configure --prefix=/usr
+	cd src/runtime/c && bash setup.sh build
+	cabal update
+	cabal install --only-dependencies
+	cabal configure --prefix=/usr -fserver -fc-runtime --extra-lib-dirs=$(CURDIR)/src/runtime/c/.libs --extra-include-dirs=$(CURDIR)/src/runtime/c
+
+override_dh_auto_install:
+	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs cabal copy --destdir=$(CURDIR)/debian/gf
+	cd src/runtime/c && bash setup.sh copy prefix=$(CURDIR)/debian/gf/usr
+	cd src/runtime/python && python setup.py install --prefix=$(CURDIR)/debian/gf/usr
+	cd src/runtime/java && make INSTALL_PATH=$(CURDIR)/debian/gf/usr/lib install
+	D="`find debian/gf -name site-packages`" && [ -n "$$D" ] && cd $$D && cd .. && mv site-packages dist-packages
+
 override_dh_auto_test:
 ifneq (nocheck,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	true

doc/Makefile

@@ -1,3 +1,18 @@
+resource:
+	gfdoc -txt2 ../lib/resource-1.0/abstract/*.gf
+	gfdoc -txt2 ../lib/resource-1.0/*/Paradigms*.gf
+	txt2tags --toc resource.txt
+#	cat resource-preamble resource.tex >final-resource.tex
+	sed -i 's/\\docum/%\\docum/g' resource.tex
+	sed -i 's/ion\*{/ion{/g' resource.tex
+	sed -i 's/\\paragraph{}//g' resource.tex
+	sed -i 's/}\\\\/}/g' resource.tex
+	cat resource-preamble resource.tex >resource.tmp
+	mv resource.tmp resource.tex
+	latex resource.tex
+	latex resource.tex
+	dvipdf resource.dvi
+
 gf-help-full.txt::
 	{ echo ; echo ; echo ; } > $@
 	echo help -full -t2t | gf -run >> $@

doc/error-messages.txt

@@ -1,551 +0,0 @@
-Compiler.hs
-mainGFC :: Options -> [FilePath] -> IO ()
-                 _ | null fs -> fail $ "No input files."
-                 _ | all (extensionIs ".pgf") fs -> unionPGFFiles opts fs
-                 _ -> fail $ "Don't know what to do with these input files: " ++ unwords fs)
-
-
-----------------------------------------
-Compile.hs
-
-compileModule
-                       case length file1s of
-                         0 -> raise (render ("Unable to find: " $$ nest 2 candidates))
-                         1 -> do return $ head file1s
-                         _ -> do putIfVerb opts1 ("matched multiple candidates: " +++ show file1s)
-                                 return $ head file1s
-               else raise (render ("File" <+> file <+> "does not exist"))
-
----------------------------------------
-Grammar.Lexer.x
-token :: P Token
-        AlexError (AI pos _ _) -> PFailed pos "lexical error"
-
-
----------------------------------------
-Grammar.Parser.y
-
-happyError = fail "syntax error"
-
-tryLoc (c,mty,Just e) = return (c,(mty,e))
-tryLoc (c,_  ,_     ) = fail ("local definition of" +++ showIdent c +++ "without value")
-
-mkR []       = return $ RecType [] --- empty record always interpreted as record type
-mkR fs@(f:_) =
-  case f of
-    (lab,Just ty,Nothing) -> mapM tryRT fs >>= return . RecType
-    _                     -> mapM tryR  fs >>= return . R
-  where
-    tryRT (lab,Just ty,Nothing) = return (ident2label lab,ty)
-    tryRT (lab,_      ,_      ) = fail $ "illegal record type field" +++ showIdent lab --- manifest fields ?!
-
-    tryR (lab,mty,Just t) = return (ident2label lab,(mty,t))
-    tryR (lab,_  ,_     ) = fail $ "illegal record field" +++ showIdent lab
-
-
----------------------------------------
-ModDeps.hs
-
-mkSourceGrammar :: [SourceModule] -> Err SourceGrammar
-  deplist <- either 
-               return 
-               (\ms -> Bad $ "circular modules" +++ unwords (map show ms)) $ 
-
-
-checkUniqueImportNames :: [Ident] -> SourceModInfo -> Err ()
-   test ms = testErr (all (`notElem` ns) ms)
-                     ("import names clashing with module names among" +++ unwords (map prt ms))
-
-
-moduleDeps :: [SourceModule] -> Err Dependencies
-  deps (c,m) = errIn ("checking dependencies of module" +++ prt c) $ case mtype m of
-      MTConcrete a -> do
-        am <- lookupModuleType gr a
-        testErr (mtype am == MTAbstract) "the of-module is not an abstract syntax" 
-
-    testErr (all (compatMType ety . mtype) ests) "inappropriate extension module type" 
-
-
----------------------------------------
-Update.hs
-
-buildAnyTree
-        Just i  -> case unifyAnyInfo m i j of
-		     Ok k  -> go (Map.insert c k map) is
-		     Bad _ -> fail $ render ("conflicting information in module"<+>m $$
-		                             nest 4 (ppJudgement Qualified (c,i)) $$
-		                             "and" $+$
-		                             nest 4 (ppJudgement Qualified (c,j)))
-extendModule
-    unless (sameMType (mtype m) (mtype mo)) 
-            (checkError ("illegal extension type to module" <+> name))
-
-rebuildModule
-      unless (null is || mstatus mi == MSIncomplete) 
-             (checkError ("module" <+> i <+> 
-                          "has open interfaces and must therefore be declared incomplete"))
-
-         unless (isModRes m1)
-                 (checkError ("interface expected instead of" <+> i0))
-          js' <- extendMod gr False ((i0,m1), isInherited mincl) i (jments mi)
-
-     unless (stat' == MSComplete || stat == MSIncomplete) 
-             (checkError ("module" <+> i <+> "remains incomplete"))
-
-
-extendMod
-		                                 checkError ("cannot unify the information" $$ 
-		                                             nest 4 (ppJudgement Qualified (c,i)) $$
-		                                             "in module" <+> name <+> "with" $$
-		                                             nest 4 (ppJudgement Qualified (c,j)) $$
-		                                             "in module" <+> base)
-
-unifyAnyInfo
-  (ResValue (L l1 t1), ResValue (L l2 t2)) 
-      | t1==t2    -> return (ResValue (L l1 t1))
-      | otherwise -> fail ""
-
-  (AnyInd b1 m1, AnyInd b2 m2) -> do
-    testErr (b1 == b2) $ "indirection status"
-    testErr (m1 == m2) $ "different sources of indirection"
-
-unifAbsDefs _         _         = fail ""
-
-----------------------------------
-
-Rename.hs
-
-renameIdentTerm'
-        _    -> case lookupTreeManyAll showIdent opens c of
-                  [f]  -> return (f c)
-                  []   -> alt c ("constant not found:" <+> c $$
-                                 "given" <+> fsep (punctuate ',' (map fst qualifs)))
-
-                           ts@(t:_) -> do checkWarn ("atomic term" <+> ppTerm Qualified 0 t0 $$
-                                                      "conflict" <+> hsep (punctuate ',' (map (ppTerm Qualified 0) ts)) $$
-                                                      "given" <+> fsep (punctuate ',' (map fst qualifs)))
-                                           return t
-
-renameInfo
-    renLoc ren (L loc x) =
-      checkInModule cwd mi loc ("Happened in the renaming of" <+> i) $ do
-
-renameTerm
-      | otherwise -> checks [ renid' (Q (MN r,label2ident l))      -- .. and qualified expression second.
-                            , renid' t >>= \t -> return (P t l) -- try as a constant at the end
-                            , checkError ("unknown qualified constant" <+> trm)
-                            ]
-
-renamePattern env patt =
-    do r@(p',vs) <- renp patt
-       let dupl = vs \\ nub vs
-       unless (null dupl) $ checkError (hang ("[C.4.13] Pattern is not linear:") 4
-                                             patt)
-       return r
-
-       case c' of
-          Q d -> renp $ PM d
-          _ -> checkError ("unresolved pattern" <+> patt)
-
-          Q  _ -> checkError ("data constructor expected but" <+> ppTerm Qualified 0 c' <+> "is found instead")
-          _    -> checkError ("unresolved data constructor" <+> ppTerm Qualified 0 c')
-
-      PM c -> do
-        x <- renid (Q c)
-        c' <- case x of
-                (Q c') -> return c'
-                _      -> checkError ("not a pattern macro" <+> ppPatt Qualified 0 patt)
-
-     PV x -> checks [ renid' (Vr x) >>= \t' -> case t' of
-                                                 QC c -> return (PP c [],[])
-                                                 _    -> checkError (pp "not a constructor")
-                     , return (patt, [x])
- 
-
-
------------------------------------
-CheckGrammar.hs
-
-checkRestrictedInheritance :: FilePath -> SourceGrammar -> SourceModule -> Check ()
-     let illegals = [(f,is) | 
-           (f,cs) <- allDeps, incld f, let is = filter illegal cs, not (null is)]
-     case illegals of 
-       [] -> return ()
-       cs -> checkWarn ("In inherited module" <+> i <> ", dependence of excluded constants:" $$
-                         nest 2 (vcat [f <+> "on" <+> fsep is | (f,is) <- cs]))
-
-checkCompleteGrammar :: Options -> FilePath -> Grammar -> Module -> Module -> Check Module
-                       case info of
-                         CncCat (Just (L loc (RecType []))) _ _ _ _ -> return (foldr (\_ -> Abs Explicit identW) (R []) cxt)
-                         _                                          -> Bad "no def lin"
-
-         where noLinOf c = checkWarn ("no linearization of" <+> c)
-
-         Ok (CncCat Nothing md mr mp mpmcfg) -> do
-           checkWarn ("no linearization type for" <+> c <> ", inserting default {s : Str}")
-           return $ updateTree (c,CncCat (Just (L NoLoc defLinType)) md mr mp mpmcfg) js
-         _ -> do
-           checkWarn ("no linearization type for" <+> c <> ", inserting default {s : Str}")
-
-                             _       -> do checkWarn ("function" <+> c <+> "is not in abstract")
-
-           Ok (_,AbsFun {}) ->
-                   checkError ("lincat:"<+>c<+>"is a fun, not a cat")
-           -}
-           _ -> do checkWarn ("category" <+> c <+> "is not in abstract")
-
-checkInfo :: Options -> FilePath -> SourceGrammar -> SourceModule -> Ident -> Info -> Check Info
-         (Just (L loct ty), Nothing) -> do
-           chIn loct "operation" $
-             checkError (pp "No definition given to the operation")
-
-    ResOverload os tysts -> chIn NoLoc "overloading" $ do
-    
-       checkUniq xss = case xss of
-     x:y:xs 
-      | x == y    -> checkError $ "ambiguous for type" <+>
-                                  ppType (mkFunType (tail x) (head x))
-
-   compAbsTyp g t = case t of
-     Vr x -> maybe (checkError ("no value given to variable" <+> x)) return $ lookup x g
-
-checkReservedId x =
-  when (isReservedWord x) $
-       checkWarn ("reserved word used as identifier:" <+> x)
-
-
---------------------------------
-TypeCheck/Abstract.hs
-
-grammar2theory :: SourceGrammar -> Theory
-  Bad s -> case lookupCatContext gr m f of
-    Ok cont -> return $ cont2val cont
-    _ -> Bad s
-
-
---------------------------------
-TypeCheck/ConcreteNew.hs
--- Concrete.hs has all its code commented out
-
-
---------------------------------
-TypeCheck/RConcrete.hs
--- seems to be used more than ConcreteNew
-
-computeLType :: SourceGrammar -> Context -> Type -> Check Type
-   AdHocOverload ts -> do
-     over <- getOverload gr g (Just typeType) t
-     case over of
-       Just (tr,_) -> return tr
-       _ -> checkError ("unresolved overloading of constants" <+> ppTerm Qualified 0 t) 
-
-inferLType :: SourceGrammar -> Context -> Term -> Check (Term, Type)
-   Q (m,ident) | isPredef m -> termWith trm $ case typPredefined ident of
-                                                Nothing -> checkError ("unknown in Predef:" <+> ident)
-
-   Q ident -> checks [
-     checkError ("cannot infer type of constant" <+> ppTerm Unqualified 0 trm)
-     ]
-
-   QC ident -> checks [
-       checkError ("cannot infer type of canonical constant" <+> ppTerm Unqualified 0 trm)
-       ]
-
-   Vr ident -> termWith trm $ checkLookup ident g
-
-   AdHocOverload ts -> do
-       _ -> checkError ("unresolved overloading of constants" <+> ppTerm Qualified 0 trm) 
-
-   App f a -> do
-         case fty' of
-           Prod bt z arg val -> do 
-           _ -> checkError ("A function type is expected for" <+> ppTerm Unqualified 0 f <+> "instead of type" <+> ppType fty)
-
-   S f x -> do
-       _ -> checkError ("table lintype expected for the table in" $$ nest 2 (ppTerm Unqualified 0 trm))
-
-   P t i -> do
-                       Nothing -> checkError ("unknown label" <+> i <+> "in" $$ nest 2 (ppTerm Unqualified 0 ty'))
-       _          -> checkError ("record type expected for:" <+> ppTerm Unqualified 0 t $$
-                                 " instead of the inferred:" <+> ppTerm Unqualified 0 ty')
-
-   R r -> do
-     checkCond ("cannot infer type of record" $$ nest 2 (ppTerm Unqualified 0 trm)) (length ts == length fsts)
-
-   T ti pts -> do  -- tries to guess: good in oper type inference
-       [] -> checkError ("cannot infer table type of" <+> ppTerm Unqualified 0 trm)
-
-   ---- hack from Rename.identRenameTerm, to live with files with naming conflicts 18/6/2007
-   Strs (Cn c : ts) | c == cConflict -> do
-     checkWarn ("unresolved constant, could be any of" <+> hcat (map (ppTerm Unqualified 0) ts))
-
-   ExtR r s -> do
-     case (rT', sT') of
-       (RecType rs, RecType ss) -> do
-       _ -> checkError ("records or record types expected in" <+> ppTerm Unqualified 0 trm)
-
-   _ -> checkError ("cannot infer lintype of" <+> ppTerm Unqualified 0 trm)
-
-
-getOverload :: SourceGrammar -> Context -> Maybe Type -> Term -> Check (Maybe (Term,Type))
-   matchOverload f typs ttys = do
-         checkWarn $  "ignoring lock fields in resolving" <+> ppTerm Unqualified 0 ot $$
-                      "for" $$
-                      nest 2 (showTypes tys) $$
-                      "using" $$
-                      nest 2 (showTypes pre)
-       ([],[]) -> do
-         checkError $ "no overload instance of" <+> ppTerm Unqualified 0 f $$
-                      "for" $$
-                      nest 2 stysError $$
-                      "among" $$
-                      nest 2 (vcat stypsError) $$
-                      maybe empty (\x -> "with value type" <+> ppType x) mt
-        ([],[(val,fun)]) -> do
-           checkWarn ("ignoring lock fields in resolving" <+> ppTerm Unqualified 0 ot) 
-         (nps1,nps2) -> do 
-              checkWarn $  "ambiguous overloading of" <+> ppTerm Unqualified 0 f <+>
-                  ----     "with argument types" <+> hsep (map (ppTerm Qualified 0) tys) $$ 
-                           "resolved by selecting the first of the alternatives" $$
-                           nest 2 (vcat [ppTerm Qualified 0 fun | (_,ty,fun) <- vfs1 ++ if null vfs1 then vfs2 else []])
-              case [(mkApp fun tts,val) | (val,fun) <- nps1 ++ nps2] of
-                 [] -> checkError $ "no alternatives left when resolving" <+> ppTerm Unqualified 0 f
- 
-checkLType :: SourceGrammar -> Context -> Term -> Type -> Check (Term, Type)
-    Abs bt x c -> do
-      case typ of
-        Prod bt' z a b -> do 
-        _ -> checkError $ "function type expected instead of" <+> ppType typ
-    AdHocOverload ts -> do
-        _ -> checkError ("unresolved overloading of constants" <+> ppTerm Qualified 0 trm) 
-    T _ [] ->
-      checkError ("found empty table in type" <+> ppTerm Unqualified 0 typ)
-    T _ cs -> case typ of 
-              else checkWarn ("patterns never reached:" $$
-                              nest 2 (vcat (map (ppPatt Unqualified 0) ps)))
-      _ -> checkError $ "table type expected for table instead of" $$ nest 2 (ppType typ)
-    V arg0 vs ->
-              if length vs1 == length vs
-                 then return ()
-                 else checkError $ "wrong number of values in table" <+> ppTerm Unqualified 0 trm
-
-    R r -> case typ of --- why needed? because inference may be too difficult
-       RecType rr -> do
-       _ -> checkError ("record type expected in type checking instead of" $$ nest 2 (ppTerm Unqualified 0 typ))
-
-    ExtR r s -> case typ of
-         case trm' of
-           RecType _ -> termWith trm' $ return typeType
-           ExtR (Vr _) (RecType _) -> termWith trm' $ return typeType 
-                                      -- ext t = t ** ...
-           _ -> checkError ("invalid record type extension" <+> nest 2 (ppTerm Unqualified 0 trm))
-
-             case typ2 of
-               RecType ss -> return $ map fst ss
-               _ ->  checkError ("cannot get labels from" $$ nest 2 (ppTerm Unqualified 0 typ2))
-       _ -> checkError ("record extension not meaningful for" <+> ppTerm Unqualified 0 typ)
-
-    S tab arg -> checks [ do
-        _ -> checkError ("table type expected for applied table instead of" <+> ppType ty')
-
-    _ -> do
-      (trm',ty') <- inferLType gr g trm
-      termWith trm' $ checkEqLType gr g typ ty' trm'
-
-   checkM rms (l,ty) = case lookup l rms of
-     _ -> checkError $ 
-            if isLockLabel l 
-              then let cat = drop 5 (showIdent (label2ident l))
-                   in ppTerm Unqualified 0 (R rms) <+> "is not in the lincat of" <+> cat <> 
-                      "; try wrapping it with lin" <+> cat
-              else "cannot find value for label" <+> l <+> "in" <+> ppTerm Unqualified 0 (R rms)
-
-checkEqLType :: SourceGrammar -> Context -> Type -> Type -> Term -> Check Type
-    False -> checkError $ s <+> "type of" <+> ppTerm Unqualified 0 trm $$
-                          "expected:" <+> ppTerm Qualified 0 t $$ -- ppqType t u $$
-                          "inferred:" <+> ppTerm Qualified 0 u -- ppqType u t
-
-checkIfEqLType :: SourceGrammar -> Context -> Type -> Type -> Term -> Check (Bool,Type,Type,String)
-      Ok lo -> do
-        checkWarn $ "missing lock field" <+> fsep lo
-
-   missingLock g t u = case (t,u) of  
-         _:_ -> Bad $ render ("missing record fields:" <+> fsep (punctuate ',' (others)))
-
-
-
-pattContext :: SourceGrammar -> Context -> Type -> Patt -> Check Context
-    checkCond ("wrong number of arguments for constructor in" <+> ppPatt Unqualified 0 p) 
-              (length cont == length ps)
-  PR r -> do
-      _ -> checkError ("record type expected for pattern instead of" <+> ppTerm Unqualified 0 typ')
-
-  PAlt p' q -> do
-    g1 <- pattContext env g typ p'
-    g2 <- pattContext env g typ q
-    let pts = nub ([x | pt@(_,x,_) <- g1, notElem pt g2] ++ [x | pt@(_,x,_) <- g2, notElem pt g1])
-    checkCond 
-      ("incompatible bindings of" <+>
-       fsep pts <+> 
-       "in pattern alterantives" <+> ppPatt Unqualified 0 p) (null pts) 
-    return g1 -- must be g1 == g2
-    
-   noBind typ p' = do
-    co <- pattContext env g typ p'
-    if not (null co)
-      then checkWarn ("no variable bound inside pattern" <+> ppPatt Unqualified 0 p) 
-           >> return []
-      else return []
-
-checkLookup :: Ident -> Context -> Check Type -- used for looking up Vr x type in context
-    []     -> checkError ("unknown variable" <+> x)
- 
-
-
--------------------------------
-Grammar/Lookup.hs
-
-lookupIdent :: ErrorMonad m => Ident -> BinTree Ident b -> m b
-    Bad _ -> raise ("unknown identifier" +++ showIdent c)
-
-lookupResDefLoc
-        _   -> raise $ render (c <+> "is not defined in resource" <+> m)
-
-lookupResType :: ErrorMonad m => Grammar -> QIdent -> m Type
-    _   -> raise $ render (c <+> "has no type defined in resource" <+> m)
-
-lookupOverloadTypes :: ErrorMonad m => Grammar -> QIdent -> m [(Term,Type)]
-    _            -> raise $ render (c <+> "has no types defined in resource" <+> m)
-
-lookupOverload :: ErrorMonad m => Grammar -> QIdent -> m [([Type],(Type,Term))]
-      _   -> raise $ render (c <+> "is not an overloaded operation")
-
-
-lookupParamValues :: ErrorMonad m => Grammar -> QIdent -> m [Term]
-  case info of
-    ResParam _ (Just pvs) -> return pvs
-    _                     -> raise $ render (ppQIdent Qualified c <+> "has no parameter values defined")
-
-
-allParamValues :: ErrorMonad m => Grammar -> Type -> m [Term]
-    _ -> raise (render ("cannot find parameter values for" <+> ptyp))
-
-
-lookupFunType :: ErrorMonad m => Grammar -> ModuleName -> Ident -> m Type
-    _                           -> raise (render ("cannot find type of" <+> c))
-
-lookupCatContext :: ErrorMonad m => Grammar -> ModuleName -> Ident -> m Context
-    _                      -> raise (render ("unknown category" <+> c))
-
-
--------------------------
-PatternMatch.hs
-
-matchPattern :: ErrorMonad m => [(Patt,rhs)] -> Term -> m (rhs, Substitution)
-  if not (isInConstantForm term)
-    then raise (render ("variables occur in" <+> pp term))
-
-findMatch :: ErrorMonad m => [([Patt],rhs)] -> [Term] -> m (rhs, Substitution)
-   [] -> raise (render ("no applicable case for" <+> hsep (punctuate ',' terms)))
-   (patts,_):_ | length patts /= length terms -> 
-       raise (render ("wrong number of args for patterns :" <+> hsep patts <+> 
-                    "cannot take" <+> hsep terms))
-
-tryMatch :: (Patt, Term) -> Err [(Ident, Term)]
-      (PNeg p',_) -> case tryMatch (p',t) of
-        Bad _ -> return []
-        _ -> raise (render ("no match with negative pattern" <+> p))
-
-
----------------------------------------------
-Compile.Optimize.hs
-
-mkLinDefault :: SourceGrammar -> Type -> Err Term
-                            _   -> Bad (render ("no parameter values given to type" <+> ppQIdent Qualified p))
-     _ -> Bad (render ("linearization type field cannot be" <+> typ))
-
-mkLinReference :: SourceGrammar -> Type -> Err Term
-                            []     -> Bad "no string"
-
-
----------------------------------------------
-Compile.Compute.Concrete.hs
-
-nfx env@(GE _ _ _ loc) t = do
-    Left i  -> fail ("variable #"++show i++" is out of scope")
-
-var :: CompleteEnv -> Ident -> Err OpenValue
-var env x = maybe unbound pick' (elemIndex x (local env))
-  where
-    unbound = fail ("Unknown variable: "++showIdent x)
-    pick' i = return $ \ vs -> maybe (err i vs) ok (pick i vs)
-    err i vs = bug $ "Stack problem: "++showIdent x++": "
-                    ++unwords (map showIdent (local env))
-                    ++" => "++show (i,length vs)
-
-resource env (m,c) =
-  where e = fail $ "Not found: "++render m++"."++showIdent c
-
-extR t vv =
-      (VRecType rs1, VRecType rs2) ->
-          case intersect (map fst rs1) (map fst rs2) of
-            [] -> VRecType (rs1 ++ rs2)
-            ls -> error $ "clash"<+>show ls
-      (v1,v2) -> error $ "not records" $$ show v1 $$ show v2
-  where
-    error explain = ppbug $ "The term" <+> t
-                            <+> "is not reducible" $$ explain
- 
-glue env (v1,v2) = glu v1 v2
-                                         ppL loc (hang "unsupported token gluing:" 4
-                                                        (Glue (vt v1) (vt v2)))
-
-strsFromValue :: Value -> Err [Str]
-  _ -> fail ("cannot get Str from value " ++ show t)
-
-match loc cs v = 
-  case value2term loc [] v of
-    Left i  -> bad ("variable #"++show i++" is out of scope")
-    Right t -> err bad return (matchPattern cs t)
-  where
-    bad = fail . ("In pattern matching: "++)
-
-    inlinePattMacro p =
-                        VPatt p' -> inlinePattMacro p'
-                        _ -> ppbug $ hang "Expected pattern macro:" 4
-
-linPattVars p =
-    if null dups
-    then return pvs
-    else fail.render $ hang "Pattern is not linear:" 4 (ppPatt Unqualified 0 p)
-
----------------------------------------------
-Compile.Compute.Abstract.hs
-
-
----------------------------------------------
-PGF.Linearize.hs
-
-bracketedLinearize :: PGF -> Language -> Tree -> [BracketedString]
-    cnc = lookMap (error "no lang") lang (concretes pgf)
-
-
----------------------------------------------
-PGF.TypeCheck.hs
-
-ppTcError :: TcError -> Doc
-ppTcError (UnknownCat cat)             = text "Category" <+> ppCId cat <+> text "is not in scope"
-ppTcError (UnknownFun fun)             = text "Function" <+> ppCId fun <+> text "is not in scope"
-ppTcError (WrongCatArgs xs ty cat m n) = text "Category" <+> ppCId cat <+> text "should have" <+> int m <+> text "argument(s), but has been given" <+> int n $$
-                                         text "In the type:" <+> ppType 0 xs ty
-ppTcError (TypeMismatch xs e ty1 ty2)  = text "Couldn't match expected type" <+> ppType 0 xs ty1 $$
-                                         text "       against inferred type" <+> ppType 0 xs ty2 $$
-                                         text "In the expression:" <+> ppExpr 0 xs e
-ppTcError (NotFunType xs e ty)         = text "A function type is expected for the expression" <+> ppExpr 0 xs e <+> text "instead of type" <+> ppType 0 xs ty
-ppTcError (CannotInferType xs e)       = text "Cannot infer the type of expression" <+> ppExpr 0 xs e
-ppTcError (UnresolvedMetaVars xs e ms) = text "Meta variable(s)" <+> fsep (List.map ppMeta ms) <+> text "should be resolved" $$
-                                         text "in the expression:" <+> ppExpr 0 xs e
-ppTcError (UnexpectedImplArg xs e)     = braces (ppExpr 0 xs e) <+> text "is implicit argument but not implicit argument is expected here"
-ppTcError (UnsolvableGoal xs metaid ty)= text "The goal:" <+> ppMeta metaid <+> colon <+> ppType 0 xs ty $$
-                                         text "cannot be solved"
-

doc/gf-developers.t2t

@@ -1,8 +1,16 @@
 GF Developers Guide
+Authors: Björn Bringert, Krasimir Angelov and Thomas Hallgren
+Last update: %%mtime(%F, %H:%M)
 
-2018-07-26
+% NOTE: this is a txt2tags file.
+% Create an html file from this file using:
+% txt2tags -t html gf-developers.t2t
 
+%!style:../css/style.css
+%!target:html
 %!options(html): --toc
+%!encoding:utf-8
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
 
 == Before you start ==
 
@@ -55,6 +63,18 @@ Other required tools included in the Haskell Platform are
 and
 [Happy http://www.haskell.org/happy/].
 
+%=== Darcs ===
+%
+%To get the GF source code, you also need //Darcs//, version 2 or later.
+%Darcs 2.10 is recommended (July 2015).
+%
+%//Darcs//
+%is a distributed version control system, see http://darcs.net/ for
+%more information. There are precompiled packages for many platforms
+%available and source code if you want to compile it yourself. Darcs
+%is also written in Haskell and so you can use GHC to compile it.
+
+
 === Git ===
 
 To get the GF source code, you also need //Git//.
@@ -405,13 +425,13 @@ There is also ``make build``, ``make copy`` and ``make clean`` which do what you
 === Advanced ===
 For advanced build options, call the Haskell build script directly:
 ```
-$ runghc Setup.hs ...
+$ runghc Make.hs ...
 ```
 For more details see the [README https://github.com/GrammaticalFramework/gf-rgl/blob/master/README.md].
 
 === Haskell-free ===
-If you do not have Haskell installed, you can use the simple build script ``Setup.sh``
-(or ``Setup.bat`` for Windows).
+If you do not have Haskell installed, you can use the simple build script ``Make.sh``
+(or ``Make.bat`` for Windows).
 
 
 == Creating binary distribution packages ==

doc/gf-editor-modes.t2t

@@ -1,6 +1,12 @@
 Editor modes & IDE integration for GF
 
 
+%!style:../css/style.css
+%!options(html): --toc
+%!postproc(html): <TITLE> <meta name = "viewport" content = "width = device-width"><TITLE>
+%!encoding:utf-8
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+
 We collect GF modes for various editors on this page. Contributions are
 welcome!
 

doc/gf-faq.t2t

@@ -0,0 +1,91 @@
+Grammatical Framework: Frequently Asked Quuestions
+Aarne Ranta
+%%date(%c)
+
+% NOTE: this is a txt2tags file.
+% Create an html file from this file using:
+% txt2tags gf-bibliography.t2t
+
+%!style:../css/style.css
+%!target:html
+%!options(html): --toc
+%!postproc(html): <TITLE> <meta name = "viewport" content = "width = device-width"><TITLE>
+%!postproc(html): #BR <br>
+%!encoding:utf-8
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+
+
+===What has been done with GF?===
+
+**Translation**: systems with any number of parallel languages, with input in one language and output in all the others.
+
+**Natural language generation** (NLG): translation from a formal language to natural languages.
+
+**Ontology verbalization** is a special case of NLG.
+
+**Language training**: grammar and vocabulary training systems.
+
+**Human-computer interaction**: natural language interfaces, spoken dialogue systems.
+
+**Linguistics**: comparisons between languages.
+
+
+
+===What parts does GF have?===
+
+A **grammar compiler**, used for compiling grammars to parsing, generation, and translation code. 
+
+A **run-time system**, used for parsing, generation and translation. The run-time system is available in several languages:
+Haskell, Java, C, C++, Javascript, and Python. The point with this is that you can include GF-based parsing and generation in 
+larger programs written in any of these languages.
+
+A **resource grammar library**, containing the morphology and basic syntax of currently 26 languages.
+
+A **web application toolkit**, containing server-side (Haskell) and client-side (Javascript) libraries.
+
+An **integrated development environment**, the GF-Eclipse plug-in.
+
+A **shell**, i.e. a command interpreter for testing and developing GF grammars. This is the program started by the command ``gf`` in a terminal.
+
+
+
+===Is GF open-source?===
+
+
+===Can I use GF for commercial applications?===
+
+Yes. Those parts of GF that you will need to distribute - the run-time system and the libraries - are licensed under LGPL and BSD; it's up to you to choose which. 
+
+
+
+===When was GF started?===
+
+
+===Where does the name GF come from?===
+
+GF = Grammatical Framework = LF + concrete syntax
+
+LF = Logical Framework
+
+Logical Frameworks are implementations of type theory, which have been built since the 1980's to support formalized mathematics. GF has its roots in
+type theory, which is widely used in the semantics of natural language. Some of these ideas were first implemented in ALF, Another Logical Framework,
+in 1992; the book //Type-Theoretical Grammar// (by A. Ranta, OUP 1994) has a chapter and an appendix on this. The first implementations did not have
+a parser, and GF proper, started in 1998, was an implementation of yet another LF together with concrete syntax supporting generation and parsing.
+Grammatical Framework was a natural name for this. We tried to avoid it in the beginning, because it sounded pretentious in its generality. But the
+name was just too natural to be avoided. 
+
+
+
+===Is GF backward compatible?===
+
+
+
+===Do I need Haskell to use GF?===
+
+No. GF is a language of its own, and you don't need to know Haskell. And if you download the GF binary, you don't need any Haskell tools. But if you want to
+become a GF developer, then it's better you install GF from the latest source, and then you need the GHC Haskell compiler to compile GF. But even then, you
+don't need to know Haskell yourself.
+
+
+===What is a lock field?===
+

doc/gf-help-full.txt

@@ -68,9 +68,9 @@ metavariables and the type of the expression.
 Prints a set of strings in the .dot format (the graphviz format).
 The graph can be saved in a file by the wf command as usual.
 If the -view flag is defined, the graph is saved in a temporary file
-which is processed by 'dot' (graphviz) and displayed by the program indicated
-by the view flag. The target format is png, unless overridden by the
-flag -format. Results from multiple trees are combined to pdf with convert (ImageMagick).
+which is processed by graphviz and displayed by the program indicated
+by the flag. The target format is postscript, unless overridden by the
+flag -format.
 
 
 - Options:
@@ -151,7 +151,6 @@ of a pipe.
  | ``-one`` | pick the first strings, if there is any, from records and tables
  | ``-table`` | show all strings labelled by parameters
  | ``-unqual`` | hide qualifying module names
- | ``-trace`` | trace computations
 
 
 #NORMAL
@@ -243,7 +242,7 @@ and thus cannot be a part of a pipe.
 
 ====e = empty====
 #NOINDENT
-``e`` = ``empty``: //empty the environment (except the command history).//
+``e`` = ``empty``: //empty the environment.//
 
 #TINY
 
@@ -282,19 +281,6 @@ but the resulting .gf file must be imported separately.
 #NORMAL
 
 
-#VSPACE
-
-====eh = execute_history====
-#NOINDENT
-``eh`` = ``execute_history``: //read commands from a file and execute them.//
-
-#TINY
-
-- Syntax: ``eh FILE``
-
-#NORMAL
-
-
 #VSPACE
 
 ====gr = generate_random====
@@ -448,14 +434,12 @@ sequences; see example.
  | ``-list`` | show all forms and variants, comma-separated on one line (cf. l -all)
  | ``-multi`` | linearize to all languages (default)
  | ``-table`` | show all forms labelled by parameters
- | ``-tabtreebank`` | show the tree and its linearizations on a tab-separated line
  | ``-treebank`` | show the tree and tag linearizations with language names
  | ``-bind`` | bind tokens separated by Prelude.BIND, i.e. &+
  | ``-chars`` | lexer that makes every non-space character a token
  | ``-from_amharic`` | from unicode to GF Amharic transliteration
  | ``-from_ancientgreek`` | from unicode to GF ancient Greek transliteration
  | ``-from_arabic`` | from unicode to GF Arabic transliteration
- | ``-from_arabic_unvocalized`` | from unicode to GF unvocalized Arabic transliteration
  | ``-from_cp1251`` | decode from cp1251 (Cyrillic used in Bulgarian resource)
  | ``-from_devanagari`` | from unicode to GF Devanagari transliteration
  | ``-from_greek`` | from unicode to GF modern Greek transliteration
@@ -469,14 +453,11 @@ sequences; see example.
  | ``-from_urdu`` | from unicode to GF Urdu transliteration
  | ``-from_utf8`` | decode from utf8 (default)
  | ``-lexcode`` | code-like lexer
- | ``-lexgreek`` | lexer normalizing ancient Greek accentuation
- | ``-lexgreek2`` | lexer normalizing ancient Greek accentuation for text with vowel length annotations
  | ``-lexmixed`` | mixture of text and code, as in LaTeX (code between $...$, \(...)\, \[...\])
  | ``-lextext`` | text-like lexer
  | ``-to_amharic`` | from GF Amharic transliteration to unicode
  | ``-to_ancientgreek`` | from GF ancient Greek transliteration to unicode
  | ``-to_arabic`` | from GF Arabic transliteration to unicode
- | ``-to_arabic_unvocalized`` | from GF unvocalized Arabic transliteration to unicode
  | ``-to_cp1251`` | encode to cp1251 (Cyrillic used in Bulgarian resource)
  | ``-to_devanagari`` | from GF Devanagari transliteration to unicode
  | ``-to_greek`` | from GF modern Greek transliteration to unicode
@@ -492,7 +473,6 @@ sequences; see example.
  | ``-to_utf8`` | encode to utf8 (default)
  | ``-unchars`` | unlexer that puts no spaces between tokens
  | ``-unlexcode`` | code-like unlexer
- | ``-unlexgreek`` | unlexer de-normalizing ancient Greek accentuation
  | ``-unlexmixed`` | mixture of text and code (code between $...$, \(...)\, \[...\])
  | ``-unlextext`` | text-like unlexer
  | ``-unwords`` | unlexer that puts a single space between tokens (default)
@@ -533,7 +513,6 @@ trees where a function node is a metavariable.
  | ``-from_amharic`` | from unicode to GF Amharic transliteration
  | ``-from_ancientgreek`` | from unicode to GF ancient Greek transliteration
  | ``-from_arabic`` | from unicode to GF Arabic transliteration
- | ``-from_arabic_unvocalized`` | from unicode to GF unvocalized Arabic transliteration
  | ``-from_cp1251`` | decode from cp1251 (Cyrillic used in Bulgarian resource)
  | ``-from_devanagari`` | from unicode to GF Devanagari transliteration
  | ``-from_greek`` | from unicode to GF modern Greek transliteration
@@ -547,14 +526,11 @@ trees where a function node is a metavariable.
  | ``-from_urdu`` | from unicode to GF Urdu transliteration
  | ``-from_utf8`` | decode from utf8 (default)
  | ``-lexcode`` | code-like lexer
- | ``-lexgreek`` | lexer normalizing ancient Greek accentuation
- | ``-lexgreek2`` | lexer normalizing ancient Greek accentuation for text with vowel length annotations
  | ``-lexmixed`` | mixture of text and code, as in LaTeX (code between $...$, \(...)\, \[...\])
  | ``-lextext`` | text-like lexer
  | ``-to_amharic`` | from GF Amharic transliteration to unicode
  | ``-to_ancientgreek`` | from GF ancient Greek transliteration to unicode
  | ``-to_arabic`` | from GF Arabic transliteration to unicode
- | ``-to_arabic_unvocalized`` | from GF unvocalized Arabic transliteration to unicode
  | ``-to_cp1251`` | encode to cp1251 (Cyrillic used in Bulgarian resource)
  | ``-to_devanagari`` | from GF Devanagari transliteration to unicode
  | ``-to_greek`` | from GF modern Greek transliteration to unicode
@@ -570,7 +546,6 @@ trees where a function node is a metavariable.
  | ``-to_utf8`` | encode to utf8 (default)
  | ``-unchars`` | unlexer that puts no spaces between tokens
  | ``-unlexcode`` | code-like unlexer
- | ``-unlexgreek`` | unlexer de-normalizing ancient Greek accentuation
  | ``-unlexmixed`` | mixture of text and code (code between $...$, \(...)\, \[...\])
  | ``-unlextext`` | text-like unlexer
  | ``-unwords`` | unlexer that puts a single space between tokens (default)
@@ -691,9 +666,10 @@ command (flag -printer):
  fa		finite automaton in graphviz format
  gsl		Nuance speech recognition format
  haskell		Haskell (abstract syntax)
- java		Java (abstract syntax)
  js		JavaScript (whole grammar)
  jsgf		JSGF speech recognition format
+ lambda_prolog		LambdaProlog (abstract syntax)
+ lp_byte_code		Bytecode for Teyjus (abstract syntax, experimental)
  pgf_pretty		human-readable pgf
  prolog		Prolog (whole grammar)
  python		Python (whole grammar)
@@ -777,7 +753,6 @@ To see transliteration tables, use command ut.
  | ``-from_amharic`` | from unicode to GF Amharic transliteration
  | ``-from_ancientgreek`` | from unicode to GF ancient Greek transliteration
  | ``-from_arabic`` | from unicode to GF Arabic transliteration
- | ``-from_arabic_unvocalized`` | from unicode to GF unvocalized Arabic transliteration
  | ``-from_cp1251`` | decode from cp1251 (Cyrillic used in Bulgarian resource)
  | ``-from_devanagari`` | from unicode to GF Devanagari transliteration
  | ``-from_greek`` | from unicode to GF modern Greek transliteration
@@ -791,14 +766,11 @@ To see transliteration tables, use command ut.
  | ``-from_urdu`` | from unicode to GF Urdu transliteration
  | ``-from_utf8`` | decode from utf8 (default)
  | ``-lexcode`` | code-like lexer
- | ``-lexgreek`` | lexer normalizing ancient Greek accentuation
- | ``-lexgreek2`` | lexer normalizing ancient Greek accentuation for text with vowel length annotations
  | ``-lexmixed`` | mixture of text and code, as in LaTeX (code between $...$, \(...)\, \[...\])
  | ``-lextext`` | text-like lexer
  | ``-to_amharic`` | from GF Amharic transliteration to unicode
  | ``-to_ancientgreek`` | from GF ancient Greek transliteration to unicode
  | ``-to_arabic`` | from GF Arabic transliteration to unicode
- | ``-to_arabic_unvocalized`` | from GF unvocalized Arabic transliteration to unicode
  | ``-to_cp1251`` | encode to cp1251 (Cyrillic used in Bulgarian resource)
  | ``-to_devanagari`` | from GF Devanagari transliteration to unicode
  | ``-to_greek`` | from GF modern Greek transliteration to unicode
@@ -814,7 +786,6 @@ To see transliteration tables, use command ut.
  | ``-to_utf8`` | encode to utf8 (default)
  | ``-unchars`` | unlexer that puts no spaces between tokens
  | ``-unlexcode`` | code-like unlexer
- | ``-unlexgreek`` | unlexer de-normalizing ancient Greek accentuation
  | ``-unlexmixed`` | mixture of text and code (code between $...$, \(...)\, \[...\])
  | ``-unlextext`` | text-like unlexer
  | ``-unwords`` | unlexer that puts a single space between tokens (default)
@@ -828,14 +799,13 @@ To see transliteration tables, use command ut.
 
 - Examples:
 
- | ``l (EAdd 3 4) | ps -unlexcode`` | linearize code-like output
- | ``ps -lexcode | p -cat=Exp`` | parse code-like input
+ | ``l (EAdd 3 4) | ps -code`` | linearize code-like output
+ | ``ps -lexer=code | p -cat=Exp`` | parse code-like input
  | ``gr -cat=QCl | l | ps -bind`` | linearization output from LangFin
  | ``ps -to_devanagari "A-p"`` | show Devanagari in UTF8 terminal
  | ``rf -file=Hin.gf | ps -env=quotes -to_devanagari`` | convert translit to UTF8
  | ``rf -file=Ara.gf | ps -from_utf8 -env=quotes -from_arabic`` | convert UTF8 to transliteration
  | ``ps -to=chinese.trans "abc"`` | apply transliteration defined in file chinese.trans
- | ``ps -lexgreek "a)gavoi` a)'nvrwpoi' tines*"`` | normalize ancient greek accentuation
 
 
 #NORMAL
@@ -858,6 +828,7 @@ are type checking and semantic computation.
 - Options:
 
  | ``-compute`` | compute by using semantic definitions (def)
+ | ``-paraphrase`` | paraphrase by using semantic definitions (def)
  | ``-largest`` | sort trees from largest to smallest, in number of nodes
  | ``-nub`` | remove duplicate trees
  | ``-smallest`` | sort trees from smallest to largest, in number of nodes
@@ -867,10 +838,12 @@ are type checking and semantic computation.
 - Flags:
 
  | ``-number`` | take at most this many trees
+ | ``-transfer`` | syntactic transfer by applying function, recursively in subtrees
 
 - Examples:
 
  | ``pt -compute (plus one two)`` | compute value
+ | ``p "4 dogs love 5 cats" | pt -transfer=digits2numeral | l`` | four...five...
 
 
 #NORMAL
@@ -1017,6 +990,8 @@ This command requires a source grammar to be in scope, imported with 'import -re
 The operations include the parameter constructors that are in scope.
 The optional TYPE filters according to the value type.
 The grep STRINGs filter according to other substrings of the type signatures.
+This command must be a line of its own, and thus cannot be a part
+of a pipe.
 
 - Syntax: ``so (-grep=STRING)* TYPE?``
 - Options:
@@ -1027,12 +1002,6 @@ The grep STRINGs filter according to other substrings of the type signatures.
 
  | ``-grep`` | substring used for filtering (the command can have many of these)
 
-- Examples:
-
- | ``so Det`` | show all opers that create a Det
- | ``so -grep=Prep`` | find opers relating to Prep
- | ``so | wf -file=/tmp/opers`` | write the list of opers to a file
-
 
 #NORMAL
 
@@ -1144,7 +1113,6 @@ This command must be a line of its own, and thus cannot be a part of a pipe.
  | ``-amharic`` | Amharic
  | ``-ancientgreek`` | ancient Greek
  | ``-arabic`` | Arabic
- | ``-arabic_unvocalized`` | unvocalized Arabic
  | ``-devanagari`` | Devanagari
  | ``-greek`` | modern Greek
  | ``-hebrew`` | unvocalized Hebrew
@@ -1169,41 +1137,35 @@ This command must be a line of its own, and thus cannot be a part of a pipe.
 #TINY
 
 Prints a dependency tree in the .dot format (the graphviz format, default)
-or LaTeX (flag -output=latex)
 or the CoNLL/MaltParser format (flag -output=conll for training, malt_input
 for unanalysed input).
 By default, the last argument is the head of every abstract syntax
 function; moreover, the head depends on the head of the function above.
 The graph can be saved in a file by the wf command as usual.
 If the -view flag is defined, the graph is saved in a temporary file
-which is processed by dot (graphviz) and displayed by the program indicated
-by the view flag. The target format is png, unless overridden by the
-flag -format. Results from multiple trees are combined to pdf with convert (ImageMagick).
-See also 'vp -showdep' for another visualization of dependencies.
+which is processed by graphviz and displayed by the program indicated
+by the flag. The target format is png, unless overridden by the
+flag -format.
 
 
 - Options:
 
  | ``-v`` | show extra information
- | ``-conll2latex`` | convert conll to latex
 
 - Flags:
 
- | ``-abslabels`` | abstract configuration file for labels, format per line 'fun label*'
- | ``-cnclabels`` | concrete configuration file for labels, format per line 'fun {words|*} pos label head'
- | ``-file`` | same as abslabels (abstract configuration file)
- | ``-format`` | format of the visualization file using dot (default "png")
- | ``-output`` | output format of graph source (latex, conll, dot (default but deprecated))
- | ``-view`` | program to open the resulting graph file (default "open")
+ | ``-file`` | configuration file for labels per fun, format 'fun l1 ... label ... l2'
+ | ``-format`` | format of the visualization file (default "png")
+ | ``-output`` | output format of graph source (default "dot")
+ | ``-view`` | program to open the resulting file (default "open")
  | ``-lang`` | the language of analysis
 
 - Examples:
 
  | ``gr | vd`` | generate a tree and show dependency tree in .dot
- | ``gr | vd -view=open`` | generate a tree and display dependency tree on with Mac's 'open'
- | ``gr | vd -view=open -output=latex`` | generate a tree and display latex dependency tree with Mac's 'open'
- | ``gr -number=1000 | vd -abslabels=Lang.labels -cnclabels=LangSwe.labels -output=conll`` | generate a random treebank
- | ``rf -file=ex.conll | vd -conll2latex | wf -file=ex.tex`` | convert conll file to latex
+ | ``gr | vd -view=open`` | generate a tree and display dependency tree on a Mac
+ | ``gr -number=1000 | vd -file=dep.labels -output=malt`` | generate training treebank
+ | ``gr -number=100 | vd -file=dep.labels -output=malt_input`` | generate test sentences
 
 
 #NORMAL
@@ -1220,16 +1182,15 @@ See also 'vp -showdep' for another visualization of dependencies.
 Prints a parse tree in the .dot format (the graphviz format).
 The graph can be saved in a file by the wf command as usual.
 If the -view flag is defined, the graph is saved in a temporary file
-which is processed by dot (graphviz) and displayed by the program indicated
-by the view flag. The target format is png, unless overridden by the
-flag -format. Results from multiple trees are combined to pdf with convert (ImageMagick).
+which is processed by graphviz and displayed by the program indicated
+by the flag. The target format is png, unless overridden by the
+flag -format.
 
 
 - Options:
 
  | ``-showcat`` | show categories in the tree nodes (default)
  | ``-nocat`` | don't show categories
- | ``-showdep`` | show dependency labels
  | ``-showfun`` | show function names in the tree nodes
  | ``-nofun`` | don't show function names (default)
  | ``-showleaves`` | show the leaves of the tree (default)
@@ -1237,8 +1198,6 @@ flag -format. Results from multiple trees are combined to pdf with convert (Imag
 
 - Flags:
 
- | ``-lang`` | the language to visualize
- | ``-file`` | configuration file for dependency labels with -deps, format per line 'fun label*'
  | ``-format`` | format of the visualization file (default "png")
  | ``-view`` | program to open the resulting file (default "open")
  | ``-nodefont`` | font for tree nodes (default: Times -- graphviz standard font)
@@ -1251,8 +1210,7 @@ flag -format. Results from multiple trees are combined to pdf with convert (Imag
 - Examples:
 
  | ``p "John walks" | vp`` | generate a tree and show parse tree as .dot script
- | ``gr | vp -view=open`` | generate a tree and display parse tree on a Mac
- | ``p "she loves us" | vp -view=open -showdep -file=uddeps.labels -nocat`` | show a visual variant of a dependency tree
+ | ``gr | vp -view="open"`` | generate a tree and display parse tree on a Mac
 
 
 #NORMAL
@@ -1269,9 +1227,9 @@ flag -format. Results from multiple trees are combined to pdf with convert (Imag
 Prints a set of trees in the .dot format (the graphviz format).
 The graph can be saved in a file by the wf command as usual.
 If the -view flag is defined, the graph is saved in a temporary file
-which is processed by dot (graphviz) and displayed by the command indicated
-by the view flag. The target format is postscript, unless overridden by the
-flag -format. Results from multiple trees are combined to pdf with convert (ImageMagick).
+which is processed by graphviz and displayed by the program indicated
+by the flag. The target format is postscript, unless overridden by the
+flag -format.
 With option -mk, use for showing library style function names of form 'mkC'.
 
 

doc/gf-people.html

@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<html> 
+
+<head>
+<title>GF People</title>
+<meta charset="UTF-8">
+<link rel=stylesheet href="../css/style.css">
+<meta name = "viewport" content = "width = device-width">
+</head>
+
+<body>
+
+<center>
+<IMG SRC="Logos/gf0.png" alt="[GF]">
+
+<h1>Grammatical Framework: Authors and Acknowledgements</h1>
+
+</center>
+
+The current developers and maintainers are
+<a href="http://www.chalmers.se/cse/EN/organization/divisions/computing-science/people/angelov-krasimir">Krasimir Angelov</a>,
+<a href="http://www.cse.chalmers.se/~hallgren/">Thomas Hallgren</a>,
+and
+<a href="http://www.cse.chalmers.se/~aarne/">Aarne Ranta</a>. Bug reports should be
+posted via the
+<a href="http://code.google.com/p/grammatical-framework/issues/list">GF bug tracker</a>.
+
+
+<p>
+
+Also the following people have contributed code to some of the versions:
+
+<dl>
+
+<dt>Grégoire Détrez (University of Gothenburg)
+<dt>Ramona Enache (University of Gothenburg)
+<dt>
+<a href="http://www.cse.chalmers.se/alumni/bringert">Björn Bringert</a> (University of Gothenburg)
+<dt>
+Håkan Burden (University of Gothenburg)
+<dt>
+Hans-Joachim Daniels (Karlsruhe)
+<dt>
+<a href="http://www.cs.chalmers.se/~markus">Markus Forsberg</a> (Chalmers)
+<dt>
+<a href="http://www.cs.chalmers.se/~krijo">Kristofer Johannisson</a> (University of Gothenburg)
+<dt>
+<a href="http://www.cs.chalmers.se/~janna">Janna Khegai</a> (Chalmers)
+<dt>
+<a href="http://www.cse.chalmers.se/~peb">Peter Ljunglöf</a> (University of Gothenburg)
+<dt>
+Petri Mäenpää (Nokia)
+</dl>
+
+
+At least the following colleagues are thanked for suggestions,
+bug reports, and other indirect contributions to the code. (Notice:
+these are early contributors - the list has not been updated since 2004 or so).
+
+<p>
+
+<a href="http://www.di.unito.it/~stefano/">Stefano Berardi</a> (Torino),
+
+Pascal Boldini (Paris),
+
+<a href="http://www.dur.ac.uk/~dcs0pcc/">Paul Callaghan</a> (Durham),
+
+Lauri Carlson (Helsinki),
+
+<a href="http://www.cse.chalmers.se/~koen">Koen Claessen</a> (Chalmers),
+
+<a href="http://www.cling.gu.se/~cooper">Robin Cooper</a> (Gothenburg),
+
+<a href="http://www.cse.chalmers.se/~coquand">Thierry Coquand</a> (Chalmers),
+
+<a
+href="http://www.xrce.xerox.com/people/dymetman/dymetman.html">Marc
+Dymetman</a> (XRCE),
+
+Bertrand Grégoire (Tudor Institure, Luxembourg),
+
+<a href="http://www.cse.chalmers.se/~reiner">Reiner Hähnle</a> (Chalmers),
+
+<a href="http://pauillac.inria.fr/~huet/">Gérard Huet</a> (INRIA),
+
+<a href="http://www.cse.chalmers.se/~patrikj">Patrik Jansson</a> (Chalmers),
+
+Bernard Jaulin (Paris),
+
+<a href="http://www.xrce.xerox.com/people/karttunen/karttunen.html">
+Lauri Karttunen</a> (PARC),
+
+Matti Kinnunen (Nokia),
+
+<a
+href="http://www.xrce.xerox.com/people/lux/">Veronika
+Lux</a> (XRCE),
+
+Per Martin-Löf (Stockholm),
+
+<a href="http://www.cse.chalmers.se/~bengt">Bengt Nordström</a> (Chalmers),
+
+<a
+href="http://www.cis.uni-muenchen.de/studenten/stud_homepages/okrslar/reklame.html">
+Martin Okrslar</a> (CIS),
+
+Jianmin Pang (Durham),
+
+<a
+href="http://www.xrce.xerox.com/people/pogodalla/index.fr.html">Sylvain
+Pogodalla</a> (XRCE),
+
+<a href="http://www.inria.fr/Loic.Pottier">Loïc Pottier</a> (INRIA),
+
+
+<a href="http://www2.parc.com/istl/members/zaenen/">Annie Zaenen</a> (PARC)
+
+<p>
+
+The GF logo was designed by Uula Ranta.
+
+<p>
+
+From 2001 to 2004, GF enjoyed funding from the
+<a href="http://www.vinnova.se">Vinnova</a> foundation, within the
+<a href="http://www.cse.chalmers.se/research/group/Language-technology/ILT.html">
+Interactive Languge Technology</a> project.
+
+
+</body>
+</html> 
+

doc/gf-people.md

@@ -1,63 +0,0 @@
----
-title: "Grammatical Framework: Authors and Acknowledgements"
----
-
-## Current maintainers
-
-The current maintainers of GF are
-
-[Krasimir Angelov](http://www.chalmers.se/cse/EN/organization/divisions/computing-science/people/angelov-krasimir),
-[Thomas Hallgren](http://www.cse.chalmers.se/~hallgren/),
-[Aarne Ranta](http://www.cse.chalmers.se/~aarne/),
-[John J. Camilleri](http://johnjcamilleri.com), and
-[Inari Listenmaa](https://inariksit.github.io/).
-
-This page is otherwise not up to date.
-For detailed data about contributors to the code repositories since 2007, see
-[here (gf-core)](https://github.com/GrammaticalFramework/gf-core/graphs/contributors)
-and
-[here (gf-rgl)](https://github.com/GrammaticalFramework/gf-rgl/graphs/contributors).
-
-## Previous contributors
-
-The following people have contributed code to some of the versions:
-
-- Grégoire Détrez (University of Gothenburg)
-- Ramona Enache (University of Gothenburg)
-- [Björn Bringert](http://www.cse.chalmers.se/alumni/bringert) (University of Gothenburg)
-- Håkan Burden (University of Gothenburg)
-- Hans-Joachim Daniels (Karlsruhe)
-- [Markus Forsberg](http://www.cs.chalmers.se/~markus) (Chalmers)
-- [Kristofer Johannisson](http://www.cs.chalmers.se/~krijo) (University of Gothenburg)
-- [Janna Khegai](http://www.cs.chalmers.se/~janna) (Chalmers)
-- [Peter Ljunglöf](http://www.cse.chalmers.se/~peb) (University of Gothenburg)
-- Petri Mäenpää (Nokia)
-
-At least the following colleagues are thanked for suggestions, bug
-reports, and other indirect contributions to the code.
-
-- [Stefano Berardi](http://www.di.unito.it/~stefano/) (Torino)
-- Pascal Boldini (Paris)
-- [Paul Callaghan](http://www.dur.ac.uk/~dcs0pcc/) (Durham)
-- Lauri Carlson (Helsinki)
-- [Koen Claessen](http://www.cse.chalmers.se/~koen) (Chalmers)
-- [Robin Cooper](http://www.cling.gu.se/~cooper) (Gothenburg)
-- [Thierry Coquand](http://www.cse.chalmers.se/~coquand) (Chalmers)
-- [Marc Dymetman](http://www.xrce.xerox.com/people/dymetman/dymetman.html) (XRCE)
-- Bertrand Grégoire (Tudor Institute, Luxembourg)
-- [Reiner Hähnle](http://www.cse.chalmers.se/~reiner) (Chalmers)
-- [Gérard Huet](http://pauillac.inria.fr/~huet/) (INRIA)
-- [Patrik Jansson](http://www.cse.chalmers.se/~patrikj) (Chalmers)
-- Bernard Jaulin (Paris)
-- [Lauri Karttunen](http://www.xrce.xerox.com/people/karttunen/karttunen.html) (PARC)
-- Matti Kinnunen (Nokia)
-- [Veronika Lux](http://www.xrce.xerox.com/people/lux/) (XRCE)
-- Per Martin-Löf (Stockholm)
-- [Bengt Nordström](http://www.cse.chalmers.se/~bengt) (Chalmers)
-- [Martin Okrslar](http://www.cis.uni-muenchen.de/studenten/stud_homepages/okrslar/reklame.html) (CIS)
-- Jianmin Pang (Durham)
-- [Sylvain Pogodalla](http://www.xrce.xerox.com/people/pogodalla/index.fr.html) (XRCE)
-- [Loïc Pottier](http://www.inria.fr/Loic.Pottier) (INRIA)
-- [Annie Zaenen](http://www2.parc.com/istl/members/zaenen/) (PARC)
-
-The GF logo was designed by Uula Ranta.

doc/gf-quickstart.html

@@ -0,0 +1,158 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>GF Quickstart</title>
+<link rel=stylesheet href="../css/style.css">
+<meta name = "viewport" content = "width = device-width">
+</head>
+
+
+<body>
+
+<center>
+<img src="Logos/gf0.png">
+<p>
+Aarne Ranta
+<p>
+October 2011 for GF 3.3
+
+<p>
+
+<h1>Grammatical Framework Quick Start</h1>
+
+</center>
+
+This Quick Start shows a few examples of how GF can be used.
+We assume that you have downloaded and installed GF, so that
+the command <tt>gf</tt> works for you. See download and install
+instructions <a href="../download/index.html">here</a>.
+
+<h2>Want to try without downloading?</h2>
+
+<a href="../demos/phrasebook/">Using GF translation</a> with an existing grammar.
+
+<p>
+
+<a href="../demos/gfse/">Writing GF grammars</a> in the cloud, without installing GF.
+
+
+
+
+<h2>Using GF for translation and generation</h2>
+
+When you have downloaded and installed GF:
+<ol>
+<li> Copy the files
+<a href="../examples/tutorial/food/Food.gf"><tt>Food.gf</tt></a>,
+<a href="../examples/tutorial/food/FoodEng.gf"><tt>FoodEng.gf</tt></a>, and
+<a href="../examples/tutorial/food/FoodIta.gf"><tt>FoodIta.gf</tt></a>.
+Or go to <tt>GF/examples/tutorial/food/</tt>, if you have downloaded the
+GF sources.
+
+ <li> Start GF with the shell command (without the prompt <tt>$</tt>)
+<pre>
+  $ gf FoodIta.gf FoodEng.gf
+</pre>
+Alternatively, start GF with <tt>gf</tt> and give the GF command <tt>import FoodIta.gf FoodEng.gf</tt>.
+
+<li> <b>Translation</b>. Try your first translation by giving the GF command
+<pre>
+  parse "this cheese is very very Italian" | linearize
+</pre>
+Notice that the parser accept the tabulator for word completion.
+
+<li> <b>Generation</b>. Random-generate sentences in two languages:
+<pre>
+  generate_random | linearize
+</pre>
+
+<li> <b>Other commands</b>. Use the help command
+<pre>
+  help
+</pre>
+<li> <b>More examples</b>. Go to <tt>GF/examples/phrasebook</tt> or some other
+subdirectory of  <tt>GF/examples/</tt>. Or try a resource grammar by, for instance,
+<pre>
+  import alltenses/LangEng.gfo alltenses/LangGer.gfo
+
+  parse -lang=Eng "I love you" | linearize -treebank
+</pre>
+The resource grammars are found relative to the value of <tt>GF_LIB_PATH</tt>, which
+you may have to set; see <a href="../download/index.html">here</a> for instructions.
+
+
+
+</ol>
+
+
+
+<h2>Grammar development</h2>
+
+Add words to the <tt>Food</tt>
+grammars and try the above commands again. For instance, add the following lines:
+<pre>
+  Bread : Kind ;          -- in Food.gf
+  Bread = {s = "bread"} ; -- in FoodEng.gf
+  Bread = {s = "pane"} ;  -- in FoodIta.gf
+</pre>
+and start GF again with the same command. Now you can even translate
+<i>this bread is very Italian</i>.
+</ol>
+To lear more on GF commands and
+grammar development, go to the one of the tutorials:
+<ul>
+<li> <a href="tutorial/gf-tutorial.html">GF Tutorial</a>: older, more programmer-oriented
+<li> <a href="gf-lrec-2010.pdf">GF Resource Tutorial</a>: newer, more linguist-oriented
+</ul>
+To learn about how GF is used for easily writing grammars for 16 languages, consult the
+<ul>
+<li> <a href="../lib/doc/synopsis.html">GF Resource Grammar Library</a>.
+</ul>
+
+
+
+<h2>Run-time grammars and web applications</h2>
+
+GF has its own "machine language", PGF (Portable Grammar Format),
+which is recommended for use in applications at run time. To produce a PGF file from
+the two grammars above, do
+<pre>
+  gf -make FoodIta.gf FoodEng.gf
+  wrote Food.pgf
+</pre>
+You can use this in Haskell and Java programs, and also on web services, such as
+<ul>
+<li> the
+  <a href="http://cloud.grammaticalframework.org/minibar/minibar.html">minibar</a>
+  fridge magnets
+</ul>
+
+The quickest way to provide a GF web service is to start GF with the <tt>-server</tt> option:
+<pre>
+  $ gf -server
+  This is GF version 3.3
+  Built on linux/i386 with ghc-7.0, flags: interrupt server cclazy
+  Document root = /usr/local/share/gf-3.3/www
+  Starting HTTP server, open http://localhost:41296/ in your web browser.
+</pre>
+You can view it locally by pointing your
+browser to the URL shown. You can add your own <tt>.pgf</tt> grammar to the service by
+copying it over to the <tt>documentRoot</tt> directory. Just push "reload" in
+your browser after each such update.
+
+<p>
+
+To build more customized web application, consult the
+<a href="http://code.google.com/p/grammatical-framework/wiki/SideBar?tm=6">developer wiki</a>.
+
+
+<h2>User group</h2>
+
+You are welcome to join the <A HREF="http://groups.google.com/group/gf-dev">User Group</A>
+to get help and discuss GF-related issues!
+
+
+
+
+
+</body></html>

doc/gf-reference.t2t

@@ -0,0 +1,493 @@
+GF Quick Reference
+Aarne Ranta
+April 4, 2006
+
+% NOTE: this is a txt2tags file.
+% Create an html file from this file using:
+% txt2tags -thtml gf-reference.t2t
+
+%!style:../css/style.css
+%!target:html
+%!options: --toc
+%!postproc(html): <TITLE> <meta name = "viewport" content = "width = device-width"><TITLE>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+
+This is a quick reference on GF grammars. It aims to
+cover all forms of expression available when writing
+grammars. It assumes basic knowledge of GF, which
+can be acquired from the 
+[GF Tutorial http://www.grammaticalframework.org/doc/tutorial/gf-tutorial.html].
+Help on GF commands is obtained on line by the
+help command (``help``), and help on invoking
+GF with (``gf -help``).
+
+
+===A complete example===
+
+This is a complete example of a GF grammar divided
+into three modules in files. The grammar recognizes the
+phrases //one pizza// and //two pizzas//.
+
+File ``Order.gf``:
+```
+abstract Order = {
+cat 
+  Order ; 
+  Item ;
+fun 
+  One, Two : Item -> Order ;
+  Pizza : Item ;
+}
+```
+File ``OrderEng.gf`` (the top file):
+```
+--# -path=.:prelude
+concrete OrderEng of Order = 
+ open Res, Prelude in {
+flags startcat=Order ;
+lincat 
+  Order = SS ; 
+  Item  = {s : Num => Str} ;
+lin 
+  One it = ss ("one" ++ it.s ! Sg) ;
+  Two it = ss ("two" ++ it.s ! Pl) ;
+  Pizza  = regNoun "pizza" ;
+}
+```
+File ``Res.gf``:
+```
+resource Res = open Prelude in {
+param Num = Sg | Pl ;
+oper regNoun : Str -> {s : Num => Str} =
+  \dog -> {s = table {
+    Sg => dog ;
+    _  => dog + "s"
+    }
+  } ;
+}
+```
+To use this example, do
+```
+  % gf             -- in shell: start GF
+  > i OrderEng.gf  -- in GF: import grammar
+  > p "one pizza"  --        parse string
+  > l Two Pizza    --        linearize tree
+```
+
+
+
+===Modules and files===
+
+One module per file.
+File named ``Foo.gf`` contains module named
+``Foo``.
+
+Each module has the structure
+```
+moduletypename =   
+  Inherits **        -- optional
+  open Opens in      -- optional
+  { Judgements }   
+```
+Inherits are names of modules of the same type.
+Inheritance can be restricted:
+```
+  Mo[f,g],  -- inherit only f,g from Mo
+  Lo-[f,g]  -- inheris all but f,g from Lo
+```
+Opens are possible in ``concrete`` and ``resource``.
+They are names of modules of these two types, possibly
+qualified:
+```
+  (M = Mo), -- refer to f as M.f or Mo.f
+  (Lo = Lo) -- refer to f as Lo.f
+```
+Module types and judgements in them:
+```
+abstract A          -- cat, fun, def, data
+concrete C of A     -- lincat, lin, lindef, printname
+resource R          -- param, oper
+
+interface I         -- like resource, but can have
+                       oper f : T without definition
+instance J of I     -- like resource, defines opers
+                       that I leaves undefined
+incomplete          -- functor: concrete that opens 
+ concrete CI of A =    one or more interfaces
+  open I in ...
+concrete CJ of A =  -- completion: concrete that
+  CI with              instantiates a functor by
+    (I = J)            instances of open interfaces
+``` 
+The forms 
+``param``, ``oper`` 
+may appear in ``concrete`` as well, but are then
+not inherited to extensions.
+
+All modules can moreover have ``flags`` and comments.
+Comments have the forms
+```
+-- till the end of line
+{- any number of lines between -}
+--# used for compiler pragmas
+```
+A ``concrete`` can be opened like a ``resource``.
+It is translated as follows:
+```
+cat C          --->  oper C : Type = 
+lincat C = T           T ** {lock_C : {}}
+
+fun f : G -> C --->  oper f : A* -> C* = \g -> 
+lin f = t              t g ** {lock_C = <>}          
+```
+An ``abstract`` can be opened like an ``interface``.
+Any ``concrete`` of it then works as an ``instance``.
+
+
+
+===Judgements===
+
+```
+cat C               -- declare category C
+cat C (x:A)(y:B x)  -- dependent category C
+cat C A B           -- same as C (x : A)(y : B)
+fun f : T           -- declare function f of type T
+def f = t           -- define f as t
+def f p q = t       -- define f by pattern matching
+data C = f | g      -- set f,g as constructors of C
+data f : A -> C     -- same as 
+                       fun f : A -> C; data C=f
+
+lincat C = T        -- define lin.type of cat C
+lin f = t           -- define lin. of fun f
+lin f x y = t       -- same as lin f = \x y -> t
+lindef C = \s -> t  -- default lin. of cat C
+printname fun f = s -- printname shown in menus
+printname cat C = s -- printname shown in menus
+printname f = s     -- same as printname fun f = s
+
+param P = C | D Q R -- define parameter type P 
+                       with constructors
+                       C : P, D : Q -> R -> P
+oper h : T = t      -- define oper h of type T
+oper h = t          -- omit type, if inferrable
+
+flags p=v           -- set value of flag p
+```
+Judgements are terminated by semicolons (``;``).
+Subsequent judgments of the same form may share the
+keyword:
+```
+cat C ; D ;         -- same as cat C ; cat D ;
+```
+Judgements can also share RHS:
+```
+fun f,g : A         -- same as fun f : A ; g : A
+```
+
+
+===Types===
+
+Abstract syntax (in ``fun``):
+```
+C                -- basic type, if cat C
+C a b            -- basic type for dep. category
+(x : A) -> B     -- dep. functions from A to B
+(_ : A) -> B     -- nondep. functions from A to B
+(p,q : A) -> B   -- same as (p : A)-> (q : A) -> B
+A -> B           -- same as (_ : A) -> B
+Int              -- predefined integer type
+Float            -- predefined float type
+String           -- predefined string type
+```
+Concrete syntax (in ``lincat``):
+```
+Str              -- token lists
+P                -- parameter type, if param P
+P => B           -- table type, if P param. type
+{s : Str ; p : P}-- record type
+{s,t : Str}      -- same as {s : Str ; t : Str}
+{a : A} **{b : B}-- record type extension, same as  
+                    {a : A ; b : B}
+A * B * C        -- tuple type, same as
+                    {p1 : A ; p2 : B ; p3 : C}
+Ints n           -- type of n first integers
+```
+Resource (in ``oper``): all those of concrete, plus
+``` 
+Tok              -- tokens (subtype of Str)
+A -> B           -- functions from A to B
+Int              -- integers
+Strs             -- list of prefixes (for pre)
+PType            -- parameter type
+Type             -- any type
+```
+As parameter types, one can use any finite type:
+``P`` defined in ``param P``,
+``Ints n``, and record types of parameter types.
+
+
+
+===Expressions===
+
+Syntax trees = full function applications
+```
+f a b              -- : C if fun f : A -> B -> C
+1977               -- : Int
+3.14               -- : Float
+"foo"              -- : String
+```
+Higher-Order Abstract syntax (HOAS): functions as arguments:
+```
+F a (\x -> c)      -- : C if a : A, c : C (x : B), 
+                      fun F : A -> (B -> C) -> C
+```
+Tokens and token lists
+```
+"hello"            -- : Tok, singleton Str
+"hello" ++ "world" -- : Str
+["hello world"]    -- : Str, same as "hello" ++ "world"
+"hello" + "world"  -- : Tok, computes to "helloworld"
+[]                 -- : Str, empty list
+```
+Parameters
+```
+Sg                   -- atomic constructor
+VPres Sg P2          -- applied constructor
+{n = Sg ; p = P3}    -- record of parameters
+```
+Tables
+```
+table {              -- by full branches
+  Sg => "mouse" ;
+  Pl => "mice"
+  }
+table {              -- by pattern matching
+  Pl => "mice" ;
+  _  => "mouse"      -- wildcard pattern
+  }
+table {               
+  n => regn n "cat"  -- variable pattern 
+  }
+table Num {...}      -- table given with arg. type
+table ["ox"; "oxen"] -- table as course of values
+\\_ => "fish"        -- same as table {_ => "fish"} 
+\\p,q => t           -- same as \\p => \\q => t
+
+t ! p                -- select p from table t
+case e of {...}      -- same as table {...} ! e 
+```
+Records
+```
+{s = "Liz"; g = Fem} -- record in full form
+{s,t = "et"}         -- same as {s = "et";t= "et"}
+{s = "Liz"} **       -- record extension: same as
+  {g = Fem}             {s = "Liz" ; g = Fem}
+
+<a,b,c>        -- tuple, same as {p1=a;p2=b;p3=c}
+```
+Functions
+```
+\x -> t            -- lambda abstract
+\x,y -> t          -- same as \x -> \y -> t
+\x,_ -> t          -- binding not in t
+```
+Local definitions
+```
+let x : A = d in t -- let definition
+let x = d in t     -- let defin, type inferred
+let x=d ; y=e in t -- same as 
+                      let x=d in let y=e in t
+let {...} in t     -- same as let ... in t
+
+t where {...}      -- same as let ... in t
+```
+Free variation
+```
+variants {x ; y}     -- both x and y possible
+variants {}          -- nothing possible
+```
+Prefix-dependent choices
+```
+pre {"a" ; "an" / v} -- "an" before v, "a" otherw.
+strs {"a" ; "i" ;"o"}-- list of condition prefixes
+```
+Typed expression
+```
+<t:T>                -- same as t, to help type inference
+```
+Accessing bound variables in ``lin``: use fields ``$1, $2, $3,...``. 
+Example:
+```
+fun F : (A : Set) -> (El A -> Prop) -> Prop ; 
+lin F A B = {s = ["for all"] ++ A.s ++ B.$1 ++ B.s}
+```
+
+
+===Pattern matching===
+
+These patterns can be used in branches of ``table`` and
+``case`` expressions. Patterns are matched in the order in
+which they appear in the grammar.
+```
+C                 -- atomic param constructor
+C p q             -- param constr. applied to patterns
+x                 -- variable, matches anything
+_                 -- wildcard, matches anything
+"foo"             -- string
+56                -- integer
+{s = p ; y = q}   -- record, matches extensions too
+<p,q>             -- tuple, same as {p1=p ; p2=q}
+p | q             -- disjunction, binds to first match
+x@p               -- binds x to what p matches
+- p               -- negation
+p + "s"           -- sequence of two string patterns
+p*                -- repetition of a string pattern
+```
+
+===Sample library functions===
+
+```
+-- lib/prelude/Predef.gf
+drop   : Int -> Tok -> Tok   -- drop prefix of length
+take   : Int -> Tok -> Tok   -- take prefix of length
+tk     : Int -> Tok -> Tok   -- drop suffix of length
+dp     : Int -> Tok -> Tok   -- take suffix of length
+occur  : Tok -> Tok -> PBool -- test if substring
+occurs : Tok -> Tok -> PBool -- test if any char occurs
+show   : (P:Type) -> P ->Tok -- param to string
+read   : (P:Type) -> Tok-> P -- string to param
+toStr  : (L:Type) -> L ->Str -- find "first" string
+
+-- lib/prelude/Prelude.gf
+param Bool = True | False
+oper
+  SS  : Type                   -- the type {s : Str}
+  ss  : Str -> SS              -- construct SS
+  cc2 : (_,_ : SS) -> SS       -- concat SS's
+  optStr : Str -> Str          -- string or empty
+  strOpt : Str -> Str          -- empty or string
+  bothWays : Str -> Str -> Str -- X++Y or Y++X 
+  init : Tok -> Tok            -- all but last char
+  last : Tok -> Tok            -- last char
+  prefixSS : Str -> SS -> SS
+  postfixSS : Str -> SS -> SS
+  infixSS : Str -> SS -> SS -> SS
+  if_then_else : (A : Type) -> Bool -> A -> A -> A
+  if_then_Str : Bool -> Str -> Str -> Str
+```
+
+
+===Flags===
+
+Flags can appear, with growing priority,
+- in files, judgement ``flags`` and without dash (``-``)
+- as flags to ``gf`` when invoked, with dash
+- as flags to various GF commands, with dash
+
+
+Some common flags used in grammars:
+```
+startcat=cat    use this category as default 
+
+lexer=literals  int and string literals recognized
+lexer=code      like program code
+lexer=text      like text: spacing, capitals
+lexer=textlit   text, unknowns as string lits
+
+unlexer=code    like program code
+unlexer=codelit code, remove string lit quotes
+unlexer=text    like text: punctuation, capitals
+unlexer=textlit text, remove string lit quotes
+unlexer=concat  remove all spaces
+unlexer=bind    remove spaces around "&+"
+
+optimize=all_subs  best for almost any concrete
+optimize=values    good for lexicon concrete
+optimize=all       usually good for resource
+optimize=noexpand  for resource, if =all too big
+```
+For the full set of values for ``FLAG``, 
+use on-line ``h -FLAG``.
+
+
+
+===File import search paths===
+
+Colon-separated list of directories searched in the
+given order: 
+```
+--# -path=.:../abstract:../common:prelude
+```
+This can be (in order of increasing priority), as
+first line in the file, as flag to ``gf``
+when invoked, or as flag to the ``i`` command.
+The prefix ``--#`` is used only in files.
+
+GF attempts to satisfy an ``import`` command by searching for the
+import filename in the above search paths, initially qualified
+relative to the current working directory. If the file is not found in
+that initial expansion, the search paths are re-qualified relative to
+the directories given in the ``GF_LIB_PATH`` environment variable. If
+``GF_LIB_PATH`` is not defined, its default value is
+``/usr/local/share/gf-3.9/lib`` (assuming you have GF version 3.9).
+
+If your GF resource grammar libraries are installed somewhere else,
+you will want to set ``GF_LIB_PATH`` to point there instead. In a
+pinch, you can point to the ``GF/lib/src/`` folder in your clone of
+the GF source code repository.
+
+Developers of resource grammars may find it useful to define multiple
+directories, colon-separated, in ``GF_LIB_PATH``.
+
+
+===Alternative grammar formats===
+
+**Old GF** (before GF 2.0): 
+all judgements in any kinds of modules,
+division into files uses ``include``s.
+A file ``Foo.gf`` is recognized as the old format
+if it lacks a module header. 
+
+**Context-free** (file ``foo.cf``). The form of rules is e.g.
+```
+Fun. S ::= NP "is" AP ;
+```
+If ``Fun`` is omitted, it is generated automatically. 
+Rules must be one per line. The RHS can be empty.
+
+**Extended BNF** (file ``foo.ebnf``). The form of rules is e.g.
+```
+S ::= (NP+ ("is" | "was") AP | V NP*) ;
+```
+where the RHS is a regular expression of categories
+and quoted tokens: ``"foo", CAT, T U, T|U, T*, T+, T?``, or empty.
+Rule labels are generated automatically.
+
+
+**Probabilistic grammars** (not a separate format).
+You can set the probability of a function ``f`` (in its value category) by
+```
+--# prob f 0.009
+```
+These are put into a file given to GF using the ``probs=File`` flag
+on command line. This file can be the grammar file itself.
+
+**Example-based grammars**  (file ``foo.gfe``). Expressions of the form
+```
+in Cat "example string"
+```
+are preprocessed by using a parser given by the flag 
+```
+--# -resource=File
+```
+and the result is written to ``foo.gf``.
+
+
+===References===
+
+[GF Homepage http://www.grammaticalframework.org/]
+
+A. Ranta, Grammatical Framework: A Type-Theoretical Grammar Formalism.
+//The Journal of Functional Programming//, vol. 14:2. 2004, pp. 145-189. 
+

doc/gf-shell-reference.t2t

@@ -1,8 +1,11 @@
 The GF Software System
 
 
+%!style:../css/style.css
 %!options(html): --toc
 %!options(html): --toc-level=4
+%!postproc(html): <TITLE> <meta name = "viewport" content = "width = device-width"><TITLE>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
 %!postproc(html): "#VSPACE" "<hr>"
 %!postproc(html): "#NORMAL" ""
 %!postproc(html): "#TINY" ""
@@ -10,7 +13,7 @@ The GF Software System
 
 The GF software system implements the GF programming language. Its
 components are
-- the //compiler//,
+- the //compiler//, 
 translating ``.gf`` source files to ``.gfo`` object files, to
 ``.pgf`` run-time grammars, and to various other formats
 - the //run-time system//,
@@ -40,7 +43,7 @@ The shell maintains a  //state//, to which belong
 
 
 Unless file arguments are provided to the ``gf`` command, the shell starts in an
-empty state, with no grammars and no history.
+empty state, with no grammars and no history. 
 
 In the shell, a set of commands
 is available. Some of these commands may change the grammars in the state. The general
@@ -56,7 +59,7 @@ syntax of commands is given by the following BNF grammar:
   ARGUMENT     ::= QUOTED_STRING | TREE
   VALUE        ::= IDENT | QUOTED_STRING
 ```
-A command pipe is a sequence of commands interpreted in such a way
+A command pipe is a sequence of commands interpreted in such a way 
 that the output of each command
 is send as input to the next. The option ``-tr`` causes GF to show a trace,
 i.e. the intermediate result of the command to which it is attached.
@@ -66,7 +69,7 @@ executed one by one, in the order of appearance.
 
 ===GF shell commands===
 
-The full set of GF shell commands is listed below with explanations.
+The full set of GF shell commands is listed below with explanations. 
 This list can also be obtained in the GF shell by the command ``help -full``.
 
 %!include: gf-help-full.txt
@@ -74,14 +77,14 @@ This list can also be obtained in the GF shell by the command ``help -full``.
 ==The GF batch compiler==
 
 With the option ``-batch``, GF can be invoked in batch mode, i.e.
-without opening the shell, to compile files from ``.gf`` to ``.gfo``.
-The ``-s`` option ("silent") eliminates all messages except errors.
+without opening the shell, to compile files from ``.gf`` to ``.gfo``. 
+The ``-s`` option ("silent") eliminates all messages except errors. 
 ```
   $ gf -batch -s LangIta.gf
 ```
 With the option ``-make``, and as a set of
 top-level grammar files (with the same abstract syntax) as arguments,
-GF produces a ``.pgf`` file. The flag ``-optimize-pgf`` minimizes
+GF produces a ``.pgf`` file. The flag ``-optimize-pgf`` minimizes 
 the size of the ``.pgf`` file, and is recommended for grammars to be shipped.
 ```
   $ gf -make -optimize-pgf LangIta.gf LangEng.gf LangGer.gf
@@ -104,3 +107,5 @@ To run GF from a //script//, redirection of standard input can be used:
 ```
 The file ``script.gfs`` should then contain a sequence of GF commands, one per line.
 Unrecognized command lines are skipped without terminating GF.
+
+

doc/index.html

@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>GF Documentation</title>
+<link rel=stylesheet href="../css/style.css">
+</head>
+ 
+
+<body>
+
+<div class=center>
+<a href="../"><img src="Logos/gf0.png"></a>
+
+
+
+
+<h1>Grammatical Framework Documents</h1>
+</div>
+
+
+<b>Top-5 documents</b>:
+
+<a href="gf-quickstart.html">Quick start instruction</a>.
+
+
+<a href="tutorial/gf-tutorial.html">Old Tutorial</a>, application-oriented.
+
+<a href="gf-lrec-2010.pdf">New Tutorial</a>, linguistics-oriented.
+
+<a href="gf-refman.html">ReferenceManual</a>.
+
+<a href="../lib/resource/doc/synopsis.html">LibrarySynopsis</a>.
+
+
+
+
+<h2>Language and system documentation</h2>
+
+<ul>
+
+  <li>
+  <a href="gf-reference.html">GF Quick Reference</a>. Also available in
+  <a href="gf-reference.pdf">pdf</a>. Covers all features of GF language
+  in a summary format.
+
+  <li>
+  <a href="gf-refman.html">GF Reference Manual</a>. A full-scale reference
+  manual of the GF language.
+  
+  <li>
+  <a href="gf-shell-reference.html">GF Shell Reference</a>.
+  Describes the commands available in the interactive GF shell. Also
+  summarizes how to run GF as a batch compiler.
+
+  <li>
+  <a href="gf-editor-modes.html">Editor modes for GF</a>.
+  Editor modes for GF provides syntax highligting, automatic indentation and
+  other features that makes editing GF grammar files easier.
+  
+</ul>
+
+
+<h2>Publications</h2>
+
+<a href="gf-bibliography.html">
+Bibliography</a>: more publications on GF, as well as background literature.
+
+
+</body></html>

doc/index.md

@@ -1,13 +0,0 @@
----
-title: Grammatical Framework Documentation
----
-
-Perhaps you're looking for one of the following:
-
-- [Tutorial](tutorial/gf-tutorial.html). This is a hands-on introduction to grammar writing in GF.
-- [Reference Manual](gf-refman.html). A full-scale reference manual of the GF language.
-- [RGL Tutorial](../lib/doc/rgl-tutorial/index.html)
-- [RGL Synopsis](../lib/doc/synopsis/index.html). Documentation of the Resource Grammar Library, including the syntax API and lexical paradigms for each language.
-- [Shell Reference](gf-shell-reference.html). Describes the commands available in the interactive GF shell.
-  Also summarizes how to run GF as a batch compiler.
-- [Developers Guide](gf-developers/html). Detailed information about building and developing GF.

doc/runtime-api.html

@@ -1,26 +1,29 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<html>
 	<head>
-		<title>C Runtime API</title>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
 		<style>
-			pre {
-				background-color:#eee;
-				margin-top: 1em;
-				padding: 0.5em 1em;
-			}
-			pre.python   {display: none}
-			pre.haskell  {display: block}
-			pre.java     {display: none}
-			pre.csharp   {display: none}
+			body { background: #eee; padding-top: 200px; }
+
+			pre.python   {background-color:#ffc; display: none}
+			pre.haskell  {background-color:#ffc; display: block}
+			pre.java     {background-color:#ffc; display: none}
+			pre.csharp   {background-color:#ffc; display: none}
 			span.python  {display: none}
 			span.haskell {display: inline}
 			span.java    {display: none}
 			span.csharp  {display: none}
+			
+			.header {
+               position: fixed;
+               top: 0;
+               left: 0;
+               background: #ddd;
+               width: 100%;
+               padding: 5pt;
+               border-bottom: solid #bbb 2pt;
+            }
 		</style>
 
+
 <script lang="javascript">
 	function change_language(href) {
 		var name = href.split("#")[1];
@@ -47,28 +50,14 @@
 </script>
 	</head>
 	<body onload="change_language(window.location.href); window.addEventListener('hashchange', function(e){change_language(window.location.href);});">
-		<div class="container-fluid" style="max-width: 1200px">
-		<div class="header sticky-top border-bottom py-3 bg-white">
-			<a href=".." title="Home">
-			  <img src="../doc/Logos/gf1.svg" height="120px" class="float-md-right ml-3 mb-3 bg-white" alt="GF Logo">
-			</a>
-			<h1>
-				Using the
-				<span class="python">Python</span>
-				<span class="haskell">Haskell</span>
-				<span class="java">Java</span>
-				<span class="csharp">C#</span>
-				binding to the C runtime
-			</h1>
-			<h4 class="text-muted">Krasimir Angelov, July 2015 - August 2017</h4>
-			Choose a language:
-			<a href="#haskell" class="mx-1">Haskell</a>
-			<a href="#python" class="mx-1">Python</a>
-			<a href="#java" class="mx-1">Java</a>
-			<a href="#csharp" class="mx-1">C#</a>
-		</div>
-		<main class="py-4">
+		<span class="header">
+		<h1>Using the <span class="python">Python</span> <span class="haskell">Haskell</span> <span class="java">Java</span> <span class="csharp">C#</span> binding to the C runtime</h1>
+		
+		Choose a language: <a href="#haskell">Haskell</a> <a href="#python">Python</a> <a href="#java">Java</a> <a href="#csharp">C#</a>
+		</span>
 
+		<h4>Krasimir Angelov, July 2015 - August 2017</h4>
+		
 <h2>Loading the Grammar</h2>
 
 Before you use the <span class="python">Python</span> binding you need to import the <span class="haskell">PGF2 module</span><span class="python">pgf module</span><span class="java">pgf package</span><span class="csharp">PGFSharp package</span>:
@@ -138,7 +127,7 @@ Concr eng = gr.Languages["AppEng"];
 
 <h2>Parsing</h2>
 
-All language specific services are available as
+All language specific services are available as 
 <span class="python">methods of the class <tt>pgf.Concr</tt></span><span class="haskell">functions that take as an argument an object of type <tt>Concr</tt></span><span class="java">methods of the class <tt>Concr</tt></span><span class="csharp">methods of the class <tt>Concr</tt></span>.
 For example to invoke the parser, you can call:
 <pre class="python">
@@ -231,10 +220,10 @@ Console.WriteLine(ep.Item1);
 PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (DetNP (DetQuant this_Quant NumSg)) (UseComp (CompNP (DetCN (DetQuant IndefArt NumSg) (AdjCN (PositA small_A) (UseN theatre_N)))))))) NoVoc
 </pre>
 
-<p>Note that depending on the grammar it is absolutely possible that for
-a single sentence you might get infinitely many trees.
+<p>Note that depending on the grammar it is absolutely possible that for 
+a single sentence you might get infinitely many trees. 
 In other cases the number of trees might be finite but still enormous.
-The parser is specifically designed to be lazy, which means that
+The parser is specifically designed to be lazy, which means that 
 each tree is returned as soon as it is found before exhausting
 the full search space. For grammars with a patological number of
 trees it is advisable to pick only the top <tt>N</tt> trees
@@ -257,16 +246,16 @@ parsing with a different start category can be done as follows:</p>
 </pre>
 </span>
 <span class="haskell">
-There is also the function <tt>parseWithHeuristics</tt> which
-takes two more paramaters which let you to have a better control
+There is also the function <tt>parseWithHeuristics</tt> which 
+takes two more paramaters which let you to have a better control 
 over the parser's behaviour:
 <pre class="haskell">
 Prelude PGF2> let res = parseWithHeuristics eng (startCat gr) heuristic_factor callbacks
 </pre>
 </span>
 <span class="java">
-There is also the method <tt>parseWithHeuristics</tt> which
-takes two more paramaters which let you to have a better control
+There is also the method <tt>parseWithHeuristics</tt> which 
+takes two more paramaters which let you to have a better control 
 over the parser's behaviour:
 <pre class="java">
 Iterable&lt;ExprProb&gt; iterable = eng.parseWithHeuristics(gr.startCat(), heuristic_factor, callbacks);
@@ -292,7 +281,7 @@ to factor 0.0. When we increase the factor then parsing becomes faster
 but at the same time the sorting becomes imprecise. The worst
 factor is 1.0. In any case the parser always returns the same set of
 trees but in different order. Our experience is that even a factor
-of about 0.6-0.8 with the translation grammar still orders
+of about 0.6-0.8 with the translation grammar still orders 
 the most probable tree on top of the list but further down the list,
 the trees become shuffled.
 </p>
@@ -468,7 +457,7 @@ the object has the following public final variables:
 </span>
 </p>
 
-The linearization works even if there are functions in the tree
+The linearization works even if there are functions in the tree 
 that doesn't have linearization definitions. In that case you
 will just see the name of the function in the generated string.
 It is sometimes helpful to be able to see whether a function
@@ -494,7 +483,7 @@ true
 
 <p>
 An already constructed tree can be analyzed and transformed
-in the host application. For example you can deconstruct
+in the host application. For example you can deconstruct 
 a tree into a function name and a list of arguments:
 <pre class="python">
 >>> e.unpack()
@@ -534,8 +523,8 @@ literal. For example the result from:
 <span class="haskell">
 The result from <tt>unApp</tt> is <tt>Just</tt> if the expression
 is an application and <tt>Nothing</tt> in all other cases.
-Similarly, if the tree is a literal string then the return value
-from <tt>unStr</tt> will be <tt>Just</tt> with the actual literal.
+Similarly, if the tree is a literal string then the return value 
+from <tt>unStr</tt> will be <tt>Just</tt> with the actual literal. 
 For example the result from:
 </span>
 <pre class="haskell">
@@ -545,8 +534,8 @@ Prelude PGF2> readExpr "\"literal\"" >>= unStr
 <span class="java">
 The result from <tt>unApp</tt> is not <tt>null</tt> if the expression
 is an application, and <tt>null</tt> in all other cases.
-Similarly, if the tree is a literal string then the return value
-from <tt>unStr</tt> will not be <tt>null</tt> with the actual literal.
+Similarly, if the tree is a literal string then the return value 
+from <tt>unStr</tt> will not be <tt>null</tt> with the actual literal. 
 For example the output from:
 </span>
 <pre class="java">
@@ -556,15 +545,15 @@ System.out.println(elit.unStr());
 <span class="csharp">
 The result from <tt>UnApp</tt> is not <tt>null</tt> if the expression
 is an application, and <tt>null</tt> in all other cases.
-Similarly, if the tree is a literal string then the return value
-from <tt>UnStr</tt> will not be <tt>null</tt> with the actual literal.
+Similarly, if the tree is a literal string then the return value 
+from <tt>UnStr</tt> will not be <tt>null</tt> with the actual literal. 
 For example the output from:
 </span>
 <pre class="csharp">
 Expr elit = Expr.ReadExpr("\"literal\"");
 Console.WriteLine(elit.UnStr());
 </pre>
-is just the string "literal".
+is just the string "literal". 
 <span class="python">Situations like this can be detected
 in Python by checking the type of the result from <tt>unpack</tt>.
 It is also possible to get an integer or a floating point number
@@ -580,7 +569,7 @@ There are also the methods <tt>UnAbs</tt>, <tt>UnInt</tt>, <tt>UnFloat</tt> and
 </span>
 </p>
 
-Constructing new trees is also easy. You can either use
+Constructing new trees is also easy. You can either use 
 <tt>readExpr</tt> to read trees from strings, or you can
 construct new trees from existing pieces. This is possible by
 <span class="python">
@@ -623,7 +612,7 @@ Console.WriteLine(e2);
 <p>If the host application needs to do a lot of expression manipulations,
 then it is helpful to use a higher-level API to the grammar,
 also known as "embedded grammars" in GF. The advantage is that
-you can construct and analyze expressions in a more compact way.</p>
+you can construct and analyze expressions in a more compact way.</p> 
 
 <span class="python">
 <p>In Python you first have to <tt>embed</tt> the grammar by calling:
@@ -732,7 +721,7 @@ call the method <tt>default</tt>. The following is an example:
       def on_DetCN(self,quant,cn):
         print("Found DetCN")
         cn.visit(self)
-
+			
       def on_AdjCN(self,adj,cn):
         print("Found AdjCN")
         cn.visit(self)
@@ -1018,7 +1007,7 @@ Traceback (most recent call last):
 pgf.PGFError: The concrete syntax is not loaded
 </pre>
 
-Before using the concrete syntax, you need to explicitly load it:
+Before using the concrete syntax, you need to explicitly load it: 
 <pre class="python">
 >>> eng.load("AppEng.pgf_c")
 >>> print(eng.lookupMorpho("letter"))
@@ -1071,7 +1060,7 @@ Traceback (most recent call last):
 pgf.PGFError: The concrete syntax is not loaded
 </pre>
 
-Before using the concrete syntax, you need to explicitly load it:
+Before using the concrete syntax, you need to explicitly load it: 
 <pre class="java">
 eng.load("AppEng.pgf_c")
 for (MorphoAnalysis an : eng.lookupMorpho("letter")) {
@@ -1300,7 +1289,6 @@ graph {
 }
 </pre>
 
-		</main>
-		</div>
 	</body>
 </html>
+

doc/tutorial/gf-tutorial.t2t

@@ -8,7 +8,7 @@ December 2010 for GF 3.2
 % txt2tags --toc -ttex gf-tutorial.txt
 
 %!target:html
-%!encoding: utf-8
+%!encoding: iso-8859-1
 %!options: --toc
 
 %!postproc(tex) : "\\subsection\*" "\\newslide"
@@ -618,32 +618,32 @@ and **semantic definitions**.
 
 
 
-% #NEW
-%
-% ==Slides==
-%
-% You can chop this tutorial into a set of slides by the command
-% ```
-%   htmls gf-tutorial.html
-% ```
-% where the program ``htmls`` is distributed with GF (see below), in
-%
-%   [``GF/src/tools/Htmls.hs`` http://grammaticalframework.org/src/tools/Htmls.hs]
-%
-% The slides will appear as a set of files beginning with ``01-gf-tutorial.htmls``.
-%
-% Internal links will not work in the slide format, except for those in the
-% upper left corner of each slide, and the links behind the "Contents" link.
+#NEW
+
+==Slides==
+
+You can chop this tutorial into a set of slides by the command
+```
+  htmls gf-tutorial.html
+```
+where the program ``htmls`` is distributed with GF (see below), in
+
+  [``GF/src/tools/Htmls.hs`` http://grammaticalframework.org/src/tools/Htmls.hs]
+
+The slides will appear as a set of files beginning with ``01-gf-tutorial.htmls``.
+
+Internal links will not work in the slide format, except for those in the
+upper left corner of each slide, and the links behind the "Contents" link.
 
 
 
 #NEW
 
-#Lchaptwo
-
 =Lesson 1: Getting Started with GF=
 
 
+#Lchaptwo
+
 Goals:
 - install and run GF
 - write the first GF grammar: a "Hello World" grammar in three languages
@@ -836,8 +836,8 @@ Finnish and an Italian concrete syntaxes:
     lin
       Hello recip = {s = "terve" ++ recip.s} ;
       World = {s = "maailma"} ;
-      Mum = {s = "äiti"} ;
-      Friends = {s = "ystävät"} ;
+      Mum = {s = "äiti"} ;
+      Friends = {s = "ystävät"} ;
   }
 
   concrete HelloIta of Hello = {
@@ -925,7 +925,7 @@ Default of the language flag (``-lang``): the last-imported concrete syntax.
 **Multilingual generation**:
 ```
   > parse -lang=HelloEng "hello friends" | linearize
-  terve ystävät
+  terve ystävät
   ciao amici
   hello friends
 ```
@@ -1037,10 +1037,9 @@ Application programs, using techniques from #Rchapeight:
 
 #NEW
 
-#Lchapthree
-
 =Lesson 2: Designing a grammar for complex phrases=
 
+#Lchapthree
 
 Goals:
 - build a larger grammar: phrases about food in English and Italian
@@ -1336,7 +1335,7 @@ Just (?) replace English words with their dictionary equivalents:
       Phrase, Item, Kind, Quality = {s : Str} ;
 
     lin
-      Is item quality = {s = item.s ++ "è" ++ quality.s} ;
+      Is item quality = {s = item.s ++ "č" ++ quality.s} ;
       This kind = {s = "questo" ++ kind.s} ;
       That kind = {s = "quel" ++ kind.s} ;
       QKind quality kind = {s = kind.s ++ quality.s} ;
@@ -1447,11 +1446,11 @@ linearizations in different languages:
   > gr -number=2 | l -treebank
 
   Is (That Cheese) (Very Boring)
-  quel formaggio è molto noioso
+  quel formaggio č molto noioso
   that cheese is very boring
 
   Is (That Cheese) Fresh
-  quel formaggio è fresco
+  quel formaggio č fresco
   that cheese is fresh
 ```
 
@@ -1473,14 +1472,14 @@ answer given in another language.
   You can interrupt the quiz by entering a line consisting of a dot ('.').
 
   this fish is warm
-  questo pesce è caldo
+  questo pesce č caldo
   > Yes.
   Score 1/1
 
   this cheese is Italian
-  questo formaggio è noioso
-  > No, not questo formaggio è noioso, but
-  questo formaggio è italiano
+  questo formaggio č noioso
+  > No, not questo formaggio č noioso, but
+  questo formaggio č italiano
 
   Score 1/2
   this fish is expensive
@@ -1757,7 +1756,7 @@ Simultaneous extension and opening:
     lincat
       Question = SS ;
     lin
-      QIs item quality = ss (item.s ++ "è" ++ quality.s) ;
+      QIs item quality = ss (item.s ++ "č" ++ quality.s) ;
       Pizza = ss "pizza" ;
   }
 ```
@@ -1798,10 +1797,9 @@ where
 
 #NEW
 
-#Lchapfour
-
 =Lesson 3: Grammars with parameters=
 
+#Lchapfour
 
 Goals:
 - implement sophisticated linguistic structures:
@@ -2366,10 +2364,10 @@ in English, with special care taken of variations with the suffix
 
 + Implement the German **Umlaut** operation on word stems.
 The operation changes the vowel of the stressed stem syllable as follows:
-//a// to //ä//, //au// to //äu//, //o// to //ö//, and //u// to //ü//. You
+//a// to //ä//, //au// to //äu//, //o// to //ö//, and //u// to //ü//. You
 can assume that the operation only takes syllables as arguments. Test the
-operation to see whether it correctly changes //Arzt// to //Ärzt//,
-//Baum// to //Bäum//, //Topf// to //Töpf//, and //Kuh// to //Küh//.
+operation to see whether it correctly changes //Arzt// to //Ärzt//,
+//Baum// to //Bäum//, //Topf// to //Töpf//, and //Kuh// to //Küh//.
 
 
 
@@ -2482,10 +2480,10 @@ The command ``morpho_quiz = mq`` generates inflection exercises.
   Welcome to GF Morphology Quiz.
   ...
 
-  réapparaître : VFin VCondit  Pl  P2
-  réapparaitriez
-  > No, not réapparaitriez, but
-  réapparaîtriez
+  réapparaître : VFin VCondit  Pl  P2
+  réapparaitriez
+  > No, not réapparaitriez, but
+  réapparaîtriez
   Score 0/1
 ```
 To create a list for later use, use the command ``morpho_list = ml``
@@ -2565,7 +2563,7 @@ We need only number variation for the copula.
 ```
     copula : Number -> Str =
       \n -> case n of {
-        Sg => "è" ;
+        Sg => "č" ;
         Pl => "sono"
         } ;
 ```
@@ -2774,10 +2772,9 @@ Thus
 
 #NEW
 
-#Lchapfive
-
 =Lesson 4: Using the resource grammar library=
 
+#Lchapfive
 
 Goals:
 - navigate in the GF resource grammar library and use it in applications
@@ -3308,13 +3305,13 @@ we can write a **functor instantiation**,
   oper
     wine_N = mkN "Wein" ;
     pizza_N = mkN "Pizza" "Pizzen" feminine ;
-    cheese_N = mkN "Käse" "Käsen" masculine ;
+    cheese_N = mkN "Käse" "Käsen" masculine ;
     fish_N = mkN "Fisch" ;
     fresh_A = mkA "frisch" ;
-    warm_A = mkA "warm" "wärmer" "wärmste" ;
+    warm_A = mkA "warm" "wärmer" "wärmste" ;
     italian_A = mkA "italienisch" ;
     expensive_A = mkA "teuer" ;
-    delicious_A = mkA "köstlich" ;
+    delicious_A = mkA "köstlich" ;
     boring_A = mkA "langweilig" ;
   }
 ```
@@ -3365,11 +3362,11 @@ Lexicon instance
     cheese_N = mkN "juusto" ;
     fish_N = mkN "kala" ;
     fresh_A = mkA "tuore" ;
-    warm_A = mkA "lämmin" ;
+    warm_A = mkA "lämmin" ;
     italian_A = mkA "italialainen" ;
     expensive_A = mkA "kallis" ;
     delicious_A = mkA "herkullinen" ;
-    boring_A = mkA "tylsä" ;
+    boring_A = mkA "tylsä" ;
   }
 ```
 Functor instantiation
@@ -3617,10 +3614,9 @@ tenses and moods, e.g. the Romance languages.
 
 #NEW
 
-#Lchapsix
-
 =Lesson 5: Refining semantics in abstract syntax=
 
+#Lchapsix
 
 Goals:
 - include semantic conditions in grammars, by using
@@ -3630,7 +3626,7 @@ Goals:
   - semantic definitions
 
 These concepts are inherited from **type theory** (more precisely:
-constructive type theory, or Martin-Löf type theory).
+constructive type theory, or Martin-Löf type theory).
 
 Type theory is the basis **logical frameworks**.
 
@@ -4181,11 +4177,11 @@ Type checking can be invoked with ``put_term -transform=solve``.
 
 #NEW
 
-#Lchapseven
-
 ==Lesson 6: Grammars of formal languages==
 
 
+#Lchapseven
+
 Goals:
 - write grammars for formal languages (mathematical notation, programming languages)
 - interface between formal and natural langauges
@@ -4520,10 +4516,9 @@ point literals as arguments.
 
 #NEW
 
-#Lchapeight
-
 =Lesson 7: Embedded grammars=
 
+#Lchapeight
 
 Goals:
 - use grammars as parts of programs written in Haskell and JavaScript
@@ -4644,7 +4639,7 @@ output. Therefore it can be a part of a pipe and read and write files.
 The simplest way to translate is to ``echo`` input to the program:
 ```
   % echo "this wine is delicious" | ./trans Food.pgf
-  questo vino è delizioso
+  questo vino č delizioso
 ```
 The result is given in all languages except the input language.
 
@@ -4963,12 +4958,12 @@ syntax name. This file contains the multilingual grammar as a JavaScript object.
 ===Using the JavaScript grammar===
 
 To perform parsing and linearization, the run-time library
-``gflib.js`` is used. It is included in ``/src/runtime/javascript/``, together with
+``gflib.js`` is used. It is included in ``GF/lib/javascript/``, together with
 some other JavaScript and HTML files; these files can be used
 as templates for building applications.
 
 An example of usage is
-[``translator.html`` ../../src/runtime/javascript/translator.html],
+[``translator.html`` http://grammaticalframework.org:41296],
 which is in fact initialized with
 a pointer to the Food grammar, so that it provides translation between the English
 and Italian grammars:

doc/txt2html.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+FILES="darcs.txt transfer-reference.txt transfer-tutorial.txt \
+      transfer.txt"
+
+for f in $FILES; do
+  h=`basename "$f" ".txt"`.html
+  if [ "$f" -nt "$h" ]; then 
+    txt2tags $f
+  else
+    echo "$h is newer than $f, skipping"
+  fi
+done

download/encoding-change.t2t

@@ -1,6 +1,10 @@
 GF character encoding changes
 Thomas Hallgren
-2013-12-18
+%%mtime(%F)
+
+%!style:../css/style.css
+%!postproc(html): <TITLE> <meta charset="UTF-8"><meta name = "viewport" content = "width = device-width"> <TITLE>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
 
 ==Changes to character encodings in GF grammar files ==
 

download/index-3.1.6.t2t

@@ -16,7 +16,7 @@ GF 3.1.6 released 23 April 2010.
 - Windows (zipped executable):
   [``gf-3.1.6-bin-i486-windows.zip`` gf-3.1.6-bin-i486-windows.zip]
   (1.6 MB)
-- Ubuntu Linux (gzipped executable):
+- Ubuntu Linux (gzipped executable): 
   [``gf-3.1.6-bin-i486-linux.gz`` gf-3.1.6-bin-i486-linux.gz]
   (1.7 MB)
 - compiled library package:
@@ -25,7 +25,7 @@ GF 3.1.6 released 23 April 2010.
 - full source package (GF system, libraries, examples, documentation):
   [``gf-3.1.6-src.tar.gz`` gf-3.1.6-src.tar.gz]
   (11 MB)
-
+  
 GF is also on [Hackage http://hackage.haskell.org/package/gf]
 
 
@@ -40,7 +40,7 @@ What's new? See the [release notes release-3.1.6.html].
 ==Installation instructions==
 
 
-The Windows package is installed by just unpacking it anywhere.
+The Windows package is installed by just unpacking it anywhere. 
 It finds the libraries relative to the ``.exe`` file.
 
 To install a binary package for MacOS X or Linux: uncompress the executable and

download/index-3.2.9.t2t

@@ -1,6 +1,11 @@
 Grammatical Framework Download and Installation
 
 
+%!style:../css/style.css
+%!postproc(html): <TD><B> <TH>
+%!postproc(html): </B></TD> </TH>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+
 **GF 3.2.9** source-only snapshot was released on 12 September 2011.
 
 What's new? Faster grammar compilation!
@@ -72,3 +77,9 @@ The above notes for installing from source apply also in this case.
 - [GF 3.2 index-3.2.html] (December 2011).
 - [GF 3.1.6 index-3.1.6.html] (April 2010).
 - [GF 3.1 old-index.html] (December 2009).
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]
+ 

download/index-3.2.t2t

@@ -1,6 +1,11 @@
 Grammatical Framework Download and Installation
 
 
+%!style:../css/style.css
+%!postproc(html): <TD><B> <TH>
+%!postproc(html): </B></TD> </TH>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+
 **GF 3.2** was released on 23 December 2010.
 
 What's new? See the [Release notes release-3.2.html].
@@ -22,7 +27,7 @@ More packages might be added later.
 
 ===Notes===
 
-The Windows package is installed by just unpacking it anywhere.
+The Windows package is installed by just unpacking it anywhere. 
 It finds the libraries relative to the ``.exe`` file.
 
 The ``.deb`` packages work on Ubuntu 10.04 and 10.10.
@@ -100,3 +105,8 @@ Subsequently:
 ```
 
 The above notes for installing from source apply also in this case.
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]
+ 

download/index-3.3.3.t2t

@@ -1,6 +1,12 @@
 Grammatical Framework Download and Installation
 
 
+%!style:../css/style.css
+%!postproc(html): <TITLE> <meta name = "viewport" content = "width = device-width"><TITLE>
+%!postproc(html): <TD><B> <TH>
+%!postproc(html): </B></TD> </TH>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+
 **GF 3.3.3** was released on 3 March 2012.
 
 What's new? See the [Release notes release-3.3.3.html].
@@ -18,7 +24,7 @@ What's new? See the [Release notes release-3.3.3.html].
 
 ===Notes===
 
-The Windows package is installed by just unpacking it anywhere.
+The Windows package is installed by just unpacking it anywhere. 
 It finds the libraries relative to the ``.exe`` file.
 
 %The ``.deb`` packages work on Ubuntu 10.04 and 10.10.
@@ -121,3 +127,9 @@ For more info, see the [GF Developers Guide ../doc/gf-developers.html].
 - [GF 3.2 index-3.2.html] (December 2010).
 - [GF 3.1.6 index-3.1.6.html] (April 2010).
 - [GF 3.1 old-index.html] (December 2009).
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]
+ 

download/index-3.3.t2t

@@ -1,6 +1,11 @@
 Grammatical Framework Download and Installation
 
 
+%!style:../css/style.css
+%!postproc(html): <TD><B> <TH>
+%!postproc(html): </B></TD> </TH>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+
 **GF 3.3** was released on 27 October 2011.
 
 What's new? See the [Release notes release-3.3.html].
@@ -22,7 +27,7 @@ More packages might be added later.
 
 ===Notes===
 
-The Windows package is installed by just unpacking it anywhere.
+The Windows package is installed by just unpacking it anywhere. 
 It finds the libraries relative to the ``.exe`` file.
 
 %The ``.deb`` packages work on Ubuntu 10.04 and 10.10.
@@ -110,3 +115,9 @@ The above notes for installing from source apply also in this case.
 - [GF 3.2 index-3.2.html] (December 2010).
 - [GF 3.1.6 index-3.1.6.html] (April 2010).
 - [GF 3.1 old-index.html] (December 2009).
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]
+ 

download/index-3.4.t2t

@@ -1,6 +1,13 @@
 Grammatical Framework Download and Installation
 
 
+%!style:../css/style.css
+%!postproc(html): </HEAD> <STYLE>body { color: #333; } li>code,p>code,pre { color: #730; }</STYLE></HEAD>
+%!postproc(html): <TITLE> <meta name = "viewport" content = "width = device-width"><TITLE>
+%!postproc(html): <TD><B> <TH>
+%!postproc(html): </B></TD> </TH>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+
 **GF 3.4** was released on 31 January 2013.
 
 What's new? See the [Release notes release-3.4.html].
@@ -13,11 +20,14 @@ What's new? See the [Release notes release-3.4.html].
 | Fedora (32-bit) | [Fedora RPMs /~hallgren/tmp/Fedora/] | ``sudo rpm -i ...``
 | Ubuntu (32-bit) | [gf_3.4-1_i386.deb gf_3.4-1_i386.deb] | ``sudo dpkg -i gf_3.4-1_i386.deb``
 | Ubuntu (64-bit) | [gf_3.4-1_amd64.deb gf_3.4-1_amd64.deb] | ``sudo dpkg -i gf_3.4-1_amd64.deb``
-| Windows | [gf-3.4-bin-windows.zip gf-3.4-bin-windows.zip] | -
+| Windows | [gf-3.4-bin-windows.zip gf-3.4-bin-windows.zip] | 
+%| ... | ... | ...
+
+%More binary packages might be added later.
 
 ===Notes===
 
-%The Windows package is installed by just unpacking it anywhere.
+%The Windows package is installed by just unpacking it anywhere. 
 %It finds the libraries relative to the ``.exe`` file.
 
 The ``.deb`` packages work on Ubuntu 12.04, 12.10 and 13.04.
@@ -143,3 +153,8 @@ For more info on working with the GF source code, see the
 - [GF 3.2 index-3.2.html] (December 2010).
 - [GF 3.1.6 index-3.1.6.html] (April 2010).
 - [GF 3.1 old-index.html] (December 2009).
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

download/index-3.5.t2t

@@ -1,6 +1,13 @@
 Grammatical Framework Download and Installation
 
 
+%!style:../css/style.css
+%!postproc(html): </HEAD> <STYLE>body { color: #333; } li>code,p>code,pre { color: #730; }</STYLE></HEAD>
+%!postproc(html): <TITLE> <meta name = "viewport" content = "width = device-width"><TITLE>
+%!postproc(html): <TD><B> <TH>
+%!postproc(html): </B></TD> </TH>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+
 **GF 3.5** was released on 6 August 2013.
 
 What's new? See the [Release notes release-3.5.html].
@@ -150,3 +157,8 @@ For more info on working with the GF source code, see the
 - [GF 3.2 index-3.2.html] (December 2010).
 - [GF 3.1.6 index-3.1.6.html] (April 2010).
 - [GF 3.1 old-index.html] (December 2009).
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

download/index-3.6.t2t

@@ -1,6 +1,13 @@
 Grammatical Framework Download and Installation
 
 
+%!style:../css/style.css
+%!postproc(html): </HEAD> <STYLE>body { color: #333; } li>code,p>code,pre { color: #730; }</STYLE></HEAD>
+%!postproc(html): <TITLE> <meta name = "viewport" content = "width = device-width"><TITLE>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+%!postproc(html): <TD><I> <TD><small>
+%!postproc(html): </I></TD> </small></TD>
+
 **GF 3.6** was released on 23 June 2014.
 
 What's new? See the [Release notes release-3.6.html].
@@ -170,3 +177,8 @@ For more info on working with the GF source code, see the
 - [GF 3.2 index-3.2.html] (December 2010).
 - [GF 3.1.6 index-3.1.6.html] (April 2010).
 - [GF 3.1 old-index.html] (December 2009).
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

download/index-3.7.1.t2t

@@ -1,6 +1,12 @@
 Grammatical Framework Download and Installation
 
 
+%!style:../css/notes.css
+%!postproc(html): <TITLE> <meta name = "viewport" content = "width = device-width"><TITLE>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+%!postproc(html): <TD><I> <TD><small>
+%!postproc(html): </I></TD> </small></TD>
+
 **GF 3.7.1** was released on 2 October 2015.
 
 What's new? See the [Release notes release-3.7.1.html].
@@ -40,7 +46,7 @@ The ``.deb`` packages work on Ubuntu 12.04, 14.04 and 15.04.
 
 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,
+(*) **Note** that for compatibility with OS X 10.11, 
 ``gf-3.7.1.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``,
@@ -174,3 +180,8 @@ For more info on working with the GF source code, see the
 - [GF 3.2 index-3.2.html] (December 2010).
 - [GF 3.1.6 index-3.1.6.html] (April 2010).
 - [GF 3.1 old-index.html] (December 2009).
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

download/index-3.7.t2t

@@ -1,6 +1,13 @@
 Grammatical Framework Download and Installation
 
 
+%!style:../css/style.css
+%!postproc(html): </HEAD> <STYLE>body { color: #333; } li>code,p>code,pre { color: #730; }</STYLE></HEAD>
+%!postproc(html): <TITLE> <meta name = "viewport" content = "width = device-width"><TITLE>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+%!postproc(html): <TD><I> <TD><small>
+%!postproc(html): </I></TD> </small></TD>
+
 **GF 3.7** was released on 25 June 2015.
 
 What's new? See the [Release notes release-3.7.html].
@@ -166,3 +173,8 @@ For more info on working with the GF source code, see the
 - [GF 3.2 index-3.2.html] (December 2010).
 - [GF 3.1.6 index-3.1.6.html] (April 2010).
 - [GF 3.1 old-index.html] (December 2009).
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

download/index-3.8.t2t

@@ -1,6 +1,12 @@
 Grammatical Framework Download and Installation
 
 
+%!style:../css/notes.css
+%!postproc(html): <TITLE> <meta name = "viewport" content = "width = device-width"><TITLE>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+%!postproc(html): <TD><I> <TD><small>
+%!postproc(html): </I></TD> </small></TD>
+
 **GF 3.8** was released on 22 June 2016.
 
 What's new? See the [Release notes release-3.8.html].
@@ -43,7 +49,7 @@ 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).
 
-(*) **Note** that for compatibility with OS X 10.11,
+(*) **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``,
@@ -165,3 +171,8 @@ For more info on working with the GF source code, see the
 - [GF 3.2 index-3.2.html] (December 2010).
 - [GF 3.1.6 index-3.1.6.html] (April 2010).
 - [GF 3.1 old-index.html] (December 2009).
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

download/index.md

@@ -1,187 +0,0 @@
----
-title: Grammatical Framework Download and Installation
-...
-
-**GF 3.10** was released on 2 December 2018.
-
-What's new? See the [release notes](release-3.10.html).
-
-## Binary packages
-
-These binary packages include both the GF core (compiler and runtime) as well as the pre-compiled RGL.
-
-| Platform        | Download                                           | Features       | How to install                     |
-|:----------------|:---------------------------------------------------|:---------------|:-----------------------------------|
-| macOS           | [gf-3.10.pkg](gf-3.10.pkg)                         | GF, S, C, J, P | Double-click on the package icon   |
-| Ubuntu (32-bit) | [gf\_3.10-2\_i386.deb](gf_3.10-2_i386.deb)         | GF, S, C, J, P | `sudo dpkg -i gf_3.10-2_i386.deb`  |
-| Ubuntu (64-bit) | [gf\_3.10-2\_amd64.deb](gf_3.10-2_amd64.deb)       | GF, S, C, J, P | `sudo dpkg -i gf_3.10-2_amd64.deb` |
-| Windows         | [gf-3.10-bin-windows.zip](gf-3.10-bin-windows.zip) | GF, S          | `unzip gf-3.10-bin-windows.zip`    |
-
-<!--
-| macOS           | [gf-3.10-bin-intel-mac.tar.gz](gf-3.10-bin-intel-mac.tar.gz) | GF,S,C,J,P | `sudo tar -C /usr/local -zxf gf-3.10-bin-intel-mac.tar.gz` |
-| Raspbian 9.1     | [gf\_3.10-1\_armhf.deb](gf_3.10-1_armhf.deb)                 | GF,S,C,J,P | `sudo dpkg -i gf_3.10-1_armhf.deb`                         |
--->
-
-**Features**
-
-- GF = GF shell and grammar compiler
-- S = `gf -server` mode
-- C = C run-time system
-- J/P = Java/Python binding to the C run-time system
-
-### Notes
-
-The Windows package is installed by just unpacking it anywhere. You will
-probably need to set the `PATH` and `GF_LIB_PATH` environment variables,
-see Inari's notes on [Installing GF on Windows](http://www.grammaticalframework.org/~inari/gf-windows.html#toc3).
-
-The Ubuntu `.deb` packages should work on Ubuntu 16.04 and 18.04 and
-similar Linux distributions. The `.deb` packages were updated
-to version 3.10-2 after the release of GF 3.10.
-(Because of a packaging bug the Resource Grammar Library was missing
-in the 3.10-1 packages.)
-
-<!-- The Raspbian `.deb` package was created on a Raspberry Pi 3 and will
-probably work on other ARM-based systems running Debian 9 (stretch) or
-similar Linux distributions. -->
-
-The packages for macOS (Mac OS X) should work on at least 10.13 and
-10.14 (High Sierra and Mojave)
-
-<!-- The Mac OS and Linux `.tar.gz` packages are designed to be installed in
-`/usr/local`. 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.10/lib
-```
-
-where `/usr/local` should be replaced with the path to the location
-where you unpacked the package. -->
-
-## Installing the latest release from source
-
-[GF is on Hackage](http://hackage.haskell.org/package/gf), so under
-normal circumstances the procedure is fairly simple:
-
-1.  Install a recent version of the [Haskell
-    Platform](http://hackage.haskell.org/platform) (see note below)
-2.  `cabal update`
-3.  On Linux: install some C libraries from your Linux distribution (see note below)
-4.  `cabal install gf`
-
-This installs the GF executable and Haskell libraries, but **does not include the RGL**.
-
-You can also download the source code release from [GitHub](https://github.com/GrammaticalFramework/gf-core/releases),
-and follow the instructions below under **Installing from the latest developer source code**.
-
-### Notes
-
-**Installation location**
-
-The above steps installs GF for a single user. The executables are put
-in `$HOME/.cabal/bin` (or, with recent versions of the Haskell platform
-on Mac OS X, in `$HOME/Library/Haskell/bin`), so it is a good idea to
-put a line in your `.bash_profile` or `.profile` to add that directory
-to you path:
-
-```
-PATH=$HOME/.cabal/bin:$PATH
-```
-
-or
-
-```
-PATH=$HOME/Library/Haskell/bin:$PATH
-```
-
-**Build tools**
-
-In order to compile GF you need the build tools **Alex** and **Happy**.
-These can be installed via Cabal, e.g.:
-
-```
-cabal install alex happy
-```
-
-or obtained by other means, depending on your OS.
-
-**Haskeline**
-
-GF uses [`haskeline`](http://hackage.haskell.org/package/haskeline), which
-on Linux depends on some non-Haskell libraries that won't be installed
-automatically by cabal, and therefore need to be installed manually.
-Here is one way to do this:
-
-- On Ubuntu: `sudo apt-get install libghc-haskeline-dev`
-- On Fedora: `sudo yum install ghc-haskeline-devel`
-
-**GHC version**
-
-The GF source code has been updated to compile with GHC 8.4.
-Using older versions of GHC (e.g. 8.2, 8.0 and 7.10) should still work too.
-
-## Installing from the latest developer source code
-
-If you haven't already, clone the repository with:
-
-```
-git clone https://github.com/GrammaticalFramework/gf-core.git
-```
-
-If you've already cloned the repository previously, update with:
-
-```
-git pull
-```
-
-Then install with:
-
-```
-cabal install
-```
-
-or, if you're a Stack user:
-
-```
-stack install
-```
-
-The above notes for installing from source apply also in these cases.
-For more info on working with the GF source code, see the
-[GF Developers Guide](../doc/gf-developers.html).
-
-## Installing the RGL from source
-
-To install the RGL from source,
-you can download a release from [GitHub](https://github.com/GrammaticalFramework/gf-rgl/releases)
-or get the latest version by cloning the repository:
-
-```
-git clone https://github.com/GrammaticalFramework/gf-rgl.git
-```
-
-In both cases, once you have the RGL sources you can install them by running:
-
-```
-make
-```
-
-in the RGL folder.
-This assumes that you already have GF installed.
-For more details about building the RGL, see the [RGL README](https://github.com/GrammaticalFramework/gf-rgl/blob/master/README.md).
-
-## Older releases
-
-- [GF 3.9](index-3.9.html) (August 2017)
-- [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)
-- [GF 3.5](index-3.5.html) (August 2013)
-- [GF 3.4](index-3.4.html) (January 2013)
-- [GF 3.3.3](index-3.3.3.html) (March 2012)
-- [GF 3.3](index-3.3.html) (October 2011)
-- [GF 3.2.9](index-3.2.9.html) source-only snapshot (September 2011)
-- [GF 3.2](index-3.2.html) (December 2010)
-- [GF 3.1.6](index-3.1.6.html) (April 2010)

download/index.t2t

@@ -1,6 +1,12 @@
 Grammatical Framework Download and Installation
 
 
+%!style:../css/notes.css
+%!postproc(html): <TITLE> <meta name = "viewport" content = "width = device-width"><TITLE>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+%!postproc(html): <TD><I> <TD><small>
+%!postproc(html): </I></TD> </small></TD>
+
 **GF 3.9** was released on 11 August 2017.
 
 What's new? See the [Release notes release-3.9.html].
@@ -12,11 +18,10 @@ What's new? See the [Release notes release-3.9.html].
 | 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 ...``
-| Raspbian 9.1 | [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``
+| Raspian 9.1 | [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``
 %| ... | ... | ... | ...
 
@@ -171,11 +176,6 @@ The above notes for installing from source apply also in these cases.
 For more info on working with the GF source code, see the
 [GF Developers Guide ../doc/gf-developers.html].
 
-==Using Stack==
-
-You can also use [Stack https://www.haskellstack.org] to compile GF, just replace ``cabal install`` above
-with ``stack install`` (assuming you already have Stack set up).
-
 ==Older releases==
 
 - [GF 3.8 index-3.8.html] (June 2016)
@@ -190,3 +190,8 @@ with ``stack install`` (assuming you already have Stack set up).
 - [GF 3.2 index-3.2.html] (December 2010).
 - [GF 3.1.6 index-3.1.6.html] (April 2010).
 - [GF 3.1 old-index.html] (December 2009).
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

download/release-3.1.6.t2t

@@ -5,13 +5,13 @@ GF Version 3.1.6 Release Notes
 =Installation=
 
 The binaries now work out of the box for each platform and support
-completions (file names and parsing), because readline has been
+completions (file names and parsing), because readline has been 
 changed to haskeline.
 
 To compile from source, GHC 6.12 is now required. But GHC is not needed
 if the binary executables are used.
 
-Binaries (``.gfo`` and ``.pgf`` files) compiled with GF 3.1 are incompatible
+Binaries (``.gfo`` and ``.pgf`` files) compiled with GF 3.1 are incompatible 
 with 3.1.6 and must either be removed; alternatively, the ``-src`` flag can be
 used when compiling.
 
@@ -24,8 +24,8 @@ Grammar language
 - improved support for dependent types (see ``SUMO``, ``nqueens`` in ``examples``)
 
 
-Shell commands and options (see ``help`` in GF for more information)
-- ``eb``: example-based grammar file conversion
+Shell commands and options (see ``help`` in GF for more information) 
+- ``eb``: example-based grammar file conversion 
   (see ``examples/animals/QuestionI.gf``)
 - ``vd = visualize_dependency``: show dependency tree
 - ``vp = visualize_parse``: show parse tree
@@ -57,3 +57,8 @@ Internal
 
 Javascript generation is not updated to the new PGF format.
 [GF 3.1 old-index.html] should still be used for building Javascript applications.
+
+
+
+
+

download/release-3.10.md

@@ -1,66 +0,0 @@
----
-title: GF 3.10 Release Notes
-date: 2 December 2018
-...
-
-## Installation
-
-See the [download page](index.html).
-
-## What's new
-
-In this release, the GF "core" (compiler and runtimes) and RGL have been split into separate repositories.
-The binary packages on the downloads page contain both GF and the RGL, but the sources are now separate:
-[gf-core](https://github.com/GrammaticalFramework/gf-core) and
-[gf-rgl](https://github.com/GrammaticalFramework/gf-rgl).
-
-Over 300 changes have been pushed to GF and over 600 changes have been made to the RGL
-since the release of GF 3.9 in August 2017.
-
-## General
-
-- Travis integration:
-GF [![Build Status](https://travis-ci.org/GrammaticalFramework/gf-core.svg?branch=master)](https://travis-ci.org/GrammaticalFramework/gf-core) and
-RGL [![Build Status](https://travis-ci.org/GrammaticalFramework/gf-rgl.svg?branch=master)](https://travis-ci.org/GrammaticalFramework/gf-rgl)
-- A lot of bug fixes and repository cleanup, including things moved to new repositories:
-    - [Phrasebook](https://github.com/GrammaticalFramework/gf-contrib/tree/master/phrasebook)
-    - [Wide coverage translator](https://github.com/GrammaticalFramework/wide-coverage)
-    - [Mobile apps](https://github.com/GrammaticalFramework/gf-offline-translator)
-    - [gftest](https://github.com/GrammaticalFramework/gftest)
-    - [gf-mode](https://github.com/GrammaticalFramework/gf-emacs-mode) for Emacs
-    - [RGL browser](https://github.com/GrammaticalFramework/rgl-source-browser) (live [here](http://www.grammaticalframework.org/~john/rgl-browser/))
-- A fresh look for the GF website.
-
-## GF compiler and run-time library
-
-- Extensive improvements in the C runtime and bindings to it from Python, Java, Haskell, C#
-- A GF shell which uses the C runtime
-- Better error messages
-- GF now has a Stack configuration file
-- The compiler source code has been updated for compatibility with GHC 8.4.3.
-- `GF_LIB_PATH` can now be `path1:path2:path3`, not just `path1`
-- Add TypeScript type definitions for `gflib.js`
-- New compiler/shell options
-    - added option `-output-format=java` for producing code for embedded grammars in Java
-    - `rf -paragraphs`
-    - `linearize -tabtreebank`
-    - A new function called `completions` is added in the Haskell runtime and used in PGFService. This makes the extraction of completions more platform independent
-
-## Resource Grammar Library
-
-- [Bash build script](https://github.com/GrammaticalFramework/gf-rgl/blob/master/Setup.sh), for building the RGL without Haskell
-- [Windows build script](https://github.com/GrammaticalFramework/gf-rgl/blob/master/Setup.bat), for building the RGL without Haskell on a regular Windows command shell
-- New languages:
-    - Basque
-    - Portuguese
-- Big progress with Arabic, Turkish, Persian
-- Introduction of `Extend` module to combine the functions of `Extra` and `Extensions` in a more disciplined way
-- Various fixes for several languages.
-- Various fixes in the translation dictionaries.
-
-## Apps and Cloud services
-
-- Sort list of public grammars by age by default
-- Browser compatibility fixes
-- Allow public grammars to be deleted in more cases
-- Show grammar comments in the list of public grammars

download/release-3.2.t2t

@@ -1,6 +1,9 @@
 GF Version 3.2 Release Notes
 December 2010
 
+%!style:../css/style.css
+%!postproc(html): <H1> <H1><IMG src="../doc/Logos/gf0.png">
+
 ==Installation==
 
 See the [download page http://www.grammaticalframework.org/download/index.html].
@@ -31,3 +34,8 @@ See the [download page http://www.grammaticalframework.org/download/index.html].
 
 - GF compiler: GPL
 - Run-time libraries and Resource Grammar Library: LGPL + BSD
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

download/release-3.3.3.t2t

@@ -1,6 +1,10 @@
 GF Version 3.3.3 Release Notes
 March 2012
 
+%!style:../css/style.css
+%!postproc(html): <TITLE> <meta name = "viewport" content = "width = device-width"><TITLE>
+%!postproc(html): <H1> <H1><IMG src="../doc/Logos/gf0.png">
+
 ==Installation==
 
 See the [download page http://www.grammaticalframework.org/download/index.html].
@@ -21,3 +25,8 @@ See the [download page http://www.grammaticalframework.org/download/index.html].
 - Fix for a bug that prevented the shell commands ``abstract_info``,
   ``generate_random`` and ``generate_trees`` from working properly.
 - Various other small improvements and bug fixes.
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

download/release-3.3.t2t

@@ -1,13 +1,17 @@
 GF Version 3.3 Release Notes
 October 2011
 
+%!style:../css/style.css
+%!postproc(html): <TITLE> <meta name = "viewport" content = "width = device-width"><TITLE>
+%!postproc(html): <H1> <H1><IMG src="../doc/Logos/gf0.png">
+
 ==Installation==
 
 See the [download page http://www.grammaticalframework.org/download/index.html].
 
 ==New features==
 
-- Source language extension: it is now possible to override the oper definitions in an interface, by using the
+- Source language extension: it is now possible to override the oper definitions in an interface, by using the 
   header syntax ``instance Foo of Bar - [f,g,h]``.
 - New functionalities in GF shell commands (more information with ``help`` command-name).
   - ``aw`` = ``align_words`` option ``-giza`` prints word alignments in Giza++ format.
@@ -25,3 +29,8 @@ See the [download page http://www.grammaticalframework.org/download/index.html].
   and the web-based grammar editor.
 - Faster grammar compilation (also included in the GF 3.2.9 source-only
   snapshot).
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

download/release-3.4.t2t

@@ -1,6 +1,10 @@
 GF Version 3.4 Release Notes
 January 2013
 
+%!style:../css/style.css
+%!postproc(html): <TITLE> <meta charset="UTF-8"><meta name = "viewport" content = "width = device-width"> <TITLE>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+
 ==Installation==
 
 See the [download page http://www.grammaticalframework.org/download/index.html].
@@ -42,3 +46,8 @@ See the [download page http://www.grammaticalframework.org/download/index.html].
 - Some new functionality in the web-based grammar editor, e.g. preliminary
   support for public grammars.
 - Various other small improvements and bug fixes.
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

download/release-3.5.t2t

@@ -1,6 +1,10 @@
 GF 3.5 Release Notes
 August 2013
 
+%!style:../css/style.css
+%!postproc(html): <TITLE> <meta charset="UTF-8"><meta name = "viewport" content = "width = device-width"> <TITLE>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+
 ==Installation==
 
 See the [download page http://www.grammaticalframework.org/download/index.html].
@@ -66,3 +70,7 @@ of GF 3.4.
   [``network-2.4.1.1`` https://github.com/haskell/network/commit/f2168b1f8978b4ad9c504e545755f0795ac869ce].
 - Various other small improvements and bug fixes.
 %- [...]
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

download/release-3.6.t2t

@@ -1,6 +1,10 @@
 GF 3.6 Release Notes
 June 2014
 
+%!style:../css/style.css
+%!postproc(html): <TITLE> <meta charset="UTF-8"><meta name = "viewport" content = "width = device-width"> <TITLE>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+
 ==Installation==
 
 See the [download page http://www.grammaticalframework.org/download/index.html].
@@ -22,7 +26,7 @@ Closed [issues http://code.google.com/p/grammatical-framework/issues/list]:
   as ``--# -coding=``//enc//, instead of ``flags coding=``//enc//.
   See the separate document
   [GF character encoding changes encoding-change.html] for more details.
-- Record update: in record objects (but not types) of form ``r ** s``, the values assigned
+- Record update: in record objects (but not types) of form ``r ** s``, the values assigned 
   in ``s`` now overwrite those in ``r``. In previous versions, record extensions with
   overlapping assignments in ``r`` and ``s`` were not supported, and their behaviour was
   unpredictable.
@@ -103,3 +107,8 @@ Closed [issues http://code.google.com/p/grammatical-framework/issues/list]:
     - ``c-wordforword``: this works as ``c-translate`` but does a
       word-for-word lookup to create a (potentially very low quality)
       translation that can be used if all else fails.
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

download/release-3.7.1.t2t

@@ -1,6 +1,10 @@
 GF 3.7.1 Release Notes
 October 2015
 
+%!style:../css/notes.css
+%!postproc(html): <TITLE> <meta charset="UTF-8"><meta name = "viewport" content = "width = device-width"> <TITLE>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+
 ==Installation==
 
 See the [download page http://www.grammaticalframework.org/download/index.html].
@@ -14,10 +18,10 @@ Over 170 changes have been pushed to the source repository since
 
 ====New features and notable changes====
 
-- GF shell: ``cc -trace`` (preliminary): you can now do things like
-
+- GF shell: ``cc -trace`` (preliminary): you can now do things like 
+  
   	``cc -trace mkV "debug"``
-
+  
   to see a trace of all opers with their arguments and results during the
   computation of ``mkV "debug"``.
 
@@ -25,7 +29,7 @@ Over 170 changes have been pushed to the source repository since
   from the GF shell by starting GF with ``gf -cshell`` or ``gf -crun``.
   Only limited functionality is available when running the shell in these
   modes (use the ``help`` command in the shell for details):
-
+  
   - You can only import ``.pgf`` files, not source files.
   - The ``-retain`` flag can not be used and the commands that require it to
     work are not available.
@@ -73,3 +77,8 @@ Over 170 changes have been pushed to the source repository since
   you can leave ``&+`` uninterpreted instead of gluing the adjacent tokens.
   This means that the output is left in a format that can be parsed in
   a subsequent request.
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

download/release-3.7.t2t

@@ -1,6 +1,10 @@
 GF 3.7 Release Notes
 June 2015
 
+%!style:../css/style.css
+%!postproc(html): <TITLE> <meta charset="UTF-8"><meta name = "viewport" content = "width = device-width"> <TITLE>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+
 ==Installation==
 
 See the [download page http://www.grammaticalframework.org/download/index.html].
@@ -36,7 +40,7 @@ Over 800 changes have been pushed to the source repository since
   ``BIND``, ``SOFT_BIND``, ``SOFT_SPACE``, ``CAPIT``, ``ALL_CAPIT`` and
    ``nonExist``.
 - It is now possible to define callbacks for literals from the Haskell
-  binding to the C runtime. This is used for instance in
+  binding to the C runtime. This is used for instance in 
   the Wide Coverage translator on the Web.
 
 
@@ -99,3 +103,8 @@ Over 800 changes have been pushed to the source repository since
   unused for 24 hours, to keep memory use down in long running servers.
 - PGF service: limit the number of parallel calls to the C run-time parse
   function to 4 by default. The limit can be changed with the ``-j`` flag.
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

download/release-3.8.t2t

@@ -1,6 +1,10 @@
 GF 3.8 Release Notes
 June 2016
 
+%!style:../css/notes.css
+%!postproc(html): <TITLE> <meta charset="UTF-8"><meta name = "viewport" content = "width = device-width"> <TITLE>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+
 ==Installation==
 
 See the [download page http://www.grammaticalframework.org/download/index.html].
@@ -21,7 +25,7 @@ Roughly 400 changes have been pushed to the source repository since
   [universal dependency http://universaldependencies.org/] diagrams
   in various formats, see ``help vd``.
 - The C runtime now includes an experimental library for managing
-  and querying ontologies built on top of the abstract syntax of
+  and querying ontologies built on top of the abstract syntax of 
   a grammar. Since the ontology is based on an abstract syntax,
   it is language independent by design. For now the library is
   only used in the GF Offline Translator. The library uses
@@ -96,3 +100,7 @@ Roughly 400 changes have been pushed to the source repository since
   translations in the domain they cover.
   You can change the order in which the selected grammars are tried
   by dragging them up and down in the list.
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

download/release-3.9.t2t

@@ -1,6 +1,10 @@
 GF 3.9 Release Notes
 August 2017
 
+%!style:../css/notes.css
+%!postproc(html): <TITLE> <meta charset="UTF-8"><meta name = "viewport" content = "width = device-width"> <TITLE>
+%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
+
 ==Installation==
 
 See the [download page http://www.grammaticalframework.org/download/index.html].
@@ -32,7 +36,7 @@ very innefficient for some grammars.
 
 - A new .NET binding for the GF runtime is available.
 
-- The API in the Java binding is extended and it covers more from
+- The API in the Java binding is extended and it covers more from 
 the full functionality of the C runtime.
 
 
@@ -62,3 +66,8 @@ the full functionality of the C runtime.
 
 - PGF service: support for language-specific depencency configurations in
   ``command=deptree``.
+
+
+--------------------
+
+[www.grammaticalframework.org http://www.grammaticalframework.org]

gf.cabal

@@ -1,5 +1,5 @@
 name: gf
-version: 3.10.3-git
+version: 3.9-git
 
 cabal-version: >= 1.22
 build-type: Custom
@@ -11,7 +11,7 @@ description: GF, Grammatical Framework, is a programming language for multilingu
 homepage: http://www.grammaticalframework.org/
 bug-reports: https://github.com/GrammaticalFramework/gf-core/issues
 maintainer: Thomas Hallgren
-tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
+tested-with: GHC==7.6.3, GHC==7.8.3, GHC==7.10.3, GHC==8.0.2
 
 data-dir: src
 data-files:
@@ -42,7 +42,7 @@ data-files:
 custom-setup
   setup-depends:
     base,
-    Cabal >=1.22.0.0,
+    Cabal >=1.4.0.0,
     directory,
     filepath,
     process >=1.0.1.1
@@ -67,6 +67,11 @@ flag network-uri
 --  Description: Make -new-comp the default
 --  Default:     True
 
+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)
   Default:     False
@@ -81,25 +86,26 @@ Library
                  random,
                  pretty,
                  mtl,
-                 exceptions,
-                 ghc-prim
+                 exceptions
   hs-source-dirs: src/runtime/haskell
 
-  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
+  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
 
 --ghc-options: -fwarn-unused-imports
 --if impl(ghc>=7.8)
 --  ghc-options: +RTS -A20M -RTS
   ghc-prof-options: -fprof-auto
-  if impl(ghc>=8.6)
-    Default-extensions: NoMonadFailDesugaring
+  extensions:
 
   exposed-modules:
     PGF
@@ -143,8 +149,8 @@ Library
 
 ---- GF compiler as a library:
 
-  build-depends: filepath, directory>=1.2, time,
-                 process, haskeline, parallel>=3, json
+  build-depends: filepath, directory, time, time-compat, old-locale,
+                 process, haskeline, parallel>=3
 
   hs-source-dirs: src/compiler
   exposed-modules:
@@ -152,7 +158,6 @@ Library
     GF.Support
     GF.Text.Pretty
     GF.Text.Lexing
-    GF.Grammar.Canonical
 
   other-modules:
     GF.Main GF.Compiler GF.Interactive
@@ -191,10 +196,7 @@ Library
     GF.Compile.PGFtoJava
     GF.Haskell
     GF.Compile.ConcreteToHaskell
-    GF.Compile.GrammarToCanonical
-    GF.Grammar.CanonicalJSON
     GF.Compile.PGFtoJS
-    GF.Compile.PGFtoJSON
     GF.Compile.PGFtoProlog
     GF.Compile.PGFtoPython
     GF.Compile.ReadFiles
@@ -273,7 +275,7 @@ Library
     cpp-options: -DC_RUNTIME
 
   if flag(server)
-    build-depends: httpd-shed>=0.4.0.3, network>=2.3 && <2.7,
+    build-depends: httpd-shed>=0.4.0.3, network>=2.3 && <2.7, json,
                    cgi>=3001.2.2.0
     if flag(network-uri)
       build-depends: network-uri>=2.6, network>=2.6

index.html

@@ -1,390 +1,418 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+<TITLE>GF - Grammatical Framework</TITLE>
+<meta charset="UTF-8">
+<link rel="stylesheet" href="css/newstyle.css" title="GF">
+<link rel="alternate" href="https://github.com/GrammaticalFramework/gf-core/" title="GF GitHub repository">
+<meta name = "viewport" content = "width = device-width">
+<script type="text/javascript">
+function sitesearch() {
+  var q=document.forms[0].q.value;
+  var site=" site:www.grammaticalframework.org";
+  var search=encodeURIComponent(q+site)
+  document.location.href="http://www.google.com/search?q="+search
+  return false;
+}
+</script>
+<meta name="keywords" content="machine translation">
+</HEAD>
 
-  <title>GF - Grammatical Framework</title>
-  <meta name="keywords" content="machine translation">
+<body class=new>
 
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.2/css/all.css" integrity="sha384-/rXc/GQVaYpyDdyxK+ecHPVYJSN9bmVFBvjA/9eOB+pb3F2w2N6fc5qB9Ew5yIns" crossorigin="anonymous">
-
-  <link rel="alternate" href="https://github.com/GrammaticalFramework/gf-core/" title="GF GitHub repository">
-</head>
-
-<body>
-<div class="container-fluid my-5" style="max-width:1200px">
-
-<div class="text-center">
-  <img style="height:250px" src="doc/Logos/gf1.svg" alt="GF Logo">
-  <h1 class="display-4" style="text-shadow: 1px 1px 5px #999;">Grammatical Framework</h1>
-  <h4 class="text-black-50">A programming language for multilingual grammar applications</h4>
+<div class="header sky blue">
+<img class="gflogo" src="doc/Logos/gf1.svg" alt="">
+<H1>Grammatical Framework</H1>
+  <small class=tagline>A programming language for multilingual grammar applications</small>
 </div>
 
-<div class="row my-4">
+<div class=menu>
 
-  <div class="col-sm-6 col-md-3">
-    <h3>Get started</h3>
-    <ul class="mb-2">
-      <li><a href="https://www.youtube.com/watch?v=x1LFbDQhbso">Google Tech Talk</a></li>
-      <li>
-        <a href="http://cloud.grammaticalframework.org/">
-          GF Cloud
-          <img src="http://www.grammaticalframework.org/src/www/P/gf-cloud.png" style="height:30px" class="ml-2" alt="Cloud logo">
-        </a>
-      </li>
-      <li>
-        <a href="doc/tutorial/gf-tutorial.html">Tutorial</a>
-        /
-        <a href="lib/doc/rgl-tutorial/index.html">RGL Tutorial</a>
-      </li>
-    </ul>
+<div class=links>
+  <h4>Use GF</h4>
+  <ul>
+    <li><a href="http://cloud.grammaticalframework.org/">GF Cloud<img class=right src="src/www/P/gf-cloud.png" alt="GF Cloud Service" title="GF Cloud Service"></a>
+    <li><A HREF="demos/index.html">Other Demos</A>
+  </ul>
+  <ul>
+    <li><A HREF="http://www.grammaticalframework.org/download/index.html"><b>Download GF</b></A>
+    <li><a href="doc/gf-editor-modes.html">GF Editor Modes</a>
+  </ul>
 
-    <a href="download/index.html" class="btn btn-primary ml-3">
-      <i class="fas fa-download mr-1"></i>
-      Download GF
-    </a>
-  </div>
+  <ul>
+    <li><A HREF="http://groups.google.com/group/gf-dev">User Group</A>
+    <li><a href="https://github.com/GrammaticalFramework/gf-core/issues">Bug Reports</a>
+        (<a href="http://code.google.com/p/grammatical-framework/issues/list">old</a>)
+  </ul>
+</div>
 
-  <div class="col-sm-6 col-md-3">
-    <h3>Learn more</h3>
+<div class=links>
+  <h4>Learn GF</h4>
+  <ul>
+    <li><a href="https://www.youtube.com/watch?v=x1LFbDQhbso">Google Tech Talk</a>
+    <li><A HREF="doc/gf-quickstart.html">QuickStart</A>
+    <li><A HREF="doc/gf-reference.html">QuickRefCard</A>
+    <li><A HREF="doc/gf-shell-reference.html">GF Shell Reference</A>
+    <li><a href="http://school.grammaticalframework.org/"><b>GF Summer School</b></a>
+  </ul>
+  <ul>
+    <li><A HREF="gf-book">The GF Book</A>
+    <li><A HREF="doc/tutorial/gf-tutorial.html">GF Tutorial</A>
+    <li><A HREF="doc/gf-refman.html">Reference Manual</A>
+    <li><A HREF="http://www.molto-project.eu/sites/default/files/MOLTO_D2.3.pdf">Best Practices</A> <small>[PDF]</small>
+  </ul>
+  <ul>
+    <li><A HREF="lib/doc/synopsis.html">Library Synopsis</A>
+    <li><A HREF="doc/gf-lrec-2010.pdf">Library Tutorial</A> <small>[PDF]</small>
+    <li><A HREF="http://www.postcrashgames.com/gf_world/">Coverage Map</A>
+  </ul>
 
-    <ul class="mb-2">
-      <li><a href="gf-book">The GF Book</a></li>
-      <li><a href="doc/gf-refman.html">Reference Manual</a></li>
-      <li><a href="doc/gf-shell-reference.html">Shell Reference</a></li>
-      <li><a href="http://www.molto-project.eu/sites/default/files/MOLTO_D2.3.pdf">Best Practices</a> <small>[PDF]</small></li>
-    </ul>
+</div>
+<div class=links>
+  <h4>Develop GF</h4>
+  <ul>
+    <li><a href="doc/gf-developers.html">GF Developers Guide</a>
+    <li><A HREF="https://github.com/GrammaticalFramework/">GF on GitHub</A>
+    <li><a href="/~hallgren/gf-experiment/browse/">Browse Source Code</a>
+    <li><A HREF="doc/gf-people.html">Authors</A>
+  </ul>
+  <h4>Develop Applications</h4>
+  <ul>
+    <li><a href="http://hackage.haskell.org/package/gf-3.9/docs/PGF.html">PGF library API (Old Runtime)</a>
+    <li><a href="doc/runtime-api.html">PGF library API (New Runtime)</a>
+    <li><a href="src/ui/android/README">GF on Android (new)</a>
+    <li><A HREF="/android/">GF on Android (old) </A>
+  </ul>
+</div>
+<div class=links>
+  <h4>Related to GF</h4>
+  <ul>
+    <li><A HREF="doc/gf-bibliography.html">Publications</A>
+    <li><A HREF="http://remu.grammaticalframework.org/">The REMU Project</A>
+    <li><A HREF="http://www.molto-project.eu">The MOLTO Project</A>
+    <li><a href="http://en.wikipedia.org/wiki/Grammatical_Framework">GF on Wikipedia</a>
+    <li><p><a href="Http://www.digitalgrammars.com/">Digital Grammars AB</a>
+  </ul>
+</div>
+</div>
 
-    <a href="lib/doc/synopsis/index.html" class="btn btn-primary ml-3">
-      <i class="fab fa-readme mr-1"></i>
-      RGL Synopsis
-    </a>
-  </div>
 
-  <div class="col-sm-6 col-md-3">
-    <h3>Develop</h3>
-    <ul class="mb-2">
-      <li><a href="doc/gf-developers.html">Developers Guide</a></li>
-      <!-- <li><a href="/~hallgren/gf-experiment/browse/">Browse Source Code</a></li> -->
-      <li><a href="http://hackage.haskell.org/package/gf/docs/PGF.html">PGF library API (Haskell runtime)</a></li>
-      <li><a href="doc/runtime-api.html">PGF library API (C runtime)</a></li>
-      <li><a href="http://hackage.haskell.org/package/gf/docs/GF.html">GF compiler API</a></li>
-      <!-- <li><a href="src/ui/android/README">GF on Android (new)</a></li>
-      <li><a href="/android/">GF on Android (old) </a></li> -->
-      <li><a href="doc/gf-editor-modes.html">Text Editor Support</a></li>
-    </ul>
-  </div>
+<script type="text/javascript">
+document.write('<div style="float: right; margin-top: 3ex;">  <form onsubmit="return sitesearch()" method=get action="http://www.google.com/search">  <input type=search name="q" placeholder="site search">  <input type=submit value="Search">  </form></div>')
+</script>
 
-  <div class="col-sm-6 col-md-3">
-    <h3>Contribute</h3>
-    <ul class="mb-2">
-      <li><a href="http://groups.google.com/group/gf-dev">Mailing List</a></li>
-      <li><a href="https://github.com/GrammaticalFramework/gf-core/issues">Issue Tracker</a></li>
-      <li><a href="doc/gf-people.html">Authors</a></li>
-      <li><a href="http://school.grammaticalframework.org/2018/">Summer School</a></li>
-    </ul>
-    <a href="https://github.com/GrammaticalFramework/" class="btn btn-primary ml-3">
-      <i class="fab fa-github mr-1"></i>
-        GF on GitHub
-    </a>
-  </div>
+<H2 class=noclear>News</H2>
+
+<div class=news2>
+
+  <table class=news>
+<tr><td>2018-07-25:<td>The GF repository has been split in two:
+  <a href="https://github.com/GrammaticalFramework/gf-core">gf-core</a> and
+  <a href="https://github.com/GrammaticalFramework/gf-rgl">gf-rgl</a>.
+  The original <a href="https://github.com/GrammaticalFramework/GF">GF</a> repository is now archived.
+<tr><td>2017-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
+  School web page</a>.
+<tr><td>2016-09-07:<td><strong>Google Tech Talk on GF</strong> <a
+  href="https://www.youtube.com/watch?v=x1LFbDQhbso">on Youtube</a>.
+<tr><td>2016-07-05:<td>GitHub mirror temporarily not updated, due to server migration.
+<tr><td>2016-06-22:<td><strong>GF 3.8 released!</strong>
+  <a href="download/release-3.8.html">Release notes</a>.
+<tr><td>2015-06-21:<td><strong>Summer School in Rule-Based Machine
+  Translation in Alacant/Alicante (Spain), 11-21 July 2016</strong>
+  featuring GF, Apertium, Matxin, and TectoMT.
+    <a href="http://xixona.dlsi.ua.es/rbmt-summer-school/2016/">Summer
+  School web page</a>.
+<tr><td>2016-06-14:<td>New resource grammar language: Nynorsk.
+<tr><td>2015-10-02:<td><strong>GF 3.7.1 released!</strong>
+    <a href="download/release-3.7.1.html">Release notes</a>.
+<tr><td>2015-06-25:<td><strong>GF 3.7 released!</strong>
+    <a href="download/release-3.7.html">Release notes</a>.
+<tr><td>2015-03-13:<td>New resource grammar language: Mongolian.
+    See <a href="lib/doc/synopsis.html">library synopsis</a>.
+<tr><td>2015-02-09:<td><strong>GF Summer School in Gozo (Malta), 13-24 July 2015</strong>
+    <a href="http://school.grammaticalframework.org/2015/">Summer
+  School web page</a>.
+<tr><td>2014-06-23:<td><strong>GF 3.6 released!</strong>
+    <a href="download/release-3.6.html">Release notes</a>.
+<tr><td>2014-03-11:
+    <td>A company for commercial applications of GF has been founded:
+        <a href="http://www.digitalgrammars.com/">Digital Grammars</a>.
+<tr><td>2013-11-25:
+    <td>The default character encoding in GF grammar files will be changed
+        from Latin-1 to UTF-8. See
+       <a href="download/encoding-change.html">GF character encoding changes</a>
+        for details.
+<tr><td>2013-10-18:<td>New resource grammar language: Estonian.
+    See <a href="lib/doc/synopsis.html">library synopsis</a>.
+<tr><td>2013-09-18:<td>New <a href="https://github.com/GrammaticalFramework/gf-contrib">GF contributions repository</a>, hosted on GitHub.
+<tr><td>2013-08-06:<td><strong>GF 3.5 released!</strong>
+    <a href="download/release-3.5.html">Release notes</a>.
+<tr><td>2013-07-26:<td>Started a page with <A HREF="lib/doc/rgl-publications.html">RGL Documentation and Publications</A>.
+<tr><td>2013-06-24:<td>We are now running the IRC channel <a href="https://webchat.freenode.net/?channels=gf"><strong><code>#gf</code></strong></a> on the Freenode network.
+<tr><td>2013-06-19:<td>New resource grammar language: Maltese.
+    See <a href="lib/doc/synopsis.html">library synopsis</a>.
+<tr><td>2013-04-25:<td>New resource grammar language: Greek.
+    See <a href="lib/doc/synopsis.html">library synopsis</a>.
+<tr><td>2013-01-31:<td><strong>GF 3.4 released!</strong>
+    <a href="download/release-3.4.html">Release notes</a>.
+<tr><td>2012-12-10:<td>
+  <a href="http://www.postcrashgames.com/gf_world/">Resource Grammar Library
+  coverage map</a>, created by Tommi Nieminen.
+<!--
+<tr><td>2012-11-18:<td>
+  <A HREF="http://school.grammaticalframework.org/2013">GF Summer School</A>
+  in Frauenchiemsee, 18-30 August 2013.
+<tr><td>2012-11-18:<td>New resource grammar language: Chinese.
+    See <a href="lib/doc/synopsis.html">library synopsis</a>.
+    Complete but not yet perfect.
+<tr><td>2012-06-29:<td>GF sources now mirrored in GitHub, with change
+  statistics and other browsing features.
+  See <a href="https://github.com/GrammaticalFramework/GF/"><tt>github.com/GrammaticalFramework/GF</tt></a>
+<tr><td>2012-05-07:<td>New resource grammar language: Japanese.
+    See <a href="lib/doc/synopsis.html">library synopsis</a>.
+<tr><td>2012-03-23:<td>There will be a
+  <a href="gf-tutorial-icfp-2012/">GF tutorial at ICFP 2012</a>
+  in Copenhagen.
+<tr><td>2012-03-03:<td><strong>GF 3.3.3 released!</strong>
+    <a href="download/release-3.3.3.html">Release notes</a>.
+  <tr><td>2012-02-24:<td>New resource grammar languages: Hindi, Sindhi.
+    See <a href="lib/doc/synopsis.html">library synopsis</a>.
+<tr><td>2011-12-29:<td>New resource grammar languages: Latvian, Thai.
+    See <a href="lib/doc/synopsis.html">library synopsis</a>.
+<tr><td>2011-10-27:<td><strong>GF 3.3 released!</strong>
+    <a href="download/release-3.3.html">Release notes</a>.
+<tr><td>2011-09-20:<td>There is now a page collecting
+  <a href="doc/gf-editor-modes.html">editor modes for GF</a>.
+  Contributions are welcome!
+<tr><td>2011-09-12:<td><strong>GF 3.2.9</strong> source snapshot with faster grammar compilation available. See <a href="download/index.html">Downloads</a>.
+<tr><td>2011-04-22:<td><a href="android/tutorial/">JPGF Android Tutorial</a> added.
+<tr><td>2011-04-15:<td>The <a href="gf-book">GF Book</a> is available.
+<tr><td>2011-01-13:<td><a href="http://www.molto-project.eu/node/1177">Phrasedroid
+    available on the Android Market</a>.
+<tr><td>2011-01-04:<td>GF is part of the
+    <a href="http://www.clt.gu.se/clt-toolkit">CLT Toolkit</a>.
+<tr><td>2010-12-23:<td><strong>GF 3.2 released!</strong>
+    <a href="download/release-3.2.html">Release notes</a>.
+-->
+</table>
 
 </div>
 
-<h2>What is GF?</h2>
-<p>
+<H2>What is GF</H2>
+<P>
 GF, Grammatical Framework, is a programming language for
-<strong>multilingual grammar applications</strong>. It is
-</p>
-<ul>
-<li>a <strong>special-purpose language for grammars</strong>, like
+<B>multilingual grammar applications</B>. It is
+</P>
+<UL>
+<LI>a <B>special-purpose language for grammars</B>, like
   <a href="http://dinosaur.compilertools.net/yacc/">YACC</a>,
   <a href="http://www.gnu.org/software/bison/">Bison</a>,
   <a href="http://www.haskell.org/happy/">Happy</a>,
   <a href="http://bnfc.digitalgrammars.com/">BNFC</a>,
   but not restricted to programming languages
-</li>
-<li>a <strong>functional programming language</strong>, like
+<LI>a <B>functional programming language</B>, like
   <a href="http://www.haskell.org/">Haskell</a>,
   <a href="http://en.wikipedia.org/wiki/Lisp_(programming_language)">Lisp</a>,
   <a href="http://ocaml.org/">OCaml</a>,
   <a href="http://www.smlnj.org/">SML</a>,
   <a href="http://schemers.org/">Scheme</a>,
   but specialized to grammar writing
-</li>
-<li>a <strong>development platform for natural language grammars</strong>, like
+<LI>a <B>development platform for natural language grammars</B>, like
   <a href="http://moin.delph-in.net/LkbTop">LKB</a>,
   <a href="http://www2.parc.com/isl/groups/nltt/xle/">XLE</a>,
   <a href="http://www.issco.unige.ch/en/research/projects/regulus/news.shtml">Regulus</a>,
   but based on functional programming and type theory
-</li>
-<li>a <strong>categorial grammar formalism</strong>, like
+<LI>a <B>categorial grammar formalism</B>, like
   <a href="http://www.loria.fr/equipes/calligramme/acg/">ACG</a>,
   <a href="http://openccg.sourceforge.net/">CCG</a>,
   but specialized for multilingual grammars,
-</li>
-<li>a <strong>logical framework</strong>, like
+<LI>a <B>logical framework</B>, like
   <a href="http://wiki.portal.chalmers.se/agda/pmwiki.php">Agda</a>,
   <a href="http://coq.inria.fr/">Coq</a>,
   <a href="http://www.cl.cam.ac.uk/research/hvg/Isabelle/">Isabelle</a>,
   but equipped with concrete syntax in addition to logic
-</li>
-<li>a <strong>platform for machine translation</strong>, like
+<li>a <b>platform for machine translation</b>, like
   <a href="http://www.statmt.org/moses/">Moses</a>,
   <a href="http://www.apertium.org/">Apertium</a>,
   but based on deep structural analysis (and usually applied for
   limited fragments of language).
-</li>
-</ul>
+</UL>
 
-<p>
+<P>
 Don't worry if you don't know most of the references above - but if you do know at
 least one, it may help you to get a first idea of what GF is.
+</P>
+<H2>Applications</H2>
+<P>
+GF can be used for building
+</P>
+<UL>
+<LI><A HREF="http://cloud.grammaticalframework.org/translator/">translation systems</A>
+<LI><A HREF="http://cloud.grammaticalframework.org/minibar/minibar.html">multilingual web gadgets</A>
+<LI><A HREF="http://www.cs.chalmers.se/~hallgren/Alfa/Tutorial/GFplugin.html">natural-language interfaces</A>
+<LI><A HREF="http://www.youtube.com/watch?v=1bfaYHWS6zU">dialogue systems</A>
+<LI><A HREF="lib/doc/synopsis.html">natural language resources</A>
+</UL>
+
+<H2>Availability</H2>
+<P>
+GF is <B>open-source</B>, licensed under <A HREF="LICENSE">GPL</A> (the program) and
+<A HREF="./LICENSE">LGPL</A> and <A HREF="./LICENSE">BSD</A> (the libraries). It
+is available for
+</P>
+<UL>
+<LI>Linux
+<LI>Mac OS X
+<LI>Windows
+<li>Android mobile platform (via Java; runtime)
+<LI>via compilation to JavaScript, almost any platform that has a web browser (runtime)
+</UL>
+
+<H2>Projects</H2>
+<P>
+GF was first created in 1998 at
+<A HREF="http://www.xrce.xerox.com/">Xerox Research Centre Europe</A>,
+Grenoble, in the project
+Multilingual Document Authoring. At Xerox, it was used for prototypes including
+a restaurant phrase book,
+a database query system,
+a formalization of an alarm system instructions with translations to 5 languages, and
+an authoring system for medical drug descriptions.
+</P>
+<P>
+Later projects using GF and involving third parties include, in chronological order,
+</P>
+<UL>
+<LI><A HREF="http://www.cs.chalmers.se/~hallgren/Alfa/Tutorial/GFplugin.html">GF-Alfa</A>:
+  natural language interface to formal proofs
+<LI><A HREF="http://efficient.citi.tudor.lu/index_noframe.html">Efficient</A>:
+  authoring tool for business models.
+<LI><A HREF="http://www.key-project.org/">GF-KeY</A>:
+  authoring and translation of software specifications
+<LI><A HREF="http://www.talk-project.org">TALK</A>:
+  multilingual and multimodal spoken dialogue systems
+<LI><A HREF="http://webalt.math.helsinki.fi/">WebALT</A>:
+  multilingual generation of mathematical exercises (commercial project)
+<LI><A HREF="http://spraakbanken.gu.se/sal/">SALDO</A>:
+  Swedish morphological dictionary based on rules developed for GF and
+  <A HREF="http://www.cse.chalmers.se/alumni/markus/FM/">Functional Morphology</A>
+<LI><a href="http://www.molto-project.eu">MOLTO</a>:
+  multilingual online translation
+<LI><a href="http://remu.grammaticalframework.org">REMU</a>:
+  reliable multilingual digital communication.
+</UL>
+<p>
+Here is a <a
+href="http://videos.xrce.xerox.com/index.php/videos/index/618">talk
+about GF at XRCE</a>,
+14 years later.
+
+<P>
+Academically, GF has been used in at least ten PhD theses and resulted
+in more than a hundred
+scientific publications (see <A HREF="doc/gf-bibliography.html">GF publication list</A>).
+</P>
+<H2>Programming in GF</H2>
+<P>
+GF is easy to learn by following the <A HREF="doc/tutorial/gf-tutorial.html">tutorial</A>.
+You can write your first translator in 15 minutes.
+</P>
+<P>
+GF has an interactive command interpreter, as well as a batch compiler.
+Grammars can be compiled to parser and translator code in many different
+formats.  These components can then be embedded in applications written
+in other programming languages. The formats currently supported are:
+</P>
+<UL>
+<LI>Haskell
+<li>Java, in particular the Android platform
+<LI>JavaScript
+<LI>Speech recognition: HTK/ATK, Nuance, JSGF
+</UL>
+
+<P>
+The GF programming language is high-level and advanced, featuring
+</P>
+<UL>
+<LI>static type checking
+<LI>higher-order functions
+<LI>dependent types
+<LI>pattern matching with data constructors and regular expressions
+<LI>module system with multiple inheritance and parametrized modules
+</UL>
+
+<h3>Getting help</h3>
+<p>
+If you need some help with GF, the first places to start are the <a href="doc/tutorial/gf-tutorial.html">Tutorial</a> and <a href="doc/gf-refman.html">Reference</a> pages.
+The printed <a href="gf-book">book</a> contains all the material in the tutorial and some extra bits, and is the recommended reference for GF.
 </p>
 
-<hr>
+<p>
+We run the IRC channel <strong><code>#gf</code></strong> on the Freenode network, where you are welcome to look for help with small questions or just start a general discussion.
+IRC logs (in raw format) are available <a href="irc/">here</a>.
+If you have a larger question which the community may benefit from, we recommend you ask it on the <a href="http://groups.google.com/group/gf-dev">mailing list</a>.
+</p>
 
-<div class="row">
+<H2>Libraries</H2>
+<P>
+Libraries are at the heart of modern software engineering. In natural language
+applications, libraries are a way to cope with thousands of details involved in
+syntax, lexicon, and inflection. The
+<A HREF="lib/doc/synopsis.html">GF resource grammar library</A> has
+support for an increasing number of languages, currently including
+</P>
+<ol class=languages>
+<LI>Afrikaans
+<LI>Amharic (partial)
+<LI>Arabic (partial)
+<LI>Bulgarian
+<LI>Catalan
+<LI>Chinese
+<LI>Danish
+<LI>Dutch
+<LI>English
+<LI>Estonian
+<LI>Finnish
+<LI>French
+<LI>German
+<li>Greek ancient (partial)
+<li>Greek modern
+<li>Hebrew (fragments)
+<LI>Hindi
+<LI><A HREF="http://www.interlingua.com/">Interlingua</A>
+<LI>Japanese
+<LI>Italian
+<LI>Latin (fragments)
+<LI>Latvian
+<li>Maltese
+<li>Mongolian
+<LI>Nepali
+<LI>Norwegian bokmål
+<LI>Norwegian nynorsk
+<LI>Persian
+<LI>Polish
+<li>Punjabi
+<LI>Romanian
+<LI>Russian
+<LI>Sindhi
+<LI>Slovene (partial)
+<LI>Spanish
+<li>Swahili (fragments)
+<LI>Swedish
+<LI>Thai
+<LI>Turkish (fragments)
+<LI>Urdu
+</ol>
 
-  <div class="col-md-6">
-    <h2>Applications & Availability</h2>
-    <p>
-    GF can be used for building
-    <a href="http://cloud.grammaticalframework.org/translator/">translation systems</a>,
-    <a href="http://cloud.grammaticalframework.org/minibar/minibar.html">multilingual web gadgets</a>,
-    <a href="http://www.cs.chalmers.se/~hallgren/Alfa/Tutorial/GFplugin.html">natural-language interfaces</a>,
-    <a href="http://www.youtube.com/watch?v=1bfaYHWS6zU">dialogue systems</a>, and
-    <a href="lib/doc/synopsis/index.html">natural language resources</a>.
-    </p>
+<P>
+Adding a language to the resource library takes 3 to 9
+months - contributions
+are welcome! You can start with the <A HREF="doc/gf-lrec-2010.pdf">resource grammarian's tutorial</A>.
 
-    <p>
-    GF is <strong>open-source</strong>, licensed under <a href="LICENSE">GPL</a> (the program) and
-    <a href="LICENSE">LGPL</a> and <a href="LICENSE">BSD</a> (the libraries). It
-    is available for
-    </p>
-    <ul>
-    <li>Linux</li>
-    <li>macOS</li>
-    <li>Windows</li>
-    <li>Android mobile platform (via Java; runtime)</li>
-    <li>via compilation to JavaScript, almost any platform that has a web browser (runtime)</li>
-    </ul>
-
-    <h2>Programming in GF</h2>
-    <p>
-    GF is easy to learn by following the <a href="doc/tutorial/gf-tutorial.html">tutorial</a>.
-    You can write your first translator in 15 minutes.
-    </p>
-    <p>
-    GF has an interactive command interpreter, as well as a batch compiler.
-    Grammars can be compiled to parser and translator code in many different
-    formats.  These components can then be embedded in applications written
-    in other programming languages. The formats currently supported are:
-    </p>
-    <ul>
-    <li>Haskell</li>
-    <li>Java, in particular the Android platform</li>
-    <li>JavaScript</li>
-    <li>Speech recognition: HTK/ATK, Nuance, JSGF</li>
-    </ul>
-
-    <p>
-    The GF programming language is high-level and advanced, featuring:
-    </p>
-    <ul>
-    <li>static type checking</li>
-    <li>higher-order functions</li>
-    <li>dependent types</li>
-    <li>pattern matching with data constructors and regular expressions</li>
-    <li>module system with multiple inheritance and parametrized modules</li>
-    </ul>
-
-    <h3>Getting help</h3>
-    <p>
-    If you need some help with GF, the first places to start are the <a href="doc/tutorial/gf-tutorial.html">Tutorial</a> and <a href="doc/gf-refman.html">Reference</a> pages.
-    The printed <a href="gf-book">book</a> contains all the material in the tutorial and some extra bits, and is the recommended reference for GF.
-    </p>
-
-    <p>
-    We run the IRC channel <strong><code>#gf</code></strong> on the Freenode network, where you are welcome to look for help with small questions or just start a general discussion.
-    You can <a href="https://webchat.freenode.net/?channels=gf">open a web chat</a>
-    or <a href="http://www.grammaticalframework.org/irc/">browse the channel logs</a>.
-    </p>
-    <p>
-    If you have a larger question which the community may benefit from, we recommend you ask it on the <a href="http://groups.google.com/group/gf-dev">mailing list</a>.
-    </p>
-
-  </div>
-
-  <div class="col-md-6">
-    <h2>News</h2>
-
-    <dl class="row">
-      <dt class="col-sm-3 text-center text-nowrap">2018-12-03</dt>
-      <dd class="col-sm-9">
-        <a href="http://school.grammaticalframework.org/2018/">Sixth GF Summer School</a> in Stellenbosch (South Africa), 3–14 December 2018
-      </dd>
-      <dt class="col-sm-3 text-center text-nowrap">2018-12-02</dt>
-      <dd class="col-sm-9">
-        <strong>GF 3.10 released.</strong>
-        <a href="download/release-3.10.html">Release notes</a>
-      </dd>
-      <dt class="col-sm-3 text-center text-nowrap">2018-07-25</dt>
-      <dd class="col-sm-9">
-        The GF repository has been split in two:
-        <a href="https://github.com/GrammaticalFramework/gf-core">gf-core</a> and
-        <a href="https://github.com/GrammaticalFramework/gf-rgl">gf-rgl</a>.
-        The original <a href="https://github.com/GrammaticalFramework/GF">GF</a> repository is now archived.
-      </dd>
-      <dt class="col-sm-3 text-center text-nowrap">2017-08-11</dt>
-      <dd class="col-sm-9">
-        <strong>GF 3.9 released.</strong>
-        <a href="download/release-3.9.html">Release notes</a>
-      </dd>
-      <dt class="col-sm-3 text-center text-nowrap">2017-06-29</dt>
-      <dd class="col-sm-9">
-        GF is moving to <a href="https://github.com/GrammaticalFramework/GF/">GitHub</a>.</dd>
-      <dt class="col-sm-3 text-center text-nowrap">2017-03-13</dt>
-      <dd class="col-sm-9">
-        <a href="http://school.grammaticalframework.org/2017/">GF Summer School</a> in Riga (Latvia), 14-25 August 2017
-      </dd>
-    </dl>
-
-    <h2>Projects</h2>
-    <p>
-    GF was first created in 1998 at
-    <a href="http://www.xrce.xerox.com/">Xerox Research Centre Europe</a>,
-    Grenoble, in the project
-    Multilingual Document Authoring. At Xerox, it was used for prototypes including
-    a restaurant phrase book,
-    a database query system,
-    a formalization of an alarm system instructions with translations to 5 languages, and
-    an authoring system for medical drug descriptions.
-    </p>
-    <p>
-    Later projects using GF and involving third parties include, in chronological order:
-    </p>
-    <ul>
-    <li>
-      <a href="http://www.cs.chalmers.se/~hallgren/Alfa/Tutorial/GFplugin.html">GF-Alfa</a>:
-      natural language interface to formal proofs
-    </li>
-    <li>
-      <a href="http://efficient.citi.tudor.lu/index_noframe.html">Efficient</a>:
-      authoring tool for business models.
-    </li>
-    <li>
-      <a href="http://www.key-project.org/">GF-KeY</a>:
-      authoring and translation of software specifications
-    </li>
-    <li>
-      <a href="http://www.talk-project.org">TALK</a>:
-      multilingual and multimodal spoken dialogue systems
-    </li>
-    <li>
-      <a href="http://webalt.math.helsinki.fi/">WebALT</a>:
-      multilingual generation of mathematical exercises (commercial project)
-    </li>
-    <li>
-      <a href="http://spraakbanken.gu.se/sal/">SALDO</a>:
-      Swedish morphological dictionary based on rules developed for GF and
-      <a href="http://www.cse.chalmers.se/alumni/markus/FM/">Functional Morphology</a>
-    </li>
-    <li>
-      <a href="http://www.molto-project.eu">MOLTO</a>:
-      multilingual online translation
-    </li>
-    <li>
-      <a href="http://remu.grammaticalframework.org">REMU</a>:
-      reliable multilingual digital communication
-    </li>
-    </ul>
-    <!-- <p>
-    Here is a <a
-    href="http://videos.xrce.xerox.com/index.php/videos/index/618">talk
-    about GF at XRCE</a>,
-    14 years later.
-    </p> -->
-
-    <p>
-    Academically, GF has been used in at least ten PhD theses and resulted
-    in more than a hundred scientific publications.
-     <!-- (see <a href="doc/gf-bibliography.html">GF publication list</a>). -->
-    </p>
-
-    <h2>Libraries</h2>
-    <p>
-    Libraries are at the heart of modern software engineering. In natural language
-    applications, libraries are a way to cope with thousands of details involved in
-    syntax, lexicon, and inflection. The
-    <a href="lib/doc/synopsis/index.html">GF resource grammar library</a> has
-    support for an increasing number of languages, currently including
-    Afrikaans,
-    Amharic (partial),
-    Arabic (partial),
-    Bulgarian,
-    Catalan,
-    Chinese,
-    Danish,
-    Dutch,
-    English,
-    Estonian,
-    Finnish,
-    French,
-    German,
-    Greek ancient (partial),
-    Greek modern,
-    Hebrew (fragments),
-    Hindi,
-    Interlingua,
-    Japanese,
-    Italian,
-    Latin (fragments),
-    Latvian,
-    Maltese,
-    Mongolian,
-    Nepali,
-    Norwegian bokmål,
-    Norwegian nynorsk,
-    Persian,
-    Polish,
-    Punjabi,
-    Romanian,
-    Russian,
-    Sindhi,
-    Slovene (partial),
-    Spanish,
-    Swahili (fragments),
-    Swedish,
-    Thai,
-    Turkish (fragments),
-    and
-    Urdu.
-    </p>
-
-    <p>
-    Adding a language to the resource library takes 3 to 9
-    months - contributions
-    are welcome! You can start with the <a href="lib/doc/rgl-tutorial/index.html">resource grammarian's tutorial</a>.
-    </p>
-
-  </div><!-- .col-6 -->
-
-</div><!-- .row -->
-
-</div><!-- .container -->
-
-<footer class="bg-light mt-5 py-4">
-  <div class="container mb-3">
-    <div class="text-center text-muted">
-      <img style="height:50px; filter: opacity(.5) grayscale(1);" class="mb-3" src="doc/Logos/gf0.svg" alt="GF Logo"><br>
-      Grammatical Framework is free and open source,<br>
-      with some support from <a href="https://www.digitalgrammars.com/">Digital Grammars AB</a>.
-    </div>
-  </div>
-</footer>
 
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
@@ -395,6 +423,5 @@ try {
 var pageTracker = _gat._getTracker("UA-7811807-3");
 pageTracker._trackPageview();
 } catch(err) {}</script>
-
-</body>
-</html>
+</BODY>
+</HTML>

src/compiler/GF.hs

@@ -19,9 +19,7 @@ module GF(
            module GF.Grammar.Printer,
            module GF.Infra.Ident,
            -- ** Binary serialisation
-           module GF.Grammar.Binary,
-           -- * Canonical GF
-           module GF.Compile.GrammarToCanonical
+           module GF.Grammar.Binary
   ) where
 import GF.Main
 import GF.Compiler
@@ -38,5 +36,3 @@ import GF.Grammar.Macros
 import GF.Grammar.Printer
 import GF.Infra.Ident
 import GF.Grammar.Binary
-
-import GF.Compile.GrammarToCanonical

src/compiler/GF/Command/Commands.hs

@@ -723,7 +723,7 @@ pgfCommands = Map.fromList [
        case toExprs arg of
          [EFun id] -> case Map.lookup id (funs (abstract pgf)) of
                         Just fd -> do putStrLn $ render (ppFun id fd)
-                                      let (_,_,_,prob) = fd
+                                      let (_,_,_,_,prob) = fd
                                       putStrLn ("Probability: "++show prob)
                                       return void
                         Nothing -> case Map.lookup id (cats (abstract pgf)) of
@@ -732,7 +732,7 @@ pgfCommands = Map.fromList [
                                                                 if null (functionsToCat pgf id)
                                                                   then empty
                                                                   else ' ' $$
-                                                                       vcat [ppFun fid (ty,0,Just ([],[]),0) | (fid,ty) <- functionsToCat pgf id] $$
+                                                                       vcat [ppFun fid (ty,[],0,Just ([],[]),0) | (fid,ty) <- functionsToCat pgf id] $$
                                                                        ' ')
                                                      let (_,_,prob) = cd
                                                      putStrLn ("Probability: "++show prob)
@@ -909,7 +909,7 @@ pgfCommands = Map.fromList [
      | otherwise             = do fmt <- readOutputFormat (valStrOpts "printer" "pgf_pretty" opts)
                                   return $ fromString $ concatMap snd $ exportPGF noOptions fmt pgf
 
-   funsigs pgf = [(f,ty) | (f,(ty,_,_,_)) <- Map.assocs (funs (abstract pgf))]
+   funsigs pgf = [(f,ty) | (f,(ty,_,_,_,_)) <- Map.assocs (funs (abstract pgf))]
    showFun (f,ty) = showCId f ++ " : " ++ showType [] ty ++ " ;"
 
    morphos (Env pgf mos) opts s =

src/compiler/GF/Compile/CFGtoPGF.hs

@@ -35,7 +35,7 @@ cf2abstr cfg = Abstr aflags afuns acats
                             | (cat,rules) <- (Map.toList . Map.fromListWith (++))
                                                 [(cat2id cat, catRules cfg cat) | 
                                                      cat <- allCats' cfg]]
-    afuns  = Map.fromList [(mkRuleName rule, (cftype [cat2id c | NonTerminal c <- ruleRhs rule] (cat2id (ruleLhs rule)), 0, Nothing, 0))
+    afuns  = Map.fromList [(mkRuleName rule, (cftype [cat2id c | NonTerminal c <- ruleRhs rule] (cat2id (ruleLhs rule)), [], 0, Nothing, 0))
                             | rule <- allRules cfg]
 
     cat2id = mkCId . fst
@@ -56,7 +56,7 @@ cf2concr cfg = Concr Map.empty Map.empty
                                map mkSequence rules)
     sequences  = listArray (0,Set.size sequences0-1) (Set.toList sequences0)
 
-    idFun = CncFun wildCId (listArray (0,0) [seqid])
+    idFun = CncFun [wildCId] (listArray (0,0) [seqid])
       where
         seq   = listArray (0,0) [SymCat 0 0]
         seqid = binSearch seq sequences (bounds sequences)
@@ -77,7 +77,7 @@ cf2concr cfg = Concr Map.empty Map.empty
       let args   = [PArg [] (cat2arg c) | NonTerminal c <- ruleRhs rule]
           prod   = PApply funid args
           seqid  = binSearch (mkSequence rule) sequences (bounds sequences)
-          fun    = CncFun (mkRuleName rule) (listArray (0,0) [seqid])
+          fun    = CncFun [mkRuleName rule] (listArray (0,0) [seqid])
           funid' = funid+1
       in funid' `seq` ((funid',fun:funs),let (c,ps) = ruleLhs rule in [(cat2fid c p, prod) | p <- ps])
 

src/compiler/GF/Compile/CheckGrammar.hs

@@ -147,17 +147,11 @@ checkCompleteGrammar opts cwd gr (am,abs) (cm,cnc) = checkInModule cwd cnc NoLoc
                                            return $ updateTree (c,CncFun (Just linty) d mn mf) js
                              _       -> do checkWarn ("function" <+> c <+> "is not in abstract")
                                            return js
-       CncCat {} ->
-         case lookupOrigInfo gr (am,c) of
-           Ok (_,AbsCat _) -> return $ updateTree i js
-           {- -- This might be too pedantic:
-           Ok (_,AbsFun {}) ->
-                   checkError ("lincat:"<+>c<+>"is a fun, not a cat")
-           -}
-           _ -> do checkWarn ("category" <+> c <+> "is not in abstract")
-                   return js
-
-       _ -> return $ updateTree i js
+       CncCat _ _ _ _ _ -> case lookupOrigInfo gr (am,c) of
+                             Ok _ -> return $ updateTree i js
+                             _    -> do checkWarn ("category" <+> c <+> "is not in abstract")
+                                        return js
+       _                -> return $ updateTree i js
 
 
 -- | General Principle: only Just-values are checked. 

src/compiler/GF/Compile/ConcreteToHaskell.hs

@@ -1,351 +1,365 @@
 -- | Translate concrete syntax to Haskell
 module GF.Compile.ConcreteToHaskell(concretes2haskell,concrete2haskell) where
-import Data.List(isPrefixOf,sort,sortOn)
+import Data.List(sort,sortBy)
+import Data.Function(on)
 import qualified Data.Map as M
 import qualified Data.Set as S
+import GF.Data.ErrM
+import GF.Data.Utilities(mapSnd)
 import GF.Text.Pretty
---import GF.Grammar.Predef(cPredef,cInts)
---import GF.Compile.Compute.Predef(predef)
---import GF.Compile.Compute.Value(Predefined(..))
-import GF.Infra.Ident(Ident,identS,identW,prefixIdent)
+import GF.Grammar.Grammar
+import GF.Grammar.Lookup(lookupFunType,lookupOrigInfo,allOrigInfos)--,allParamValues
+import GF.Grammar.Macros(typeForm,collectOp,collectPattOp,mkAbs,mkApp)
+import GF.Grammar.Lockfield(isLockLabel)
+import GF.Grammar.Predef(cPredef,cInts)
+import GF.Compile.Compute.Predef(predef)
+import GF.Compile.Compute.Value(Predefined(..))
+import GF.Infra.Ident(Ident,identS,prefixIdent) --,moduleNameS
 import GF.Infra.Option
-import GF.Haskell as H
-import GF.Grammar.Canonical as C
-import GF.Compile.GrammarToCanonical
-import Debug.Trace(trace)
+import GF.Compile.Compute.ConcreteNew(normalForm,resourceValues)
+import GF.Haskell
+import Debug.Trace
 
 -- | Generate Haskell code for the all concrete syntaxes associated with
 -- the named abstract syntax in given the grammar.
 concretes2haskell opts absname gr =
-  [(filename,render80 $ concrete2haskell opts abstr cncmod)
-     | let Grammar abstr cncs = grammar2canonical opts absname gr,
-       cncmod<-cncs,
-       let ModId name = concName cncmod
-           filename = name ++ ".hs" :: FilePath
+  [(cncname,concrete2haskell opts gr cenv absname cnc cncmod)
+     | let cenv = resourceValues opts gr,
+       cnc<-allConcretes gr absname,
+       let cncname = render cnc ++ ".hs" :: FilePath
+           Ok cncmod = lookupModule gr cnc
   ]
 
 -- | Generate Haskell code for the given concrete module.
 -- The only options that make a difference are
 -- @-haskell=noprefix@ and @-haskell=variants@.
-concrete2haskell opts
-                 abstr@(Abstract _ _ cats funs)
-                 modinfo@(Concrete cnc absname _ ps lcs lns) =
-  haskPreamble absname cnc $$
-  vcat (
-    nl:Comment "--- Parameter types ---":
-    map paramDef ps ++
-    nl:Comment "--- Type signatures for linearization functions ---":
-    map signature cats ++
-    nl:Comment "--- Linearization functions for empty categories ---":
-    emptydefs ++
-    nl:Comment "--- Linearization types ---":
-    map lincatDef lcs ++
-    nl:Comment "--- Linearization functions ---":
-    lindefs ++
-    nl:Comment "--- Type classes for projection functions ---":
-    map labelClass (S.toList labels) ++
-    nl:Comment "--- Record types ---":
-    concatMap recordType recs)
+concrete2haskell opts gr cenv absname cnc modinfo =
+    renderStyle style{lineLength=80,ribbonsPerLine=1} $
+      haskPreamble va absname cnc $$ vcat (
+      nl:Comment "--- Parameter types ---":
+      neededParamTypes S.empty (params defs) ++
+      nl:Comment "--- Type signatures for linearization functions ---":
+      map signature (S.toList allcats)++
+      nl:Comment "--- Linearization functions for empty categories ---":
+      emptydefs ++
+      nl:Comment "--- Linearization types and linearization functions ---":
+      map ppDef defs ++
+      nl:Comment "--- Type classes for projection functions ---":
+      map labelClass (S.toList labels) ++
+      nl:Comment "--- Record types ---":
+      concatMap recordType recs)
   where
     nl = Comment ""
-    recs = S.toList (S.difference (records (lcs,lns)) common_records)
-
     labels = S.difference (S.unions (map S.fromList recs)) common_labels
+    recs = S.toList (S.difference (records rhss) common_records)
     common_records = S.fromList [[label_s]]
     common_labels = S.fromList [label_s]
-    label_s = LabelId "s"
+    label_s = ident2label (identS "s")
 
-    signature (CatDef c _) = TypeSig lf (Fun abs (pure lin))
+    rhss = map (either snd (snd.snd)) defs
+    defs = sortBy (compare `on` either (const Nothing) (Just . fst)) .
+           concatMap (toHaskell gId gr absname cenv) . 
+           M.toList $
+           jments modinfo
+
+--  signature c = "lin"<>c<+>"::"<+>"A."<>gId c<+>"->"<+>"Lin"<>c
+--  signature c = "--lin"<>c<+>":: (Applicative f,Monad f) =>"<+>"A."<>gId c<+>"->"<+>"f Lin"<>c
+    signature c = TypeSig lf (Fun abs (pure lin))
       where
         abs = tcon0 (prefixIdent "A." (gId c))
         lin = tcon0 lc
-        lf = linfunName c
-        lc = lincatName c
+        lf = prefixIdent "lin" c
+        lc = prefixIdent "Lin" c
 
     emptydefs = map emptydef (S.toList emptyCats)
-    emptydef c = Eqn (linfunName c,[WildP]) (Const "undefined")
+    emptydef c = Eqn (prefixIdent "lin" c,[WildP]) (Const "undefined")
 
-    emptyCats = allcats `S.difference` linfuncats
-      where
-     --funcats = S.fromList [c | FunDef f (C.Type _ (TypeApp c _))<-funs]
-       allcats = S.fromList [c | CatDef c _<-cats]
-      
-    gId :: ToIdent i => i -> Ident
-    gId = (if haskellOption opts HaskellNoPrefix then id else prefixIdent "G")
-          . toIdent
+    emptyCats = allcats `S.difference` cats
+    cats = S.fromList [c|Right (c,_)<-defs]
+    allcats = S.fromList [c|((_,c),AbsCat (Just _))<-allOrigInfos gr absname]
 
+    params = S.toList . S.unions . map params1
+    params1 (Left (_,rhs)) = paramTypes gr rhs
+    params1 (Right (_,(_,rhs))) = tableTypes gr [rhs]
+
+    ppDef (Left (lhs,rhs)) = lhs (convType va gId rhs)
+    ppDef (Right (_,(lhs,rhs))) = lhs (convert va gId gr rhs)
+
+    gId :: Ident -> Ident
+    gId = if haskellOption opts HaskellNoPrefix then id else prefixIdent "G"
     va = haskellOption opts HaskellVariants
     pure = if va then ListT else id
 
-    haskPreamble :: ModId -> ModId -> Doc
-    haskPreamble absname cncname =
-      "{-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, LambdaCase #-}" $$
-      "module" <+> cncname <+> "where" $$
-      "import Prelude hiding (Ordering(..))" $$
-      "import Control.Applicative((<$>),(<*>))" $$
-      "import PGF.Haskell" $$
-      "import qualified" <+> absname <+> "as A" $$
-      "" $$
-      "--- Standard definitions ---" $$
-      "linString (A.GString s) ="<+>pure "R_s [TK s]" $$
-      "linInt (A.GInt i) ="<+>pure "R_s [TK (show i)]" $$
-      "linFloat (A.GFloat x) ="<+>pure "R_s [TK (show x)]" $$
-      "" $$
-      "----------------------------------------------------" $$
-      "-- Automatic translation from GF to Haskell follows" $$
-      "----------------------------------------------------"
+    neededParamTypes have [] = []
+    neededParamTypes have (q:qs) =
+        if q `S.member` have
+        then neededParamTypes have qs
+        else let ((got,need),def) = paramType va gId gr q
+             in def++neededParamTypes (S.union got have) (S.toList need++qs)
+
+haskPreamble :: Bool -> ModuleName -> ModuleName -> Doc
+haskPreamble va absname cncname =
+  "{-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, LambdaCase #-}" $$
+  "module" <+> cncname <+> "where" $$
+  "import Prelude hiding (Ordering(..))" $$
+  "import Control.Applicative((<$>),(<*>))" $$
+  "import PGF.Haskell" $$
+  "import qualified" <+> absname <+> "as A" $$
+  "" $$
+  "--- Standard definitions ---" $$
+  "linString (A.GString s) ="<+>pure "R_s [TK s]" $$
+  "linInt (A.GInt i) ="<+>pure "R_s [TK (show i)]" $$
+  "linFloat (A.GFloat x) ="<+>pure "R_s [TK (show x)]" $$
+  "" $$
+  "----------------------------------------------------" $$
+  "-- Automatic translation from GF to Haskell follows" $$
+  "----------------------------------------------------"
+  where
+    pure = if va then brackets else pp
+
+toHaskell gId gr absname cenv (name,jment) =
+  case jment of
+    CncCat (Just (L loc typ)) _ _ pprn _ ->
+        [Left (tsyn0 (prefixIdent "Lin" name),nf loc typ)]
+    CncFun (Just r@(cat,ctx,lincat)) (Just (L loc def)) pprn _ ->
+--      trace (render (name<+>hcat[parens (x<>"::"<>t)|(_,x,t)<-ctx]<+>"::"<+>cat)) $
+        [Right (cat,(Eqn (prefixIdent "lin" cat,lhs),coerce [] lincat rhs))]
       where
-        pure = if va then brackets else pp
+        Ok abstype = lookupFunType gr absname name
+        (absctx,_abscat,_absargs) = typeForm abstype
 
-    paramDef pd =
-      case pd of
-        ParamAliasDef p t -> H.Type (conap0 (gId p)) (convLinType t)
-        ParamDef p pvs -> Data (conap0 (gId p)) (map paramCon pvs) derive
-          where
-            paramCon (Param c cs) = ConAp (gId c) (map (tcon0.gId) cs)
-            derive = ["Eq","Ord","Show"]
+        e' = unAbs (length params) $
+             nf loc (mkAbs params (mkApp def (map Vr args)))
+        params = [(b,prefixIdent "g" x)|(b,x,_)<-ctx]
+        args = map snd params
+        abs_args = map (prefixIdent "abs_") args
+        lhs = [ConP (aId name) (map VarP abs_args)]
+        rhs = foldr letlin e' (zip args absctx)
+        letlin (a,(_,_,at)) =
+           Let (a,(Just (con ("Lin"++render at)),(App (con ("lin"++render at)) (con ("abs_"++render a)))))
+    AnyInd _ m  -> case lookupOrigInfo gr (m,name) of
+                     Ok (m,jment) -> toHaskell gId gr absname cenv (name,jment)
+                     _ -> []
+    _ -> []
+  where
+    nf loc = normalForm cenv (L loc name)
+    aId n = prefixIdent "A." (gId n)
 
-    convLinType = ppT
-      where
-        ppT t =
-          case t of
-            FloatType -> tcon0 (identS "Float")
-            IntType -> tcon0 (identS "Int")
-            ParamType (ParamTypeId p) -> tcon0 (gId p)
-            RecordType rs -> tcon (rcon' ls) (map ppT ts)
-              where (ls,ts) = unzip $ sortOn fst [(l,t)|RecordRow l t<-rs]
-            StrType -> tcon0 (identS "Str")
-            TableType pt lt -> Fun (ppT pt) (ppT lt)
---          TupleType lts -> 
-
-    lincatDef (LincatDef c t) = tsyn0 (lincatName c) (convLinType t)
-
-    linfuncats = S.fromList linfuncatl
-    (linfuncatl,lindefs) = unzip (linDefs lns)
-
-    linDefs = map eqn . sortOn fst . map linDef
-      where eqn (cat,(f,(ps,rhs))) = (cat,Eqn (f,ps) rhs)
-
-    linDef (LinDef f xs rhs0) = 
-        (cat,(linfunName cat,(lhs,rhs)))
-      where
-        lhs = [ConP (aId f) (map VarP abs_args)]
-        aId f = prefixIdent "A." (gId f)
-
-        [lincat] = [lincat | LincatDef c lincat<-lcs,c==cat]
-        [C.Type absctx (TypeApp cat _)] = [t | FunDef f' t<-funs, f'==f]
-
-        abs_args = map abs_arg args
-        abs_arg = prefixIdent "abs_"
-        args = map (prefixIdent "g" . toIdent) xs
-
-        rhs = lets (zipWith letlin args absctx)
-                   (convert vs (coerce env lincat rhs0))
-          where
-            vs = [(VarValueId (Unqual x),a)|(VarId x,a)<-zip xs args]
-            env= [(VarValueId (Unqual x),lc)|(VarId x,lc)<-zip xs (map arglincat absctx)]
-            
-        letlin a (TypeBinding _ (C.Type _ (TypeApp acat _))) =
-          (a,Ap (Var (linfunName acat)) (Var (abs_arg a)))
-
-        arglincat (TypeBinding _ (C.Type _ (TypeApp acat _))) = lincat
-          where
-            [lincat] = [lincat | LincatDef c lincat<-lcs,c==acat]
-
-    convert = convert' va
-
-    convert' va vs = ppT
-      where
-        ppT0 = convert' False vs
-        ppTv vs' = convert' va vs'
-
-        pure = if va then single else id
-
-        ppT t =
-          case t of
-            TableValue ty cs -> pure (table cs)
-            Selection t p -> select (ppT t) (ppT p)
-            ConcatValue t1 t2 -> concat (ppT t1) (ppT t2)
-            RecordValue r -> aps (rcon ls) (map ppT ts)
-              where (ls,ts) = unzip $ sortOn fst [(l,t)|RecordRow l t<-r]
-            PredefValue p -> single (Var (toIdent p)) -- hmm
-            Projection t l -> ap (proj l) (ppT t)
-            VariantValue [] -> empty
-            VariantValue ts@(_:_) -> variants ts
-            VarValue x -> maybe (Var (gId x)) (pure . Var) $ lookup x vs
-            PreValue vs t' -> pure (alts t' vs)
-            ParamConstant (Param c vs) -> aps (Var (pId c)) (map ppT vs)
-            ErrorValue s -> ap (Const "error") (Const (show s)) -- !!
-            LiteralValue l -> ppL l
-            _ -> error ("convert "++show t)
-
-        ppL l =
-          case l of
-            FloatConstant x -> pure (lit x)
-            IntConstant n -> pure (lit n)
-            StrConstant s -> pure (token s)
-
-        pId p@(ParamId s) =
-          if "to_R_" `isPrefixOf` unqual s then toIdent p else gId p -- !! a hack
-          
-        table cs =
-            if all (null.patVars) ps
-            then lets ds (LambdaCase [(ppP p,t')|(p,t')<-zip ps ts'])
-            else LambdaCase (map ppCase cs)
-          where
-            (ds,ts') = dedup ts
-            (ps,ts) = unzip [(p,t)|TableRow p t<-cs]
-        ppCase (TableRow p t) = (ppP p,ppTv (patVars p++vs) t)
-{-
-        ppPredef n =
-          case predef n of
-            Ok BIND       -> single (c "BIND")
-            Ok SOFT_BIND  -> single (c "SOFT_BIND")
-            Ok SOFT_SPACE -> single (c "SOFT_SPACE")
-            Ok CAPIT      -> single (c "CAPIT")
-            Ok ALL_CAPIT  -> single (c "ALL_CAPIT")
-            _ -> Var n
--}
-        ppP p =
-          case p of
-            ParamPattern (Param c ps) -> ConP (gId c) (map ppP ps)
-            RecordPattern r -> ConP (rcon' ls) (map ppP ps)
-              where (ls,ps) = unzip $ sortOn fst [(l,p)|RecordRow l p<-r]
-            WildPattern -> WildP
-
-        token s = single (c "TK" `Ap` lit s)
-
-        alts t' vs = single (c "TP" `Ap` List (map alt vs) `Ap` ppT0 t')
-          where
-            alt (s,t) = Pair (List (pre s)) (ppT0 t)
-            pre s = map lit s
-
-        c = Const
-        lit s = c (show s) -- hmm
-        concat = if va then concat' else plusplus
-          where
-            concat' (List [List ts1]) (List [List ts2]) = List [List (ts1++ts2)]
-            concat' t1 t2 = Op t1 "+++" t2
-
-        pure' = single -- forcing the list monad
-
-        select = if va then select' else Ap
-        select' (List [t]) (List [p]) = Op t "!" p
-        select' (List [t]) p = Op t "!$" p
-        select' t p = Op t "!*" p
-
-        ap = if va then ap' else Ap
-          where
-            ap' (List [f]) x = fmap f x
-            ap' f x = Op f "<*>" x
-            fmap f (List [x]) = pure' (Ap f x)
-            fmap f x = Op f "<$>" x
-
-    --  join = if va then join' else id
-        join' (List [x]) = x
-        join' x = c "concat" `Ap` x
-
-        empty = if va then List [] else c "error" `Ap` c (show "empty variant")
-        variants = if va then \ ts -> join' (List (map ppT ts))
-                         else \ (t:_) -> ppT t
-
-        aps f [] = f
-        aps f (a:as) = aps (ap f a) as
-
-        dedup ts =
-            if M.null dups
-            then ([],map ppT ts)
-            else ([(ev i,ppT t)|(i,t)<-defs],zipWith entry ts is)
-          where
-            entry t i = maybe (ppT t) (Var . ev) (M.lookup i dups)
-            ev i = identS ("e'"++show i)
-
-            defs = [(i1,t)|(t,i1:_:_)<-ms]
-            dups = M.fromList [(i2,i1)|(_,i1:is@(_:_))<-ms,i2<-i1:is]
-            ms = M.toList m
-            m = fmap sort (M.fromListWith (++) (zip ts [[i]|i<-is]))
-            is = [0..]::[Int]
+    unAbs 0 t = t
+    unAbs n (Abs _ _ t) = unAbs (n-1) t
+    unAbs _ t = t
 
 
---con = Cn . identS
+con = Cn . identS
 
-class Records t where
-  records :: t -> S.Set [LabelId]
+tableTypes gr ts = S.unions (map tabtys ts)
+  where
+    tabtys t =
+      case t of
+        V t cc -> S.union (paramTypes gr t) (tableTypes gr cc)
+        T (TTyped t) cs -> S.union (paramTypes gr t) (tableTypes gr (map snd cs))
+        _ -> collectOp tabtys t
 
-instance Records t => Records [t] where
-  records = S.unions . map records
+paramTypes gr t =
+  case t of
+    RecType fs -> S.unions (map (paramTypes gr.snd) fs)
+    Table t1 t2 -> S.union (paramTypes gr t1) (paramTypes gr t2)
+    App tf ta -> S.union (paramTypes gr tf) (paramTypes gr ta)
+    Sort _ -> S.empty
+    EInt _ -> S.empty
+    Q q -> lookup q
+    QC q -> lookup q
+    FV ts -> S.unions (map (paramTypes gr) ts)
+    _ -> ignore
+  where
+    lookup q = case lookupOrigInfo gr q of
+                 Ok (_,ResOper  _ (Just (L _ t))) ->
+                                       S.insert q (paramTypes gr t)
+                 Ok (_,ResParam {}) -> S.singleton q
+                 _ -> ignore
 
-instance (Records t1,Records t2) => Records (t1,t2) where
-  records (t1,t2) = S.union (records t1) (records t2)
-
-instance Records LincatDef where
-  records (LincatDef _ lt) = records lt
-
-instance Records LinDef where
-  records (LinDef _ _ lv) = records lv
-
-instance Records LinType where
-  records t =
-    case t of
-      RecordType r -> rowRecords r
-      TableType pt lt -> records (pt,lt)
-      TupleType ts -> records ts
-      _ -> S.empty
-
-rowRecords r = S.insert (sort ls) (records ts)
-  where (ls,ts) = unzip [(l,t)|RecordRow l t<-r]
-
-instance Records LinValue where
-  records v =
-    case v of
-      ConcatValue v1 v2 -> records (v1,v2)
-      ParamConstant (Param c vs) -> records vs
-      RecordValue r -> rowRecords r
-      TableValue t r -> records (t,r)
-      TupleValue vs -> records vs
-      VariantValue vs -> records vs
-      PreValue alts d -> records (map snd alts,d)
-      Projection v l -> records v
-      Selection v1 v2 -> records (v1,v2)
-      _ -> S.empty
-
-instance Records rhs => Records (TableRow rhs) where
-  records (TableRow _ v) = records v
+    ignore = trace ("Ignore: "++show t) S.empty
+
+
+
+records ts = S.unions (map recs ts)
+  where
+    recs t =
+      case t of
+        R r -> S.insert (labels r) (records (map (snd.snd) r))
+        RecType r -> S.insert (labels r) (records (map snd r))
+        _ -> collectOp recs t
+
+    labels = sort . filter (not . isLockLabel) . map fst
 
 
--- | Record subtyping is converted into explicit coercions in Haskell
 coerce env ty t =
   case (ty,t) of 
-    (_,VariantValue ts) -> VariantValue (map (coerce env ty) ts)
-    (TableType ti tv,TableValue _ cs) ->
-      TableValue ti [TableRow p (coerce env tv t)|TableRow p t<-cs]
-    (RecordType rt,RecordValue r) ->
-      RecordValue [RecordRow l (coerce env ft f) |
-                     RecordRow l f<-r,ft<-[ft|RecordRow l' ft<-rt,l'==l]]
-    (RecordType rt,VarValue x)->
+    (_,Let d t) -> Let d (coerce (extend env d) ty t)
+    (_,FV ts) -> FV (map (coerce env ty) ts)
+    (Table ti tv,V _ ts) -> V ti (map (coerce env tv) ts)
+    (Table ti tv,T (TTyped _) cs) -> T (TTyped ti) (mapSnd (coerce env tv) cs)
+    (RecType rt,R r) ->
+      R [(l,(Just ft,coerce env ft f))|(l,(_,f))<-r,Just ft<-[lookup l rt]]
+    (RecType rt,Vr x)->
       case lookup x env of
         Just ty' | ty'/=ty -> -- better to compare to normal form of ty'
-                            --trace ("coerce "++render ty'++" to "++render ty) $
-                            app (to_rcon rt) [t]
-                 | otherwise -> t -- types match, no coercion needed
-        _ -> trace (render ("missing type to coerce"<+>x<+>"to"<+>render ty
-                            $$ "in" <+> map fst env))
-                   t
+          --trace ("coerce "++render ty'++" to "++render ty) $
+          App (to_rcon (map fst rt)) t
+        _ -> trace ("no coerce to "++render ty) t
     _ -> t
   where
-    app f ts = ParamConstant (Param f ts) -- !! a hack
-    to_rcon = ParamId . Unqual . to_rcon' . labels
+    extend env (x,(Just ty,rhs)) = (x,ty):env
+    extend env _ = env
 
-patVars p = []
+convert va gId gr = convert' va gId [] gr
 
-labels r = [l|RecordRow l _<-r]
+convert' va gId vs gr = ppT
+  where
+    ppT0 = convert' False gId vs gr
+    ppTv vs' = convert' va gId vs' gr
 
-proj = Var . identS . proj'
-proj' (LabelId l) = "proj_"++l
-rcon = Var . rcon'
+    ppT t =
+      case t of
+         -- Only for 'let' inserted on the top-level by this converter:
+        Let (x,(_,xt)) t -> let1 x (ppT0 xt) (ppT t)
+--      Abs b x t -> ...
+        V ty ts -> pure (c "table" `Ap` dedup ts)
+        T (TTyped ty) cs -> pure (LambdaCase (map ppCase cs))
+        S t p -> select (ppT t) (ppT p)
+        C t1 t2 -> concat (ppT t1) (ppT t2)
+        App f a -> ap (ppT f) (ppT a)
+        R r -> aps (ppT (rcon (map fst r))) (fields r)
+        P t l -> ap (ppT (proj l)) (ppT t)
+        FV [] -> empty
+        Vr x -> if x `elem` vs then pure (Var x) else Var x
+        Cn x -> pure (Var x)
+        Con c -> pure (Var (gId c))
+        Sort k -> pure (Var k)
+        EInt n -> pure (lit n)
+        Q (m,n) -> if m==cPredef then pure (ppPredef n) else Var (qual m n)
+        QC (m,n) -> pure (Var (gId (qual m n)))
+        K s -> pure (token s)
+        Empty -> pure (List [])
+        FV ts@(_:_) -> variants ts
+        Alts t' vs -> pure (alts t' vs)
+
+    ppCase (p,t) = (ppP p,ppTv (patVars p++vs) t)
+
+    ppPredef n =
+      case predef n of
+        Ok BIND       -> single (c "BIND")
+        Ok SOFT_BIND  -> single (c "SOFT_BIND")
+        Ok SOFT_SPACE -> single (c "SOFT_SPACE")
+        Ok CAPIT      -> single (c "CAPIT")
+        Ok ALL_CAPIT  -> single (c "ALL_CAPIT")
+        _ -> Var n
+
+    ppP p =
+      case p of
+        PC c ps -> ConP (gId c) (map ppP ps)
+        PP (_,c) ps -> ConP (gId c) (map ppP ps)
+        PR r -> ConP (rcon' (map fst r)) (map (ppP.snd) (filter (not.isLockLabel.fst) r))
+        PW -> WildP
+        PV x -> VarP x
+        PString s -> Lit (show s) -- !!
+        PInt i -> Lit (show i)
+        PFloat x -> Lit (show x)
+        PT _ p -> ppP p
+        PAs x p -> AsP x (ppP p)
+        
+    token s = single (c "TK" `Ap` lit s)
+
+    alts t' vs = single (c "TP" `Ap` List (map alt vs) `Ap` ppT0 t')
+      where
+        alt (t,p) = Pair (List (pre p)) (ppT0 t)
+
+        pre (K s) = [lit s]
+        pre (Strs ts) = concatMap pre ts
+        pre (EPatt p) = pat p
+        pre t = error $ "pre "++show t
+
+        pat (PString s) = [lit s]
+        pat (PAlt p1 p2) = pat p1++pat p2
+        pat p = error $ "pat "++show p
+
+    fields = map (ppT.snd.snd) . sort . filter (not.isLockLabel.fst)
+
+    c = Const
+    lit s = c (show s) -- hmm
+    concat = if va then concat' else plusplus
+      where
+        concat' (List [List ts1]) (List [List ts2]) = List [List (ts1++ts2)]
+        concat' t1 t2 = Op t1 "+++" t2
+    pure = if va then single else id
+    pure' = single -- forcing the list monad
+
+    select = if va then select' else Ap
+    select' (List [t]) (List [p]) = Op t "!" p
+    select' (List [t]) p = Op t "!$" p
+    select' t p = Op t "!*" p
+
+    ap = if va then ap' else Ap
+      where
+        ap' (List [f]) x = fmap f x
+        ap' f x = Op f "<*>" x
+        fmap f (List [x]) = pure' (Ap f x)
+        fmap f x = Op f "<$>" x
+
+--  join = if va then join' else id
+    join' (List [x]) = x
+    join' x = c "concat" `Ap` x
+
+    empty = if va then List [] else c "error" `Ap` c (show "empty variant")
+    variants = if va then \ ts -> join' (List (map ppT ts))
+                     else \ (t:_) -> ppT t
+
+    aps f [] = f
+    aps f (a:as) = aps (ap f a) as
+
+    dedup ts =
+        if M.null dups
+        then List (map ppT ts)
+        else Lets [(ev i,ppT t)|(i,t)<-defs] (List (zipWith entry ts is))
+      where
+        entry t i = maybe (ppT t) (Var . ev) (M.lookup i dups)
+        ev i = identS ("e'"++show i)
+
+        defs = [(i1,t)|(t,i1:_:_)<-ms]
+        dups = M.fromList [(i2,i1)|(_,i1:is@(_:_))<-ms,i2<-i1:is]
+        ms = M.toList m
+        m = fmap sort (M.fromListWith (++) (zip ts [[i]|i<-is]))
+        is = [0..]::[Int]
+
+patVars p =
+  case p of
+    PV x -> [x]
+    PAs x p -> x:patVars p
+    _ -> collectPattOp patVars p
+
+convType va gId = ppT
+  where
+    ppT t =
+      case t of
+        Table ti tv -> Fun (ppT ti) (if va then ListT (ppT tv) else ppT tv)
+        RecType rt -> tcon (rcon' (map fst rt)) (fields rt)
+        App tf ta -> TAp (ppT tf) (ppT ta)
+        FV [] -> tcon0 (identS "({-empty variant-})")
+        Sort k -> tcon0 k
+        EInt n -> tcon0 (identS ("({-"++show n++"-})")) -- type level numeric literal
+        FV (t:ts) -> ppT t -- !!
+        QC (m,n) -> tcon0 (gId (qual m n))
+        Q (m,n) -> tcon0 (gId (qual m n))
+        _ -> error $ "Missing case in convType for: "++show t
+
+    fields = map (ppT.snd) . sort . filter (not.isLockLabel.fst)
+
+proj = con . proj'
+proj' l = "proj_"++render l
+rcon = con . rcon_name
 rcon' = identS . rcon_name
-rcon_name ls = "R"++concat (sort ['_':l|LabelId l<-ls])
-
+rcon_name ls = "R"++concat (sort ['_':render l|l<-ls,not (isLockLabel l)])
+to_rcon = con . to_rcon'
 to_rcon' = ("to_"++) . rcon_name
 
 recordType ls =
@@ -386,6 +400,31 @@ labelClass l =
     r = identS "r"
     a = identS "a"
 
+paramType va gId gr q@(_,n) =
+    case lookupOrigInfo gr q of
+      Ok (m,ResParam (Just (L _ ps)) _)
+       {- - | m/=cPredef && m/=moduleNameS "Prelude"-} ->
+         ((S.singleton (m,n),argTypes ps),
+          [Data (conap0 name) (map (param m) ps)["Eq","Ord","Show"],
+           Instance [] (TId (identS "EnumAll") `TAp` TId name)
+              [(lhs0 "enumAll",foldr1 plusplus (map (enumParam m) ps))]]
+         )
+       where name = gId (qual m n)
+      Ok (m,ResOper  _ (Just (L _ t)))
+        | m==cPredef && n==cInts ->
+           ((S.singleton (m,n),S.empty),
+            [Type (ConAp (gId (qual m n)) [identS "n"]) (TId (identS "Int"))])
+        | otherwise ->
+           ((S.singleton (m,n),paramTypes gr t),
+            [Type (conap0 (gId (qual m n))) (convType va gId t)])
+      _ -> ((S.empty,S.empty),[])
+  where
+    param m (n,ctx) = ConAp (gId (qual m n)) [convType va gId t|(_,_,t)<-ctx]
+    argTypes = S.unions . map argTypes1
+    argTypes1 (n,ctx) = S.unions [paramTypes gr t|(_,_,t)<-ctx]
+
+    enumParam m (n,ctx) = enumCon (gId (qual m n)) (length ctx)
+
 enumCon name arity =
     if arity==0
     then single (Var name)
@@ -394,23 +433,5 @@ enumCon name arity =
     ap (List [f]) a = Op f "<$>" a
     ap f a = Op f "<*>" a
 
-lincatName,linfunName :: CatId -> Ident
-lincatName c = prefixIdent "Lin" (toIdent c)
-linfunName c = prefixIdent "lin" (toIdent c)
-
-class ToIdent i where toIdent :: i -> Ident
-
-instance ToIdent ParamId where toIdent (ParamId q) = qIdentS q
-instance ToIdent PredefId where toIdent (PredefId s) = identS s
-instance ToIdent CatId   where toIdent (CatId s) = identS s
-instance ToIdent C.FunId where toIdent (FunId s) = identS s
-instance ToIdent VarValueId where toIdent (VarValueId q) = qIdentS q
-
-qIdentS = identS . unqual
-
-unqual (Qual (ModId m) n) = m++"_"++n
-unqual (Unqual n) = n
-
-instance ToIdent VarId where
-  toIdent Anonymous = identW
-  toIdent (VarId s) = identS s
+qual :: ModuleName -> Ident -> Ident
+qual m = prefixIdent (render m++"_")

src/compiler/GF/Compile/Export.hs

@@ -3,11 +3,9 @@ module GF.Compile.Export where
 import PGF
 import PGF.Internal(ppPGF)
 import GF.Compile.PGFtoHaskell
---import GF.Compile.PGFtoAbstract
 import GF.Compile.PGFtoJava
 import GF.Compile.PGFtoProlog
 import GF.Compile.PGFtoJS
-import GF.Compile.PGFtoJSON
 import GF.Compile.PGFtoPython
 import GF.Infra.Option
 --import GF.Speech.CFG
@@ -36,10 +34,7 @@ exportPGF :: Options
 exportPGF opts fmt pgf = 
     case fmt of
       FmtPGFPretty    -> multi "txt" (render . ppPGF)
-      FmtCanonicalGF  -> [] -- canon "gf" (render80 . abstract2canonical)
-      FmtCanonicalJson-> []
       FmtJavaScript   -> multi "js"  pgf2js
-      FmtJSON         -> multi "json"  pgf2json
       FmtPython       -> multi "py"  pgf2python
       FmtHaskell      -> multi "hs"  (grammar2haskell opts name)
       FmtJava         -> multi "java" (grammar2java opts name)
@@ -62,12 +57,9 @@ exportPGF opts fmt pgf =
    multi :: String -> (PGF -> String) -> [(FilePath,String)]
    multi ext pr = [(name <.> ext, pr pgf)]
 
--- canon ext pr = [("canonical"</>name<.>ext,pr pgf)]
-
    single :: String -> (PGF -> CId -> String) -> [(FilePath,String)]
    single ext pr = [(showCId cnc <.> ext, pr pgf cnc) | cnc <- languages pgf]
 
-
 -- | Get the name of the concrete syntax to generate output from.
 -- FIXME: there should be an option to change this.
 outputConcr :: PGF -> CId

src/compiler/GF/Compile/GrammarToCanonical.hs

@@ -1,388 +0,0 @@
--- | Translate grammars to Canonical form
--- (a common intermediate representation to simplify export to other formats)
-module GF.Compile.GrammarToCanonical(
-       grammar2canonical,abstract2canonical,concretes2canonical,
-       projection,selection
-       ) where
-import Data.List(nub,partition)
-import qualified Data.Map as M
-import qualified Data.Set as S
-import GF.Data.ErrM
-import GF.Text.Pretty
-import GF.Grammar.Grammar
-import GF.Grammar.Lookup(lookupOrigInfo,allOrigInfos,allParamValues)
-import GF.Grammar.Macros(typeForm,collectOp,collectPattOp,mkAbs,mkApp,term2patt)
-import GF.Grammar.Lockfield(isLockLabel)
-import GF.Grammar.Predef(cPredef,cInts)
-import GF.Compile.Compute.Predef(predef)
-import GF.Compile.Compute.Value(Predefined(..))
-import GF.Infra.Ident(ModuleName(..),Ident,prefixIdent,showIdent,isWildIdent)
-import GF.Infra.Option(optionsPGF)
-import PGF.Internal(Literal(..))
-import GF.Compile.Compute.ConcreteNew(normalForm,resourceValues)
-import GF.Grammar.Canonical as C
-import Debug.Trace
-
--- | Generate Canonical code for the named abstract syntax and all associated
--- concrete syntaxes
-grammar2canonical opts absname gr =
-   Grammar (abstract2canonical absname gr)
-           (map snd (concretes2canonical opts absname gr))
-
--- | Generate Canonical code for the named abstract syntax
-abstract2canonical absname gr =
-    Abstract (modId absname) (convFlags gr absname) cats funs
-  where
-    cats = [CatDef (gId c) (convCtx ctx) | ((_,c),AbsCat ctx) <- adefs]
-
-    funs = [FunDef (gId f) (convType ty) |
-            ((_,f),AbsFun (Just (L _ ty)) ma mdef _) <- adefs]
-
-    adefs = allOrigInfos gr absname
-
-    convCtx = maybe [] (map convHypo . unLoc)
-    convHypo (bt,name,t) =
-      case typeForm t of
-        ([],(_,cat),[]) -> gId cat -- !!
-
-    convType t =
-      case typeForm t of
-        (hyps,(_,cat),args) -> Type bs (TypeApp (gId cat) as)
-          where
-            bs = map convHypo' hyps
-            as = map convType args
-
-    convHypo' (bt,name,t) = TypeBinding (gId name) (convType t)
-
-
--- | Generate Canonical code for the all concrete syntaxes associated with
--- the named abstract syntax in given the grammar.
-concretes2canonical opts absname gr =
-  [(cncname,concrete2canonical gr cenv absname cnc cncmod)
-     | let cenv = resourceValues opts gr,
-       cnc<-allConcretes gr absname,
-       let cncname = "canonical/"++render cnc ++ ".gf" :: FilePath
-           Ok cncmod = lookupModule gr cnc
-  ]
-
--- | Generate Canonical GF for the given concrete module.
-concrete2canonical gr cenv absname cnc modinfo =
-  Concrete (modId cnc) (modId absname) (convFlags gr cnc)
-      (neededParamTypes S.empty (params defs))
-      [lincat|(_,Left lincat)<-defs]
-      [lin|(_,Right lin)<-defs]
-  where
-    defs = concatMap (toCanonical gr absname cenv) . 
-           M.toList $
-           jments modinfo
-
-    params = S.toList . S.unions . map fst
-
-    neededParamTypes have [] = []
-    neededParamTypes have (q:qs) =
-        if q `S.member` have
-        then neededParamTypes have qs
-        else let ((got,need),def) = paramType gr q
-             in def++neededParamTypes (S.union got have) (S.toList need++qs)
-
-toCanonical gr absname cenv (name,jment) =
-  case jment of
-    CncCat (Just (L loc typ)) _ _ pprn _ ->
-        [(pts,Left (LincatDef (gId name) (convType ntyp)))]
-      where
-        pts = paramTypes gr ntyp
-        ntyp = nf loc typ
-    CncFun (Just r@(cat,ctx,lincat)) (Just (L loc def)) pprn _ ->
-        [(tts,Right (LinDef (gId name) (map gId args) (convert gr e')))]
-      where
-        tts = tableTypes gr [e']
-
-        e' = unAbs (length params) $
-             nf loc (mkAbs params (mkApp def (map Vr args)))
-        params = [(b,x)|(b,x,_)<-ctx]
-        args = map snd params
-
-    AnyInd _ m  -> case lookupOrigInfo gr (m,name) of
-                     Ok (m,jment) -> toCanonical gr absname cenv (name,jment)
-                     _ -> []
-    _ -> []
-  where
-    nf loc = normalForm cenv (L loc name)
---  aId n = prefixIdent "A." (gId n)
-
-    unAbs 0 t = t
-    unAbs n (Abs _ _ t) = unAbs (n-1) t
-    unAbs _ t = t
-
-tableTypes gr ts = S.unions (map tabtys ts)
-  where
-    tabtys t =
-      case t of
-        V t cc -> S.union (paramTypes gr t) (tableTypes gr cc)
-        T (TTyped t) cs -> S.union (paramTypes gr t) (tableTypes gr (map snd cs))
-        _ -> collectOp tabtys t
-
-paramTypes gr t =
-  case t of
-    RecType fs -> S.unions (map (paramTypes gr.snd) fs)
-    Table t1 t2 -> S.union (paramTypes gr t1) (paramTypes gr t2)
-    App tf ta -> S.union (paramTypes gr tf) (paramTypes gr ta)
-    Sort _ -> S.empty
-    EInt _ -> S.empty
-    Q q -> lookup q
-    QC q -> lookup q
-    FV ts -> S.unions (map (paramTypes gr) ts)
-    _ -> ignore
-  where
-    lookup q = case lookupOrigInfo gr q of
-                 Ok (_,ResOper  _ (Just (L _ t))) ->
-                                       S.insert q (paramTypes gr t)
-                 Ok (_,ResParam {}) -> S.singleton q
-                 _ -> ignore
-
-    ignore = trace ("Ignore: "++show t) S.empty
-
-
-convert gr = convert' gr []
-
-convert' gr vs = ppT
-  where
-    ppT0 = convert' gr vs
-    ppTv vs' = convert' gr vs'
-
-    ppT t =
-      case t of
---      Abs b x t -> ...
---      V ty ts -> VTableValue (convType ty) (map ppT ts)
-        V ty ts -> TableValue (convType ty) [TableRow (ppP p) (ppT t)|(p,t)<-zip ps ts]
-          where
-            Ok pts = allParamValues gr ty
-            Ok ps = mapM term2patt pts
-        T (TTyped ty) cs -> TableValue (convType ty) (map ppCase cs)
-        S t p -> selection (ppT t) (ppT p)
-        C t1 t2 -> concatValue (ppT t1) (ppT t2)
-        App f a -> ap (ppT f) (ppT a)
-        R r -> RecordValue (fields r)
-        P t l -> projection (ppT t) (lblId l)
-        Vr x -> VarValue (gId x)
-        Cn x -> VarValue (gId x) -- hmm
-        Con c -> ParamConstant (Param (gId c) [])
-        Sort k -> VarValue (gId k)
-        EInt n -> LiteralValue (IntConstant n)
-        Q (m,n) -> if m==cPredef then ppPredef n else VarValue ((gQId m n))
-        QC (m,n) -> ParamConstant (Param ((gQId m n)) [])
-        K s -> LiteralValue (StrConstant s)
-        Empty -> LiteralValue (StrConstant "")
-        FV ts -> VariantValue (map ppT ts)
-        Alts t' vs -> alts vs (ppT t')
-        _ -> error $ "convert' "++show t
-
-    ppCase (p,t) = TableRow (ppP p) (ppTv (patVars p++vs) t)
-
-    ppPredef n =
-      case predef n of
-        Ok BIND       -> p "BIND"
-        Ok SOFT_BIND  -> p "SOFT_BIND"
-        Ok SOFT_SPACE -> p "SOFT_SPACE"
-        Ok CAPIT      -> p "CAPIT"
-        Ok ALL_CAPIT  -> p "ALL_CAPIT"
-        _ -> VarValue (gQId cPredef n) -- hmm
-      where
-       p = PredefValue . PredefId
-      
-    ppP p =
-      case p of
-        PC c ps -> ParamPattern (Param (gId c) (map ppP ps))
-        PP (m,c) ps -> ParamPattern (Param ((gQId m c)) (map ppP ps))
-        PR r -> RecordPattern (fields r) {-
-        PW -> WildPattern
-        PV x -> VarP x
-        PString s -> Lit (show s) -- !!
-        PInt i -> Lit (show i)
-        PFloat x -> Lit (show x)
-        PT _ p -> ppP p
-        PAs x p -> AsP x (ppP p) -}
-      where
-        fields = map field . filter (not.isLockLabel.fst)
-        field (l,p) = RecordRow (lblId l) (ppP p)
-
---  patToParam p = case ppP p of ParamPattern pv -> pv
-
---  token s = single (c "TK" `Ap` lit s)
-
-    alts vs = PreValue (map alt vs)
-      where
-        alt (t,p) = (pre p,ppT0 t)
-
-        pre (K s) = [s]
-        pre (Strs ts) = concatMap pre ts
-        pre (EPatt p) = pat p
-        pre t = error $ "pre "++show t
-
-        pat (PString s) = [s]
-        pat (PAlt p1 p2) = pat p1++pat p2
-        pat (PSeq p1 p2) = [s1++s2 | s1<-pat p1, s2<-pat p2]
-        pat p = error $ "pat "++show p
-
-    fields = map field . filter (not.isLockLabel.fst)
-    field (l,(_,t)) = RecordRow (lblId l) (ppT t)
-  --c = Const
-  --c = VarValue . VarValueId
-  --lit s = c (show s) -- hmm
-
-    ap f a = case f of
-               ParamConstant (Param p ps) ->
-                 ParamConstant (Param p (ps++[a]))
-               _ -> error $ "convert' ap: "++render (ppA f <+> ppA a)
-
-concatValue v1 v2 =
-  case (v1,v2) of
-    (LiteralValue (StrConstant ""),_) -> v2
-    (_,LiteralValue (StrConstant "")) -> v1
-    _ -> ConcatValue v1 v2
-
--- | Smart constructor for projections
-projection r l = maybe (Projection r l) id (proj r l)
-
-proj r l =
-  case r of
-    RecordValue r -> case [v|RecordRow l' v<-r,l'==l] of
-                          [v] -> Just v
-                          _ -> Nothing
-    _ -> Nothing
-
--- | Smart constructor for selections
-selection t v =
-  -- Note: impossible cases can become possible after grammar transformation
-  case t of
-    TableValue tt r ->
-        case nub [rv|TableRow _ rv<-keep] of
-          [rv] -> rv
-          _ -> Selection (TableValue tt r') v
-      where
-        -- Don't introduce wildcard patterns, true to the canonical format,
-        -- annotate (or eliminate) rhs in impossible rows
-        r' = map trunc r
-        trunc r@(TableRow p e) = if mightMatchRow v r
-                                 then r
-                                 else TableRow p (impossible e)
-        {-
-        -- Creates smaller tables, but introduces wildcard patterns
-        r' = if null discard
-             then r
-             else keep++[TableRow WildPattern impossible]
-        -}
-        (keep,discard) = partition (mightMatchRow v) r
-    _ -> Selection t v
-
-impossible = CommentedValue "impossible"
-
-mightMatchRow v (TableRow p _) =
-  case p of
-    WildPattern -> True
-    _ -> mightMatch v p
-
-mightMatch v p =
-  case v of
-    ConcatValue _ _ -> False
-    ParamConstant (Param c1 pvs) ->
-      case p of
-        ParamPattern (Param c2 pps) -> c1==c2 && length pvs==length pps &&
-                                       and [mightMatch v p|(v,p)<-zip pvs pps]
-        _ -> False
-    RecordValue rv ->
-      case p of
-        RecordPattern rp ->
-          and [maybe False (flip mightMatch p) (proj v l) | RecordRow l p<-rp]
-        _ -> False
-    _ -> True
-
-patVars p =
-  case p of
-    PV x -> [x]
-    PAs x p -> x:patVars p
-    _ -> collectPattOp patVars p
-
-convType = ppT
-  where
-    ppT t =
-      case t of
-        Table ti tv -> TableType (ppT ti) (ppT tv)
-        RecType rt -> RecordType (convFields rt)
---      App tf ta -> TAp (ppT tf) (ppT ta)
---      FV [] -> tcon0 (identS "({-empty variant-})")
-        Sort k -> convSort k
---      EInt n -> tcon0 (identS ("({-"++show n++"-})")) -- type level numeric literal
-        FV (t:ts) -> ppT t -- !!
-        QC (m,n) -> ParamType (ParamTypeId ((gQId m n)))
-        Q (m,n) -> ParamType (ParamTypeId ((gQId m n)))
-        _ -> error $ "Missing case in convType for: "++show t
-
-    convFields = map convField . filter (not.isLockLabel.fst)
-    convField (l,r) = RecordRow (lblId l) (ppT r)
-
-    convSort k = case showIdent k of
-                   "Float" -> FloatType
-                   "Int" -> IntType
-                   "Str" -> StrType
-                   _ -> error ("convSort "++show k)
-
-toParamType t = case convType t of
-                  ParamType pt -> pt
-                  _ -> error ("toParamType "++show t)
-
-toParamId t = case toParamType t of
-                   ParamTypeId p -> p
-
-paramType gr q@(_,n) =
-    case lookupOrigInfo gr q of
-      Ok (m,ResParam (Just (L _ ps)) _)
-       {- - | m/=cPredef && m/=moduleNameS "Prelude"-} ->
-         ((S.singleton (m,n),argTypes ps),
-          [ParamDef name (map (param m) ps)]
-         )
-       where name = (gQId m n)
-      Ok (m,ResOper  _ (Just (L _ t)))
-        | m==cPredef && n==cInts ->
-           ((S.empty,S.empty),[]) {-
-           ((S.singleton (m,n),S.empty),
-            [Type (ConAp ((gQId m n)) [identS "n"]) (TId (identS "Int"))])-}
-        | otherwise ->
-           ((S.singleton (m,n),paramTypes gr t),
-            [ParamAliasDef ((gQId m n)) (convType t)])
-      _ -> ((S.empty,S.empty),[])
-  where
-    param m (n,ctx) = Param ((gQId m n)) [toParamId t|(_,_,t)<-ctx]
-    argTypes = S.unions . map argTypes1
-    argTypes1 (n,ctx) = S.unions [paramTypes gr t|(_,_,t)<-ctx]
-
-lblId = LabelId . render -- hmm
-modId (MN m) = ModId (showIdent m)
-
-class FromIdent i where gId :: Ident -> i
-
-instance FromIdent VarId where
-  gId i = if isWildIdent i then Anonymous else VarId (showIdent i)
-
-instance FromIdent C.FunId where gId = C.FunId . showIdent
-instance FromIdent CatId where gId = CatId . showIdent
-instance FromIdent ParamId where gId = ParamId . unqual
-instance FromIdent VarValueId where gId = VarValueId . unqual
-
-class FromIdent i => QualIdent i where gQId :: ModuleName -> Ident -> i
-
-instance QualIdent ParamId    where gQId m n = ParamId (qual m n)
-instance QualIdent VarValueId where gQId m n = VarValueId (qual m n)
-
-qual m n = Qual (modId m) (showIdent n)
-unqual n = Unqual (showIdent n)
-
-convFlags gr mn =
-  Flags [(n,convLit v) |
-         (n,v)<-err (const []) (optionsPGF.mflags) (lookupModule gr mn)]
-  where
-    convLit l =
-      case l of
-        LStr s -> Str s
-        LInt i -> C.Int i
-        LFlt d -> Flt d

src/compiler/GF/Compile/GrammarToPGF.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE BangPatterns, FlexibleContexts, MagicHash #-}
+{-# LANGUAGE BangPatterns, FlexibleContexts #-}
 module GF.Compile.GrammarToPGF (mkCanon2pgf) where
 
 --import GF.Compile.Export
@@ -6,18 +6,15 @@ import GF.Compile.GeneratePMCFG
 import GF.Compile.GenerateBC
 
 import PGF(CId,mkCId,utf8CId)
-import PGF.Internal(fidInt,fidFloat,fidString,fidVar)
+import PGF.Internal(fidInt,fidFloat,fidString,fidVar,DepPragma(..))
 import PGF.Internal(updateProductionIndices)
---import qualified PGF.Macros as CM
 import qualified PGF.Internal as C
-import qualified PGF.Internal as D
 import GF.Grammar.Predef
 --import GF.Grammar.Printer
 import GF.Grammar.Grammar
 import qualified GF.Grammar.Lookup as Look
 import qualified GF.Grammar as A
 import qualified GF.Grammar.Macros as GM
---import GF.Compile.GeneratePMCFG
 
 import GF.Infra.Ident
 import GF.Infra.Option
@@ -25,24 +22,24 @@ import GF.Infra.UseIO (IOE)
 import GF.Data.Operations
 
 import Data.List
+import Data.Maybe (fromMaybe)
 import qualified Data.Set as Set
 import qualified Data.Map as Map
 import qualified Data.IntMap as IntMap
 import Data.Array.IArray
 
-import Data.Char
-import GHC.Prim
-import GHC.Base(getTag)
-
-mkCanon2pgf :: Options -> SourceGrammar -> ModuleName -> IOE D.PGF
+mkCanon2pgf :: Options -> SourceGrammar -> ModuleName -> IOE C.PGF
 mkCanon2pgf opts gr am = do
-  (an,abs) <- mkAbstr am
+  depconf  <- case flag optLabelsFile opts of
+                Nothing    -> return Map.empty
+                Just fpath -> readDepConfig fpath
+  (an,abs) <- mkAbstr am depconf
   cncs     <- mapM mkConcr (allConcretes gr am)
-  return $ updateProductionIndices (D.PGF Map.empty an abs (Map.fromList cncs))
+  return $ updateProductionIndices (C.PGF Map.empty an abs (Map.fromList cncs))
   where
     cenv = resourceValues opts gr
 
-    mkAbstr am = return (mi2i am, D.Abstr flags funs cats)
+    mkAbstr am depconf = return (mi2i am, C.Abstr flags funs cats)
       where
         aflags = err (const noOptions) mflags (lookupModule gr am)
 
@@ -52,7 +49,7 @@ mkCanon2pgf opts gr am = do
 
         flags = Map.fromList [(mkCId f,x) | (f,x) <- optionsPGF aflags]
 
-        funs = Map.fromList [(i2i f, (mkType [] ty, arity, mkDef gr arity mdef, 0)) | 
+        funs = Map.fromList [(i2i f, (mkType [] ty, fromMaybe [] (Map.lookup (i2i f) depconf), arity, mkDef gr arity mdef, 0)) | 
                                    ((m,f),AbsFun (Just (L _ ty)) ma mdef _) <- adefs,
                                    let arity = mkArity ma mdef ty]
 
@@ -63,9 +60,7 @@ mkCanon2pgf opts gr am = do
               [(0,i2i f) | ((m,f),AbsFun (Just (L _ ty)) _ _ (Just True)) <- adefs, snd (GM.valCat ty) == cat]
 
     mkConcr cm = do
-      let cflags = err (const noOptions) mflags (lookupModule gr cm)
-          ciCmp | flag optCaseSensitive cflags = compare
-                | otherwise                    = compareCaseInsensitve
+      let cflags  = err (const noOptions) mflags (lookupModule gr cm)
 
       (ex_seqs,cdefs) <- addMissingPMCFGs
                             Map.empty 
@@ -74,17 +69,17 @@ mkCanon2pgf opts gr am = do
 
       let flags = Map.fromList [(mkCId f,x) | (f,x) <- optionsPGF cflags]
 
-          seqs = (mkArray . sortNubBy ciCmp . concat) $
+          seqs = (mkSetArray . Set.fromList . concat) $
                      (Map.keys ex_seqs : [maybe [] elems (mseqs mi) | (m,mi) <- allExtends gr cm])
 
           ex_seqs_arr = mkMapArray ex_seqs :: Array SeqId Sequence
 
           !(!fid_cnt1,!cnccats) = genCncCats gr am cm cdefs
           !(!fid_cnt2,!productions,!lindefs,!linrefs,!cncfuns)
-                                = genCncFuns gr am cm ex_seqs_arr ciCmp seqs cdefs fid_cnt1 cnccats
-
+                                = genCncFuns gr am cm ex_seqs_arr seqs cdefs fid_cnt1 cnccats
+        
           printnames = genPrintNames cdefs
-      return (mi2i cm, D.Concr flags
+      return (mi2i cm, C.Concr flags
                               printnames
                               cncfuns
                               lindefs
@@ -192,58 +187,83 @@ genCncFuns :: Grammar
            -> ModuleName
            -> ModuleName
            -> Array SeqId Sequence
-           -> (Sequence -> Sequence -> Ordering)
            -> Array SeqId Sequence
            -> [(QIdent, Info)]
            -> FId
-           -> Map.Map CId D.CncCat
+           -> Map.Map CId C.CncCat
            -> (FId,
-               IntMap.IntMap (Set.Set D.Production),
+               IntMap.IntMap (Set.Set C.Production),
                IntMap.IntMap [FunId],
                IntMap.IntMap [FunId],
-               Array FunId D.CncFun)
-genCncFuns gr am cm ex_seqs ciCmp seqs cdefs fid_cnt cnccats =
-  let (fid_cnt1,funs_cnt1,funs1,lindefs,linrefs) = mkCncCats cdefs fid_cnt  0 [] IntMap.empty IntMap.empty
-      (fid_cnt2,funs_cnt2,funs2,prods)           = mkCncFuns cdefs fid_cnt1 funs_cnt1 funs1 lindefs Map.empty IntMap.empty
-  in (fid_cnt2,prods,lindefs,linrefs,array (0,funs_cnt2-1) funs2)
+               Array FunId C.CncFun)
+genCncFuns gr am cm ex_seqs seqs cdefs fid_cnt cnccats =
+  let (fid_cnt1,lindefs,linrefs,fun_st1) = mkCncCats cdefs fid_cnt IntMap.empty IntMap.empty Map.empty
+      ((fid_cnt2,crc,prods),fun_st2)     = mkCncFuns cdefs lindefs ((fid_cnt1,Map.empty,IntMap.empty),fun_st1)
+  in (fid_cnt2,prods,lindefs,linrefs,array (0,Map.size fun_st2-1) (Map.elems fun_st2))
   where
-    mkCncCats []                                                        fid_cnt funs_cnt funs lindefs linrefs =
-      (fid_cnt,funs_cnt,funs,lindefs,linrefs)
-    mkCncCats (((m,id),CncCat _ _ _ _ (Just (PMCFG prods0 funs0))):cdefs) fid_cnt funs_cnt funs lindefs linrefs =
-      let !funs_cnt' = let (s_funid, e_funid) = bounds funs0
-                       in funs_cnt+(e_funid-s_funid+1)
-          lindefs'   = foldl' (toLinDef (am,id) funs_cnt) lindefs prods0
-          linrefs'   = foldl' (toLinRef (am,id) funs_cnt) linrefs prods0
-          funs'      = foldl' (toCncFun funs_cnt (m,mkLinDefId id)) funs (assocs funs0)
-      in mkCncCats cdefs fid_cnt funs_cnt' funs' lindefs' linrefs'
-    mkCncCats (_                                                :cdefs) fid_cnt funs_cnt funs lindefs linrefs =
-      mkCncCats cdefs fid_cnt funs_cnt funs lindefs linrefs
+    mkCncCats []                                                          fid_cnt lindefs linrefs fun_st =
+      (fid_cnt,lindefs,linrefs,fun_st)
+    mkCncCats (((m,id),CncCat _ _ _ _ (Just (PMCFG prods0 funs0))):cdefs) fid_cnt lindefs linrefs fun_st =
+      let mseqs   = case lookupModule gr m of
+                      Ok (ModInfo{mseqs=Just mseqs}) -> mseqs
+                      _                              -> ex_seqs
+          (lindefs',fun_st1) = foldl' (toLinDef (m,id) funs0 mseqs) (lindefs,fun_st ) prods0
+          (linrefs',fun_st2) = foldl' (toLinRef (m,id) funs0 mseqs) (linrefs,fun_st1) prods0
+      in mkCncCats cdefs fid_cnt lindefs' linrefs' fun_st2
+    mkCncCats (_                                                  :cdefs) fid_cnt lindefs linrefs fun_st =
+      mkCncCats cdefs fid_cnt lindefs linrefs fun_st
 
-    mkCncFuns []                                                        fid_cnt funs_cnt funs lindefs crc prods =
-      (fid_cnt,funs_cnt,funs,prods)
-    mkCncFuns (((m,id),CncFun _ _ _ (Just (PMCFG prods0 funs0))):cdefs) fid_cnt funs_cnt funs lindefs crc prods =
-      let ---Ok ty_C        = fmap GM.typeForm (Look.lookupFunType gr am id)
-          ty_C           = err error (\x -> x) $ fmap GM.typeForm (Look.lookupFunType gr am id)
-          !funs_cnt'     = let (s_funid, e_funid) = bounds funs0
-                           in funs_cnt+(e_funid-s_funid+1)
-          !(fid_cnt',crc',prods') 
-                         = foldl' (toProd lindefs ty_C funs_cnt)
-                                  (fid_cnt,crc,prods) prods0
-          funs'          = foldl' (toCncFun funs_cnt (m,id)) funs (assocs funs0)
-      in mkCncFuns cdefs fid_cnt' funs_cnt' funs' lindefs crc' prods'
-    mkCncFuns (_                                                :cdefs) fid_cnt funs_cnt funs lindefs crc prods = 
-      mkCncFuns cdefs fid_cnt funs_cnt funs lindefs crc prods
+    mkCncFuns []                                                        lindefs st = st
+    mkCncFuns (((m,id),CncFun _ _ _ (Just (PMCFG prods0 funs0))):cdefs) lindefs st =
+      let ty_C    = err error (\x -> x) $ fmap GM.typeForm (Look.lookupFunType gr am id)
+          mseqs   = case lookupModule gr m of
+                      Ok (ModInfo{mseqs=Just mseqs}) -> mseqs
+                      _                              -> ex_seqs
+          bundles = [([(args0,res0) | Production res0 funid0 args0 <- prods0, funid0==funid],lins) | (funid,lins) <- assocs funs0]
+          !st'    = foldl' (toProd id lindefs mseqs ty_C) st bundles
+      in mkCncFuns cdefs lindefs st'
+    mkCncFuns (_                                                :cdefs) lindefs st =
+      mkCncFuns cdefs lindefs st
 
-    toProd lindefs (ctxt_C,res_C,_) offs st (Production fid0 funid0 args0) =
-      let !((fid_cnt,crc,prods),args) = mapAccumL mkArg st (zip ctxt_C args0) 
-          set0    = Set.fromList (map (C.PApply (offs+funid0)) (sequence args))
-          fid     = mkFId res_C fid0
-          !prods' = case IntMap.lookup fid prods of
-                     Just set -> IntMap.insert fid (Set.union set0 set) prods
-                     Nothing  -> IntMap.insert fid set0 prods
-      in (fid_cnt,crc,prods')
+    toLinDef mid funs0 mseqs st@(lindefs,fun_st) (Production res0 funid0 [arg0])
+      | arg0 == [fidVar] =
+          let res  = mkFId mid res0
+
+              lins = amap (newSeqId mseqs) (funs0 ! funid0)
+
+              !funid    = Map.size fun_st
+              !fun_st'  = Map.insert ([([C.PArg [] fidVar],res)],lins) (funid, C.CncFun [] lins) fun_st
+
+              !lindefs' = IntMap.insertWith (++) res [funid] lindefs
+          in (lindefs',fun_st')
+    toLinDef res funs0 mseqs st _ = st
+
+    toLinRef mid funs0 mseqs st (Production res0 funid0 [arg0])
+      | res0 == fidVar  =
+          let arg  = map (mkFId mid) arg0
+
+              lins = amap (newSeqId mseqs) (funs0 ! funid0)
+
+          in foldr (\arg (linrefs,fun_st) -> 
+                          let !funid    = Map.size fun_st
+                              !fun_st'  = Map.insert ([([C.PArg [] arg],fidVar)],lins) (funid, C.CncFun [] lins) fun_st
+
+                              !linrefs' = IntMap.insertWith (++) arg [funid] linrefs
+                          in (linrefs',fun_st'))
+                   st arg
+    toLinRef res funs0 mseqs st _ = st
+
+    toProd id lindefs mseqs (ctxt_C,res_C,_) (prod_st,fun_st) (sigs0,lins0) =
+      let (prod_st',sigs) = mapAccumL mkCncSig prod_st sigs0
+          lins            = amap (newSeqId mseqs) lins0
+      in addBundle id (prod_st',fun_st) (concat sigs,lins)
       where
-        mkArg st@(fid_cnt,crc,prods) ((_,_,ty),fid0s ) =
+        mkCncSig prod_st (args0,res0) =
+          let !(prod_st',args) = mapAccumL mkArg prod_st (zip ctxt_C args0)
+              res              = mkFId res_C res0
+          in (prod_st',[(args,res) | args <- sequence args])
+
+        mkArg st@(fid_cnt,crc,prods) ((_,_,ty),fid0s) =
           case fid0s of
             [fid0] -> (st,map (flip C.PArg (mkFId arg_C fid0)) ctxt)
             fid0s  -> case Map.lookup fids crc of
@@ -253,45 +273,18 @@ genCncFuns gr am cm ex_seqs ciCmp seqs cdefs fid_cnt cnccats =
                                     in ((fid_cnt+1,crc',prods'),map (flip C.PArg fid_cnt) ctxt)
           where
             (hargs_C,arg_C) = GM.catSkeleton ty
-            ctxt = mapM (mkCtxt lindefs) hargs_C
+            ctxt = mapM mkCtxt hargs_C
             fids = map (mkFId arg_C) fid0s
 
-    mkLinDefId id = prefixIdent "lindef " id
+        mkCtxt (_,cat) =
+          case Map.lookup (i2i cat) cnccats of
+            Just (C.CncCat s e _) -> [(C.fidVar,fid) | fid <- [s..e], Just _ <- [IntMap.lookup fid lindefs]]
+            Nothing               -> error "GrammarToPGF.mkCtxt failed"
 
-    toLinDef res offs lindefs (Production fid0 funid0 args) =
-      if args == [[fidVar]]
-        then IntMap.insertWith (++) fid [offs+funid0] lindefs
-        else lindefs
+    newSeqId mseqs i = binSearch (mseqs ! i) seqs (bounds seqs)
       where
-        fid = mkFId res fid0
-
-    toLinRef res offs linrefs (Production fid0 funid0 [fargs]) =
-      if fid0 == fidVar
-        then foldr (\fid -> IntMap.insertWith (++) fid [offs+funid0]) linrefs fids
-        else linrefs
-      where
-        fids = map (mkFId res) fargs
-
-    mkFId (_,cat) fid0 =
-      case Map.lookup (i2i cat) cnccats of
-        Just (C.CncCat s e _) -> s+fid0
-        Nothing               -> error ("GrammarToPGF.mkFId: missing category "++showIdent cat)
-
-    mkCtxt lindefs (_,cat) =
-      case Map.lookup (i2i cat) cnccats of
-        Just (C.CncCat s e _) -> [(C.fidVar,fid) | fid <- [s..e], Just _ <- [IntMap.lookup fid lindefs]]
-        Nothing               -> error "GrammarToPGF.mkCtxt failed"
-
-    toCncFun offs (m,id) funs (funid0,lins0) =
-      let mseqs = case lookupModule gr m of
-                    Ok (ModInfo{mseqs=Just mseqs}) -> mseqs
-                    _                              -> ex_seqs
-      in (offs+funid0,C.CncFun (i2i id) (amap (newIndex mseqs) lins0)):funs                                          
-      where
-        newIndex mseqs i = binSearch (mseqs ! i) seqs (bounds seqs)
-
         binSearch v arr (i,j)
-          | i <= j    = case ciCmp v (arr ! k) of
+          | i <= j    = case compare v (arr ! k) of
                           LT -> binSearch v arr (i,k-1)
                           EQ -> k
                           GT -> binSearch v arr (k+1,j)
@@ -299,6 +292,24 @@ genCncFuns gr am cm ex_seqs ciCmp seqs cdefs fid_cnt cnccats =
           where
             k = (i+j) `div` 2
 
+    addBundle id ((fid_cnt,crc,prods),fun_st) bundle@(sigs,lins) =
+      case Map.lookup bundle fun_st of
+        Just (funid, C.CncFun funs lins) -> 
+          let !fun_st' = Map.insert bundle (funid, C.CncFun (i2i id:funs) lins) fun_st
+              !prods'  = foldl' (\prods (args,res) -> IntMap.insert res (Set.singleton (C.PApply funid args)) prods) prods sigs
+          in ((fid_cnt,crc,prods'),fun_st')
+        Nothing                          -> 
+          let !funid   = Map.size fun_st
+              !fun_st' = Map.insert bundle (funid, C.CncFun [i2i id] lins) fun_st
+              !prods'  = foldl' (\prods (args,res) -> IntMap.insert res (Set.singleton (C.PApply funid args)) prods) prods sigs
+          in ((fid_cnt,crc,prods'),fun_st')
+
+    mkFId (_,cat) fid0 =
+      case Map.lookup (i2i cat) cnccats of
+        Just (C.CncCat s e _) -> s+fid0
+        Nothing               -> error ("GrammarToPGF.mkFId: missing category "++showIdent cat)
+
+
 genPrintNames cdefs =
   Map.fromAscList [(i2i id, name) | ((m,id),info) <- cdefs, name <- prn info]
   where
@@ -310,121 +321,32 @@ genPrintNames cdefs =
     flatten (Alts x _) = flatten x
     flatten (C x y)    = flatten x +++ flatten y
 
-mkArray    lst = listArray (0,length lst-1) lst
+--mkArray    lst = listArray (0,length lst-1) lst
 mkMapArray map = array (0,Map.size map-1) [(v,k) | (k,v) <- Map.toList map]
+mkSetArray set = listArray (0,Set.size set-1) [v | v <- Set.toList set]
 
--- The following is a version of Data.List.sortBy which together
--- with the sorting also eliminates duplicate values 
-sortNubBy cmp = mergeAll . sequences
+
+
+readDepConfig :: FilePath -> IO (Map.Map CId [DepPragma])
+readDepConfig fpath =
+  fmap (Map.fromList . concatMap toEntry . lines) $ readFile fpath
   where
-    sequences (a:b:xs) =
-      case cmp a b of
-        GT -> descending b [a]  xs
-        EQ -> sequences (b:xs)
-        LT -> ascending  b (a:) xs
-    sequences xs = [xs]
+    toEntry l =
+      case words l of
+        []       -> []
+        ("--":_) -> []
+        (fun:ws) -> [(mkCId fun,[toPragma w | w <- ws])]
 
-    descending a as []     = [a:as]
-    descending a as (b:bs) =
-      case cmp a b of
-        GT -> descending b (a:as) bs
-        EQ -> descending a as bs
-        LT -> (a:as) : sequences (b:bs)
-
-    ascending a as []     = let !x = as [a]
-                            in [x]
-    ascending a as (b:bs) =
-      case cmp a b of
-        GT -> let !x = as [a]
-              in x : sequences (b:bs)
-        EQ -> ascending a as bs
-        LT -> ascending b (\ys -> as (a:ys)) bs
-
-    mergeAll [x] = x
-    mergeAll xs  = mergeAll (mergePairs xs)
-
-    mergePairs (a:b:xs) = let !x = merge a b
-                          in x : mergePairs xs
-    mergePairs xs       = xs
-
-    merge as@(a:as') bs@(b:bs') =
-      case cmp a b of
-        GT -> b:merge as  bs'
-        EQ -> a:merge as' bs'
-        LT -> a:merge as' bs
-    merge [] bs         = bs
-    merge as []         = as
-
--- The following function does case-insensitive comparison of sequences.
--- This is used to allow case-insensitive parsing, while
--- the linearizer still has access to the original cases.
-compareCaseInsensitve s1 s2 =
-    compareSeq (elems s1) (elems s2)
-    where
-      compareSeq []     []     = EQ
-      compareSeq []     _      = LT
-      compareSeq _      []     = GT
-      compareSeq (x:xs) (y:ys) =
-        case compareSym x y of
-          EQ -> compareSeq xs ys
-          x  -> x
-
-      compareSym s1 s2 =
-        case s1 of
-          D.SymCat d1 r1
-            -> case s2 of
-                 D.SymCat d2 r2
-                   -> case compare d1 d2 of
-                        EQ -> r1 `compare` r2
-                        x  -> x
-                 _ -> LT
-          D.SymLit d1 r1
-            -> case s2 of
-                 D.SymCat {} -> GT
-                 D.SymLit d2 r2
-                   -> case compare d1 d2 of
-                        EQ -> r1 `compare` r2
-                        x  -> x
-                 _ -> LT
-          D.SymVar d1 r1
-            -> if tagToEnum# (getTag s2 ># 2#)
-                 then LT
-                 else case s2 of
-                        D.SymVar d2 r2
-                          -> case compare d1 d2 of
-                               EQ -> r1 `compare` r2
-                               x  -> x
-                        _ -> GT
-          D.SymKS t1
-            -> if tagToEnum# (getTag s2 ># 3#)
-                 then LT
-                 else case s2 of
-                        D.SymKS t2 -> t1 `compareToken` t2
-                        _          -> GT
-          D.SymKP a1 b1
-            -> if tagToEnum# (getTag s2 ># 4#)
-                 then LT
-                 else case s2 of
-                        D.SymKP a2 b2
-                          -> case compare a1 a2 of
-                               EQ -> b1 `compare` b2
-                               x  -> x
-                        _ -> GT
-          _ -> let t1 = getTag s1
-                   t2 = getTag s2
-               in if tagToEnum# (t1 <# t2) 
-                    then LT
-                    else if tagToEnum# (t1 ==# t2)
-                           then EQ
-                           else GT
-  
-      compareToken []     []     = EQ
-      compareToken []     _      = LT
-      compareToken _      []     = GT
-      compareToken (x:xs) (y:ys)
-        | x == y    = compareToken xs ys
-        | otherwise = case compare (toLower x) (toLower y) of
-                        EQ -> case compareToken xs ys of
-                                EQ -> compare x y
-                                x  -> x
-                        x  -> x
+    toPragma "head"                   = Head 0         ""
+    toPragma ('h':'e':'a':'d':':':cs) =
+      case break (==':') cs of
+        (lbl,[]    ) ->                 Head 0         lbl
+        (lbl,':':cs) ->                 Head (read cs) lbl
+    toPragma "rel"                    = Rel  0
+    toPragma ('r':'e':'l':':':cs)     = Rel  (read cs)
+    toPragma "_"                      = Skip
+    toPragma "anchor"                 = Anch
+    toPragma s                        =
+      case break (==':') s of
+        (lbl,[]    ) ->                 Mod  0         lbl
+        (lbl,':':cs) ->                 Mod  (read cs) lbl

src/compiler/GF/Compile/PGFtoHaskell.hs

@@ -273,7 +273,7 @@ hSkeleton gr =
    fns = groupBy valtypg (sortBy valtyps (map jty (Map.assocs (funs (abstract gr)))))
    valtyps (_, (_,x)) (_, (_,y)) = compare x y
    valtypg (_, (_,x)) (_, (_,y)) = x == y
-   jty (f,(ty,_,_,_)) = (f,catSkeleton ty)
+   jty (f,(ty,_,_,_,_)) = (f,catSkeleton ty)
 {-
 updateSkeleton :: OIdent -> HSkeleton -> (OIdent, [OIdent]) -> HSkeleton
 updateSkeleton cat skel rule =

src/compiler/GF/Compile/PGFtoJS.hs

@@ -32,8 +32,8 @@ pgf2js pgf =
 abstract2js :: String -> Abstr -> JS.Expr
 abstract2js start ds = new "GFAbstract" [JS.EStr start, JS.EObj $ map absdef2js (Map.assocs (funs ds))]
 
-absdef2js :: (CId,(Type,Int,Maybe ([Equation],[[M.Instr]]),Double)) -> JS.Property
-absdef2js (f,(typ,_,_,_)) =
+absdef2js :: (CId,(Type,[DepPragma],Int,Maybe ([Equation],[[M.Instr]]),Double)) -> JS.Property
+absdef2js (f,(typ,_,_,_,_)) =
   let (args,cat) = M.catSkeleton typ in 
     JS.Prop (JS.IdentPropName (JS.Ident (showCId f))) (new "Type" [JS.EArray [JS.EStr (showCId x) | x <- args], JS.EStr (showCId cat)])
 
@@ -78,7 +78,7 @@ frule2js (PCoerce arg)       = new "Coerce" [JS.EInt arg]
 
 farg2js (PArg hypos fid) = new "PArg" (map (JS.EInt . snd) hypos ++ [JS.EInt fid])
 
-ffun2js (CncFun f lins) = new "CncFun" [JS.EStr (showCId f), JS.EArray (map JS.EInt (Array.elems lins))]
+ffun2js (CncFun fns lins) = new "CncFun" [JS.EArray (map (JS.EStr . showCId) fns), JS.EArray (map JS.EInt (Array.elems lins))]
 
 seq2js :: Array.Array DotPos Symbol -> JS.Expr
 seq2js seq = JS.EArray [sym2js s | s <- Array.elems seq]

src/compiler/GF/Compile/PGFtoJSON.hs

@@ -1,156 +0,0 @@
-module GF.Compile.PGFtoJSON (pgf2json) where
-
-import PGF (showCId)
-import qualified PGF.Internal as M
-import PGF.Internal (
-  Abstr,
-  CId,
-  CncCat(..),
-  CncFun(..),
-  Concr,
-  DotPos,
-  Equation(..),
-  Literal(..),
-  PArg(..),
-  PGF,
-  Production(..),
-  Symbol(..),
-  Type,
-  absname,
-  abstract,
-  cflags,
-  cnccats,
-  cncfuns,
-  concretes,
-  funs,
-  productions,
-  sequences,
-  totalCats
-  )
-
-import qualified Text.JSON as JSON
-import Text.JSON (JSValue(..))
-
-import qualified Data.Array.IArray as Array
-import Data.Map (Map)
-import qualified Data.Set as Set
-import qualified Data.Map as Map
-import qualified Data.IntMap as IntMap
-
-pgf2json :: PGF -> String
-pgf2json pgf =
-  JSON.encode $ JSON.makeObj
-    [ ("abstract", json_abstract)
-    , ("concretes", json_concretes)
-    ]
- where
-   n  = showCId $ absname pgf
-   as = abstract pgf
-   cs = Map.assocs (concretes pgf)
-   start = showCId $ M.lookStartCat pgf
-   json_abstract = abstract2json n start as
-   json_concretes = JSON.makeObj $ map concrete2json cs
-
-abstract2json :: String -> String -> Abstr -> JSValue
-abstract2json name start ds =
-  JSON.makeObj
-    [ ("name", mkJSStr name)
-    , ("startcat", mkJSStr start)
-    , ("funs", JSON.makeObj $ map absdef2json (Map.assocs (funs ds)))
-    ]
-
-absdef2json :: (CId,(Type,Int,Maybe ([Equation],[[M.Instr]]),Double)) -> (String,JSValue)
-absdef2json (f,(typ,_,_,_)) = (showCId f,sig)
-  where
-    (args,cat) = M.catSkeleton typ
-    sig = JSON.makeObj
-      [ ("args", JSArray $ map (mkJSStr.showCId) args)
-      , ("cat", mkJSStr $ showCId cat)
-      ]
-
-lit2json :: Literal -> JSValue
-lit2json (LStr s) = mkJSStr s
-lit2json (LInt n) = mkJSInt n
-lit2json (LFlt d) = JSRational True (toRational d)
-
-concrete2json :: (CId,Concr) -> (String,JSValue)
-concrete2json (c,cnc) = (showCId c,obj)
-  where
-    obj = JSON.makeObj
-      [ ("flags", JSON.makeObj [ (showCId k, lit2json v) | (k,v) <- Map.toList (cflags cnc) ])
-      , ("productions", JSON.makeObj [ (show cat, JSArray (map frule2json (Set.toList set))) | (cat,set) <- IntMap.toList (productions cnc)])
-      , ("functions", JSArray (map ffun2json (Array.elems (cncfuns cnc))))
-      , ("sequences", JSArray (map seq2json (Array.elems (sequences cnc))))
-      , ("categories", JSON.makeObj $ map cats2json (Map.assocs (cnccats cnc)))
-      , ("totalfids", mkJSInt (totalCats cnc))
-      ]
-
-cats2json :: (CId, CncCat) -> (String,JSValue)
-cats2json (c,CncCat start end _) = (showCId c, ixs)
-  where
-    ixs = JSON.makeObj
-      [ ("start", mkJSInt start)
-      , ("end", mkJSInt end)
-      ]
-
-frule2json :: Production -> JSValue
-frule2json (PApply fid args) =
-  JSON.makeObj
-    [ ("type", mkJSStr "Apply")
-    , ("fid", mkJSInt fid)
-    , ("args", JSArray (map farg2json args))
-    ]
-frule2json (PCoerce arg) =
-  JSON.makeObj
-    [ ("type", mkJSStr "Coerce")
-    , ("arg", mkJSInt arg)
-    ]
-
-farg2json :: PArg -> JSValue
-farg2json (PArg hypos fid) =
-  JSON.makeObj
-    [ ("type", mkJSStr "PArg")
-    , ("hypos", JSArray $ map (mkJSInt . snd) hypos)
-    , ("fid", mkJSInt fid)
-    ]
-
-ffun2json :: CncFun -> JSValue
-ffun2json (CncFun f lins) =
-  JSON.makeObj
-    [ ("name", mkJSStr $ showCId f)
-    , ("lins", JSArray (map mkJSInt (Array.elems lins)))
-    ]
-
-seq2json :: Array.Array DotPos Symbol -> JSValue
-seq2json seq = JSArray [sym2json s | s <- Array.elems seq]
-
-sym2json :: Symbol -> JSValue
-sym2json (SymCat n l)    = new "SymCat" [mkJSInt n, mkJSInt l]
-sym2json (SymLit n l)    = new "SymLit" [mkJSInt n, mkJSInt l]
-sym2json (SymVar n l)    = new "SymVar" [mkJSInt n, mkJSInt l]
-sym2json (SymKS t)       = new "SymKS"  [mkJSStr t]
-sym2json (SymKP ts alts) = new "SymKP"  [JSArray (map sym2json ts), JSArray (map alt2json alts)]
-sym2json SymBIND         = new "SymKS"  [mkJSStr "&+"]
-sym2json SymSOFT_BIND    = new "SymKS"  [mkJSStr "&+"]
-sym2json SymSOFT_SPACE   = new "SymKS"  [mkJSStr "&+"]
-sym2json SymCAPIT        = new "SymKS"  [mkJSStr "&|"]
-sym2json SymALL_CAPIT    = new "SymKS"  [mkJSStr "&|"]
-sym2json SymNE           = new "SymNE"  []
-
-alt2json :: ([Symbol],[String]) -> JSValue
-alt2json (ps,ts) = new "Alt" [JSArray (map sym2json ps), JSArray (map mkJSStr ts)]
-
-new :: String -> [JSValue] -> JSValue
-new f xs =
-  JSON.makeObj
-    [ ("type", mkJSStr f)
-    , ("args", JSArray xs)
-    ]
-
--- | Make JSON value from string
-mkJSStr :: String -> JSValue
-mkJSStr = JSString . JSON.toJSString
-
--- | Make JSON value from integer
-mkJSInt :: Integral a => a -> JSValue
-mkJSInt = JSRational False . toRational

src/compiler/GF/Compile/PGFtoProlog.hs

@@ -54,11 +54,11 @@ plAbstract name abs
                         let args = reverse [EFun x | (_,x) <- subst]] ++++
        plFacts name "fun" 3 "(?Fun, ?Type, ?[X:Type,...])"
                    [[plp fun, plType cat args, plHypos hypos] |
-                    (fun, (typ, _, _, _)) <- Map.assocs (funs abs),
+                    (fun, (typ, _, _, _, _)) <- Map.assocs (funs abs),
                     let (_, DTyp hypos cat args) = alphaConvert emptyEnv typ] ++++
        plFacts name "def" 2 "(?Fun, ?Expr)" 
                    [[plp fun, plp expr] |
-                    (fun, (_, _, Just (eqs,_), _)) <- Map.assocs (funs abs),
+                    (fun, (_, _, _, Just (eqs,_), _)) <- Map.assocs (funs abs),
                     let (_, expr) = alphaConvert emptyEnv eqs]
       )
     where plType cat args = plTerm (plp cat) (map plp args)

src/compiler/GF/Compile/PGFtoPython.hs

@@ -40,8 +40,8 @@ pgf2python pgf = ("# -*- coding: utf-8 -*-" ++++
       abs = abstract pgf
       cncs = concretes pgf
 
-pyAbsdef :: (Type, Int, Maybe ([Equation], [[M.Instr]]), Double) -> String
-pyAbsdef (typ, _, _, _) = pyTuple 0 id [pyCId cat, pyList 0 pyCId args]
+pyAbsdef :: (Type, [DepPragma], Int, Maybe ([Equation], [[M.Instr]]), Double) -> String
+pyAbsdef (typ, _, _, _, _) = pyTuple 0 id [pyCId cat, pyList 0 pyCId args]
     where (args, cat) = M.catSkeleton typ 
 
 pyLiteral :: Literal -> String
@@ -62,7 +62,7 @@ pyConcrete cnc = pyDict 3 pyStr id [
                  ]
     where pyProds prods = pyList 5 pyProduction (Set.toList prods)
           pyCncCat (CncCat start end _) = pyList 0 pyCat [start..end]
-          pyCncFun (CncFun f lins) = pyTuple 0 id [pyList 0 pySeq (Array.elems lins), pyCId f]
+          pyCncFun (CncFun fns lins) = pyTuple 0 id [pyList 0 pySeq (Array.elems lins), pyList 0 pyCId fns]
           pySymbols syms = pyList 0 pySymbol (Array.elems syms)
 
 pyProduction :: Production -> String

src/compiler/GF/Compile/TypeCheck/RConcrete.hs

@@ -360,13 +360,12 @@ getOverload gr g mt ot = case appForm ot of
                       nest 2 (showTypes pre)
          return (mkApp fun tts, val)
        ([],[]) -> do
-         checkError $ "no overload instance of" <+> ppTerm Qualified 0 f $$
-                      maybe empty (\x -> "with value type" <+> ppType x) mt $$
-                      "for argument list" $$
+         checkError $ "no overload instance of" <+> ppTerm Unqualified 0 f $$
+                      "for" $$
                       nest 2 stysError $$
-                      "among alternatives" $$
-                      nest 2 (vcat stypsError) 
-
+                      "among" $$
+                      nest 2 (vcat stypsError) $$
+                      maybe empty (\x -> "with value type" <+> ppType x) mt
 
        (vfs1,vfs2) -> case (noProds vfs1,noProds vfs2) of
          ([(val,fun)],_) -> do

src/compiler/GF/Compile/pgf.schema.json

@@ -1,232 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "http://grammaticalframework.org/pgf.schema.json",
-  "type": "object",
-  "title": "PGF JSON Schema",
-  "required": [
-    "abstract",
-    "concretes"
-  ],
-  "properties": {
-    "abstract": {
-      "type": "object",
-      "required": [
-        "name",
-        "startcat",
-        "funs"
-      ],
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "startcat": {
-          "type": "string"
-        },
-        "funs": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "object",
-            "required": [
-              "args",
-              "cat"
-            ],
-            "properties": {
-              "args": {
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              },
-              "cat": {
-                "type": "string"
-              }
-            }
-          }
-        }
-      }
-    },
-    "concretes": {
-      "type": "object",
-      "additionalProperties": {
-        "required": [
-          "flags",
-          "productions",
-          "functions",
-          "sequences",
-          "categories",
-          "totalfids"
-        ],
-        "properties": {
-          "flags": {
-            "type": "object",
-            "additionalProperties": {
-              "type": ["string", "number"]
-            }
-          },
-          "productions": {
-            "type": "object",
-            "additionalProperties": {
-              "type": "array",
-              "items": {
-                "oneOf": [
-                  {
-                    "$ref": "#/definitions/apply"
-                  },
-                  {
-                    "$ref": "#/definitions/coerce"
-                  }
-                ]
-              }
-            }
-          },
-          "functions": {
-            "type": "array",
-            "items": {
-              "title": "CncFun",
-              "type": "object",
-              "properties": {
-                "name": {
-                  "type": "string"
-                },
-                "lins": {
-                  "type": "array",
-                  "items": {
-                    "type": "integer"
-                  }
-                }
-              }
-            }
-          },
-          "sequences": {
-            "type": "array",
-            "items": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/sym"
-              }
-            }
-          },
-          "categories": {
-            "type": "object",
-            "additionalProperties": {
-              "title": "CncCat",
-              "type": "object",
-              "required": [
-                "start",
-                "end"
-              ],
-              "properties": {
-                "start": {
-                  "type": "integer"
-                },
-                "end": {
-                  "type": "integer"
-                }
-              }
-            }
-          },
-          "totalfids": {
-            "type": "integer"
-          }
-        }
-      }
-    }
-  },
-  "definitions": {
-    "apply": {
-      "required": [
-        "type",
-        "fid",
-        "args"
-      ],
-      "properties": {
-        "type": {
-          "type": "string",
-          "enum": ["Apply"]
-        },
-        "fid": {
-          "type": "integer"
-        },
-        "args": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/parg"
-          }
-        }
-      }
-    },
-    "coerce": {
-      "required": [
-        "type",
-        "arg"
-      ],
-      "properties": {
-        "type": {
-          "type": "string",
-          "enum": ["Coerce"]
-        },
-        "arg": {
-          "type": "integer"
-        }
-      }
-    },
-    "parg": {
-      "required": [
-        "type",
-        "hypos",
-        "fid"
-      ],
-      "properties": {
-        "type": {
-          "type": "string",
-          "enum": ["PArg"]
-        },
-        "hypos": {
-          "type": "array",
-          "items": {
-            "type": "integer"
-          }
-        },
-        "fid": {
-          "type": "integer"
-        }
-      }
-    },
-    "sym": {
-      "title": "Sym",
-      "required": [
-        "type",
-        "args"
-      ],
-      "properties": {
-        "type": {
-          "type": "string",
-          "enum": [
-            "SymCat",
-            "SymLit",
-            "SymVar",
-            "SymKS",
-            "SymKP",
-            "SymNE"
-          ]
-        },
-        "args": {
-          "type": "array",
-          "items": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "integer"
-              },
-              {
-                "$ref": "#/definitions/sym"
-              }
-            ]
-          }
-        }
-      }
-    }
-  }
-}

src/compiler/GF/Compiler.hs

@@ -7,7 +7,6 @@ import GF.Compile as S(batchCompile,link,srcAbsName)
 import GF.CompileInParallel as P(parallelBatchCompile)
 import GF.Compile.Export
 import GF.Compile.ConcreteToHaskell(concretes2haskell)
-import GF.Compile.GrammarToCanonical--(concretes2canonical)
 import GF.Compile.CFGtoPGF
 import GF.Compile.GetGrammar
 import GF.Grammar.BNFC
@@ -18,13 +17,12 @@ import GF.Infra.UseIO
 import GF.Infra.Option
 import GF.Data.ErrM
 import GF.System.Directory
-import GF.Text.Pretty(render,render80)
+import GF.Text.Pretty(render)
 
 import Data.Maybe
 import qualified Data.Map as Map
 import qualified Data.Set as Set
 import qualified Data.ByteString.Lazy as BSL
-import GF.Grammar.CanonicalJSON (encodeJSON)
 import System.FilePath
 import Control.Monad(when,unless,forM_)
 
@@ -49,7 +47,7 @@ mainGFC opts fs = do
 compileSourceFiles :: Options -> [FilePath] -> IOE ()
 compileSourceFiles opts fs = 
     do output <- batchCompile opts fs
-       exportCanonical output
+       cncs2haskell output
        unless (flag optStopAfterPhase opts == Compile) $
            linkGrammars opts output
   where
@@ -57,35 +55,15 @@ compileSourceFiles opts fs =
     batchCompile' opts fs = do (t,cnc_gr) <- S.batchCompile opts fs
                                return (t,[cnc_gr])
 
-    exportCanonical (_time, canonical) =
-      do when (FmtHaskell `elem` ofmts && haskellOption opts HaskellConcrete) $
-           mapM_ cnc2haskell canonical
-         when (FmtCanonicalGF `elem` ofmts) $
-           do createDirectoryIfMissing False "canonical"
-              mapM_ abs2canonical canonical
-              mapM_ cnc2canonical canonical
-         when (FmtCanonicalJson `elem` ofmts) $ mapM_ grammar2json canonical
-      where
-        ofmts = flag optOutputFormats opts
+    cncs2haskell output =
+      when (FmtHaskell `elem` flag optOutputFormats opts &&
+            haskellOption opts HaskellConcrete) $
+        mapM_ cnc2haskell (snd output)
 
     cnc2haskell (cnc,gr) =
-      do mapM_ writeExport $ concretes2haskell opts (srcAbsName gr cnc) gr
+        mapM_ writeHs $ concretes2haskell opts (srcAbsName gr cnc) gr
 
-    abs2canonical (cnc,gr) =
-        writeExport ("canonical/"++render absname++".gf",render80 canAbs)
-      where
-        absname = srcAbsName gr cnc
-        canAbs = abstract2canonical absname gr
-
-    cnc2canonical (cnc,gr) =
-      mapM_ (writeExport.fmap render80) $
-            concretes2canonical opts (srcAbsName gr cnc) gr
-
-    grammar2json (cnc,gr) = encodeJSON (render absname ++ ".json") gr_canon
-      where absname = srcAbsName gr cnc
-            gr_canon = grammar2canonical opts absname gr
-
-    writeExport (path,s) = writing opts path $ writeUTF8File path s
+    writeHs (path,s) = writing opts path $ writeUTF8File path s
 
 
 -- | Create a @.pgf@ file (and possibly files in other formats, if specified
@@ -102,9 +80,7 @@ linkGrammars opts (t_src,~cnc_grs@(~(cnc,gr):_)) =
        if t_pgf >= Just t_src
          then putIfVerb opts $ pgfFile ++ " is up-to-date."
          else do pgfs <- mapM (link opts) cnc_grs
-                 let pgf0 = foldl1 unionPGF pgfs
-                 probs <- maybe (return . defaultProbabilities) readProbabilitiesFromFile (flag optProbsFile opts) pgf0
-                 let pgf = setProbabilities probs pgf0
+                 let pgf = foldl1 unionPGF pgfs
                  writePGF opts pgf
                  writeOutputs opts pgf
 
@@ -139,9 +115,7 @@ unionPGFFiles opts fs =
     doIt =
       do pgfs <- mapM readPGFVerbose fs
          let pgf0 = foldl1 unionPGF pgfs
-             pgf1 = if flag optOptimizePGF opts then optimizePGF pgf0 else pgf0
-         probs <- liftIO (maybe (return . defaultProbabilities) readProbabilitiesFromFile (flag optProbsFile opts) pgf1)
-         let pgf  = setProbabilities probs pgf1
+             pgf  = if flag optOptimizePGF opts then optimizePGF pgf0 else pgf0
              pgfFile = outputPath opts (grammarName opts pgf <.> "pgf")
          if pgfFile `elem` fs
            then putStrLnE $ "Refusing to overwrite " ++ pgfFile

src/compiler/GF/Grammar/Canonical.hs

@@ -1,313 +0,0 @@
--- |
--- Module    :  GF.Grammar.Canonical
--- Stability :  provisional
---
--- Abstract syntax for canonical GF grammars, i.e. what's left after
--- high-level constructions such as functors and opers have been eliminated
--- by partial evaluation. This is intended as a common intermediate
--- representation to simplify export to other formats.
-
-{-# LANGUAGE DeriveTraversable #-}
-module GF.Grammar.Canonical where
-import Prelude hiding ((<>))
-import GF.Text.Pretty
-
--- | A Complete grammar
-data Grammar = Grammar Abstract [Concrete] deriving Show
-
---------------------------------------------------------------------------------
--- ** Abstract Syntax
-
--- | Abstract Syntax
-data Abstract = Abstract ModId Flags [CatDef] [FunDef] deriving Show
-abstrName (Abstract mn _ _ _) = mn
-
-data CatDef   = CatDef CatId [CatId]        deriving Show
-data FunDef   = FunDef FunId Type           deriving Show
-data Type     = Type [TypeBinding] TypeApp  deriving Show
-data TypeApp  = TypeApp CatId [Type]        deriving Show
-
-data TypeBinding = TypeBinding VarId Type   deriving Show
-
---------------------------------------------------------------------------------
--- ** Concreate syntax
-
--- | Concrete Syntax
-data Concrete  = Concrete ModId ModId Flags [ParamDef] [LincatDef] [LinDef]
-                 deriving Show
-concName (Concrete cnc _ _ _ _ _) = cnc
-
-data ParamDef  = ParamDef ParamId [ParamValueDef]
-               | ParamAliasDef ParamId LinType
-               deriving Show
-data LincatDef = LincatDef CatId LinType  deriving Show
-data LinDef    = LinDef FunId [VarId] LinValue  deriving Show
-
--- | Linearization type, RHS of @lincat@
-data LinType = FloatType 
-             | IntType 
-             | ParamType ParamType
-             | RecordType [RecordRowType]
-             | StrType 
-             | TableType LinType LinType 
-             | TupleType [LinType]
-              deriving (Eq,Ord,Show)
-
-newtype ParamType = ParamTypeId ParamId deriving (Eq,Ord,Show)
-
--- | Linearization value, RHS of @lin@
-data LinValue = ConcatValue LinValue LinValue
-              | LiteralValue LinLiteral
-              | ErrorValue String
-              | ParamConstant ParamValue 
-              | PredefValue PredefId
-              | RecordValue [RecordRowValue]
-              | TableValue LinType [TableRowValue]
----           | VTableValue LinType [LinValue]
-              | TupleValue [LinValue]
-              | VariantValue [LinValue]
-              | VarValue VarValueId
-              | PreValue [([String], LinValue)] LinValue
-              | Projection LinValue LabelId
-              | Selection LinValue LinValue
-              | CommentedValue String LinValue
-              deriving (Eq,Ord,Show)
-
-data LinLiteral = FloatConstant Float 
-                | IntConstant Int 
-                | StrConstant String 
-                deriving (Eq,Ord,Show)
-
-data LinPattern = ParamPattern ParamPattern
-                | RecordPattern [RecordRow LinPattern]
-                | TuplePattern [LinPattern]
-                | WildPattern
-                deriving (Eq,Ord,Show)
-
-type ParamValue = Param LinValue
-type ParamPattern = Param LinPattern
-type ParamValueDef = Param ParamId
-
-data Param arg = Param ParamId [arg]
-                 deriving (Eq,Ord,Show,Functor,Foldable,Traversable)
-
-type RecordRowType  = RecordRow LinType
-type RecordRowValue = RecordRow LinValue
-type TableRowValue  = TableRow LinValue
-
-data RecordRow rhs = RecordRow LabelId    rhs
-                     deriving (Eq,Ord,Show,Functor,Foldable,Traversable)
-data TableRow  rhs = TableRow  LinPattern rhs
-                     deriving (Eq,Ord,Show,Functor,Foldable,Traversable)
-
--- *** Identifiers in Concrete Syntax
-
-newtype PredefId = PredefId Id        deriving (Eq,Ord,Show)
-newtype LabelId  = LabelId Id         deriving (Eq,Ord,Show)
-data VarValueId  = VarValueId QualId  deriving (Eq,Ord,Show)
-
--- | Name of param type or param value 
-newtype ParamId = ParamId QualId  deriving (Eq,Ord,Show)
-
---------------------------------------------------------------------------------
--- ** Used in both Abstract and Concrete Syntax
-
-newtype ModId = ModId Id  deriving (Eq,Ord,Show)
-
-newtype CatId = CatId Id  deriving (Eq,Ord,Show)
-newtype FunId = FunId Id  deriving (Eq,Show)
-
-data VarId = Anonymous | VarId Id  deriving Show
-
-newtype Flags = Flags [(FlagName,FlagValue)] deriving Show
-type FlagName = Id
-data FlagValue = Str String | Int Int | Flt Double deriving Show
-
-
--- *** Identifiers
-
-type Id = String
-data QualId = Qual ModId Id | Unqual Id  deriving (Eq,Ord,Show)
-
---------------------------------------------------------------------------------
--- ** Pretty printing
-
-instance Pretty Grammar where
-  pp (Grammar abs cncs) = abs $+$ vcat cncs
-
-instance Pretty Abstract where
-  pp (Abstract m flags cats funs) =
-    "abstract" <+> m <+> "=" <+> "{" $$
-       flags $$
-       "cat" <+> fsep cats $$
-       "fun" <+> vcat funs $$
-       "}"
-
-instance Pretty CatDef where
-  pp (CatDef c cs) = hsep (c:cs)<>";"
-
-instance Pretty FunDef where
-  pp (FunDef f ty) = f <+> ":" <+> ty <>";"
-
-instance Pretty Type where
-  pp (Type bs ty) = sep (punctuate " ->" (map pp bs ++ [pp ty]))
-
-instance PPA Type where
-  ppA (Type [] (TypeApp c [])) = pp c
-  ppA t = parens t
-
-instance Pretty TypeBinding where
-  pp (TypeBinding Anonymous (Type [] tapp)) = pp tapp
-  pp (TypeBinding Anonymous ty) = parens ty
-  pp (TypeBinding (VarId x) ty) = parens (x<+>":"<+>ty)
-
-instance Pretty TypeApp where
- pp (TypeApp c targs) = c<+>hsep (map ppA targs)
-
-instance Pretty VarId where
-  pp Anonymous = pp "_"
-  pp (VarId x) = pp x
-
---------------------------------------------------------------------------------
-
-instance Pretty Concrete where
-  pp (Concrete cncid absid flags params lincats lins) =
-      "concrete" <+> cncid <+> "of" <+> absid <+> "=" <+> "{" $$
-      vcat params $$
-      section "lincat" lincats $$
-      section "lin" lins $$
-      "}"
-    where
-      section name [] = empty
-      section name ds = name <+> vcat (map (<> ";") ds)
-
-instance Pretty ParamDef where
-  pp (ParamDef p pvs) = hang ("param"<+> p <+> "=") 4 (punctuate " |" pvs)<>";"
-  pp (ParamAliasDef p t) = hang ("oper"<+> p <+> "=") 4 t<>";"
-
-instance PPA arg => Pretty (Param arg) where
-  pp (Param p ps) = pp p<+>sep (map ppA ps)
-
-instance PPA arg => PPA (Param arg) where
-  ppA (Param p []) = pp p
-  ppA pv = parens pv
-
-instance Pretty LincatDef where
-  pp (LincatDef c lt) = hang (c <+> "=") 4 lt
-
-instance Pretty LinType where
- pp lt = case lt of
-           FloatType -> pp "Float"
-           IntType -> pp "Int"
-           ParamType pt -> pp pt
-           RecordType rs -> block rs
-           StrType -> pp "Str"
-           TableType pt lt -> sep [pt <+> "=>",pp lt]
-           TupleType lts -> "<"<>punctuate "," lts<>">"
-
-instance RhsSeparator LinType  where rhsSep _ = pp ":"
-
-instance Pretty ParamType where
-  pp (ParamTypeId p) = pp p
-
-instance Pretty LinDef where
-  pp (LinDef f xs lv) = hang (f<+>hsep xs<+>"=") 4 lv
-
-instance Pretty LinValue where
-  pp lv = case lv of
-            ConcatValue v1 v2 -> sep [v1 <+> "++",pp v2]
-            ErrorValue s -> "Predef.error"<+>doubleQuotes s
-            ParamConstant pv -> pp pv
-            Projection lv l -> ppA lv<>"."<>l
-            Selection tv pv -> ppA tv<>"!"<>ppA pv
-            VariantValue vs -> "variants"<+>block vs
-            CommentedValue s v -> "{-" <+> s <+> "-}" $$ v
-            _ -> ppA lv
-
-instance PPA LinValue where
-  ppA lv = case lv of
-             LiteralValue l -> ppA l
-             ParamConstant pv -> ppA pv
-             PredefValue p -> ppA p
-             RecordValue [] -> pp "<>"
-             RecordValue rvs -> block rvs
-             PreValue alts def ->
-               "pre"<+>block (map alt alts++["_"<+>"=>"<+>def])
-               where
-                 alt (ss,lv) = hang (hcat (punctuate "|" (map doubleQuotes ss)))
-                                    2 ("=>"<+>lv)
-             TableValue _ tvs -> "table"<+>block tvs
---           VTableValue t ts -> "table"<+>t<+>brackets (semiSep ts)
-             TupleValue lvs -> "<"<>punctuate "," lvs<>">"
-             VarValue v -> pp v
-             _ -> parens lv
-
-instance Pretty LinLiteral where pp = ppA
-
-instance PPA LinLiteral where
-  ppA l = case l of
-            FloatConstant f -> pp f
-            IntConstant n -> pp n
-            StrConstant s -> doubleQuotes s -- hmm
-  
-instance RhsSeparator LinValue where rhsSep _ = pp "="
-
-instance Pretty LinPattern where
-  pp p =
-    case p of
-      ParamPattern pv -> pp pv
-      _ -> ppA p
-
-instance PPA LinPattern where
-  ppA p =
-    case p of
-      ParamPattern pv -> ppA pv
-      RecordPattern r -> block r
-      TuplePattern ps -> "<"<>punctuate "," ps<>">"
-      WildPattern     -> pp "_"                
-      _ -> parens p
-
-instance RhsSeparator LinPattern where rhsSep _ = pp "="
-
-instance RhsSeparator rhs => Pretty (RecordRow rhs) where
-  pp (RecordRow l v) = hang (l<+>rhsSep v) 2 v
-
-instance Pretty rhs => Pretty (TableRow rhs) where
-  pp (TableRow l v) = hang (l<+>"=>") 2 v
-
---------------------------------------------------------------------------------
-instance Pretty ModId where pp (ModId s) = pp s
-instance Pretty CatId where pp (CatId s) = pp s
-instance Pretty FunId where pp (FunId s) = pp s
-instance Pretty LabelId where pp (LabelId s) = pp s
-instance Pretty PredefId where pp = ppA
-instance PPA    PredefId where ppA (PredefId s) = "Predef."<>s
-instance Pretty ParamId where pp = ppA
-instance PPA    ParamId where ppA (ParamId s) = pp s
-instance Pretty VarValueId where pp (VarValueId s) = pp s
-
-instance Pretty QualId where pp = ppA
-
-instance PPA QualId where
-  ppA (Qual m n) = m<>"_"<>n -- hmm
-  ppA (Unqual n) = pp n
-
-instance Pretty Flags where
-  pp (Flags []) = empty
-  pp (Flags flags) = "flags" <+> vcat (map ppFlag flags)
-    where
-      ppFlag (name,value) = name <+> "=" <+> value <>";"
-
-instance Pretty FlagValue where
-  pp (Str s) = pp s
-  pp (Int i) = pp i
-  pp (Flt d) = pp d
-
---------------------------------------------------------------------------------
--- | Pretty print atomically (i.e. wrap it in parentheses if necessary)
-class Pretty a => PPA a where ppA :: a -> Doc
-
-class Pretty rhs => RhsSeparator rhs where rhsSep :: rhs -> Doc
-
-semiSep xs = punctuate ";" xs
-block xs = braces (semiSep xs)

src/compiler/GF/Grammar/CanonicalJSON.hs

@@ -1,289 +0,0 @@
-module GF.Grammar.CanonicalJSON (
-  encodeJSON
-  ) where
-
-import Text.JSON
-import Control.Applicative ((<|>))
-import Data.Ratio (denominator, numerator)
-import GF.Grammar.Canonical
-
-
-encodeJSON :: FilePath -> Grammar -> IO ()
-encodeJSON fpath g = writeFile fpath (encode g)
-
-
--- in general we encode grammars using JSON objects/records,
--- except for newtypes/coercions/direct values
-
--- the top-level definitions use normal record labels,
--- but recursive types/values/ids use labels staring with a "."
-
-instance JSON Grammar where
-  showJSON (Grammar abs cncs) = makeObj [("abstract", showJSON abs), ("concretes", showJSON cncs)]
-
-  readJSON o = Grammar <$> o!"abstract" <*> o!"concretes"
-
-
---------------------------------------------------------------------------------
--- ** Abstract Syntax
-
-instance JSON Abstract where
-  showJSON (Abstract absid flags cats funs) 
-    = makeObj [("abs", showJSON absid),
-               ("flags", showJSON flags),
-               ("cats", showJSON cats),
-               ("funs", showJSON funs)]
-
-  readJSON o = Abstract
-    <$> o!"abs"
-    <*>(o!"flags" <|> return (Flags []))
-    <*> o!"cats"
-    <*> o!"funs"
-
-instance JSON CatDef where
-  -- non-dependent categories are encoded as simple strings:
-  showJSON (CatDef c []) = showJSON c
-  showJSON (CatDef c cs) = makeObj [("cat", showJSON c), ("args", showJSON cs)]
-
-  readJSON o = CatDef <$> readJSON o <*> return []
-    <|>        CatDef <$> o!"cat" <*> o!"args"
-
-instance JSON FunDef where
-  showJSON (FunDef f ty) = makeObj [("fun", showJSON f), ("type", showJSON ty)]
-
-  readJSON o = FunDef <$> o!"fun" <*> o!"type"
-
-instance JSON Type where
-  showJSON (Type bs ty) = makeObj [(".args", showJSON bs), (".result", showJSON ty)]
-
-  readJSON o = Type <$> o!".args" <*> o!".result"
-
-instance JSON TypeApp where
-  -- non-dependent categories are encoded as simple strings:
-  showJSON (TypeApp c [])   = showJSON c
-  showJSON (TypeApp c args) = makeObj [(".cat", showJSON c), (".args", showJSON args)]
-
-  readJSON o = TypeApp <$> readJSON o <*> return []
-    <|>        TypeApp <$> o!".cat" <*> o!".args"
-
-instance JSON TypeBinding where
-  -- non-dependent categories are encoded as simple strings:
-  showJSON (TypeBinding Anonymous (Type [] (TypeApp c []))) = showJSON c
-  showJSON (TypeBinding x ty) = makeObj [(".var", showJSON x), (".type", showJSON ty)]
-
-  readJSON o = do c <- readJSON o
-                  return (TypeBinding Anonymous (Type [] (TypeApp c [])))
-           <|> TypeBinding <$> o!".var" <*> o!".type"
-
-
---------------------------------------------------------------------------------
--- ** Concrete syntax
-
-instance JSON Concrete where
-  showJSON (Concrete cncid absid flags params lincats lins) 
-    = makeObj [("cnc", showJSON cncid),
-               ("abs", showJSON absid),
-               ("flags", showJSON flags),
-               ("params", showJSON params),
-               ("lincats", showJSON lincats),
-               ("lins", showJSON lins)]
-
-  readJSON o = Concrete
-    <$> o!"cnc"
-    <*> o!"abs"
-    <*>(o!"flags" <|> return (Flags []))
-    <*> o!"params"
-    <*> o!"lincats"
-    <*> o!"lins"
-
-instance JSON ParamDef where
-  showJSON (ParamDef      p pvs) = makeObj [("param", showJSON p), ("values", showJSON pvs)]
-  showJSON (ParamAliasDef p t)   = makeObj [("param", showJSON p), ("alias", showJSON t)]
-
-  readJSON o = ParamDef      <$> o!"param" <*> o!"values"
-    <|>        ParamAliasDef <$> o!"param" <*> o!"alias"
-
-instance JSON LincatDef where
-  showJSON (LincatDef c lt) = makeObj [("cat", showJSON c), ("lintype", showJSON lt)]
-
-  readJSON o = LincatDef <$> o!"cat" <*> o!"lintype"
-
-instance JSON LinDef where
-  showJSON (LinDef f xs lv) = makeObj [("fun", showJSON f), ("args", showJSON xs), ("lin", showJSON lv)]
-
-  readJSON o = LinDef <$> o!"fun" <*> o!"args" <*> o!"lin"
-
-instance JSON LinType where
-  -- the basic types (Str, Float, Int) are encoded as strings:
-  showJSON (StrType)         = showJSON "Str"
-  showJSON (FloatType)       = showJSON "Float"
-  showJSON (IntType)         = showJSON "Int"
-  -- parameters are also encoded as strings:
-  showJSON (ParamType pt)    = showJSON pt
-  -- tables/tuples are encoded as JSON objects:
-  showJSON (TableType pt lt) = makeObj [(".tblarg", showJSON pt), (".tblval", showJSON lt)]
-  showJSON (TupleType lts)   = makeObj [(".tuple",  showJSON lts)]
-  -- records are encoded as records:
-  showJSON (RecordType rows) = showJSON rows
-
-  readJSON o = do "Str"   <- readJSON o; return StrType
-    <|>        do "Float" <- readJSON o; return FloatType
-    <|>        do "Int"   <- readJSON o; return IntType
-    <|>        do  ptype  <- readJSON o; return (ParamType ptype)
-    <|>        TableType  <$> o!".tblarg" <*> o!".tblval"
-    <|>        TupleType  <$> o!".tuple"
-    <|>        RecordType <$> readJSON o
-
-instance JSON LinValue where
-  showJSON (LiteralValue  l ) = showJSON l
-  -- most values are encoded as JSON objects:
-  showJSON (ParamConstant pv) = makeObj [(".param",    showJSON pv)]
-  showJSON (PredefValue   p ) = makeObj [(".predef",   showJSON p)]
-  showJSON (TableValue t tvs) = makeObj [(".tblarg",   showJSON t), (".tblrows", showJSON tvs)]
-  showJSON (TupleValue   lvs) = makeObj [(".tuple",    showJSON lvs)]
-  showJSON (VarValue      v ) = makeObj [(".var",      showJSON v)]
-  showJSON (ErrorValue    s ) = makeObj [(".error",    showJSON s)]
-  showJSON (Projection lv l ) = makeObj [(".project",  showJSON lv), (".label", showJSON l)]
-  showJSON (Selection  tv pv) = makeObj [(".select",   showJSON tv), (".key", showJSON pv)]
-  showJSON (VariantValue  vs) = makeObj [(".variants", showJSON vs)]
-  showJSON (PreValue pre def) = makeObj [(".pre",      showJSON pre),(".default", showJSON def)]
-  -- records are encoded directly as JSON records:
-  showJSON (RecordValue rows) = showJSON rows
-  -- concatenation is encoded as a JSON array:
-  showJSON v@(ConcatValue _ _) = showJSON (flatten v [])
-    where flatten (ConcatValue v v') = flatten v . flatten v'
-          flatten  v                 = (v :)
-
-  readJSON o = LiteralValue  <$> readJSON o
-    <|>        ParamConstant <$> o!".param"
-    <|>        PredefValue   <$> o!".predef"
-    <|>        TableValue    <$> o!".tblarg"  <*> o!".tblrows"
-    <|>        TupleValue    <$> o!".tuple"
-    <|>        VarValue      <$> o!".var"
-    <|>        ErrorValue    <$> o!".error"
-    <|>        Projection    <$> o!".project" <*> o!".label"
-    <|>        Selection     <$> o!".select"  <*> o!".key"
-    <|>        VariantValue  <$> o!".variants"
-    <|>        PreValue      <$> o!".pre"     <*> o!".default"
-    <|>        RecordValue   <$> readJSON o
-    <|>        do vs <- readJSON o :: Result [LinValue]
-                  return (foldr1 ConcatValue vs)
-
-instance JSON LinLiteral where
-  -- basic values (Str, Float, Int) are encoded as JSON strings/numbers:
-  showJSON (StrConstant   s) = showJSON s
-  showJSON (FloatConstant f) = showJSON f
-  showJSON (IntConstant   n) = showJSON n
-
-  readJSON = readBasicJSON StrConstant IntConstant FloatConstant
-
-instance JSON LinPattern where
-  -- wildcards and patterns without arguments are encoded as strings:
-  showJSON (WildPattern) = showJSON "_"
-  showJSON (ParamPattern (Param p [])) = showJSON p
-  -- complex patterns are encoded as JSON objects:
-  showJSON (ParamPattern pv) = showJSON pv
-  -- and records as records:
-  showJSON (RecordPattern r) = showJSON r
-
-  readJSON o = do "_" <- readJSON o; return WildPattern
-    <|>        do  p  <- readJSON o; return (ParamPattern (Param p []))
-    <|>        ParamPattern  <$> readJSON o
-    <|>        RecordPattern <$> readJSON o
-
-instance JSON arg => JSON (Param arg) where
-  -- parameters without arguments are encoded as strings:
-  showJSON (Param p [])   = showJSON p
-  showJSON (Param p args) = makeObj [(".paramid", showJSON p), (".args", showJSON args)]
-
-  readJSON o = Param <$> readJSON o <*> return []
-    <|>        Param <$> o!".paramid" <*> o!".args"
-
-instance JSON a => JSON (RecordRow a) where
-  -- record rows and lists of record rows are both encoded as JSON records (i.e., objects)
-  showJSON  row  = showJSONs [row]
-  showJSONs rows = makeObj (map toRow rows)
-    where toRow (RecordRow (LabelId lbl) val) = (lbl, showJSON val)
-
-  readJSON  obj = head <$> readJSONs obj
-  readJSONs obj = mapM fromRow (assocsJSObject obj)
-    where fromRow (lbl, jsvalue) = do value <- readJSON jsvalue
-                                      return (RecordRow (LabelId lbl) value)
-
-instance JSON rhs => JSON (TableRow rhs) where
-  showJSON (TableRow l v) = makeObj [(".pattern", showJSON l), (".value", showJSON v)]
-
-  readJSON o = TableRow <$> o!".pattern" <*> o!".value"
-
-
--- *** Identifiers in Concrete Syntax
-
-instance JSON PredefId   where showJSON (PredefId    s) = showJSON s ; readJSON = fmap PredefId    . readJSON 
-instance JSON LabelId    where showJSON (LabelId     s) = showJSON s ; readJSON = fmap LabelId     . readJSON 
-instance JSON VarValueId where showJSON (VarValueId  s) = showJSON s ; readJSON = fmap VarValueId  . readJSON 
-instance JSON ParamId    where showJSON (ParamId     s) = showJSON s ; readJSON = fmap ParamId     . readJSON 
-instance JSON ParamType  where showJSON (ParamTypeId s) = showJSON s ; readJSON = fmap ParamTypeId . readJSON 
-
-
---------------------------------------------------------------------------------
--- ** Used in both Abstract and Concrete Syntax
-
-instance JSON ModId where showJSON (ModId s) = showJSON s ; readJSON = fmap ModId . readJSON 
-instance JSON CatId where showJSON (CatId s) = showJSON s ; readJSON = fmap CatId . readJSON 
-instance JSON FunId where showJSON (FunId s) = showJSON s ; readJSON = fmap FunId . readJSON 
-
-instance JSON VarId where
-  -- the anonymous variable is the underscore:
-  showJSON Anonymous = showJSON "_"
-  showJSON (VarId x) = showJSON x
-
-  readJSON o = do "_" <- readJSON o; return Anonymous
-    <|>        VarId <$> readJSON o
-
-instance JSON QualId where
-  showJSON (Qual (ModId m) n) = showJSON (m++"."++n)
-  showJSON (Unqual n) = showJSON n
-
-  readJSON o = do qualid <- readJSON o
-                  let (mod, id) = span (/= '.') qualid
-                  return $ if null mod then Unqual id else Qual (ModId mod) id
-
-instance JSON Flags where
-  -- flags are encoded directly as JSON records (i.e., objects):
-  showJSON (Flags fs) = makeObj [(f, showJSON v) | (f, v) <- fs]
-
-  readJSON obj = Flags <$> mapM fromRow (assocsJSObject obj)
-    where fromRow (lbl, jsvalue) = do value <- readJSON jsvalue
-                                      return (lbl, value)
-
-instance JSON FlagValue where
-  -- flag values are encoded as basic JSON types:
-  showJSON (Str s) = showJSON s
-  showJSON (Int i) = showJSON i
-  showJSON (Flt f) = showJSON f
-
-  readJSON = readBasicJSON Str Int Flt
-
-
---------------------------------------------------------------------------------
--- ** Convenience functions
-
-(!) :: JSON a => JSValue -> String -> Result a
-obj ! key = maybe (fail $ "CanonicalJSON.(!): Could not find key: " ++ show key)
-            readJSON
-            (lookup key (assocsJSObject obj))
-
-assocsJSObject :: JSValue -> [(String, JSValue)]
-assocsJSObject (JSObject o) = fromJSObject o
-assocsJSObject (JSArray  _) = fail $ "CanonicalJSON.assocsJSObject: Expected a JSON object, found an Array"
-assocsJSObject  jsvalue     = fail $ "CanonicalJSON.assocsJSObject: Expected a JSON object, found " ++ show jsvalue
-
-
-readBasicJSON :: (JSON int, Integral int, JSON flt, RealFloat flt) =>
-                 (String -> v) -> (int -> v) -> (flt -> v) -> JSValue -> Result v
-readBasicJSON str int flt o
-  =   str        <$> readJSON o
-  <|> int_or_flt <$> readJSON o
-  where int_or_flt f | f == fromIntegral n = int n
-                     | otherwise           = flt f
-          where n = round f

src/compiler/GF/Grammar/Printer.hs

@@ -209,7 +209,7 @@ ppTerm q d (S x y)     = case x of
 ppTerm q d (ExtR x y)  = prec d 3 (ppTerm q 3 x <+> "**" <+> ppTerm q 4 y)
 ppTerm q d (App x y)   = prec d 4 (ppTerm q 4 x <+> ppTerm q 5 y)
 ppTerm q d (V e es)    = hang "table" 2 (sep [ppTerm q 6 e,brackets (fsep (punctuate ';' (map (ppTerm q 0) es)))])
-ppTerm q d (FV es)     = prec d 4 ("variants" <+> braces (fsep (punctuate ';' (map (ppTerm q 0) es))))
+ppTerm q d (FV es)     = "variants" <+> braces (fsep (punctuate ';' (map (ppTerm q 0) es)))
 ppTerm q d (AdHocOverload es)     = "overload" <+> braces (fsep (punctuate ';' (map (ppTerm q 0) es)))
 ppTerm q d (Alts e xs) = prec d 4 ("pre" <+> braces (ppTerm q 0 e <> ';' <+> fsep (punctuate ';' (map (ppAltern q) xs))))
 ppTerm q d (Strs es)   = "strs" <+> braces (fsep (punctuate ';' (map (ppTerm q 0) es)))

src/compiler/GF/Haskell.hs

@@ -40,9 +40,6 @@ tvar = TId
 tcon0 = TId
 tcon c = foldl TAp (TId c)
 
-lets [] e = e
-lets ds e = Lets ds e
-
 let1 x xe e = Lets [(x,xe)] e
 single x = List [x]
 
@@ -116,8 +113,7 @@ instance Pretty Exp where
           Op e1 op e2 -> hang (ppB e1<+>op) 2 (ppB e2)
           Lets bs e -> sep ["let"<+>vcat [hang (x<+>"=") 2 xe|(x,xe)<-bs],
                             "in" <+>e]
-          LambdaCase alts ->
-              hang "\\case" 2 (vcat [hang (p<+>"->") 2 e|(p,e)<-alts])
+          LambdaCase alts -> hang "\\case" 4 (vcat [p<+>"->"<+>e|(p,e)<-alts])
           _ -> ppB e
 
       ppB e = case flatAp e of f:as -> hang (ppA f) 2 (sep (map ppA as))

src/compiler/GF/Infra/Option.hs

@@ -87,10 +87,7 @@ data Phase = Preproc | Convert | Compile | Link
   deriving (Show,Eq,Ord)
 
 data OutputFormat = FmtPGFPretty
-                  | FmtCanonicalGF
-                  | FmtCanonicalJson
                   | FmtJavaScript 
-                  | FmtJSON
                   | FmtPython 
                   | FmtHaskell 
                   | FmtJava
@@ -160,6 +157,7 @@ data Flags = Flags {
       optDocumentRoot    :: Maybe FilePath, -- For --server mode
       optRecomp          :: Recomp,
       optProbsFile       :: Maybe FilePath,
+      optLabelsFile      :: Maybe FilePath,
       optRetainResource  :: Bool,
       optName            :: Maybe String,
       optPreprocessors   :: [String],
@@ -271,6 +269,7 @@ defaultFlags = Flags {
       optDocumentRoot    = Nothing,
       optRecomp          = RecompIfNewer,
       optProbsFile       = Nothing,
+      optLabelsFile      = Nothing,
       optRetainResource  = False,
 
       optName            = Nothing,
@@ -328,8 +327,7 @@ optDescr =
      Option [] ["gfo-dir"] (ReqArg gfoDir "DIR") "Directory to put .gfo files in (default = '.').",
      Option ['f'] ["output-format"] (ReqArg outFmt "FMT") 
         (unlines ["Output format. FMT can be one of:",
-                  "Canonical GF grammar: canonical_gf, canonical_json, (and haskell with option --haskell=concrete)",
-                  "Multiple concrete: pgf (default), json, js, pgf_pretty, prolog, python, ...", -- gar,
+                  "Multiple concrete: pgf (default), js, pgf_pretty, prolog, python, ...", -- gar,
                   "Single concrete only: bnf, ebnf, fa, gsl, jsgf, regexp, slf, srgs_xml, srgs_abnf, vxml, ....", -- cf, lbnf,
                   "Abstract only: haskell, ..."]), -- prolog_abs,
      Option [] ["sisr"] (ReqArg sisrFmt "FMT") 
@@ -353,8 +351,9 @@ optDescr =
      Option [] ["gfo","no-recomp"] (NoArg (recomp NeverRecomp)) 
                  "Never recompile from source, if there is already .gfo file.",
      Option [] ["retain"] (NoArg (set $ \o -> o { optRetainResource = True })) "Retain opers.",
-     Option [] ["probs"] (ReqArg probsFile "file.probs") "Read probabilities from file.",
-     Option ['n'] ["name"] (ReqArg name "NAME") 
+     Option [] ["probs"] (ReqArg probsFile "file.probs") "Read probabilities from a file.",
+     Option [] ["depconf"] (ReqArg labelsFile "file.labels") "Read a configuration for generation of syntactic dependency graphs from a file.",
+     Option ['n'] ["name"] (ReqArg name "NAME")
            (unlines ["Use NAME as the name of the output. This is used in the output file names, ",
                      "with suffixes depending on the formats, and, when relevant, ",
                      "internally in the output."]),
@@ -377,6 +376,8 @@ optDescr =
                 "Enable or disable global grammar optimization. This could significantly reduce the size of the final PGF file",
      Option [] ["split-pgf"] (NoArg (splitPGF True))
                 "Split the PGF into one file per language. This allows the runtime to load only individual languages",
+     Option [] ["stem"] (onOff (toggleOptimize OptStem) True) "Perform stem-suffix analysis (default on).",
+     Option [] ["cse"] (onOff (toggleOptimize OptCSE) True) "Perform common sub-expression elimination (default on).",
      Option [] ["cfg"] (ReqArg cfgTransform "TRANS") "Enable or disable specific CFG transformations. TRANS = merge, no-merge, bottomup, no-bottomup, ...",
      Option [] ["heuristic_search_factor"] (ReqArg (readDouble (\d o -> o { optHeuristicFactor = Just d })) "FACTOR") "Set the heuristic search factor for statistical parsing",
      Option [] ["case_sensitive"] (onOff (\v -> set $ \o -> o{optCaseSensitive=v}) True) "Set the parser in case-sensitive/insensitive mode [sensitive by default]",
@@ -430,6 +431,7 @@ optDescr =
        gfDocuRoot  x = set $ \o -> o { optDocumentRoot = Just x }
        recomp      x = set $ \o -> o { optRecomp = x }
        probsFile   x = set $ \o -> o { optProbsFile = Just x }
+       labelsFile  x = set $ \o -> o { optLabelsFile = Just x }
 
        name        x = set $ \o -> o { optName = Just x }
        addLibDir   x = set $ \o -> o { optLibraryPath = x:optLibraryPath o }
@@ -450,6 +452,8 @@ optDescr =
        optimize_pgf x = set $ \o -> o { optOptimizePGF = x }
        splitPGF x = set $ \o -> o { optSplitPGF = x }
 
+       toggleOptimize x b = set $ setOptimization' x b
+
        cfgTransform x = let (x', b) = case x of
                                         'n':'o':'-':rest -> (rest, False)
                                         _                -> (x, True)
@@ -472,10 +476,7 @@ outputFormats = map fst outputFormatsExpl
 outputFormatsExpl :: [((String,OutputFormat),String)]
 outputFormatsExpl = 
     [(("pgf_pretty",   FmtPGFPretty),"human-readable pgf"),
-     (("canonical_gf", FmtCanonicalGF),"Canonical GF source files"),
-     (("canonical_json", FmtCanonicalJson),"Canonical JSON source files"),
      (("js",           FmtJavaScript),"JavaScript (whole grammar)"),
-     (("json",         FmtJSON),"JSON (whole grammar)"),
      (("python",       FmtPython),"Python (whole grammar)"),
      (("haskell",      FmtHaskell),"Haskell (abstract syntax)"),
      (("java",         FmtJava),"Java (abstract syntax)"),

src/compiler/GF/Main.hs

@@ -23,7 +23,7 @@ import GF.System.Console (setConsoleEncoding)
 -- Run @gf --help@ for usage info.
 main :: IO ()
 main = do
-  --setConsoleEncoding
+  setConsoleEncoding
   uncurry mainOpts =<< getOptions
 
 -- | Get and parse GF command line arguments. Fix relative paths.

src/compiler/GF/Speech/PGFToCFG.hs

@@ -57,7 +57,7 @@ pgfToCFG pgf lang = mkCFG (showCId (lookStartCat pgf)) extCats (startRules ++ co
 
     topdownRules cat = f cat []
       where
-        f cat rules = maybe rules (Set.foldr g rules) (IntMap.lookup cat (productions cnc))
+        f cat rules = maybe rules (Set.fold g rules) (IntMap.lookup cat (productions cnc))
 	 
         g (PApply funid args) rules = (cncfuns cnc ! funid,args) : rules
         g (PCoerce cat)       rules = f cat rules
@@ -74,12 +74,15 @@ pgfToCFG pgf lang = mkCFG (showCId (lookStartCat pgf)) extCats (startRules ++ co
 
     ruleToCFRule :: (FId,Production) -> [CFRule]
     ruleToCFRule (c,PApply funid args) = 
-        [Rule (fcatToCat c l) (mkRhs row) (profilesToTerm [fixProfile row n | n <- [0..length args-1]])
+        [Rule (fcatToCat c l) (mkRhs row) term
            | (l,seqid) <- Array.assocs rhs
            , let row = sequences cnc ! seqid
-           , not (containsLiterals row)]
+           , not (containsLiterals row)
+           , f <- fns
+           , let term = profilesToTerm f [fixProfile row n | n <- [0..length args-1]]
+           ]
       where
-        CncFun f rhs = cncfuns cnc ! funid
+        CncFun fns rhs = cncfuns cnc ! funid
 
         mkRhs :: Array DotPos Symbol -> [CFSymbol]
         mkRhs = concatMap symbolToCFSymbol . Array.elems
@@ -111,8 +114,8 @@ pgfToCFG pgf lang = mkCFG (showCId (lookStartCat pgf)) extCats (startRules ++ co
               getPos (SymLit j _) = [j]
               getPos _            = []
 
-        profilesToTerm :: [Profile] -> CFTerm
-        profilesToTerm ps = CFObj f (zipWith profileToTerm argTypes ps)
+        profilesToTerm :: CId -> [Profile] -> CFTerm
+        profilesToTerm f ps = CFObj f (zipWith profileToTerm argTypes ps)
             where (argTypes,_) = catSkeleton $ lookType (abstract pgf) f
 
         profileToTerm :: CId -> Profile -> CFTerm

src/compiler/GF/System/Directory.hs

@@ -8,13 +8,13 @@ import System.Directory as D
                doesDirectoryExist,doesFileExist,getModificationTime,
                getCurrentDirectory,getDirectoryContents,getPermissions,
                removeFile,renameFile)
---import Data.Time.Compat
+import Data.Time.Compat
 
 canonicalizePath path = liftIO $ D.canonicalizePath path
 createDirectoryIfMissing b = liftIO . D.createDirectoryIfMissing b
 doesDirectoryExist path = liftIO $ D.doesDirectoryExist path
 doesFileExist path = liftIO $ D.doesFileExist path
-getModificationTime path = liftIO $ {-fmap toUTCTime-} (D.getModificationTime path)
+getModificationTime path = liftIO $ fmap toUTCTime (D.getModificationTime path)
 getDirectoryContents path = liftIO $ D.getDirectoryContents path
 
 getCurrentDirectory :: MonadIO io => io FilePath

src/compiler/GF/Text/Pretty.hs

@@ -20,7 +20,6 @@ instance Pretty a => Pretty [a] where
   ppList = fsep . map pp -- hmm
 
 render x = PP.render (pp x)
-render80 x = renderStyle style{lineLength=80,ribbonsPerLine=1} x
 renderStyle s x = PP.renderStyle s (pp x)
 
 infixl 5 $$,$+$

src/pgf-binary/PGF/Data/Binary.hs

@@ -0,0 +1,489 @@
+{-# LANGUAGE FlexibleInstances, FlexibleContexts #-}
+-- | This is a layer on top of "Data.Binary" with its own 'Binary' class
+-- and customised instances for 'Word', 'Int' and 'Double'.
+-- The 'Int' and 'Word' instance use a variable-length encoding to save space
+-- for small numbers. The 'Double' instance uses the standard IEEE754 encoding.
+module PGF.Data.Binary (
+
+    -- * The Binary class
+      Binary(..)
+
+    -- * The Get and Put monads
+    , Get , Put, runPut
+
+    -- * Useful helpers for writing instances
+    , putWord8 , getWord8 , putWord16be , getWord16be
+
+    -- * Binary serialisation
+    , encode , decode
+
+    -- * IO functions for serialisation
+    , encodeFile , decodeFile
+
+    , encodeFile_ , decodeFile_
+
+    -- * Useful
+    , Word8, Word16
+
+    ) where
+
+
+import Data.Word
+
+import qualified Data.Binary as Bin
+import Data.Binary.Put
+import Data.Binary.Get
+import Data.Binary.IEEE754 ( putFloat64be, getFloat64be)
+import Control.Monad
+import Control.Exception
+import Foreign
+import System.IO
+
+import Data.ByteString.Lazy (ByteString)
+import qualified Data.ByteString.Lazy as L
+
+--import Data.Char    (chr,ord)
+--import Data.List    (unfoldr)
+
+-- And needed for the instances:
+import qualified Data.ByteString as B
+import qualified Data.Map        as Map
+import qualified Data.Set        as Set
+import qualified Data.IntMap     as IntMap
+import qualified Data.IntSet     as IntSet
+--import qualified Data.Ratio      as R
+
+--import qualified Data.Tree as T
+
+import Data.Array.Unboxed
+
+------------------------------------------------------------------------
+
+-- | The @Binary@ class provides 'put' and 'get', methods to encode and
+-- decode a Haskell value to a lazy ByteString. It mirrors the Read and
+-- Show classes for textual representation of Haskell types, and is
+-- suitable for serialising Haskell values to disk, over the network.
+--
+-- For parsing and generating simple external binary formats (e.g. C
+-- structures), Binary may be used, but in general is not suitable
+-- for complex protocols. Instead use the Put and Get primitives
+-- directly.
+--
+-- Instances of Binary should satisfy the following property:
+--
+-- > decode . encode == id
+--
+-- That is, the 'get' and 'put' methods should be the inverse of each
+-- other. A range of instances are provided for basic Haskell types. 
+--
+class Binary t where
+    -- | Encode a value in the Put monad.
+    put :: t -> Put
+    -- | Decode a value in the Get monad
+    get :: Get t
+
+------------------------------------------------------------------------
+-- Wrappers to run the underlying monad
+
+-- | Encode a value using binary serialisation to a lazy ByteString.
+--
+encode :: Binary a => a -> ByteString
+encode = runPut . put
+{-# INLINE encode #-}
+
+-- | Decode a value from a lazy ByteString, reconstructing the original structure.
+--
+decode :: Binary a => ByteString -> a
+decode = runGet get
+
+------------------------------------------------------------------------
+-- Convenience IO operations
+
+-- | Lazily serialise a value to a file
+--
+-- This is just a convenience function, it's defined simply as:
+--
+-- > encodeFile f = B.writeFile f . encode
+--
+-- So for example if you wanted to compress as well, you could use:
+--
+-- > B.writeFile f . compress . encode
+--
+encodeFile :: Binary a => FilePath -> a -> IO ()
+encodeFile f v = L.writeFile f (encode v)
+
+encodeFile_ :: FilePath -> Put -> IO ()
+encodeFile_ f m = L.writeFile f (runPut m)
+
+-- | Lazily reconstruct a value previously written to a file.
+--
+-- This is just a convenience function, it's defined simply as:
+--
+-- > decodeFile f = return . decode =<< B.readFile f
+--
+-- So for example if you wanted to decompress as well, you could use:
+--
+-- > return . decode . decompress =<< B.readFile f
+--
+decodeFile :: Binary a => FilePath -> IO a
+decodeFile f = bracket (openBinaryFile f ReadMode) hClose $ \h -> do
+    s <- L.hGetContents h
+    evaluate $ runGet get s
+
+decodeFile_ :: FilePath -> Get a -> IO a
+decodeFile_ f m = bracket (openBinaryFile f ReadMode) hClose $ \h -> do
+    s <- L.hGetContents h
+    evaluate $ runGet m s
+
+------------------------------------------------------------------------
+-- For ground types, the standard instances can be reused,
+-- but for container types it would imply using
+-- the standard instances for all types of values in the container...
+
+instance Binary () where put=Bin.put; get=Bin.get
+instance Binary Bool where put=Bin.put; get=Bin.get
+instance Binary Word8 where put=Bin.put; get=Bin.get
+instance Binary Word16 where put=Bin.put; get=Bin.get
+instance Binary Char where put=Bin.put; get=Bin.get
+
+-- -- GF doesn't need these:
+--instance Binary Ordering where put=Bin.put; get=Bin.get
+--instance Binary Word32 where put=Bin.put; get=Bin.get
+--instance Binary Word64 where put=Bin.put; get=Bin.get
+--instance Binary Int8 where put=Bin.put; get=Bin.get
+--instance Binary Int16 where put=Bin.put; get=Bin.get
+--instance Binary Int32 where put=Bin.put; get=Bin.get
+
+--instance Binary Int64 where put=Bin.put; get=Bin.get -- needed by instance Binary ByteString
+
+------------------------------------------------------------------------
+
+-- Words are written as sequence of bytes. The last bit of each
+-- byte indicates whether there are more bytes to be read
+instance Binary Word where
+    put i | i <=               0x7f = do put  a
+          | i <=             0x3fff = do put (a .|. 0x80)
+                                         put  b
+          | i <=           0x1fffff = do put (a .|. 0x80)
+                                         put (b .|. 0x80)
+                                         put  c
+          | i <=          0xfffffff = do put (a .|. 0x80)
+                                         put (b .|. 0x80)
+                                         put (c .|. 0x80)
+                                         put  d
+-- -- #if WORD_SIZE_IN_BITS < 64
+          | otherwise               = do put (a .|. 0x80)
+                                         put (b .|. 0x80)
+                                         put (c .|. 0x80)
+                                         put (d .|. 0x80)
+                                         put  e
+{-
+-- Restricted to 32 bits even on 64-bit systems, so that negative
+-- Ints are written as 5 bytes instead of 10 bytes (TH 2013-02-13)
+--#else
+          | i <=        0x7ffffffff = do put (a .|. 0x80)
+                                         put (b .|. 0x80)
+                                         put (c .|. 0x80)
+                                         put (d .|. 0x80)
+                                         put  e
+          | i <=      0x3ffffffffff = do put (a .|. 0x80)
+                                         put (b .|. 0x80)
+                                         put (c .|. 0x80)
+                                         put (d .|. 0x80)
+                                         put (e .|. 0x80)
+                                         put  f
+          | i <=    0x1ffffffffffff = do put (a .|. 0x80)
+                                         put (b .|. 0x80)
+                                         put (c .|. 0x80)
+                                         put (d .|. 0x80)
+                                         put (e .|. 0x80)
+                                         put (f .|. 0x80)
+                                         put  g
+          | i <=   0xffffffffffffff = do put (a .|. 0x80)
+                                         put (b .|. 0x80)
+                                         put (c .|. 0x80)
+                                         put (d .|. 0x80)
+                                         put (e .|. 0x80)
+                                         put (f .|. 0x80)
+                                         put (g .|. 0x80)
+                                         put  h
+          | i <=   0xffffffffffffff = do put (a .|. 0x80)
+                                         put (b .|. 0x80)
+                                         put (c .|. 0x80)
+                                         put (d .|. 0x80)
+                                         put (e .|. 0x80)
+                                         put (f .|. 0x80)
+                                         put (g .|. 0x80)
+                                         put  h
+          | i <= 0x7fffffffffffffff = do put (a .|. 0x80)
+                                         put (b .|. 0x80)
+                                         put (c .|. 0x80)
+                                         put (d .|. 0x80)
+                                         put (e .|. 0x80)
+                                         put (f .|. 0x80)
+                                         put (g .|. 0x80)
+                                         put (h .|. 0x80)
+                                         put  j
+          | otherwise               = do put (a .|. 0x80)
+                                         put (b .|. 0x80)
+                                         put (c .|. 0x80)
+                                         put (d .|. 0x80)
+                                         put (e .|. 0x80)
+                                         put (f .|. 0x80)
+                                         put (g .|. 0x80)
+                                         put (h .|. 0x80)
+                                         put (j .|. 0x80)
+                                         put  k
+-- #endif
+-}
+          where
+            a = fromIntegral (       i    .&. 0x7f) :: Word8
+            b = fromIntegral (shiftR i  7 .&. 0x7f) :: Word8
+            c = fromIntegral (shiftR i 14 .&. 0x7f) :: Word8
+            d = fromIntegral (shiftR i 21 .&. 0x7f) :: Word8
+            e = fromIntegral (shiftR i 28 .&. 0x7f) :: Word8
+{-
+            f = fromIntegral (shiftR i 35 .&. 0x7f) :: Word8
+            g = fromIntegral (shiftR i 42 .&. 0x7f) :: Word8
+            h = fromIntegral (shiftR i 49 .&. 0x7f) :: Word8
+            j = fromIntegral (shiftR i 56 .&. 0x7f) :: Word8
+            k = fromIntegral (shiftR i 63 .&. 0x7f) :: Word8
+-}
+    get = do i <- getWord8
+             (if i <= 0x7f
+                then return (fromIntegral i)
+                else do n <- get
+                        return $ (n `shiftL` 7) .|. (fromIntegral (i .&. 0x7f)))
+
+-- Int has the same representation as Word
+instance Binary Int where
+    put i   = put (fromIntegral i :: Word)
+    get     = liftM toInt32 (get :: Get Word)
+      where
+       -- restrict to 32 bits (for PGF portability, TH 2013-02-13)
+       toInt32 w = fromIntegral (fromIntegral w::Int32)::Int
+
+------------------------------------------------------------------------
+-- 
+-- Portable, and pretty efficient, serialisation of Integer
+--
+
+-- Fixed-size type for a subset of Integer
+--type SmallInt = Int32
+
+-- Integers are encoded in two ways: if they fit inside a SmallInt,
+-- they're written as a byte tag, and that value.  If the Integer value
+-- is too large to fit in a SmallInt, it is written as a byte array,
+-- along with a sign and length field.
+{-
+instance Binary Integer where
+
+    {-# INLINE put #-}
+    put n | n >= lo && n <= hi = do
+        putWord8 0
+        put (fromIntegral n :: SmallInt)  -- fast path
+     where
+        lo = fromIntegral (minBound :: SmallInt) :: Integer
+        hi = fromIntegral (maxBound :: SmallInt) :: Integer
+
+    put n = do
+        putWord8 1
+        put sign
+        put (unroll (abs n))         -- unroll the bytes
+     where
+        sign = fromIntegral (signum n) :: Word8
+
+    {-# INLINE get #-}
+    get = do
+        tag <- get :: Get Word8
+        case tag of
+            0 -> liftM fromIntegral (get :: Get SmallInt)
+            _ -> do sign  <- get
+                    bytes <- get
+                    let v = roll bytes
+                    return $! if sign == (1 :: Word8) then v else - v
+
+--
+-- Fold and unfold an Integer to and from a list of its bytes
+--
+unroll :: Integer -> [Word8]
+unroll = unfoldr step
+  where
+    step 0 = Nothing
+    step i = Just (fromIntegral i, i `shiftR` 8)
+
+roll :: [Word8] -> Integer
+roll   = foldr unstep 0
+  where
+    unstep b a = a `shiftL` 8 .|. fromIntegral b
+
+instance (Binary a,Integral a) => Binary (R.Ratio a) where
+    put r = put (R.numerator r) >> put (R.denominator r)
+    get = liftM2 (R.%) get get
+-}
+
+------------------------------------------------------------------------
+-- Instances for the first few tuples
+
+instance (Binary a, Binary b) => Binary (a,b) where
+    put (a,b)           = put a >> put b
+    get                 = liftM2 (,) get get
+
+instance (Binary a, Binary b, Binary c) => Binary (a,b,c) where
+    put (a,b,c)         = put a >> put b >> put c
+    get                 = liftM3 (,,) get get get
+
+instance (Binary a, Binary b, Binary c, Binary d) => Binary (a,b,c,d) where
+    put (a,b,c,d)       = put a >> put b >> put c >> put d
+    get                 = liftM4 (,,,) get get get get
+
+instance (Binary a, Binary b, Binary c, Binary d, Binary e) => Binary (a,b,c,d,e) where
+    put (a,b,c,d,e)     = put a >> put b >> put c >> put d >> put e
+    get                 = liftM5 (,,,,) get get get get get
+
+-- 
+-- and now just recurse:
+--
+
+instance (Binary a, Binary b, Binary c, Binary d, Binary e, Binary f)
+        => Binary (a,b,c,d,e,f) where
+    put (a,b,c,d,e,f)   = put (a,(b,c,d,e,f))
+    get                 = do (a,(b,c,d,e,f)) <- get ; return (a,b,c,d,e,f)
+
+instance (Binary a, Binary b, Binary c, Binary d, Binary e, Binary f, Binary g)
+        => Binary (a,b,c,d,e,f,g) where
+    put (a,b,c,d,e,f,g) = put (a,(b,c,d,e,f,g))
+    get                 = do (a,(b,c,d,e,f,g)) <- get ; return (a,b,c,d,e,f,g)
+
+instance (Binary a, Binary b, Binary c, Binary d, Binary e,
+          Binary f, Binary g, Binary h)
+        => Binary (a,b,c,d,e,f,g,h) where
+    put (a,b,c,d,e,f,g,h) = put (a,(b,c,d,e,f,g,h))
+    get                   = do (a,(b,c,d,e,f,g,h)) <- get ; return (a,b,c,d,e,f,g,h)
+
+instance (Binary a, Binary b, Binary c, Binary d, Binary e,
+          Binary f, Binary g, Binary h, Binary i)
+        => Binary (a,b,c,d,e,f,g,h,i) where
+    put (a,b,c,d,e,f,g,h,i) = put (a,(b,c,d,e,f,g,h,i))
+    get                     = do (a,(b,c,d,e,f,g,h,i)) <- get ; return (a,b,c,d,e,f,g,h,i)
+
+instance (Binary a, Binary b, Binary c, Binary d, Binary e,
+          Binary f, Binary g, Binary h, Binary i, Binary j)
+        => Binary (a,b,c,d,e,f,g,h,i,j) where
+    put (a,b,c,d,e,f,g,h,i,j) = put (a,(b,c,d,e,f,g,h,i,j))
+    get                       = do (a,(b,c,d,e,f,g,h,i,j)) <- get ; return (a,b,c,d,e,f,g,h,i,j)
+
+------------------------------------------------------------------------
+-- Container types
+
+instance Binary a => Binary [a] where
+    put l  = put (length l) >> mapM_ put l
+    get    = do n <- get :: Get Int
+                xs <- replicateM n get
+                return xs
+
+instance (Binary a) => Binary (Maybe a) where
+    put Nothing  = putWord8 0
+    put (Just x) = putWord8 1 >> put x
+    get = do
+        w <- getWord8
+        case w of
+            0 -> return Nothing
+            _ -> liftM Just get
+
+instance (Binary a, Binary b) => Binary (Either a b) where
+    put (Left  a) = putWord8 0 >> put a
+    put (Right b) = putWord8 1 >> put b
+    get = do
+        w <- getWord8
+        case w of
+            0 -> liftM Left  get
+            _ -> liftM Right get
+
+------------------------------------------------------------------------
+-- ByteStrings (have specially efficient instances)
+
+instance Binary B.ByteString where
+    put bs = do put (B.length bs)
+                putByteString bs
+    get    = get >>= getByteString
+
+--
+-- Using old versions of fps, this is a type synonym, and non portable
+-- 
+-- Requires 'flexible instances'
+--
+{-
+instance Binary ByteString where
+    put bs = do put (fromIntegral (L.length bs) :: Int)
+                putLazyByteString bs
+    get    = get >>= getLazyByteString
+-}
+------------------------------------------------------------------------
+-- Maps and Sets
+
+instance (Ord a, Binary a) => Binary (Set.Set a) where
+    put s = put (Set.size s) >> mapM_ put (Set.toAscList s)
+    get   = liftM Set.fromDistinctAscList get
+
+instance (Ord k, Binary k, Binary e) => Binary (Map.Map k e) where
+    put m = put (Map.size m) >> mapM_ put (Map.toAscList m)
+    get   = liftM Map.fromDistinctAscList get
+
+instance Binary IntSet.IntSet where
+    put s = put (IntSet.size s) >> mapM_ put (IntSet.toAscList s)
+    get   = liftM IntSet.fromDistinctAscList get
+
+instance (Binary e) => Binary (IntMap.IntMap e) where
+    put m = put (IntMap.size m) >> mapM_ put (IntMap.toAscList m)
+    get   = liftM IntMap.fromDistinctAscList get
+
+------------------------------------------------------------------------
+-- Floating point
+
+-- instance Binary Double where
+--     put d = put (decodeFloat d)
+--     get   = liftM2 encodeFloat get get
+
+instance Binary Double where
+    put = putFloat64be
+    get = getFloat64be
+{-
+instance Binary Float where
+    put f = put (decodeFloat f)
+    get   = liftM2 encodeFloat get get
+-}
+------------------------------------------------------------------------
+-- Trees
+{-
+instance (Binary e) => Binary (T.Tree e) where
+    put (T.Node r s) = put r >> put s
+    get = liftM2 T.Node get get
+-}
+------------------------------------------------------------------------
+-- Arrays
+
+instance (Binary i, Ix i, Binary e) => Binary (Array i e) where
+    put a = do
+        put (bounds a)
+        put (rangeSize $ bounds a) -- write the length
+        mapM_ put (elems a)        -- now the elems.
+    get = do
+        bs <- get
+        n  <- get                  -- read the length
+        xs <- replicateM n get     -- now the elems.
+        return (listArray bs xs)
+
+--
+-- The IArray UArray e constraint is non portable. Requires flexible instances
+--
+instance (Binary i, Ix i, Binary e, IArray UArray e) => Binary (UArray i e) where
+    put a = do
+        put (bounds a)
+        put (rangeSize $ bounds a) -- now write the length
+        mapM_ put (elems a)
+    get = do
+        bs <- get
+        n  <- get
+        xs <- replicateM n get
+        return (listArray bs xs)

src/pgf-binary/pgf-binary.cabal

@@ -0,0 +1,27 @@
+name: pgf-binary
+version: 0.5
+
+cabal-version: >= 1.10
+build-type: Simple
+license: BSD3
+--license-file: LICENSE
+synopsis: Custom version of the binary-0.5 package for the PGF library
+homepage: http://www.grammaticalframework.org/
+--bug-reports: http://code.google.com/p/grammatical-framework/issues/list
+maintainer: Thomas Hallgren
+stability: provisional
+category: Data, Parsing
+tested-with: GHC==7.4.2, GHC==7.8.3
+
+source-repository head
+  type:     darcs
+  location: http://www.grammaticalframework.org/
+
+Library
+  default-language:    Haskell2010
+  build-depends: base >= 4.3 && <5, binary, data-binary-ieee754,
+                 containers, array, bytestring
+  exposed-modules: PGF.Data.Binary
+
+  ghc-options: -fwarn-unused-imports -O2
+  extensions: FlexibleInstances, FlexibleContexts

src/runtime/c/Makefile.am

@@ -68,7 +68,6 @@ libpgf_la_SOURCES = \
 	pgf/data.h \
 	pgf/expr.c \
 	pgf/expr.h \
-	pgf/scanner.c \
 	pgf/parser.c \
 	pgf/lookup.c \
 	pgf/jit.c \

src/runtime/c/gu/defs.h

@@ -74,8 +74,6 @@
 
 #ifdef GU_ALIGNOF
 # define gu_alignof GU_ALIGNOF
-#elif defined(_MSC_VER)
-# define gu_alignof __alignof
 #else
 # define gu_alignof(t_) \
 	((size_t)(offsetof(struct { char c_; t_ e_; }, e_)))
@@ -89,7 +87,7 @@
 
 #define GU_COMMA ,
 
-#define GU_ARRAY_LEN(a) (sizeof(a) / sizeof(a[0]))
+#define GU_ARRAY_LEN(t,a) (sizeof((const t[])a) / sizeof(t))
 
 #define GU_ID(...) __VA_ARGS__
 
@@ -195,13 +193,9 @@ typedef union {
 	void (*fp)();
 } GuMaxAlign;
 
-#if defined(_MSC_VER)
-#include <malloc.h>
-#define gu_alloca(N) alloca(N)
-#else
 #define gu_alloca(N)				\
 	(((union { GuMaxAlign align_; uint8_t buf_[N]; }){{0}}).buf_)
-#endif
+
 
 // For Doxygen
 #define GU_PRIVATE /** @private */

src/runtime/c/gu/mem.c

@@ -8,10 +8,6 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 #endif
-#if defined(__MINGW32__) || defined(_MSC_VER)
-#include <malloc.h>
-#endif
-
 #if !defined(_MSC_VER)
 #include <unistd.h>
 #endif
@@ -112,39 +108,6 @@ gu_mem_buf_alloc(size_t min_size, size_t* real_size_out)
 	return gu_mem_buf_realloc(NULL, min_size, real_size_out);
 }
 
-#if defined(__MINGW32__) || defined(_MSC_VER)
-#include <windows.h>
-
-static int
-getpagesize()
-{
-  SYSTEM_INFO system_info;
-  GetSystemInfo(&system_info);
-  return system_info.dwPageSize;
-}
-#endif
-
-GU_API void*
-gu_mem_page_alloc(size_t min_size, size_t* real_size_out)
-{
-	size_t page_size = getpagesize();
-	size_t size = ((min_size + page_size - 1) / page_size) * page_size;
-	void *page = NULL;
-
-#if defined(ANDROID)
-	if ((page = memalign(page_size, size)) == NULL) {	
-#elif defined(__MINGW32__) || defined(_MSC_VER)
-	if ((page = malloc(size)) == NULL) {
-#else
-	if (posix_memalign(&page, page_size, size) != 0) {
-#endif
-		gu_fatal("Memory allocation failed");
-	}
-
-	*real_size_out = size;
-	return page;
-}
-
 GU_API void
 gu_mem_buf_free(void* buf)
 {
@@ -169,7 +132,6 @@ struct GuFinalizerNode {
 enum GuPoolType {
 	GU_POOL_HEAP,
 	GU_POOL_LOCAL,
-	GU_POOL_PAGE,
 	GU_POOL_MMAP
 };
 
@@ -218,16 +180,6 @@ gu_new_pool(void)
 	return pool;
 }
 
-GU_API GuPool*
-gu_new_page_pool(void)
-{
-	size_t sz = GU_FLEX_SIZE(GuPool, init_buf, gu_mem_pool_initial_size);
-	uint8_t* buf = gu_mem_page_alloc(sz, &sz);
-	GuPool* pool = gu_init_pool(buf, sz);
-	pool->type = GU_POOL_PAGE;
-	return pool;
-}
-
 GU_API GuPool* 
 gu_mmap_pool(char* fpath, void* addr, size_t size, void**pptr)
 {
@@ -286,10 +238,7 @@ gu_pool_expand(GuPool* pool, size_t req)
 					     gu_mem_chunk_max_size));
 	gu_assert(real_req >= sizeof(GuMemChunk));
 	size_t size = 0;
-	GuMemChunk* chunk = 
-		(pool->type == GU_POOL_PAGE)
-		   ? gu_mem_page_alloc(real_req,  &size)
-		   : gu_mem_buf_alloc(real_req, &size);
+	GuMemChunk* chunk = gu_mem_buf_alloc(real_req, &size);
 	chunk->next = pool->chunks;
 	pool->chunks = chunk;
 	pool->curr_buf = (uint8_t*) chunk;
@@ -360,7 +309,6 @@ gu_malloc_prefixed(GuPool* pool, size_t pre_align, size_t pre_size,
 	size_t full_size = gu_mem_advance(offsetof(GuMemChunk, data),
 					  pre_align, pre_size, align, size);
 	if (full_size > gu_mem_max_shared_alloc &&
-	    pool->type != GU_POOL_PAGE &&
 	    pool->type != GU_POOL_MMAP) {
 		GuMemChunk* chunk = gu_mem_alloc(full_size);
 		chunk->next = pool->chunks;

src/runtime/c/gu/mem.h

@@ -55,11 +55,6 @@ gu_local_pool_(uint8_t* init_buf, size_t sz);
  * should not be used in the bodies of recursive functions.
  */
 
-/// Create a pool where each chunk is corresponds to one or
-/// more pages.
-GU_API_DECL GuPool*
-gu_new_page_pool(void);
-
 /// Create a pool stored in a memory mapped file.
 GU_API_DECL GuPool* 
 gu_mmap_pool(char* fpath, void* addr, size_t size, void**pptr);
@@ -203,9 +198,6 @@ gu_mem_buf_realloc(
 	size_t min_size,
 	size_t* real_size_out);
 
-/// Allocate enough memory pages to contain min_size bytes.
-GU_API_DECL void*
-gu_mem_page_alloc(size_t min_size, size_t* real_size_out);
 
 /// Free a memory buffer.
 GU_API_DECL void

src/runtime/c/gu/seq.c

@@ -100,11 +100,6 @@ gu_seq_free(GuSeq* seq)
 	gu_mem_buf_free(seq);
 }
 
-static void
-gu_dummy_finalizer(GuFinalizer* self)
-{
-}
-
 GU_API void
 gu_buf_require(GuBuf* buf, size_t req_len)
 {
@@ -114,9 +109,7 @@ gu_buf_require(GuBuf* buf, size_t req_len)
 
 	size_t req_size = sizeof(GuSeq) + buf->elem_size * req_len;
 	size_t real_size;
-
-	gu_require(buf->fin.fn != gu_dummy_finalizer);
-
+	
 	if (buf->seq == NULL || buf->seq == gu_empty_seq())  {
 		buf->seq = gu_mem_buf_alloc(req_size, &real_size);
 		buf->seq->len = 0;
@@ -171,24 +164,6 @@ gu_buf_freeze(GuBuf* buf, GuPool* pool)
 	return seq;
 }
 
-GU_API void
-gu_buf_evacuate(GuBuf* buf, GuPool* pool)
-{
-	if (buf->seq != gu_empty_seq()) {
-		size_t len = gu_buf_length(buf);
-
-		GuSeq* seq = gu_make_seq(buf->elem_size, len, pool);
-		void* bufdata = gu_buf_data(buf);
-		void* seqdata = gu_seq_data(seq);
-		memcpy(seqdata, bufdata, buf->elem_size * len);
-		gu_mem_buf_free(buf->seq);
-
-		buf->seq       = seq;
-		buf->fin.fn    = gu_dummy_finalizer;
-		buf->avail_len = len;
-	}
-}
-
 GU_API void*
 gu_buf_insert(GuBuf* buf, size_t index)
 {
@@ -360,8 +335,13 @@ GU_API void
 gu_buf_heap_pop(GuBuf *buf, GuOrder *order, void* data_out)
 {
 	const void* last = gu_buf_trim(buf); // raises an error if empty
-	memcpy(data_out, buf->seq->data, buf->elem_size);
-	gu_heap_siftup(buf, order, last, 0);
+
+	if (gu_buf_length(buf) > 0) {
+		memcpy(data_out, buf->seq->data, buf->elem_size);
+		gu_heap_siftup(buf, order, last, 0);
+	} else {
+		memcpy(data_out, last, buf->elem_size);
+	}
 }
 
 GU_API void

src/runtime/c/gu/seq.h

@@ -182,9 +182,6 @@ gu_buf_heapify(GuBuf *buf, GuOrder *order);
 
 GU_API_DECL GuSeq*
 gu_buf_freeze(GuBuf* buf, GuPool* pool);
-
-GU_API_DECL void
-gu_buf_evacuate(GuBuf* buf, GuPool* pool);
 #endif // GU_SEQ_H_
 
 #ifdef GU_STRING_H_

src/runtime/c/pgf/data.h

@@ -76,9 +76,27 @@ typedef GuSeq PgfEquations;
 
 typedef void *PgfFunction;
 
+typedef enum {
+	PGF_DEP_PRAGMA_HEAD,
+	PGF_DEP_PRAGMA_MOD,
+	PGF_DEP_PRAGMA_REL,
+	PGF_DEP_PRAGMA_SKIP,
+	PGF_DEP_PRAGMA_ANCH,
+	PGF_DEP_PRAGMA_TAGS
+} PgfDepPragmaTag;
+
+typedef struct {
+	PgfDepPragmaTag tag;
+	size_t   index;
+	GuString label;
+} PgfDepPragma;
+
+typedef GuSeq PgfDepPragmas;
+
 typedef struct {
 	PgfCId name;
 	PgfType* type;
+	PgfDepPragmas* pragmas;
 	int arity;
 	PgfEquations* defns; // maybe null
 	PgfExprProb ep;
@@ -119,7 +137,6 @@ typedef struct {
 	PgfFlags* aflags;
 	PgfAbsFuns* funs;
 	PgfAbsCats* cats;
-	PgfAbsFun* abs_lin_fun;
 	PgfEvalGates* eval_gates;
 } PgfAbstr;
 
@@ -262,8 +279,8 @@ typedef struct {
 typedef GuSeq PgfSequences;
 
 typedef struct {
-	PgfAbsFun* absfun;
-	PgfExprProb *ep;
+	GuSeq* absfuns;
+	prob_t prob;
     int funid;
 	size_t n_lins;
 	PgfSequence* lins[];

src/runtime/c/pgf/expr.h

@@ -197,16 +197,16 @@ pgf_literal_hash(GuHash h, PgfLiteral lit);
 PGF_API_DECL GuHash
 pgf_expr_hash(GuHash h, PgfExpr e);
 
-PGF_API_DECL size_t
+PGF_API size_t
 pgf_expr_size(PgfExpr expr);
 
-PGF_API_DECL GuSeq*
+PGF_API GuSeq*
 pgf_expr_functions(PgfExpr expr, GuPool* pool);
 
-PGF_API_DECL PgfExpr
+PGF_API PgfExpr
 pgf_expr_substitute(PgfExpr expr, GuSeq* meta_values, GuPool* pool);
 
-PGF_API_DECL PgfType*
+PGF_API PgfType*
 pgf_type_substitute(PgfType* type, GuSeq* meta_values, GuPool* pool);
 
 typedef struct PgfPrintContext PgfPrintContext;

src/runtime/c/pgf/graphviz.c

@@ -413,3 +413,304 @@ pgf_graphviz_word_alignment(PgfConcr** concrs, size_t n_concrs, PgfExpr expr, Pg
 
 	gu_pool_free(tmp_pool);
 }
+
+typedef struct {
+	PgfPGF* pgf;
+	int next_fid;
+	GuBuf* anchors;
+	GuBuf* heads;
+    GuPool* pool;
+} PgfDepGenState;
+
+typedef struct {
+	int fid;
+	int visit;
+	PgfExpr expr;
+	GuBuf* edges;
+} PgfDepNode;
+
+typedef struct {
+	GuString label;
+	PgfDepNode* node;
+} PgfDepEdge;
+
+typedef struct {
+	bool   solved;
+	size_t start;
+	size_t end;
+	GuString label;
+} PgfDepStackRange;
+
+static void
+pgf_graphviz_dependency_graph_(PgfDepGenState* state,
+                               size_t parents_start,size_t parents_end,
+                               GuString head_label, GuString mod_label,
+                               PgfExpr expr);
+
+static bool
+pgf_graphviz_dependency_graph_apply(PgfDepGenState* state,
+                                    size_t parents_start,size_t parents_end,
+                                    GuString head_label, GuString mod_label,
+                                    GuBuf* args, GuSeq* pragmas)
+{
+	size_t n_args    = gu_buf_length(args);
+	size_t n_pragmas = pragmas ? gu_seq_length(pragmas) : 0;
+
+	size_t n_count = (n_args <= n_pragmas) ? n_args : n_pragmas;
+	PgfDepStackRange ranges[n_count+1];
+	for (size_t i = 0; i <= n_count; i++) {
+		ranges[i].solved = false;
+		ranges[i].label =
+			(i > 0) ? gu_seq_index(pragmas, PgfDepPragma, i-1)->label
+					: NULL;
+	}
+
+	ranges[0].start = gu_buf_length(state->heads);
+	ranges[0].end   = gu_buf_length(state->heads);
+
+    bool rel_solved = false;
+	size_t n_solved = 0;
+	size_t count = 0;
+	while (n_solved < n_count) {
+		if (!ranges[0].solved) {
+			ranges[0].start = gu_buf_length(state->heads);
+		}
+
+		for (size_t i = 0; i < n_count; i++) {
+			if (ranges[i+1].solved)
+				continue;
+
+			PgfExpr       arg    = gu_buf_get(args, PgfExpr, n_args-i-1);
+			PgfDepPragma* pragma = gu_seq_index(pragmas, PgfDepPragma, i);
+
+			switch (pragma->tag) {
+			case PGF_DEP_PRAGMA_MOD:
+				assert(pragma->index <= n_count);
+				if (ranges[0].solved && ranges[pragma->index].solved) {
+					ranges[i+1].start = gu_buf_length(state->heads);
+					pgf_graphviz_dependency_graph_(state,
+												   ranges[pragma->index].start, ranges[pragma->index].end,
+												   NULL, ranges[i+1].label,
+												   arg);
+					ranges[i+1].end   = gu_buf_length(state->heads);
+					ranges[i+1].solved= true;
+					n_solved++;
+				}
+				break;
+			case PGF_DEP_PRAGMA_REL:
+				ranges[i+1].solved = true;
+				ranges[i+1].start  = 0;
+				ranges[i+1].end    = 0;
+				n_solved++;
+
+				GuPool *tmp_pool = gu_local_pool();
+
+				GuStringBuf* sbuf =
+					gu_new_string_buf(tmp_pool);
+				GuOut* out = gu_string_buf_out(sbuf);
+				GuExn* err = gu_new_exn(tmp_pool);
+
+				pgf_print_expr(arg, NULL, 0, out, err);
+
+				ranges[pragma->index].label =
+					gu_string_buf_freeze(sbuf, state->pool);
+
+				gu_pool_free(tmp_pool);
+				break;
+			case PGF_DEP_PRAGMA_SKIP:
+				ranges[i+1].solved = true;
+				n_solved++;
+				break;
+			case PGF_DEP_PRAGMA_ANCH:
+				if (ranges[0].solved) {
+					ranges[i+1].start = gu_buf_length(state->heads);
+					pgf_graphviz_dependency_graph_(state,0,0,"ROOT","ROOT",arg);
+					ranges[i+1].end   = gu_buf_length(state->heads);
+					ranges[i+1].solved= true;
+					n_solved++;
+					count++;
+				}
+				break;
+			case PGF_DEP_PRAGMA_HEAD:
+				if (!rel_solved)
+					break;
+
+				if (!ranges[0].solved) {
+					GuString new_head_label = head_label;
+					GuString new_mod_label = mod_label;
+					if (pragma->label != NULL && *pragma->label && pragma->index == 0) {
+						new_head_label = pragma->label;
+						new_mod_label = "ROOT";
+					}
+					if (ranges[0].label != NULL)
+						new_mod_label = ranges[0].label;
+					ranges[i+1].start = gu_buf_length(state->heads);
+					pgf_graphviz_dependency_graph_(state,
+												   parents_start,parents_end,
+												   new_head_label, new_mod_label,
+												   arg);
+					ranges[i+1].end   = gu_buf_length(state->heads);
+					if (pragma->index == 0) {
+						ranges[i+1].solved = true;
+						n_solved++;
+					}
+					count++;
+				}
+				if (pragma->index != 0 && ranges[pragma->index].solved) {
+					for (size_t j = ranges[pragma->index].start; j < ranges[pragma->index].end; j++) {
+						PgfDepNode* parent = gu_buf_get(state->heads, PgfDepNode*, j);
+						for (size_t k = ranges[i+1].start; k < ranges[i+1].end; k++) {
+							PgfDepNode* child = gu_buf_get(state->heads, PgfDepNode*, k);
+							PgfDepEdge* edge = gu_buf_extend(parent->edges);
+							edge->label = pragma->label;
+							edge->node  = child;
+						}
+					}
+					ranges[i+1].solved = true;
+					n_solved++;
+				}
+				break;
+			default:
+				gu_impossible();
+			}
+		}
+
+		if (rel_solved) {
+			if (!ranges[0].solved) {
+				ranges[0].end = gu_buf_length(state->heads);
+				ranges[0].solved = true;
+			}
+		} else {
+			rel_solved = true;
+		}
+	}
+
+	gu_buf_trim_n(state->heads, gu_buf_length(state->heads)-ranges[0].end);
+
+	return (count > 0);
+}
+
+static void
+pgf_graphviz_dependency_graph_(PgfDepGenState* state,
+                               size_t parents_start,size_t parents_end,
+                               GuString head_label, GuString mod_label,
+                               PgfExpr expr)
+{
+	PgfExpr e = expr;
+	GuBuf* args = gu_new_buf(PgfDepNode*, state->pool);
+
+	for (;;) {
+		GuVariantInfo ei = gu_variant_open(e);
+		switch (ei.tag) {
+		case PGF_EXPR_APP: {
+			PgfExprApp* app = ei.data;
+			gu_buf_push(args, PgfExpr, app->arg);
+			e = app->fun;
+			break;
+		}
+		case PGF_EXPR_TYPED: {
+			PgfExprTyped* typed = ei.data;
+			e = typed->expr;
+			break;
+		}
+		case PGF_EXPR_IMPL_ARG: {
+			PgfExprImplArg* implarg = ei.data;
+			e = implarg->expr;
+			break;
+		}
+		case PGF_EXPR_FUN: {
+			PgfExprFun* fun = ei.data;
+			PgfAbsFun* absfun =
+				gu_seq_binsearch(state->pgf->abstract.funs, pgf_absfun_order, PgfAbsFun, fun->fun);
+
+			if (pgf_graphviz_dependency_graph_apply(state,
+			                                        parents_start,parents_end,
+			                                        head_label,mod_label,
+			                                        args,absfun ? absfun->pragmas : NULL))
+				return;
+			// continue to default
+		}
+		default: {
+			PgfDepNode* node = gu_new(PgfDepNode, state->pool);
+			node->fid   = state->next_fid++;
+			node->visit = 0;
+			node->expr  = expr;
+			node->edges = gu_new_buf(PgfDepEdge, state->pool);
+
+			for (size_t i = parents_start; i < parents_end; i++) {
+				PgfDepNode* parent = gu_buf_get(state->heads, PgfDepNode*, i);
+				if (head_label == NULL) {
+					PgfDepEdge* edge = gu_buf_extend(parent->edges);
+					edge->label = mod_label;
+					edge->node  = node;
+				} else {
+					PgfDepEdge* edge = gu_buf_extend(node->edges);
+					edge->label = head_label;
+					edge->node  = parent;
+				}
+			}
+
+			gu_buf_push(state->heads, PgfDepNode*, node);
+			if (head_label != NULL)
+				gu_buf_push(state->anchors, PgfDepNode*, node);
+
+			return;
+		}
+		}
+	}
+}
+
+static void
+pgf_graphviz_print_graph(PgfGraphvizOptions* opts, PgfDepNode* node,
+                         GuOut* out, GuExn* err)
+{
+	if (node->visit++ > 0)
+		return;
+
+	gu_printf(out, err, "  n%d[label = \"", node->fid);
+	pgf_print_expr(node->expr, NULL, 0, out, err);
+	if (opts->nodeColor != NULL && *opts->nodeColor)
+		gu_printf(out, err, ", fontcolor = \"%s\"", opts->nodeColor);
+	if (opts->nodeFont != NULL && *opts->nodeFont)
+		gu_printf(out, err, ", fontname = \"%s\"", opts->nodeFont);
+	gu_puts("\"]\n", out, err);
+
+	size_t n_children = gu_buf_length(node->edges);
+	for (size_t i = 0; i < n_children; i++) {
+		PgfDepEdge* edge = gu_buf_index(node->edges, PgfDepEdge, n_children-i-1);
+		gu_printf(out, err, "  n%d -> n%d [label = \"%s\"",
+		          node->fid, edge->node->fid, edge->label);
+		if (opts->nodeEdgeStyle != NULL && *opts->nodeEdgeStyle)
+			gu_printf(out, err, ", style = \"%s\"", opts->nodeEdgeStyle);
+		if (opts->nodeColor != NULL && *opts->nodeColor)
+			gu_printf(out, err, ", color = \"%s\"", opts->nodeColor);
+		gu_puts("]\n", out, err);
+
+		if (edge->node->fid > node->fid)
+			pgf_graphviz_print_graph(opts, edge->node, out, err);
+	}
+}
+
+void
+pgf_graphviz_dependency_graph(PgfPGF* pgf, PgfExpr expr,
+                              PgfGraphvizOptions* opts,
+                              GuOut* out, GuExn* err,
+                              GuPool* pool)
+{
+	PgfDepGenState state;
+	state.pgf  = pgf;
+	state.next_fid = 1;
+	state.pool = pool;
+	state.anchors = gu_new_buf(PgfDepNode*, pool);
+	state.heads   = gu_new_buf(PgfDepNode*, pool);
+
+	pgf_graphviz_dependency_graph_(&state, 0, 0, "ROOT", "ROOT", expr);
+
+	gu_puts("digraph {\n", out, err);
+	size_t n_anchors = gu_buf_length(state.anchors);
+	for (size_t i = 0; i < n_anchors; i++) {
+		PgfDepNode* node = gu_buf_get(state.anchors, PgfDepNode*, i);
+		pgf_graphviz_print_graph(opts,node,out,err);
+	}
+	gu_puts("}", out, err);
+}

src/runtime/c/pgf/jit.c

@@ -5,6 +5,9 @@
 #include <pgf/reasoner.h>
 #include <pgf/reader.h>
 #include "lightning.h"
+#if defined(__MINGW32__) || defined(_MSC_VER)
+#include <malloc.h>
+#endif
 
 //#define PGF_JIT_DEBUG
 
@@ -40,6 +43,18 @@ typedef struct {
 #define JIT_VSTATE JIT_V1
 #define JIT_VCLOS  JIT_V2
 
+#if defined(__MINGW32__) || defined(_MSC_VER)
+#include <windows.h>
+
+static int
+getpagesize()
+{
+  SYSTEM_INFO system_info;
+  GetSystemInfo(&system_info);
+  return system_info.dwPageSize;
+}
+#endif
+
 
 static void
 pgf_jit_finalize_page(GuFinalizer* self)
@@ -50,8 +65,19 @@ pgf_jit_finalize_page(GuFinalizer* self)
 static void
 pgf_jit_alloc_page(PgfReader* rdr)
 {
-	size_t page_size;
-	void *page = gu_mem_page_alloc(sizeof(GuFinalizer), &page_size);
+	void *page;
+
+	size_t page_size = getpagesize();
+
+#if defined(ANDROID)
+	if ((page = memalign(page_size, page_size)) == NULL) {	
+#elif defined(__MINGW32__) || defined(_MSC_VER)
+	if ((page = malloc(page_size)) == NULL) {
+#else
+	if (posix_memalign(&page, page_size, page_size) != 0) {
+#endif
+		gu_fatal("Memory allocation failed");
+	}
 
 	GuFinalizer* fin = page;
 	fin->fn = pgf_jit_finalize_page;